diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0cd47bfa6d1d..1d74e6e64316 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,11 +69,11 @@ jobs:
         - run:
             name: cache server tests
             command: './scripts/circle-test-cache-servers.sh'
-  
+
   end-to-end-test:
       docker:
         - image: circleci/node:8-browsers
-        - image: grafana/grafana:master
+        - image: grafana/grafana-dev:master-$CIRCLE_SHA1
       steps:
           - run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
           - checkout
@@ -91,6 +91,12 @@ jobs:
               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:
@@ -103,7 +109,7 @@ jobs:
       - run:
           # Important: all words have to be in lowercase, and separated by "\n".
           name: exclude known exceptions
-          command: 'echo -e "unknwon" > words_to_ignore.txt'
+          command: 'echo -e "unknwon\nreferer\nerrorstring" > words_to_ignore.txt'
       - run:
           name: check documentation spelling errors
           command: 'codespell -I ./words_to_ignore.txt docs/'
@@ -588,6 +594,7 @@ jobs:
           root: .
           paths:
             - dist/grafana-*.msi
+            - dist/grafana-*.msi.sha256
 
   store-build-artifacts:
     docker:
@@ -628,7 +635,7 @@ workflows:
             - mysql-integration-test
             - postgres-integration-test
             - build-oss-msi
-          filters: *filter-only-master
+          filters: *filter-only-master 
       - grafana-docker-master:
           requires:
             - build-all
@@ -661,7 +668,10 @@ workflows:
             - mysql-integration-test
             - postgres-integration-test
           filters: *filter-only-master
-
+      - end-to-end-test:
+          requires:
+            - grafana-docker-master
+          filters: *filter-only-master
   release:
     jobs:
       - build-all:
@@ -722,7 +732,7 @@ workflows:
             - backend-lint
             - mysql-integration-test
             - postgres-integration-test
-          filters: *filter-only-master
+          filters: *filter-only-release
 
   build-branches-and-prs:
       jobs:
diff --git a/.gitignore b/.gitignore
index 50bfceb36861..2df94cb35c98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,10 +79,12 @@ debug.test
 /scripts/build/release_publisher/release_publisher
 *.patch
 
-
 # Ignoring frontend packages specifics
 /packages/**/dist
 /packages/**/compiled
 /packages/**/.rpt2_cache
 
-theOutput/
\ No newline at end of file
+theOutput/
+
+# Ignore go local build dependencies
+/scripts/go/bin/**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7183196d91f4..64d8d41d5f5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,59 @@
-# 6.2.0 (unreleased)
+# 6.3.0 (unreleased)
+
+# 6.2.1 (2019-05-27)
+
+### Features / Enhancements
+  * **CLI**: Add command to migrate all datasources to use encrypted password fields . [#17118](https://github.com/grafana/grafana/pull/17118), [@aocenas](https://github.com/aocenas)
+  * **Gauge/BarGauge**: Improvements to auto value font size . [#17292](https://github.com/grafana/grafana/pull/17292), [@torkelo](https://github.com/torkelo)
+
+### Bug Fixes
+  * **Auth Proxy**: Resolve database is locked errors. [#17274](https://github.com/grafana/grafana/pull/17274), [@marefr](https://github.com/marefr)
+  * **Database**: Retry transaction if sqlite returns database is locked error. [#17276](https://github.com/grafana/grafana/pull/17276), [@marefr](https://github.com/marefr)
+  * **Explore**: Fixes so clicking in a Prometheus Table the query is filtered by clicked value. [#17083](https://github.com/grafana/grafana/pull/17083), [@hugohaggmark](https://github.com/hugohaggmark)
+  * **Singlestat**: Fixes issue with value placement and line wraps. [#17249](https://github.com/grafana/grafana/pull/17249), [@torkelo](https://github.com/torkelo)
+  * **Tech**: Update jQuery to 3.4.1 to fix issue on iOS 10 based browers as well as Chrome 53.x . [#17290](https://github.com/grafana/grafana/pull/17290), [@timbutler](https://github.com/timbutler)
+
+# 6.2.0 (2019-05-22)
+
+### Bug Fixes
+* **BarGauge**: Fix for negative min values. [#17192](https://github.com/grafana/grafana/pull/17192), [@torkelo](https://github.com/torkelo)
+* **Gauge/BarGauge**: Fix for issues editing min & max options. [#17174](https://github.com/grafana/grafana/pull/17174)
+* **Search**: Make only folder name only open search with current folder filter. [#17226](https://github.com/grafana/grafana/pull/17226)
+* **AzureMonitor**: Revert to clearing chained dropdowns. [#17212](https://github.com/grafana/grafana/pull/17212)
+
+### Breaking Changes
+* **Plugins**: Data source plugins that process hidden queries need to add a "hiddenQueries: true" attribute in plugin.json. [#17124](https://github.com/grafana/grafana/pull/17124), [@ryantxu](https://github.com/ryantxu)
+
+### Removal of old deprecated package repository
+
+5 months ago we deprecated our old package cloud repository and [replaced it](https://grafana.com/blog/2019/01/05/moving-to-packages.grafana.com/) with our own. We will remove the old depreciated
+repo on July 1st. Make sure you have switched to the new repo by then. The new repository has all our old releases so you are not required to upgrade just to switch package repository.
+
+# 6.2.0-beta2 (2019-05-15)
+
+### Features / Enhancements
+  * **Plugins**: Support templated urls in plugin routes. [#16599](https://github.com/grafana/grafana/pull/16599), [@briangann](https://github.com/briangann)
+  * **Packaging**: New MSI windows installer package**. [#17073](https://github.com/grafana/grafana/pull/17073), [@briangann](https://github.com/briangann)
+
+  ### Bug Fixes
+  * **Dashboard**: Fixes blank dashboard after window resize with panel without title. [#16942](https://github.com/grafana/grafana/pull/16942), [@torkelo](https://github.com/torkelo)
+  * **Dashboard**: Fixes lazy loading & expanding collapsed rows on mobile. [#17055](https://github.com/grafana/grafana/pull/17055), [@torkelo](https://github.com/torkelo)
+  * **Dashboard**: Fixes scrolling issues for Edge browser. [#17033](https://github.com/grafana/grafana/pull/17033), [@jschill](https://github.com/jschill)
+  * **Dashboard**: Show refresh button in first kiosk(tv) mode. [#17032](https://github.com/grafana/grafana/pull/17032), [@torkelo](https://github.com/torkelo)
+  * **Explore**: Fix empty result from datasource should render logs container. [#16999](https://github.com/grafana/grafana/pull/16999), [@marefr](https://github.com/marefr)
+  * **Explore**: Fixes so clicking in a Prometheus Table the query is filtered by clicked value. [#17083](https://github.com/grafana/grafana/pull/17083), [@hugohaggmark](https://github.com/hugohaggmark)
+  * **Explore**: Makes it possible to zoom in Explore/Loki/Graph without exception. [#16991](https://github.com/grafana/grafana/pull/16991), [@hugohaggmark](https://github.com/hugohaggmark)
+  * **Gauge**: Fixes orientation issue after switching from BarGauge to Gauge. [#17064](https://github.com/grafana/grafana/pull/17064), [@torkelo](https://github.com/torkelo)
+  * **GettingStarted**: Fixes layout issues in getting started panel. [#16941](https://github.com/grafana/grafana/pull/16941), [@torkelo](https://github.com/torkelo)
+  * **InfluxDB**: Fix HTTP method should default to GET. [#16949](https://github.com/grafana/grafana/pull/16949), [@StephenSorriaux](https://github.com/StephenSorriaux)
+  * **Panels**: Fixed alert icon position in panel header. [#17070](https://github.com/grafana/grafana/pull/17070), [@torkelo](https://github.com/torkelo)
+  * **Panels**: Fixes panel error tooltip not showing. [#16993](https://github.com/grafana/grafana/pull/16993), [@torkelo](https://github.com/torkelo)
+  * **Plugins**: Fix how datemath utils are exposed to plugins. [#16976](https://github.com/grafana/grafana/pull/16976), [@marefr](https://github.com/marefr)
+  * **Singlestat**: fixed centering issue for very small panels. [#16944](https://github.com/grafana/grafana/pull/16944), [@torkelo](https://github.com/torkelo)
+  * **Search**: Scroll issue in dashboard search in latest Chrome. [#17054](https://github.com/grafana/grafana/pull/17054), [@jschill](https://github.com/jschill)
+  * **Docker**: Prevent a permission denied error when writing files to the default provisioning directory. [#16831](https://github.com/grafana/grafana/pull/16831), [@wmedlar](https://github.com/wmedlar)
+  * **Gauge**: Adds background shade to gauge track and improves height usage. [#17019](https://github.com/grafana/grafana/pull/17019), [@torkelo](https://github.com/torkelo)
+  * **RemoteCache**: Avoid race condition in Set causing error on insert. . [#17082](https://github.com/grafana/grafana/pull/17082), [@bergquist](https://github.com/bergquist)
 
 # 6.2.0-beta1 (2019-05-07)
 
@@ -30,6 +85,7 @@
   * **Provisioning**: Add API endpoint to reload provisioning configs. [#16579](https://github.com/grafana/grafana/pull/16579), [@aocenas](https://github.com/aocenas)
   * **Provisioning**: Do not allow deletion of provisioned dashboards. [#16211](https://github.com/grafana/grafana/pull/16211), [@aocenas](https://github.com/aocenas)
   * **Provisioning**: Interpolate env vars in provisioning files. [#16499](https://github.com/grafana/grafana/pull/16499), [@aocenas](https://github.com/aocenas)
+  * **Provisioning**: Support FolderUid in Dashboard Provisioning Config. [#16559](https://github.com/grafana/grafana/pull/16559), [@swtch1](https://github.com/swtch1)
   * **Security**: Add new setting allow_embedding. [#16853](https://github.com/grafana/grafana/pull/16853), [@marefr](https://github.com/marefr)
   * **Security**: Store datasource passwords encrypted in secureJsonData. [#16175](https://github.com/grafana/grafana/pull/16175), [@aocenas](https://github.com/aocenas)
   * **UX**: Improve Grafana usage for smaller screens. [#16783](https://github.com/grafana/grafana/pull/16783), [@torkelo](https://github.com/torkelo)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 272e53787601..db02d4134948 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,6 +31,8 @@ To setup a local development environment we recommend reading [Building Grafana
 
 * Add tests relevant to the fixed bug or new feature.
 
+* Follow [PR and commit messages guidelines](#PR-and-commit-messages-guidelines)
+
 ### Pull requests with new features
 Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
 
@@ -38,12 +40,12 @@ Make sure to include `Closes #<issue number>` or `Fixes #<issue number>` in the
 
 ### Pull requests with bug fixes
 Please make all changes in one commit if possible. Include `Closes #<issue number>` in bottom of the commit message.
-A commit message for a bug fix should look something like this.
+A commit message for a bug fix should look something like this:
 
 ```
-avoid infinite loop in the dashboard provisioner
+Dashboard: Avoid infinite loop in the dashboard provisioner
 
-if one dashboard with an uid is refered to by two
+If one dashboard with an uid is refered to by two
 provsioners each provisioner overwrite each other.
 filling up dashboard_versions quite fast if using
 default settings.
@@ -51,6 +53,8 @@ default settings.
 Closes #12864
 ```
 
+For more details about PR naming and commit messages please see [PR and commit messages guidelines](#PR-and-commit-messages-guidelines)
+
 If the pull request needs changes before its merged the new commits should be rebased into one commit before its merged.
 
 ## Backend dependency management
@@ -80,3 +84,22 @@ GO111MODULE=on go mod vendor
 ```
 
 You have to commit the changes to `go.mod`, `go.sum` and the `vendor/` directory before submitting the pull request.
+
+## PR and commit messages guidelines
+PR title and squash commit messages should follow guidelines below:
+
+```
+Area of changes: Message
+
+Detailed description
+```
+
+The `Area of changes` is related either to functional domain (i.e. Build, Release) or feature domain (i.e. Explore, Plugins, BarGaugePanel).
+
+
+`Message` should be concise, written in present tense and start with capitalised verb. Detailed description should be provided as commit message body, by entering a blank line between commit title and the description.
+
+### Examples of good PR titles/commit messages:
+- `Explore: Adds Live option for supported datasources`
+- `GraphPanel: Don't sort series when legend table & sort column is not visible`
+- `Build: Support publishing MSI to grafana.com`
diff --git a/Dockerfile b/Dockerfile
index 537aaca840cb..fd305d8af3ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,6 +35,8 @@ RUN ./node_modules/.bin/grunt build
 # Final container
 FROM debian:stretch-slim
 
+LABEL maintainer="Grafana team <hello@grafana.com>"
+
 ARG GF_UID="472"
 ARG GF_GID="472"
 
diff --git a/Makefile b/Makefile
index 2e06a9569651..1d71675dbaba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 -include local/Makefile
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go test-go test-js test run clean
+.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go test-go test-js test run clean gosec revive devenv devenv-down revive-alerting
+
+GO := GO111MODULE=on go
+GO_FILES := ./pkg/...
 
 all: deps build
 
@@ -66,3 +69,52 @@ clean:
 node_modules: package.json yarn.lock
 	@echo "install frontend dependencies"
 	yarn install --pure-lockfile --no-progress
+
+scripts/go/bin/revive: scripts/go/go.mod
+	@cd scripts/go; \
+	$(GO) build -o ./bin/revive github.com/mgechev/revive
+
+scripts/go/bin/gosec: scripts/go/go.mod
+	@cd scripts/go; \
+	$(GO) build -o ./bin/gosec github.com/securego/gosec/cmd/gosec
+
+revive: scripts/go/bin/revive
+	@scripts/go/bin/revive \
+		-formatter stylish \
+		-config ./scripts/go/configs/revive.toml \
+		$(GO_FILES)
+
+revive-alerting: scripts/go/bin/revive
+	@scripts/go/bin/revive \
+		-formatter stylish \
+		./pkg/services/alerting/...
+
+# create docker-compose file with provided sources and start them
+# example: make devenv sources=postgres,openldap
+ifeq ($(sources),)
+devenv:
+	@printf 'You have to define sources for this command \nexample: make devenv sources=postgres,openldap\n'
+else
+devenv: devenv-down
+	$(eval targets := $(shell echo '$(sources)' | tr "," " "))
+
+	@cd devenv; \
+	./create_docker_compose.sh $(targets) || \
+	(rm -rf docker-compose.yaml; exit 1)
+
+	@cd devenv; \
+	docker-compose up -d --build
+endif
+
+# drop down the envs
+devenv-down:
+	@cd devenv; \
+	test -f docker-compose.yaml && \
+	docker-compose down || exit 0;
+
+# TODO recheck the rules and leave only necessary exclusions
+gosec: scripts/go/bin/gosec
+	@scripts/go/bin/gosec -quiet \
+		-exclude=G104,G107,G201,G202,G204,G301,G304,G401,G402,G501 \
+		-conf=./scripts/go/configs/gosec.json \
+		$(GO_FILES)
diff --git a/conf/defaults.ini b/conf/defaults.ini
index acbf080b5d32..7fcb02d3115a 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -47,6 +47,9 @@ enforce_domain = false
 # The full public facing url
 root_url = %(protocol)s://%(domain)s:%(http_port)s/
 
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
+serve_from_sub_path = false
+
 # Log web requests
 router_logging = false
 
diff --git a/conf/sample.ini b/conf/sample.ini
index e318026b73ad..e942f6d1b014 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -48,6 +48,9 @@
 # If you use reverse proxy and sub path specify full url (with sub path)
 ;root_url = http://localhost:3000
 
+# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
+;serve_from_sub_path = false
+
 # Log web requests
 ;router_logging = false
 
diff --git a/devenv/datasources.yaml b/devenv/datasources.yaml
index e0f63bef2999..33dde611bdcd 100644
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -1,10 +1,11 @@
+
 apiVersion: 1
 
 datasources:
   - name: gdev-graphite
     type: graphite
     access: proxy
-    url: http://localhost:8080
+    url: http://localhost:8180
     jsonData:
       graphiteVersion: "1.1"
 
@@ -142,6 +143,17 @@ datasources:
       timeField: "@timestamp"
       esVersion: 70
 
+  - name: gdev-elasticsearch-v7-metricbeat
+    type: elasticsearch
+    access: proxy
+    database: "[metricbeat-]YYYY.MM.DD"
+    url: http://localhost:12200
+    jsonData:
+      interval: Daily
+      timeField: "@timestamp"
+      esVersion: 70
+      timeInterval: "10s"
+
   - name: gdev-mysql
     type: mysql
     url: localhost:3306
diff --git a/devenv/dev-dashboards/datasource-testdata/new_features_in_v62.json b/devenv/dev-dashboards/datasource-testdata/new_features_in_v62.json
new file mode 100644
index 000000000000..f3844bea1f39
--- /dev/null
+++ b/devenv/dev-dashboards/datasource-testdata/new_features_in_v62.json
@@ -0,0 +1,1337 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "content": "# v6.2 Feature Demos \n\nScroll down to view all demo panels. \n",
+      "gridPos": {
+        "h": 3,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 13,
+      "links": [],
+      "mode": "markdown",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 3
+      },
+      "id": 15,
+      "title": "Bar Gauge",
+      "type": "row"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 4
+      },
+      "id": 7,
+      "links": [],
+      "options": {
+        "displayMode": "lcd",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "watt"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "green",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "orange",
+              "index": 1,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 2,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "vertical"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "E",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "10003,33333"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "G",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "refId": "I",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "J",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "K",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "L",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "P",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Retro LED mode",
+      "type": "bargauge"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 10,
+        "w": 18,
+        "x": 0,
+        "y": 11
+      },
+      "id": 6,
+      "links": [],
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "celsius"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "blue",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "green",
+              "index": 1,
+              "value": 20
+            },
+            {
+              "color": "orange",
+              "index": 2,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "horizontal"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "alias": "Inside",
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "alias": "Outhouse",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "Area B",
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "Basement",
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "Garage",
+          "refId": "D",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Gradient mode",
+      "type": "bargauge"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 10,
+        "w": 6,
+        "x": 18,
+        "y": 11
+      },
+      "id": 8,
+      "links": [],
+      "options": {
+        "displayMode": "basic",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "watt"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "blue",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "green",
+              "index": 1,
+              "value": 42.5
+            },
+            {
+              "color": "orange",
+              "index": 2,
+              "value": 80
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 90
+            }
+          ],
+          "values": false
+        },
+        "orientation": "horizontal"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "J",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "K",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "L",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "P",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Basic",
+      "type": "bargauge"
+    },
+    {
+      "collapsed": false,
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 21
+      },
+      "id": 36,
+      "panels": [],
+      "title": "Gauge multi series",
+      "type": "row"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 6,
+        "w": 18,
+        "x": 0,
+        "y": 22
+      },
+      "id": 38,
+      "links": [],
+      "options": {
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "max": 100,
+            "min": 0,
+            "unit": "decgbytes"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "green",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "red",
+              "index": 1,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "auto",
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "pluginVersion": "6.3.0-pre",
+      "targets": [
+        {
+          "alias": "sda1",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda2",
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda3",
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda4",
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda5",
+          "refId": "E",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda6",
+          "refId": "F",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "type": "gauge"
+    },
+    {
+      "content": "  \n* The new Gauge and Bar Gauge repeat for every series, row or column your queries return.\n* Works great with table & time series data \n",
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 18,
+        "y": 22
+      },
+      "id": 40,
+      "links": [],
+      "mode": "markdown",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Multiple Series or Rows",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 28
+      },
+      "id": 19,
+      "panels": [],
+      "title": "Panels With No Title",
+      "type": "row"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": ["#299c46", "#73BF69", "#d44a3a"],
+      "datasource": "gdev-testdata",
+      "decimals": null,
+      "format": "ms",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 0,
+        "y": 29
+      },
+      "id": 20,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "pluginVersion": "6.2.0-pre",
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "p99",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": true
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "type": "singlestat",
+      "valueFontSize": "120%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": ["#299c46", "#73BF69", "#d44a3a"],
+      "datasource": "gdev-testdata",
+      "decimals": null,
+      "format": "ms",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 6,
+        "y": 29
+      },
+      "id": 23,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "pluginVersion": "6.2.0-pre",
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "p95",
+      "prefixFontSize": "80%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": true
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "type": "singlestat",
+      "valueFontSize": "120%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": true,
+      "colors": ["#299c46", "#73BF69", "#d44a3a"],
+      "datasource": "gdev-testdata",
+      "decimals": null,
+      "format": "ms",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 12,
+        "y": 29
+      },
+      "id": 24,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "pluginVersion": "6.2.0-pre",
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "p90",
+      "prefixFontSize": "80%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": true
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "thresholds": "",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "type": "singlestat",
+      "valueFontSize": "120%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
+    {
+      "content": "In v6.2 if you remove the panel title the visualization will take up all the space available. \nThe panel header menu will be overlayed on top if you hover over the panel so you can still move & edit the panel. ",
+      "gridPos": {
+        "h": 4,
+        "w": 6,
+        "x": 18,
+        "y": 29
+      },
+      "id": 42,
+      "links": [],
+      "mode": "markdown",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 4,
+        "w": 24,
+        "x": 0,
+        "y": 33
+      },
+      "id": 17,
+      "links": [],
+      "options": {
+        "displayMode": "lcd",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "max": 100,
+            "min": 0,
+            "title": "Completion rate",
+            "unit": "percent"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "red",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "red",
+              "index": 1,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "horizontal"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "type": "bargauge"
+    },
+    {
+      "aliasColors": {
+        "A-series": "blue",
+        "B-series": "dark-purple",
+        "C-series": "purple",
+        "Q-series": "dark-blue"
+      },
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-testdata",
+      "fill": 3,
+      "gridPos": {
+        "h": 6,
+        "w": 24,
+        "x": 0,
+        "y": 37
+      },
+      "id": 26,
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pluginVersion": "6.2.0-pre",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": true,
+      "steppedLine": false,
+      "targets": [
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 43
+      },
+      "id": 22,
+      "panels": [],
+      "title": "Lazy loading of panels",
+      "type": "row"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-testdata",
+      "fill": 1,
+      "gridPos": {
+        "h": 8,
+        "w": 15,
+        "x": 0,
+        "y": 44
+      },
+      "id": 28,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "slow_query",
+          "stringInput": "5s"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Slow Query (5s)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "content": "\n# Lazy Loading\n\nAs you scroll down you will see that Grafana only loads & issues queries for these panels as they are scrolled in to view. \nThis greatly reduces the load on your data source backends if you have many long dashboards with many panels. \n\n\n",
+      "gridPos": {
+        "h": 40,
+        "w": 9,
+        "x": 15,
+        "y": 44
+      },
+      "id": 34,
+      "links": [],
+      "mode": "markdown",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "",
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-testdata",
+      "fill": 1,
+      "gridPos": {
+        "h": 8,
+        "w": 15,
+        "x": 0,
+        "y": 52
+      },
+      "id": 30,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "slow_query",
+          "stringInput": "5s"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Slow Query (5s)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-testdata",
+      "fill": 1,
+      "gridPos": {
+        "h": 8,
+        "w": 15,
+        "x": 0,
+        "y": 60
+      },
+      "id": 31,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "slow_query",
+          "stringInput": "5s"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Slow Query (5s)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-testdata",
+      "fill": 1,
+      "gridPos": {
+        "h": 8,
+        "w": 15,
+        "x": 0,
+        "y": 68
+      },
+      "id": 32,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "slow_query",
+          "stringInput": "5s"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Slow Query (5s)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-testdata",
+      "fill": 1,
+      "gridPos": {
+        "h": 8,
+        "w": 15,
+        "x": 0,
+        "y": 76
+      },
+      "id": 29,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "slow_query",
+          "stringInput": "5s"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Slow Query (5s)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 18,
+  "style": "dark",
+  "tags": ["gdev", "demo"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+  },
+  "timezone": "",
+  "title": "New Features in v6.2",
+  "uid": "ZvPm55mWk",
+  "version": 1
+}
diff --git a/devenv/dev-dashboards/home.json b/devenv/dev-dashboards/home.json
index 8608b0b82647..f4cdfed9d53e 100644
--- a/devenv/dev-dashboards/home.json
+++ b/devenv/dev-dashboards/home.json
@@ -48,39 +48,39 @@
         "y": 0
       },
       "headings": false,
-      "id": 8,
+      "id": 2,
       "limit": 1000,
       "links": [],
       "query": "",
       "recent": false,
       "search": true,
       "starred": false,
-      "tags": ["panel-demo"],
+      "tags": ["panel-tests"],
       "timeFrom": null,
       "timeShift": null,
-      "title": "tag: panel-demo",
+      "title": "tag: panel-tests",
       "type": "dashlist"
     },
     {
       "folderId": null,
       "gridPos": {
-        "h": 13,
+        "h": 26,
         "w": 6,
         "x": 12,
         "y": 0
       },
       "headings": false,
-      "id": 2,
+      "id": 3,
       "limit": 1000,
       "links": [],
       "query": "",
       "recent": false,
       "search": true,
       "starred": false,
-      "tags": ["panel-tests"],
+      "tags": ["gdev", "demo"],
       "timeFrom": null,
       "timeShift": null,
-      "title": "tag: panel-tests",
+      "title": "tag: dashboard-demo",
       "type": "dashlist"
     },
     {
@@ -114,28 +114,6 @@
         "y": 13
       },
       "headings": false,
-      "id": 3,
-      "limit": 1000,
-      "links": [],
-      "query": "",
-      "recent": false,
-      "search": true,
-      "starred": false,
-      "tags": ["gdev", "demo"],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "tag: dashboard-demo",
-      "type": "dashlist"
-    },
-    {
-      "folderId": null,
-      "gridPos": {
-        "h": 13,
-        "w": 6,
-        "x": 12,
-        "y": 13
-      },
-      "headings": false,
       "id": 4,
       "limit": 1000,
       "links": [],
@@ -146,7 +124,7 @@
       "tags": ["templating", "gdev"],
       "timeFrom": null,
       "timeShift": null,
-      "title": "tag: templating",
+      "title": "tag: templating ",
       "type": "dashlist"
     }
   ],
@@ -167,5 +145,5 @@
   "timezone": "",
   "title": "Grafana Dev Overview & Home",
   "uid": "j6T00KRZz",
-  "version": 1
+  "version": 2
 }
diff --git a/devenv/dev-dashboards/panel-bargauge/animated_demo.json b/devenv/dev-dashboards/panel-bargauge/bar_gauge_demo.json
similarity index 62%
rename from devenv/dev-dashboards/panel-bargauge/animated_demo.json
rename to devenv/dev-dashboards/panel-bargauge/bar_gauge_demo.json
index a061f5766d1f..dcbc7fd1343d 100644
--- a/devenv/dev-dashboards/panel-bargauge/animated_demo.json
+++ b/devenv/dev-dashboards/panel-bargauge/bar_gauge_demo.json
@@ -15,26 +15,27 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
+  "id": 7501,
   "links": [],
   "panels": [
     {
+      "datasource": "gdev-testdata",
       "gridPos": {
         "h": 7,
-        "w": 18,
+        "w": 24,
         "x": 0,
         "y": 0
       },
-      "id": 7,
+      "id": 2,
       "links": [],
       "options": {
-        "displayMode": "gradient",
+        "displayMode": "lcd",
         "fieldOptions": {
           "calcs": ["mean"],
           "defaults": {
-            "decimals": null,
             "max": 100,
             "min": 0,
-            "unit": "watt"
+            "unit": "decgbytes"
           },
           "mappings": [],
           "override": {},
@@ -47,7 +48,7 @@
             {
               "color": "orange",
               "index": 1,
-              "value": 40
+              "value": 60
             },
             {
               "color": "red",
@@ -59,92 +60,103 @@
         },
         "orientation": "vertical"
       },
-      "pluginVersion": "6.2.0-pre",
       "targets": [
         {
+          "alias": "sda1",
           "refId": "A",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda2",
           "refId": "B",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda3",
           "refId": "C",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda4",
           "refId": "D",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda5",
           "refId": "E",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "10003,33333"
+          "scenarioId": "random_walk"
         },
         {
+          "alias": "sda6",
           "refId": "F",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda7",
           "refId": "G",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda8",
           "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
+          "scenarioId": "random_walk"
         },
         {
+          "alias": "sda9",
           "refId": "I",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda10",
           "refId": "J",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda11",
           "refId": "K",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda12",
           "refId": "L",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda13",
           "refId": "M",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda14",
           "refId": "N",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda15",
           "refId": "O",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda16",
           "refId": "P",
           "scenarioId": "random_walk"
-        },
-        {
-          "refId": "Q",
-          "scenarioId": "random_walk"
         }
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Usage",
+      "title": "",
+      "transparent": true,
       "type": "bargauge"
     },
     {
+      "datasource": "gdev-testdata",
       "gridPos": {
-        "h": 22,
-        "w": 6,
-        "x": 18,
-        "y": 0
+        "h": 10,
+        "w": 16,
+        "x": 0,
+        "y": 7
       },
-      "id": 8,
+      "id": 4,
       "links": [],
       "options": {
         "displayMode": "gradient",
@@ -154,25 +166,30 @@
             "decimals": null,
             "max": 100,
             "min": 0,
-            "unit": "watt"
+            "unit": "celsius"
           },
           "mappings": [],
           "override": {},
           "thresholds": [
             {
-              "color": "green",
+              "color": "blue",
               "index": 0,
               "value": null
             },
             {
-              "color": "orange",
+              "color": "green",
               "index": 1,
-              "value": 55
+              "value": 20
             },
             {
-              "color": "red",
+              "color": "orange",
               "index": 2,
-              "value": 95
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 80
             }
           ],
           "values": false
@@ -182,32 +199,94 @@
       "pluginVersion": "6.2.0-pre",
       "targets": [
         {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
+          "alias": "Inside",
           "refId": "H",
           "scenarioId": "csv_metric_values",
           "stringInput": "100,100,100"
         },
         {
+          "alias": "Outhouse",
           "refId": "A",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "Area B",
           "refId": "B",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "Basement",
           "refId": "C",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "Garage",
           "refId": "D",
           "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Gradient mode",
+      "type": "bargauge"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 10,
+        "w": 6,
+        "x": 16,
+        "y": 7
+      },
+      "id": 6,
+      "links": [],
+      "options": {
+        "displayMode": "basic",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "watt"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "blue",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "green",
+              "index": 1,
+              "value": 42.5
+            },
+            {
+              "color": "orange",
+              "index": 2,
+              "value": 80
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 90
+            }
+          ],
+          "values": false
+        },
+        "orientation": "horizontal"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
         },
         {
-          "refId": "I",
+          "refId": "A",
           "scenarioId": "random_walk"
         },
         {
@@ -241,47 +320,78 @@
         {
           "refId": "Q",
           "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Basic",
+      "type": "bargauge"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 22,
+        "w": 2,
+        "x": 22,
+        "y": 7
+      },
+      "id": 8,
+      "links": [],
+      "options": {
+        "displayMode": "lcd",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "max": 100,
+            "min": 0
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "red",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "red",
+              "index": 1,
+              "value": 90
+            }
+          ],
+          "values": false
         },
+        "orientation": "vertical"
+      },
+      "targets": [
         {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "R",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "S",
+          "refId": "A",
           "scenarioId": "random_walk"
         }
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Usage",
+      "title": "Completion",
       "type": "bargauge"
     },
     {
+      "datasource": "gdev-testdata",
       "gridPos": {
-        "h": 15,
-        "w": 11,
+        "h": 12,
+        "w": 22,
         "x": 0,
-        "y": 7
+        "y": 17
       },
-      "id": 6,
+      "id": 10,
       "links": [],
       "options": {
         "displayMode": "gradient",
         "fieldOptions": {
           "calcs": ["mean"],
           "defaults": {
-            "decimals": null,
             "max": 100,
             "min": 0,
-            "unit": "celsius"
+            "unit": "decgbytes"
           },
           "mappings": [],
           "override": {},
@@ -294,12 +404,12 @@
             {
               "color": "green",
               "index": 1,
-              "value": 20
+              "value": 30
             },
             {
               "color": "orange",
               "index": 2,
-              "value": 40
+              "value": 60
             },
             {
               "color": "red",
@@ -309,69 +419,113 @@
           ],
           "values": false
         },
-        "orientation": "horizontal"
+        "orientation": "vertical"
       },
-      "pluginVersion": "6.2.0-pre",
       "targets": [
         {
-          "alias": "Inside",
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "alias": "Outhouse",
+          "alias": "sda1",
           "refId": "A",
           "scenarioId": "random_walk"
         },
         {
-          "alias": "Area B",
+          "alias": "sda2",
           "refId": "B",
           "scenarioId": "random_walk"
         },
         {
-          "alias": "Basement",
+          "alias": "sda3",
           "refId": "C",
           "scenarioId": "random_walk"
         },
         {
-          "alias": "Garage",
+          "alias": "sda4",
           "refId": "D",
           "scenarioId": "random_walk"
         },
         {
-          "alias": "Attic",
+          "alias": "sda5",
           "refId": "E",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda6",
           "refId": "F",
           "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda7",
+          "refId": "G",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda8",
+          "refId": "H",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda9",
+          "refId": "I",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda10",
+          "refId": "J",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda11",
+          "refId": "K",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda12",
+          "refId": "L",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda13",
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda14",
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda15",
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda16",
+          "refId": "P",
+          "scenarioId": "random_walk"
         }
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Temperature",
+      "title": "",
       "type": "bargauge"
     },
     {
+      "datasource": "gdev-testdata",
       "gridPos": {
-        "h": 15,
-        "w": 7,
-        "x": 11,
-        "y": 7
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 29
       },
-      "id": 9,
+      "id": 11,
       "links": [],
       "options": {
         "displayMode": "basic",
         "fieldOptions": {
           "calcs": ["mean"],
           "defaults": {
-            "decimals": null,
             "max": 100,
             "min": 0,
-            "unit": "celsius"
+            "unit": "decgbytes"
           },
           "mappings": [],
           "override": {},
@@ -384,12 +538,12 @@
             {
               "color": "green",
               "index": 1,
-              "value": 20
+              "value": 30
             },
             {
               "color": "orange",
               "index": 2,
-              "value": 40
+              "value": 60
             },
             {
               "color": "red",
@@ -399,89 +553,113 @@
           ],
           "values": false
         },
-        "orientation": "horizontal"
+        "orientation": "vertical"
       },
-      "pluginVersion": "6.2.0-pre",
       "targets": [
         {
-          "alias": "Inside",
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "alias": "Outhouse",
+          "alias": "sda1",
           "refId": "A",
           "scenarioId": "random_walk"
         },
         {
-          "alias": "Area B",
+          "alias": "sda2",
           "refId": "B",
           "scenarioId": "random_walk"
         },
         {
-          "alias": "Basement",
+          "alias": "sda3",
           "refId": "C",
           "scenarioId": "random_walk"
         },
         {
-          "alias": "Garage",
+          "alias": "sda4",
           "refId": "D",
           "scenarioId": "random_walk"
         },
         {
-          "alias": "Attic",
+          "alias": "sda5",
           "refId": "E",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda6",
           "refId": "F",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda7",
           "refId": "G",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda8",
+          "refId": "H",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda9",
           "refId": "I",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda10",
           "refId": "J",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda11",
           "refId": "K",
           "scenarioId": "random_walk"
         },
         {
+          "alias": "sda12",
           "refId": "L",
           "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda13",
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda14",
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda15",
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "alias": "sda16",
+          "refId": "P",
+          "scenarioId": "random_walk"
         }
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Temperature",
+      "title": "",
       "type": "bargauge"
     }
   ],
-  "refresh": false,
+  "refresh": "10s",
   "schemaVersion": 18,
   "style": "dark",
-  "tags": ["gdev", "bargauge", "panel-demo"],
+  "tags": ["gdev", "demo"],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-30m",
+    "from": "now-6h",
     "to": "now"
   },
   "timepicker": {
-    "refresh_intervals": ["1s", "5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "refresh_intervals": ["2s", "5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
     "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
   },
   "timezone": "",
-  "title": "Bar Gauge Animated Demo",
-  "uid": "k5IUwQeikaa",
-  "version": 1
+  "title": "Bar Gauge Demo",
+  "uid": "vmie2cmWz",
+  "version": 3
 }
diff --git a/devenv/dev-dashboards/panel-bargauge/gradient_demo.json b/devenv/dev-dashboards/panel-bargauge/gradient_demo.json
deleted file mode 100644
index ffe68eb7a863..000000000000
--- a/devenv/dev-dashboards/panel-bargauge/gradient_demo.json
+++ /dev/null
@@ -1,376 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "gridPos": {
-        "h": 7,
-        "w": 18,
-        "x": 0,
-        "y": 0
-      },
-      "id": 7,
-      "links": [],
-      "options": {
-        "displayMode": "gradient",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "watt"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "green",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "orange",
-              "index": 1,
-              "value": 40
-            },
-            {
-              "color": "red",
-              "index": 2,
-              "value": 80
-            }
-          ],
-          "values": false
-        },
-        "orientation": "vertical"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "10003,33333"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "refId": "I",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "J",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "K",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "L",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "M",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "N",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "O",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "P",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "Q",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Usage",
-      "type": "bargauge"
-    },
-    {
-      "gridPos": {
-        "h": 20,
-        "w": 6,
-        "x": 18,
-        "y": 0
-      },
-      "id": 8,
-      "links": [],
-      "options": {
-        "displayMode": "gradient",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "watt"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "green",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "orange",
-              "index": 1,
-              "value": 65
-            },
-            {
-              "color": "red",
-              "index": 2,
-              "value": 95
-            }
-          ],
-          "values": false
-        },
-        "orientation": "horizontal"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "I",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "J",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "K",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "L",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "M",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "N",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "O",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "P",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "Q",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "R",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "S",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Usage",
-      "type": "bargauge"
-    },
-    {
-      "gridPos": {
-        "h": 13,
-        "w": 18,
-        "x": 0,
-        "y": 7
-      },
-      "id": 6,
-      "links": [],
-      "options": {
-        "displayMode": "gradient",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "celsius"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "blue",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "green",
-              "index": 1,
-              "value": 20
-            },
-            {
-              "color": "orange",
-              "index": 2,
-              "value": 40
-            },
-            {
-              "color": "red",
-              "index": 3,
-              "value": 80
-            }
-          ],
-          "values": false
-        },
-        "orientation": "horizontal"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "alias": "Inside",
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "alias": "Outhouse",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Area B",
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Basement",
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Garage",
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Attic",
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Temperature",
-      "type": "bargauge"
-    }
-  ],
-  "schemaVersion": 18,
-  "style": "dark",
-  "tags": ["gdev", "bargauge", "panel-demo"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
-  },
-  "timezone": "",
-  "title": "Bar Gauge Gradient Demo",
-  "uid": "RndRQw6mz",
-  "version": 1
-}
diff --git a/devenv/dev-dashboards/panel-bargauge/many_modes_demo.json b/devenv/dev-dashboards/panel-bargauge/many_modes_demo.json
deleted file mode 100644
index 8b498e78ef15..000000000000
--- a/devenv/dev-dashboards/panel-bargauge/many_modes_demo.json
+++ /dev/null
@@ -1,405 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "gridPos": {
-        "h": 7,
-        "w": 22,
-        "x": 0,
-        "y": 0
-      },
-      "id": 7,
-      "links": [],
-      "options": {
-        "displayMode": "lcd",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "watt"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "green",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "orange",
-              "index": 1,
-              "value": 40
-            },
-            {
-              "color": "red",
-              "index": 2,
-              "value": 80
-            }
-          ],
-          "values": false
-        },
-        "orientation": "vertical"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "10003,33333"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "refId": "I",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "J",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "K",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "L",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "M",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "N",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "O",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "P",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "Q",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Usage",
-      "type": "bargauge"
-    },
-    {
-      "gridPos": {
-        "h": 20,
-        "w": 2,
-        "x": 22,
-        "y": 0
-      },
-      "id": 11,
-      "links": [],
-      "options": {
-        "displayMode": "lcd",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "percent"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "green",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "red",
-              "index": 1,
-              "value": 80
-            }
-          ],
-          "values": false
-        },
-        "orientation": "vertical"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Progress",
-      "type": "bargauge"
-    },
-    {
-      "gridPos": {
-        "h": 13,
-        "w": 10,
-        "x": 0,
-        "y": 7
-      },
-      "id": 6,
-      "links": [],
-      "options": {
-        "displayMode": "gradient",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "celsius"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "blue",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "green",
-              "index": 1,
-              "value": 20
-            },
-            {
-              "color": "orange",
-              "index": 2,
-              "value": 40
-            },
-            {
-              "color": "red",
-              "index": 3,
-              "value": 80
-            }
-          ],
-          "values": false
-        },
-        "orientation": "horizontal"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "alias": "Inside",
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "alias": "Outhouse",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Area B",
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Basement",
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Garage",
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Attic",
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Temperature",
-      "type": "bargauge"
-    },
-    {
-      "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 10,
-        "y": 7
-      },
-      "id": 8,
-      "links": [],
-      "options": {
-        "displayMode": "basic",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "watt"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "green",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "purple",
-              "index": 1,
-              "value": 50
-            },
-            {
-              "color": "blue",
-              "index": 2,
-              "value": 70
-            }
-          ],
-          "values": false
-        },
-        "orientation": "horizontal"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "I",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "J",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "K",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "L",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "M",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "N",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "O",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "P",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "Q",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Usage",
-      "type": "bargauge"
-    }
-  ],
-  "schemaVersion": 18,
-  "style": "dark",
-  "tags": ["gdev", "bargauge", "panel-demo"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
-  },
-  "timezone": "",
-  "title": "Bar Gauge All Modes Demo",
-  "uid": "zt2f6NgZzaa",
-  "version": 1
-}
diff --git a/devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json b/devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json
new file mode 100644
index 000000000000..6230bb6c3055
--- /dev/null
+++ b/devenv/dev-dashboards/panel-bargauge/panel_tests_bar_gauge.json
@@ -0,0 +1,829 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 0,
+        "y": 0
+      },
+      "id": 6,
+      "links": [],
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "celsius"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "blue",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "green",
+              "index": 1,
+              "value": 20
+            },
+            {
+              "color": "orange",
+              "index": 2,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "horizontal"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "alias": "Inside",
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "alias": "Outhouse",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Title above bar",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 7,
+        "w": 5,
+        "x": 6,
+        "y": 0
+      },
+      "id": 12,
+      "links": [],
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "celsius"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "blue",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "green",
+              "index": 1,
+              "value": 20
+            },
+            {
+              "color": "orange",
+              "index": 2,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "horizontal"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "alias": "Inside",
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "alias": "Outhouse",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Title to left of bar",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 7,
+        "w": 7,
+        "x": 11,
+        "y": 0
+      },
+      "id": 13,
+      "links": [],
+      "options": {
+        "displayMode": "basic",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "celsius"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "blue",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "green",
+              "index": 1,
+              "value": 20
+            },
+            {
+              "color": "orange",
+              "index": 2,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "horizontal"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "alias": "Inside",
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "alias": "Outhouse",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Basic mode",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 0
+      },
+      "id": 14,
+      "links": [],
+      "options": {
+        "displayMode": "lcd",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "celsius"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "blue",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "green",
+              "index": 1,
+              "value": 20
+            },
+            {
+              "color": "orange",
+              "index": 2,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "horizontal"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "alias": "Inside",
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "alias": "Outhouse",
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "LED",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 9,
+        "w": 11,
+        "x": 0,
+        "y": 7
+      },
+      "id": 7,
+      "links": [],
+      "options": {
+        "displayMode": "lcd",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "watt"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "green",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "orange",
+              "index": 1,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 2,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "vertical"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "refId": "E",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "10003,33333"
+        },
+        {
+          "refId": "F",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "G",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "refId": "I",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "J",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "K",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "L",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "P",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "LED Vertical",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 9,
+        "w": 13,
+        "x": 11,
+        "y": 7
+      },
+      "id": 8,
+      "links": [],
+      "options": {
+        "displayMode": "basic",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": null,
+            "max": 100,
+            "min": 0,
+            "unit": "watt"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "green",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "purple",
+              "index": 1,
+              "value": 50
+            },
+            {
+              "color": "blue",
+              "index": 2,
+              "value": 70
+            }
+          ],
+          "values": false
+        },
+        "orientation": "vertical"
+      },
+      "pluginVersion": "6.2.0-pre",
+      "targets": [
+        {
+          "refId": "H",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "100,100,100"
+        },
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "I",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "J",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "K",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "L",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "M",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "N",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "O",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "P",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "Q",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Basic vertical ",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 7,
+        "w": 11,
+        "x": 0,
+        "y": 16
+      },
+      "id": 16,
+      "links": [],
+      "options": {
+        "displayMode": "lcd",
+        "fieldOptions": {
+          "calcs": ["last"],
+          "defaults": {
+            "max": 100,
+            "min": 0
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "green",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "blue",
+              "index": 1,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 2,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "horizontal"
+      },
+      "pluginVersion": "6.3.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "1,20,90,30,5,0,-100"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Negative value below min",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 7,
+        "w": 3,
+        "x": 11,
+        "y": 16
+      },
+      "id": 17,
+      "links": [],
+      "options": {
+        "displayMode": "lcd",
+        "fieldOptions": {
+          "calcs": ["last"],
+          "defaults": {
+            "max": 100,
+            "min": 0
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "green",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "blue",
+              "index": 1,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 2,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "vertical"
+      },
+      "pluginVersion": "6.3.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "1,20,90,30,5,0,-100"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Negative value below min",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 7,
+        "w": 3,
+        "x": 14,
+        "y": 16
+      },
+      "id": 18,
+      "links": [],
+      "options": {
+        "displayMode": "lcd",
+        "fieldOptions": {
+          "calcs": ["last"],
+          "defaults": {
+            "max": 100,
+            "min": -10
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "green",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "blue",
+              "index": 1,
+              "value": 40
+            },
+            {
+              "color": "red",
+              "index": 2,
+              "value": 80
+            }
+          ],
+          "values": false
+        },
+        "orientation": "vertical"
+      },
+      "pluginVersion": "6.3.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "1,20,90,30,5,6"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Positive value above min",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 7,
+        "w": 3,
+        "x": 17,
+        "y": 16
+      },
+      "id": 19,
+      "links": [],
+      "options": {
+        "displayMode": "lcd",
+        "fieldOptions": {
+          "calcs": ["last"],
+          "defaults": {
+            "max": 35,
+            "min": -20
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "blue",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "green",
+              "index": 1,
+              "value": 5
+            },
+            {
+              "color": "#EAB839",
+              "index": 2,
+              "value": 25
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 30
+            }
+          ],
+          "values": false
+        },
+        "orientation": "vertical"
+      },
+      "pluginVersion": "6.3.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "1,20,90,30,5,6"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Negative min ",
+      "type": "bargauge"
+    },
+    {
+      "gridPos": {
+        "h": 7,
+        "w": 4,
+        "x": 20,
+        "y": 16
+      },
+      "id": 20,
+      "links": [],
+      "options": {
+        "displayMode": "gradient",
+        "fieldOptions": {
+          "calcs": ["last"],
+          "defaults": {
+            "max": 35,
+            "min": -20
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "blue",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "green",
+              "index": 1,
+              "value": 5
+            },
+            {
+              "color": "#EAB839",
+              "index": 2,
+              "value": 25
+            },
+            {
+              "color": "red",
+              "index": 3,
+              "value": 30
+            }
+          ],
+          "values": false
+        },
+        "orientation": "vertical"
+      },
+      "pluginVersion": "6.3.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "30,30"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Negative min",
+      "type": "bargauge"
+    }
+  ],
+  "schemaVersion": 18,
+  "style": "dark",
+  "tags": ["gdev", "panel-tests"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
+    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+  },
+  "timezone": "",
+  "title": "Panel Tests - Bar Gauge",
+  "uid": "O6f11TZWk",
+  "version": 12
+}
diff --git a/devenv/dev-dashboards/panel-bargauge/retro_led_demo.json b/devenv/dev-dashboards/panel-bargauge/retro_led_demo.json
deleted file mode 100644
index 3fe8272c4dfe..000000000000
--- a/devenv/dev-dashboards/panel-bargauge/retro_led_demo.json
+++ /dev/null
@@ -1,400 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "gridPos": {
-        "h": 8,
-        "w": 22,
-        "x": 0,
-        "y": 0
-      },
-      "id": 7,
-      "links": [],
-      "options": {
-        "displayMode": "lcd",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "watt"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "green",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "orange",
-              "index": 1,
-              "value": 40
-            },
-            {
-              "color": "red",
-              "index": 2,
-              "value": 80
-            }
-          ],
-          "values": false
-        },
-        "orientation": "vertical"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "10003,33333"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "refId": "I",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "J",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "K",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "L",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "M",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "N",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "O",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "P",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "Q",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Usage",
-      "type": "bargauge"
-    },
-    {
-      "gridPos": {
-        "h": 21,
-        "w": 2,
-        "x": 22,
-        "y": 0
-      },
-      "id": 11,
-      "links": [],
-      "options": {
-        "displayMode": "lcd",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "percent"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "green",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "red",
-              "index": 1,
-              "value": 80
-            }
-          ],
-          "values": false
-        },
-        "orientation": "vertical"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Progress",
-      "type": "bargauge"
-    },
-    {
-      "gridPos": {
-        "h": 13,
-        "w": 10,
-        "x": 0,
-        "y": 8
-      },
-      "id": 6,
-      "links": [],
-      "options": {
-        "displayMode": "lcd",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "celsius"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "green",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "orange",
-              "index": 1,
-              "value": 40
-            },
-            {
-              "color": "red",
-              "index": 2,
-              "value": 80
-            }
-          ],
-          "values": false
-        },
-        "orientation": "horizontal"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "alias": "Inside",
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "alias": "Outhouse",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Area B",
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Basement",
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Garage",
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Attic",
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Temperature",
-      "type": "bargauge"
-    },
-    {
-      "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 10,
-        "y": 8
-      },
-      "id": 8,
-      "links": [],
-      "options": {
-        "displayMode": "lcd",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": null,
-            "max": 100,
-            "min": 0,
-            "unit": "watt"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "green",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "orange",
-              "index": 1,
-              "value": 85
-            },
-            {
-              "color": "red",
-              "index": 2,
-              "value": 95
-            }
-          ],
-          "values": false
-        },
-        "orientation": "horizontal"
-      },
-      "pluginVersion": "6.2.0-pre",
-      "targets": [
-        {
-          "refId": "H",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "100,100,100"
-        },
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "I",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "J",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "K",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "L",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "M",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "N",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "O",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "P",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "Q",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Usage",
-      "type": "bargauge"
-    }
-  ],
-  "schemaVersion": 18,
-  "style": "dark",
-  "tags": ["gdev", "bargauge", "panel-demo"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
-  },
-  "timezone": "",
-  "title": "Bar Gauge LED Demo",
-  "uid": "0G3rbkqmkaa",
-  "version": 1
-}
diff --git a/devenv/dev-dashboards/panel-gauge/gauge-multi-series.json b/devenv/dev-dashboards/panel-gauge/gauge-multi-series.json
index 2f89d3ea9f31..3e1428a98657 100644
--- a/devenv/dev-dashboards/panel-gauge/gauge-multi-series.json
+++ b/devenv/dev-dashboards/panel-gauge/gauge-multi-series.json
@@ -21,79 +21,62 @@
       "datasource": "gdev-testdata",
       "gridPos": {
         "h": 8,
-        "w": 24,
+        "w": 20,
         "x": 0,
         "y": 0
       },
       "id": 6,
       "links": [],
-      "options-gauge": {
-        "decimals": 0,
-        "maxValue": 100,
-        "minValue": 0,
-        "options": {
-          "decimals": 0,
-          "maxValue": 100,
-          "minValue": 0,
-          "prefix": "",
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true,
-          "stat": "avg",
-          "suffix": "",
-          "thresholds": [],
-          "unit": "none",
-          "valueMappings": []
+      "options": {
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": 0,
+            "max": 100,
+            "min": 0,
+            "unit": "none"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "#7EB26D",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "#EAB839",
+              "index": 1,
+              "value": 50
+            },
+            {
+              "color": "#6ED0E0",
+              "index": 2,
+              "value": 75
+            },
+            {
+              "color": "#EF843C",
+              "index": 3,
+              "value": 87.5
+            },
+            {
+              "color": "#E24D42",
+              "index": 4,
+              "value": 93.75
+            },
+            {
+              "color": "#1F78C1",
+              "index": 5,
+              "value": 96.875
+            }
+          ],
+          "values": false
         },
-        "prefix": "",
+        "orientation": "auto",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "stat": "avg",
-        "suffix": "",
-        "thresholds": [
-          {
-            "color": "#1F78C1",
-            "index": 5,
-            "value": 96.875
-          },
-          {
-            "color": "#E24D42",
-            "index": 4,
-            "value": 93.75
-          },
-          {
-            "color": "#EF843C",
-            "index": 3,
-            "value": 87.5
-          },
-          {
-            "color": "#6ED0E0",
-            "index": 2,
-            "value": 75
-          },
-          {
-            "color": "#EAB839",
-            "index": 1,
-            "value": 50
-          },
-          {
-            "color": "#7EB26D",
-            "index": 0,
-            "value": null
-          }
-        ],
-        "unit": "none",
-        "valueMappings": [
-          {
-            "from": "50",
-            "id": 1,
-            "operator": "",
-            "text": "Hello :) ",
-            "to": "90",
-            "type": 2,
-            "value": ""
-          }
-        ]
+        "showThresholdMarkers": true
       },
+      "pluginVersion": "6.3.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -124,50 +107,48 @@
     {
       "datasource": "gdev-testdata",
       "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 8
+        "h": 28,
+        "w": 4,
+        "x": 20,
+        "y": 0
       },
-      "id": 2,
+      "id": 4,
       "links": [],
-      "options-gauge": {
-        "decimals": 0,
-        "maxValue": 100,
-        "minValue": 0,
-        "options": {
-          "decimals": 0,
-          "maxValue": 100,
-          "minValue": 0,
-          "prefix": "",
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true,
-          "stat": "avg",
-          "suffix": "",
-          "thresholds": [],
-          "unit": "none",
-          "valueMappings": []
+      "options": {
+        "fieldOptions": {
+          "calcs": ["max"],
+          "defaults": {
+            "decimals": 0,
+            "max": "200",
+            "min": 0,
+            "unit": "none"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "#7EB26D",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "#EAB839",
+              "index": 1,
+              "value": 50
+            },
+            {
+              "color": "#6ED0E0",
+              "index": 2,
+              "value": 75
+            }
+          ],
+          "values": false
         },
-        "prefix": "",
+        "orientation": "auto",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "stat": "avg",
-        "suffix": "",
-        "thresholds": [
-          {
-            "color": "#EAB839",
-            "index": 1,
-            "value": 50
-          },
-          {
-            "color": "#7EB26D",
-            "index": 0,
-            "value": null
-          }
-        ],
-        "unit": "none",
-        "valueMappings": []
+        "showThresholdMarkers": true
       },
+      "pluginVersion": "6.3.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -192,61 +173,49 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Repeat horizontal",
+      "title": "Vertical",
       "type": "gauge"
     },
     {
       "datasource": "gdev-testdata",
       "gridPos": {
-        "h": 14,
-        "w": 5,
+        "h": 20,
+        "w": 20,
         "x": 0,
-        "y": 16
+        "y": 8
       },
-      "id": 4,
+      "id": 2,
       "links": [],
-      "options-gauge": {
-        "decimals": 0,
-        "maxValue": "200",
-        "minValue": 0,
-        "options": {
-          "decimals": 0,
-          "maxValue": 100,
-          "minValue": 0,
-          "prefix": "",
-          "showThresholdLabels": false,
-          "showThresholdMarkers": true,
-          "stat": "avg",
-          "suffix": "",
-          "thresholds": [],
-          "unit": "none",
-          "valueMappings": []
+      "options": {
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "decimals": 0,
+            "max": 100,
+            "min": 0,
+            "unit": "none"
+          },
+          "mappings": [],
+          "override": {},
+          "thresholds": [
+            {
+              "color": "#7EB26D",
+              "index": 0,
+              "value": null
+            },
+            {
+              "color": "#EAB839",
+              "index": 1,
+              "value": 50
+            }
+          ],
+          "values": false
         },
-        "prefix": "",
+        "orientation": "auto",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true,
-        "stat": "max",
-        "suffix": "",
-        "thresholds": [
-          {
-            "color": "#6ED0E0",
-            "index": 2,
-            "value": 75
-          },
-          {
-            "color": "#EAB839",
-            "index": 1,
-            "value": 50
-          },
-          {
-            "color": "#7EB26D",
-            "index": 0,
-            "value": null
-          }
-        ],
-        "unit": "none",
-        "valueMappings": []
+        "showThresholdMarkers": true
       },
+      "pluginVersion": "6.3.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -271,11 +240,11 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Vertical",
+      "title": "Repeat horizontal",
       "type": "gauge"
     }
   ],
-  "schemaVersion": 17,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["panel-tests", "gdev", "gauge"],
   "templating": {
@@ -292,5 +261,5 @@
   "timezone": "",
   "title": "Panel Tests - Gauge Multi Series",
   "uid": "szkuR1umk",
-  "version": 7
+  "version": 2
 }
diff --git a/devenv/docker/blocks/elastic7/docker-compose.yaml b/devenv/docker/blocks/elastic7/docker-compose.yaml
index 3ef922c890c3..45e2836f870e 100644
--- a/devenv/docker/blocks/elastic7/docker-compose.yaml
+++ b/devenv/docker/blocks/elastic7/docker-compose.yaml
@@ -21,3 +21,19 @@
       - ./docker/blocks/elastic7/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
       - /var/log:/var/log:ro
       - ../data/log:/var/log/grafana:ro
+
+  metricbeat7:
+    image: docker.elastic.co/beats/metricbeat-oss:7.0.0
+    network_mode: host
+    command: metricbeat -e -strict.perms=false
+    user: root
+    volumes:
+      - ./docker/blocks/elastic7/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+
+  kibana7:
+    image: docker.elastic.co/kibana/kibana-oss:7.0.0
+    ports:
+      - "5601:5601"
+    environment:
+      ELASTICSEARCH_HOSTS: http://elasticsearch7:9200
diff --git a/devenv/docker/blocks/elastic7/metricbeat.yml b/devenv/docker/blocks/elastic7/metricbeat.yml
new file mode 100644
index 000000000000..4788c0cdd9a5
--- /dev/null
+++ b/devenv/docker/blocks/elastic7/metricbeat.yml
@@ -0,0 +1,38 @@
+metricbeat.config:
+  modules:
+    path: ${path.config}/modules.d/*.yml
+    # Reload module configs as they change:
+    reload.enabled: false
+
+metricbeat.autodiscover:
+  providers:
+    - type: docker
+      hints.enabled: true
+
+metricbeat.modules:
+- module: docker
+  metricsets:
+    - "container"
+    - "cpu"
+    - "diskio"
+    - "healthcheck"
+    - "info"
+    #- "image"
+    - "memory"
+    - "network"
+  hosts: ["unix:///var/run/docker.sock"]
+  period: 10s
+  enabled: true
+
+processors:
+  - add_cloud_metadata: ~
+
+output.elasticsearch:
+  hosts: ["localhost:12200"]
+  index: "metricbeat-%{+yyyy.MM.dd}"
+
+setup.template.name: "metricbeat"
+setup.template.pattern: "metricbeat-*"
+setup.template.settings:
+  index.number_of_shards: 1
+  index.number_of_replicas: 1
\ No newline at end of file
diff --git a/devenv/docker/blocks/multiple-openldap/admins-ldap-server.Dockerfile b/devenv/docker/blocks/multiple-openldap/admins-ldap-server.Dockerfile
new file mode 100644
index 000000000000..29e581d2b137
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/admins-ldap-server.Dockerfile
@@ -0,0 +1,30 @@
+# Fork of https://github.com/dinkel/docker-openldap
+
+FROM debian:jessie
+
+LABEL maintainer="Grafana team <hello@grafana.com>"
+
+ENV OPENLDAP_VERSION 2.4.40
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        slapd=${OPENLDAP_VERSION}* \
+        ldap-utils && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN mv /etc/ldap /etc/ldap.dist
+
+EXPOSE 389
+
+VOLUME ["/etc/ldap", "/var/lib/ldap"]
+
+COPY admins-ldap-server/modules/ /etc/ldap.dist/modules
+COPY admins-ldap-server/prepopulate/ /etc/ldap.dist/prepopulate
+
+COPY ./entrypoint.sh /entrypoint.sh
+COPY ./prepopulate.sh /prepopulate.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["slapd", "-d", "32768", "-u", "openldap", "-g", "openldap"]
diff --git a/devenv/docker/blocks/multiple-openldap/admins-ldap-server/modules/memberof.ldif b/devenv/docker/blocks/multiple-openldap/admins-ldap-server/modules/memberof.ldif
new file mode 100644
index 000000000000..fd9cce957c33
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/admins-ldap-server/modules/memberof.ldif
@@ -0,0 +1,33 @@
+dn: cn=module,cn=config
+cn: module
+objectClass: olcModuleList
+objectClass: top
+olcModulePath: /usr/lib/ldap
+olcModuleLoad: memberof.la
+
+dn: olcOverlay={0}memberof,olcDatabase={1}hdb,cn=config
+objectClass: olcConfig
+objectClass: olcMemberOf
+objectClass: olcOverlayConfig
+objectClass: top
+olcOverlay: memberof
+olcMemberOfDangling: ignore
+olcMemberOfRefInt: TRUE
+olcMemberOfGroupOC: groupOfNames
+olcMemberOfMemberAD: member
+olcMemberOfMemberOfAD: memberOf
+
+dn: cn=module,cn=config
+cn: module
+objectClass: olcModuleList
+objectClass: top
+olcModulePath: /usr/lib/ldap
+olcModuleLoad: refint.la
+
+dn: olcOverlay={1}refint,olcDatabase={1}hdb,cn=config
+objectClass: olcConfig
+objectClass: olcOverlayConfig
+objectClass: olcRefintConfig
+objectClass: top
+olcOverlay: {1}refint
+olcRefintAttribute: memberof member manager owner
diff --git a/devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/1_units.ldif b/devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/1_units.ldif
new file mode 100644
index 000000000000..22e063036889
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/1_units.ldif
@@ -0,0 +1,9 @@
+dn: ou=groups,dc=grafana,dc=org
+ou: Groups
+objectclass: top
+objectclass: organizationalUnit
+
+dn: ou=users,dc=grafana,dc=org
+ou: Users
+objectclass: top
+objectclass: organizationalUnit
diff --git a/devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/2_users.ldif b/devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/2_users.ldif
new file mode 100644
index 000000000000..1ee592dc7a06
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/2_users.ldif
@@ -0,0 +1,20 @@
+# ldap-admin
+dn: cn=ldap-admin,ou=users,dc=grafana,dc=org
+mail: ldap-admin@grafana.com
+userPassword: grafana
+objectClass: person
+objectClass: top
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+sn: ldap-admin
+cn: ldap-admin
+
+dn: cn=ldap-torkel,ou=users,dc=grafana,dc=org
+mail: ldap-torkel@grafana.com
+userPassword: grafana
+objectClass: person
+objectClass: top
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+sn: ldap-torkel
+cn: ldap-torkel
diff --git a/devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/3_groups.ldif b/devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/3_groups.ldif
new file mode 100644
index 000000000000..f7285f8a9c32
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/3_groups.ldif
@@ -0,0 +1,6 @@
+dn: cn=admins,ou=groups,dc=grafana,dc=org
+cn: admins
+objectClass: groupOfNames
+objectClass: top
+member: cn=ldap-admin,ou=users,dc=grafana,dc=org
+member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
diff --git a/devenv/docker/blocks/multiple-openldap/docker-compose.yaml b/devenv/docker/blocks/multiple-openldap/docker-compose.yaml
new file mode 100644
index 000000000000..7ed0ca2e840a
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/docker-compose.yaml
@@ -0,0 +1,23 @@
+  admins-openldap:
+    build: 
+      context: docker/blocks/multiple-openldap
+      dockerfile: ./admins-ldap-server.Dockerfile
+    environment:
+      SLAPD_PASSWORD: grafana
+      SLAPD_DOMAIN: grafana.org
+      SLAPD_ADDITIONAL_MODULES: memberof
+    ports:
+      - "389:389"
+
+  openldap:
+    build: 
+      context: docker/blocks/multiple-openldap
+      dockerfile: ./ldap-server.Dockerfile
+    environment:
+      SLAPD_PASSWORD: grafana
+      SLAPD_DOMAIN: grafana.org
+      SLAPD_ADDITIONAL_MODULES: memberof
+    ports:
+      - "388:389"
+
+
diff --git a/devenv/docker/blocks/multiple-openldap/entrypoint.sh b/devenv/docker/blocks/multiple-openldap/entrypoint.sh
new file mode 100755
index 000000000000..d202ed14b31f
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/entrypoint.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+# When not limiting the open file descritors limit, the memory consumption of
+# slapd is absurdly high. See https://github.com/docker/docker/issues/8231
+ulimit -n 8192
+
+
+set -e
+
+chown -R openldap:openldap /var/lib/ldap/
+
+if [[ ! -d /etc/ldap/slapd.d ]]; then
+
+    if [[ -z "$SLAPD_PASSWORD" ]]; then
+        echo -n >&2 "Error: Container not configured and SLAPD_PASSWORD not set. "
+        echo >&2 "Did you forget to add -e SLAPD_PASSWORD=... ?"
+        exit 1
+    fi
+
+    if [[ -z "$SLAPD_DOMAIN" ]]; then
+        echo -n >&2 "Error: Container not configured and SLAPD_DOMAIN not set. "
+        echo >&2 "Did you forget to add -e SLAPD_DOMAIN=... ?"
+        exit 1
+    fi
+
+    SLAPD_ORGANIZATION="${SLAPD_ORGANIZATION:-${SLAPD_DOMAIN}}"
+
+    cp -a /etc/ldap.dist/* /etc/ldap
+
+    cat <<-EOF | debconf-set-selections
+        slapd slapd/no_configuration boolean false
+        slapd slapd/password1 password $SLAPD_PASSWORD
+        slapd slapd/password2 password $SLAPD_PASSWORD
+        slapd shared/organization string $SLAPD_ORGANIZATION
+        slapd slapd/domain string $SLAPD_DOMAIN
+        slapd slapd/backend select HDB
+        slapd slapd/allow_ldap_v2 boolean false
+        slapd slapd/purge_database boolean false
+        slapd slapd/move_old_database boolean true
+EOF
+
+    dpkg-reconfigure -f noninteractive slapd >/dev/null 2>&1
+
+    dc_string=""
+
+    IFS="."; declare -a dc_parts=($SLAPD_DOMAIN)
+
+    for dc_part in "${dc_parts[@]}"; do
+        dc_string="$dc_string,dc=$dc_part"
+    done
+
+    base_string="BASE ${dc_string:1}"
+
+    sed -i "s/^#BASE.*/${base_string}/g" /etc/ldap/ldap.conf
+
+    if [[ -n "$SLAPD_CONFIG_PASSWORD" ]]; then
+        password_hash=`slappasswd -s "${SLAPD_CONFIG_PASSWORD}"`
+
+        sed_safe_password_hash=${password_hash//\//\\\/}
+
+        slapcat -n0 -F /etc/ldap/slapd.d -l /tmp/config.ldif
+        sed -i "s/\(olcRootDN: cn=admin,cn=config\)/\1\nolcRootPW: ${sed_safe_password_hash}/g" /tmp/config.ldif
+        rm -rf /etc/ldap/slapd.d/*
+        slapadd -n0 -F /etc/ldap/slapd.d -l /tmp/config.ldif >/dev/null 2>&1
+    fi
+
+    if [[ -n "$SLAPD_ADDITIONAL_SCHEMAS" ]]; then
+        IFS=","; declare -a schemas=($SLAPD_ADDITIONAL_SCHEMAS); unset IFS
+
+        for schema in "${schemas[@]}"; do
+            slapadd -n0 -F /etc/ldap/slapd.d -l "/etc/ldap/schema/${schema}.ldif" >/dev/null 2>&1
+        done
+    fi
+
+    if [[ -n "$SLAPD_ADDITIONAL_MODULES" ]]; then
+        IFS=","; declare -a modules=($SLAPD_ADDITIONAL_MODULES); unset IFS
+
+        for module in "${modules[@]}"; do
+          echo "Adding module ${module}"
+          slapadd -n0 -F /etc/ldap/slapd.d -l "/etc/ldap/modules/${module}.ldif" >/dev/null 2>&1
+        done
+    fi
+
+    # This needs to run in background
+    # Will prepopulate entries after ldap daemon has started
+    ./prepopulate.sh &
+
+    chown -R openldap:openldap /etc/ldap/slapd.d/ /var/lib/ldap/ /var/run/slapd/
+else
+    slapd_configs_in_env=`env | grep 'SLAPD_'`
+
+    if [ -n "${slapd_configs_in_env:+x}" ]; then
+        echo "Info: Container already configured, therefore ignoring SLAPD_xxx environment variables"
+    fi
+fi
+
+exec "$@"
+
diff --git a/devenv/docker/blocks/multiple-openldap/ldap-server.Dockerfile b/devenv/docker/blocks/multiple-openldap/ldap-server.Dockerfile
new file mode 100644
index 000000000000..7604d1118a3f
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/ldap-server.Dockerfile
@@ -0,0 +1,30 @@
+# Fork of https://github.com/dinkel/docker-openldap
+
+FROM debian:jessie
+
+LABEL maintainer="Grafana team <hello@grafana.com>"
+
+ENV OPENLDAP_VERSION 2.4.40
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+        slapd=${OPENLDAP_VERSION}* \
+        ldap-utils && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN mv /etc/ldap /etc/ldap.dist
+
+EXPOSE 389
+
+VOLUME ["/etc/ldap", "/var/lib/ldap"]
+
+COPY ldap-server/modules/ /etc/ldap.dist/modules
+COPY ldap-server/prepopulate/ /etc/ldap.dist/prepopulate
+
+COPY ./entrypoint.sh /entrypoint.sh
+COPY ./prepopulate.sh /prepopulate.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["slapd", "-d", "32768", "-u", "openldap", "-g", "openldap"]
diff --git a/devenv/docker/blocks/multiple-openldap/ldap-server/modules/memberof.ldif b/devenv/docker/blocks/multiple-openldap/ldap-server/modules/memberof.ldif
new file mode 100644
index 000000000000..fd9cce957c33
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/ldap-server/modules/memberof.ldif
@@ -0,0 +1,33 @@
+dn: cn=module,cn=config
+cn: module
+objectClass: olcModuleList
+objectClass: top
+olcModulePath: /usr/lib/ldap
+olcModuleLoad: memberof.la
+
+dn: olcOverlay={0}memberof,olcDatabase={1}hdb,cn=config
+objectClass: olcConfig
+objectClass: olcMemberOf
+objectClass: olcOverlayConfig
+objectClass: top
+olcOverlay: memberof
+olcMemberOfDangling: ignore
+olcMemberOfRefInt: TRUE
+olcMemberOfGroupOC: groupOfNames
+olcMemberOfMemberAD: member
+olcMemberOfMemberOfAD: memberOf
+
+dn: cn=module,cn=config
+cn: module
+objectClass: olcModuleList
+objectClass: top
+olcModulePath: /usr/lib/ldap
+olcModuleLoad: refint.la
+
+dn: olcOverlay={1}refint,olcDatabase={1}hdb,cn=config
+objectClass: olcConfig
+objectClass: olcOverlayConfig
+objectClass: olcRefintConfig
+objectClass: top
+olcOverlay: {1}refint
+olcRefintAttribute: memberof member manager owner
diff --git a/devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/1_units.ldif b/devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/1_units.ldif
new file mode 100644
index 000000000000..22e063036889
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/1_units.ldif
@@ -0,0 +1,9 @@
+dn: ou=groups,dc=grafana,dc=org
+ou: Groups
+objectclass: top
+objectclass: organizationalUnit
+
+dn: ou=users,dc=grafana,dc=org
+ou: Users
+objectclass: top
+objectclass: organizationalUnit
diff --git a/devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/2_users.ldif b/devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/2_users.ldif
new file mode 100644
index 000000000000..8e1dfbf603ad
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/2_users.ldif
@@ -0,0 +1,59 @@
+dn: cn=ldap-editor,ou=users,dc=grafana,dc=org
+mail: ldap-editor@grafana.com
+userPassword: grafana
+objectClass: person
+objectClass: top
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+sn: ldap-editor
+cn: ldap-editor
+
+dn: cn=ldap-viewer,ou=users,dc=grafana,dc=org
+mail: ldap-viewer@grafana.com
+userPassword: grafana
+objectClass: person
+objectClass: top
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+sn: ldap-viewer
+cn: ldap-viewer
+
+dn: cn=ldap-carl,ou=users,dc=grafana,dc=org
+mail: ldap-carl@grafana.com
+userPassword: grafana
+objectClass: person
+objectClass: top
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+sn: ldap-carl
+cn: ldap-carl
+
+dn: cn=ldap-daniel,ou=users,dc=grafana,dc=org
+mail: ldap-daniel@grafana.com
+userPassword: grafana
+objectClass: person
+objectClass: top
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+sn: ldap-daniel
+cn: ldap-daniel
+
+dn: cn=ldap-leo,ou=users,dc=grafana,dc=org
+mail: ldap-leo@grafana.com
+userPassword: grafana
+objectClass: person
+objectClass: top
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+sn: ldap-leo
+cn: ldap-leo
+
+dn: cn=ldap-tobias,ou=users,dc=grafana,dc=org
+mail: ldap-tobias@grafana.com
+userPassword: grafana
+objectClass: person
+objectClass: top
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+sn: ldap-tobias
+cn: ldap-tobias
diff --git a/devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/3_groups.ldif b/devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/3_groups.ldif
new file mode 100644
index 000000000000..8d55eaaa7079
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/3_groups.ldif
@@ -0,0 +1,23 @@
+dn: cn=admins,ou=groups,dc=grafana,dc=org
+cn: admins
+objectClass: groupOfNames
+objectClass: top
+
+dn: cn=editors,ou=groups,dc=grafana,dc=org
+cn: editors
+objectClass: groupOfNames
+member: cn=ldap-editor,ou=users,dc=grafana,dc=org
+
+dn: cn=backend,ou=groups,dc=grafana,dc=org
+cn: backend
+objectClass: groupOfNames
+member: cn=ldap-carl,ou=users,dc=grafana,dc=org
+member: cn=ldap-leo,ou=users,dc=grafana,dc=org
+member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
+
+dn: cn=frontend,ou=groups,dc=grafana,dc=org
+cn: frontend
+objectClass: groupOfNames
+member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
+member: cn=ldap-daniel,ou=users,dc=grafana,dc=org
+member: cn=ldap-leo,ou=users,dc=grafana,dc=org
diff --git a/devenv/docker/blocks/multiple-openldap/ldap_dev.toml b/devenv/docker/blocks/multiple-openldap/ldap_dev.toml
new file mode 100644
index 000000000000..c4c2516694f4
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/ldap_dev.toml
@@ -0,0 +1,59 @@
+# To troubleshoot and get more log info enable ldap debug logging in grafana.ini
+# [log]
+# filters = ldap:debug
+
+# For the verbose comments options see "openldap" env block
+
+# --- First LDAP Server (only admins) ---
+
+[[servers]]
+host = "127.0.0.1"
+port = 389
+use_ssl = false
+start_tls = false
+ssl_skip_verify = false
+bind_dn = "cn=admin,dc=grafana,dc=org"
+bind_password = 'grafana'
+search_filter = "(cn=%s)"
+search_base_dns = ["ou=users,dc=grafana,dc=org"]
+
+[servers.attributes]
+name = "givenName"
+surname = "sn"
+username = "cn"
+member_of = "memberOf"
+email =  "email"
+
+[[servers.group_mappings]]
+group_dn = "cn=admins,ou=groups,dc=grafana,dc=org"
+org_role = "Admin"
+grafana_admin = true
+
+# --- Second LDAP Server (rest of the users) ---
+
+[[servers]]
+host = "127.0.0.1"
+port = 388
+use_ssl = false
+start_tls = false
+ssl_skip_verify = false
+
+bind_dn = "cn=admin,dc=grafana,dc=org"
+bind_password = 'grafana'
+search_filter = "(cn=%s)"
+search_base_dns = ["ou=users,dc=grafana,dc=org"]
+
+[servers.attributes]
+name = "givenName"
+surname = "sn"
+username = "cn"
+member_of = "memberOf"
+email =  "email"
+
+[[servers.group_mappings]]
+group_dn = "cn=editors,ou=groups,dc=grafana,dc=org"
+org_role = "Editor"
+
+[[servers.group_mappings]]
+group_dn = "*"
+org_role = "Viewer"
diff --git a/devenv/docker/blocks/multiple-openldap/notes.md b/devenv/docker/blocks/multiple-openldap/notes.md
new file mode 100644
index 000000000000..1fcbfa013db0
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/notes.md
@@ -0,0 +1,38 @@
+# Notes on Multiple OpenLdap Docker Block
+
+This is very similar to openldap docker block, but it creates multiple ldap servers instead of one.
+
+Any ldif files added to the prepopulate subdirectory will be automatically imported into the OpenLdap database.
+
+"admins-ldap-server" block contains admin group and admin users. The "ldap-server" block has all the rest of the users. See below for the full list of users.
+
+This blocks are here to help with testing multiple LDAP servers, for any other LDAP related development and testing "openldap" block should be used.
+
+## Enabling LDAP in Grafana
+
+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]
+enabled = true
+config_file = conf/ldap_dev.toml
+; allow_sign_up = true
+```
+
+## Groups & Users
+
+admins
+  ldap-admin
+  ldap-torkel
+backend
+  ldap-carl
+  ldap-torkel
+  ldap-leo
+frontend
+  ldap-torkel
+  ldap-tobias
+  ldap-daniel
+editors
+  ldap-editor
+no groups
+  ldap-viewer
diff --git a/devenv/docker/blocks/multiple-openldap/prepopulate.sh b/devenv/docker/blocks/multiple-openldap/prepopulate.sh
new file mode 100755
index 000000000000..aa11f8aba4f7
--- /dev/null
+++ b/devenv/docker/blocks/multiple-openldap/prepopulate.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+echo "Pre-populating ldap entries, first waiting for ldap to start"
+
+sleep 3
+
+adminUserDn="cn=admin,dc=grafana,dc=org"
+adminPassword="grafana"
+
+for file in `ls /etc/ldap/prepopulate/*.ldif`; do
+  ldapadd -x -D $adminUserDn -w $adminPassword -f "$file"
+done
+
+
diff --git a/devenv/docker/blocks/openldap/Dockerfile b/devenv/docker/blocks/openldap/Dockerfile
index 76172e133a45..b0d23b9e0c91 100644
--- a/devenv/docker/blocks/openldap/Dockerfile
+++ b/devenv/docker/blocks/openldap/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM debian:jessie
 
-LABEL maintainer="Christian Luginbühl <dinke@pimprecords.com>"
+LABEL maintainer="Grafana team <hello@grafana.com>"
 
 ENV OPENLDAP_VERSION 2.4.40
 
diff --git a/devenv/docker/blocks/openldap/notes.md b/devenv/docker/blocks/openldap/notes.md
index fb4130859706..a74c1427901f 100644
--- a/devenv/docker/blocks/openldap/notes.md
+++ b/devenv/docker/blocks/openldap/notes.md
@@ -2,8 +2,6 @@
 
 Any ldif files added to the prepopulate subdirectory will be automatically imported into the OpenLdap database.
 
-The ldif files add eight users, `ldap-admin`, `ldap-editor`, `ldap-viewer`, `ldap-carl`, `ldap-daniel`, `ldap-leo`, `ldap-tobias` and `ldap-torkel`. Two groups, `admins` and `users`, are added that correspond with the group mappings in the default conf/ldap.toml. `ldap-admin` is a member of `admins` and `ldap-editor` is a member of `users`.
-
 Note that users that are added here need to specify a `memberOf` attribute manually as well as the `member` attribute for the group. The `memberOf` module usually does this automatically (if you add a group in Apache Directory Studio for example) but this does not work in the entrypoint script as it uses the `slapadd` command to add entries before the server has started and before the `memberOf` module is loaded.
 
 After adding ldif files to `prepopulate`:
@@ -23,12 +21,11 @@ config_file = conf/ldap_dev.toml
 ; allow_sign_up = true
 ```
 
-Test groups & users
+## Groups & Users
 
 admins
   ldap-admin
   ldap-torkel
-  ldap-daniel
 backend
   ldap-carl
   ldap-torkel
diff --git a/devenv/docker/loadtest/README.md b/devenv/docker/loadtest/README.md
index ca70a77dc74f..95f5c38dc0eb 100644
--- a/devenv/docker/loadtest/README.md
+++ b/devenv/docker/loadtest/README.md
@@ -6,6 +6,9 @@ Runs load tests and checks using [k6](https://k6.io/).
 
 Docker
 
+To run the auth proxy test you'll need to setup nginx proxy from docker block and
+enable auth proxy together with configuring Grafana for auth proxy.
+
 ## Run
 
 Run load test for 15 minutes using 2 virtual users and targeting http://localhost:3000.
@@ -32,6 +35,13 @@ Run load test for 10 virtual users:
 $ ./run.sh -v 10
 ```
 
+Run auth proxy test:
+
+```bash
+$ ./run.sh -c auth_proxy_test
+```
+
+
 Example output:
 
 ```bash
diff --git a/devenv/docker/loadtest/auth_proxy_test.js b/devenv/docker/loadtest/auth_proxy_test.js
new file mode 100644
index 000000000000..f506701e44e0
--- /dev/null
+++ b/devenv/docker/loadtest/auth_proxy_test.js
@@ -0,0 +1,56 @@
+import { sleep, check, group } from 'k6';
+import { createBasicAuthClient } from './modules/client.js';
+
+export let options = {
+  noCookiesReset: true
+};
+
+let endpoint = __ENV.URL || 'http://localhost:10080/grafana';
+const client = createBasicAuthClient(endpoint, 'user1', 'grafana');
+client.withOrgId(1);
+
+export const setup = () => {
+  const adminClient = createBasicAuthClient(endpoint, 'admin', 'admin');
+  let res = adminClient.datasources.getByName('gdev-prometheus');
+  if (res.status !== 200) {
+    throw new Error('Expected 200 response status when creating datasource');
+  }
+
+  return {
+    datasourceId: res.json().id,
+  };
+}
+
+export default (data) => {
+  group("auth proxy test", () => {
+    group("batch proxy requests", () => {
+      const d = new Date();
+      const batchCount = 300;
+      const requests = [];
+      const query = encodeURI('topk(5, max(scrape_duration_seconds) by (job))');
+      const start = (d.getTime() / 1000) - 3600;
+      const end = (d.getTime() / 1000);
+      const step = 20;
+
+      requests.push({ method: 'GET', url: '/api/annotations?dashboardId=8&from=1558670300607&to=1558691900607' });
+
+      for (let n = 0; n < batchCount; n++) {
+        requests.push({
+          method: 'GET',
+          url: `/api/datasources/proxy/${data.datasourceId}/api/v1/query_range?query=${query}&start=${start}&end=${end}&step=${step}`,
+        });
+      }
+
+      let responses = client.batch(requests);
+      for (let n = 0; n < batchCount; n++) {
+        check(responses[n], {
+          'response status is 200': (r) => r.status === 200,
+        });
+      }
+    });
+  });
+
+  sleep(5)
+}
+
+export const teardown = (data) => {}
diff --git a/devenv/docker/loadtest/run.sh b/devenv/docker/loadtest/run.sh
index 9517edf5d743..0d5d9cc441c8 100755
--- a/devenv/docker/loadtest/run.sh
+++ b/devenv/docker/loadtest/run.sh
@@ -6,8 +6,9 @@ run() {
   duration='15m'
   url='http://localhost:3000'
   vus='2'
+  testcase='auth_token_test'
 
-  while getopts ":d:u:v:" o; do
+  while getopts ":d:u:v:c:" o; do
     case "${o}" in
 				d)
             duration=${OPTARG}
@@ -18,11 +19,14 @@ run() {
         v)
             vus=${OPTARG}
             ;;
+        c)
+            testcase=${OPTARG}
+            ;;
     esac
 	done
 	shift $((OPTIND-1))
 
-  docker run -t --network=host -v $PWD:/src -e URL=$url --rm -i loadimpact/k6:master run --vus $vus --duration $duration src/auth_token_test.js
+  docker run -t --network=host -v $PWD:/src -e URL=$url --rm -i loadimpact/k6:master run --vus $vus --duration $duration src/$testcase.js
 }
 
 run "$@"
diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md
index da95a311635b..d09fb0bbc51b 100644
--- a/docs/sources/administration/provisioning.md
+++ b/docs/sources/administration/provisioning.md
@@ -179,6 +179,24 @@ Secure json data is a map of settings that will be encrypted with [secret key](/
 | accessKey | string | Cloudwatch | Access key for connecting to Cloudwatch |
 | secretKey | string | Cloudwatch | Secret key for connecting to Cloudwatch |
 
+#### Custom HTTP headers for datasources
+Datasources managed by Grafanas provisioning can be configured to add HTTP headers to all requests
+going to that datasource. The header name is configured in the `jsonData` field and the header value should be
+configured in `secureJsonData`.
+
+```yaml
+apiVersion: 1
+
+datasources:
+- name: Graphite
+  jsonData:
+    httpHeaderName1: "HeaderName"
+    httpHeaderName2: "Authorization"
+  secureJsonData:
+    httpHeaderValue1: "HeaderValue"
+    httpHeaderValue2: "Bearer XXXXXXXXX"
+```
+
 ### Dashboards
 
 It's possible to manage dashboards in Grafana by adding one or more yaml config files in the [`provisioning/dashboards`](/installation/configuration/#provisioning) directory. Each config file can contain a list of `dashboards providers` that will load dashboards into Grafana from the local filesystem.
@@ -204,7 +222,7 @@ providers:
   # <bool> enable dashboard editing
   editable: true
   # <int> how often Grafana will scan for changed dashboards
-  updateIntervalSeconds: 10  
+  updateIntervalSeconds: 10
   options:
     # <string, required> path to dashboard files on disk. Required
     path: /var/lib/grafana/dashboards
@@ -274,7 +292,7 @@ notifiers:
     # or
     org_name: Main Org.
     is_default: true
-    send_reminders: true
+    send_reminder: true
     frequency: 1h
     disable_resolve_message: false
     # See `Supported Settings` section for settings supporter for each
diff --git a/docs/sources/auth/ldap.md b/docs/sources/auth/ldap.md
index d0ae9094d66a..a3a01e6b6c67 100644
--- a/docs/sources/auth/ldap.md
+++ b/docs/sources/auth/ldap.md
@@ -215,6 +215,67 @@ email =  "email"
 # [[servers.group_mappings]] omitted for clarity
 ```
 
+### Multiple LDAP servers
+
+Grafana does support receiving information from multiple LDAP servers.
+
+**LDAP specific configuration file (ldap.toml):**
+```bash
+# --- First LDAP Server ---
+
+[[servers]]
+host = "10.0.0.1"
+port = 389
+use_ssl = false
+start_tls = false
+ssl_skip_verify = false
+bind_dn = "cn=admin,dc=grafana,dc=org"
+bind_password = 'grafana'
+search_filter = "(cn=%s)"
+search_base_dns = ["ou=users,dc=grafana,dc=org"]
+
+[servers.attributes]
+name = "givenName"
+surname = "sn"
+username = "cn"
+member_of = "memberOf"
+email =  "email"
+
+[[servers.group_mappings]]
+group_dn = "cn=admins,ou=groups,dc=grafana,dc=org"
+org_role = "Admin"
+grafana_admin = true
+
+# --- Second LDAP Server ---
+
+[[servers]]
+host = "10.0.0.2"
+port = 389
+use_ssl = false
+start_tls = false
+ssl_skip_verify = false
+
+bind_dn = "cn=admin,dc=grafana,dc=org"
+bind_password = 'grafana'
+search_filter = "(cn=%s)"
+search_base_dns = ["ou=users,dc=grafana,dc=org"]
+
+[servers.attributes]
+name = "givenName"
+surname = "sn"
+username = "cn"
+member_of = "memberOf"
+email =  "email"
+
+[[servers.group_mappings]]
+group_dn = "cn=editors,ou=groups,dc=grafana,dc=org"
+org_role = "Editor"
+
+[[servers.group_mappings]]
+group_dn = "*"
+org_role = "Viewer"
+```
+
 ### Active Directory
 
 [Active Directory](https://technet.microsoft.com/en-us/library/hh831484(v=ws.11).aspx) is a directory service which is commonly used in Windows environments.
@@ -247,6 +308,8 @@ email =  "mail"
 # [[servers.group_mappings]] omitted for clarity
 ```
 
+
+
 #### Port requirements
 
 In above example SSL is enabled and an encrypted port have been configured. If your Active Directory don't support SSL please change `enable_ssl = false` and `port = 389`.
diff --git a/docs/sources/features/datasources/azuremonitor.md b/docs/sources/features/datasources/azuremonitor.md
index d72f5273925f..114187499f17 100644
--- a/docs/sources/features/datasources/azuremonitor.md
+++ b/docs/sources/features/datasources/azuremonitor.md
@@ -31,34 +31,37 @@ The datasource can access metrics from four different services. You can configur
 - [Guide to setting up an Azure Active Directory Application for Azure Log Analytics.](https://dev.loganalytics.io/documentation/Authorization/AAD-Setup)
 - [Quickstart Guide for Application Insights.](https://dev.applicationinsights.io/quickstart/)
 
-1. Accessed from the Grafana main menu, newly installed data sources can be added immediately within the Data Sources section. Next, click the  "Add data source" button in the upper right. The data source will be available for selection in the Type select box.
+1. Accessed from the Grafana main menu, newly installed data sources can be added immediately within the Data Sources section. Next, click the "Add data source" button in the upper right. The Azure Monitor data source will be available for selection in the Cloud section in the list of data sources.
 
-2. Select Azure Monitor from the Type dropdown:<br/>
-![Data Source Type](https://raw.githubusercontent.com/grafana/azure-monitor-datasource/master/src/img/config_1_select_type.png)
-3. In the name field, fill in a name for the data source. It can be anything. Some suggestions are Azure Monitor or App Insights.
+2. In the name field, Grafana will automatically fill in a name for the data source - `Azure Monitor` or something like `Azure Monitor - 3`. If you are going to configure multiple data sources then change the name to something more informative.
 
-4. If you are using Azure Monitor, then you need 4 pieces of information from the Azure portal (see link above for detailed instructions):
-    - **Tenant Id** (Azure Active Directory -> Properties -> Directory ID)
-    - **Subscription Id** (Subscriptions -> Choose subscription -> Overview -> Subscription ID)
-    - **Client Id** (Azure Active Directory -> App Registrations -> Choose your app -> Application ID)
-    - **Client Secret** ( Azure Active Directory -> App Registrations -> Choose your app -> Keys)
+3. If you are using Azure Monitor, you need 4 pieces of information from the Azure portal (see link above for detailed instructions):
 
-5. Paste these four items into the fields in the Azure Monitor API Details section:<br/>
-![Azure Monitor API Details](https://raw.githubusercontent.com/grafana/azure-monitor-datasource/master/src/img/config_2_azure_monitor_api_details.png)
+   - **Tenant Id** (Azure Active Directory -> Properties -> Directory ID)
+   - **Client Id** (Azure Active Directory -> App Registrations -> Choose your app -> Application ID)
+   - **Client Secret** ( Azure Active Directory -> App Registrations -> Choose your app -> Keys)
+   - **Default Subscription Id** (Subscriptions -> Choose subscription -> Overview -> Subscription ID)
 
-6. If you are also using the Azure Log Analytics service, then you need to specify these two config values (or you can reuse the Client Id and Secret from the previous step).
-    - Client Id (Azure Active Directory -> App Registrations -> Choose your app -> Application ID)
-    - Client Secret ( Azure Active Directory -> App Registrations -> Choose your app -> Keys -> Create a key -> Use client secret)
+4. Paste these four items into the fields in the Azure Monitor API Details section:
+   {{< docs-imagebox img="/img/docs/v62/config_1_azure_monitor_details.png" class="docs-image--no-shadow" caption="Azure Monitor Configuration Details" >}}
 
-7. If you are are using  Application Insights, then you need two pieces of information from the Azure Portal (see link above for detailed instructions):
-    - Application ID
-    - API Key
+   - The Subscription Id can be changed per query. Save the datasource and refresh the page to see the list of subscriptions available for the specified Client Id.
 
-8. Paste these two items into the appropriate fields in the Application Insights API Details section:<br/>
-![Application Insights API Details](https://raw.githubusercontent.com/grafana/azure-monitor-datasource/master/src/img/config_3_app_insights_api_details.png)
+5. If you are also using the Azure Log Analytics service, then you need to specify these two config values (or you can reuse the Client Id and Secret from the previous step).
 
-9. Test that the configuration details are correct by clicking on the "Save & Test" button:<br/>
-![Azure Monitor API Details](https://raw.githubusercontent.com/grafana/azure-monitor-datasource/master/src/img/config_4_save_and_test.png)
+   - Client Id (Azure Active Directory -> App Registrations -> Choose your app -> Application ID)
+   - Client Secret (Azure Active Directory -> App Registrations -> Choose your app -> Keys -> Create a key -> Use client secret)
+
+6. If you are using Application Insights, then you need two pieces of information from the Azure Portal (see link above for detailed instructions):
+
+   - Application ID
+   - API Key
+
+7. Paste these two items into the appropriate fields in the Application Insights API Details section:
+   {{< docs-imagebox img="/img/docs/v62/config_2_app_insights_api_details.png" class="docs-image--no-shadow" caption="Application Insights Configuration Details" >}}
+
+8. Test that the configuration details are correct by clicking on the "Save & Test" button:
+   {{< docs-imagebox img="/img/docs/v62/config_3_save_and_test.png" class="docs-image--no-shadow" caption="Save and Test" >}}
 
 Alternatively on step 4 if creating a new Azure Active Directory App, use the [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/?view=azure-cli-latest):
 
@@ -68,17 +71,25 @@ az ad sp create-for-rbac -n "http://localhost:3000"
 
 ## Choose a Service
 
-In the query editor for a panel, after choosing your Azure Monitor datasource, the first option is to choose a service. There are three options here: Azure Monitor, Application Insights and Azure Log Analytics. The query editor will change depending on which one you pick. Azure Monitor is the default.
+In the query editor for a panel, after choosing your Azure Monitor datasource, the first option is to choose a service. There are three options here:
+
+- `Azure Monitor`
+- `Application Insights`
+- `Azure Log Analytics`
+
+The query editor will change depending on which one you pick. Azure Monitor is the default.
 
 ## Querying the Azure Monitor Service
 
 The Azure Monitor service provides metrics for all the Azure services that you have running. It helps you understand how your applications on Azure are performing and to proactively find issues affecting your applications.
 
+If your Azure Monitor credentials give you access to multiple subscriptions then choose the appropriate subscription first.
+
 Examples of metrics that you can get from the service are:
 
-- Microsoft.Compute/virtualMachines - Percentage CPU
-- Microsoft.Network/networkInterfaces - Bytes sent
-- Microsoft.Storage/storageAccounts - Used Capacity
+- `Microsoft.Compute/virtualMachines - Percentage CPU`
+- `Microsoft.Network/networkInterfaces - Bytes sent`
+- `Microsoft.Storage/storageAccounts - Used Capacity`
 
 {{< docs-imagebox img="/img/docs/v60/azuremonitor-service-query-editor.png" class="docs-image--no-shadow" caption="Azure Monitor Query Editor" >}}
 
@@ -112,12 +123,17 @@ Note that the Azure Monitor service does not support multiple values yet. If you
 
 The Azure Monitor Datasource Plugin provides the following queries you can specify in the `Query` field in the Variable edit view. They allow you to fill a variable's options list.
 
-| Name                                                     | Description                                                    |
-| -------------------------------------------------------- | -------------------------------------------------------------- |
-| *ResourceGroups()*                                       | Returns a list of resource groups.                             |
-| *Namespaces(aResourceGroup)*                             | Returns a list of namespaces for the specified resource group. |
-| *ResourceNames(aResourceGroup, aNamespace)*              | Returns a list of resource names.                              |
-| *MetricNames(aResourceGroup, aNamespace, aResourceName)* | Returns a list of metric names.                                |
+| Name                                                                                         | Description                                                                     |
+| -------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
+| _Subscriptions()_                                                                            | Returns a list of subscriptions.                                                |
+| _ResourceGroups()_                                                                           | Returns a list of resource groups.                                              |
+| _ResourceGroups(12345678-aaaa-bbbb-cccc-123456789aaa)_                                       | Returns a list of resource groups for a specified subscription.                 |
+| _Namespaces(aResourceGroup)_                                                                 | Returns a list of namespaces for the specified resource group.                  |
+| _Namespaces(12345678-aaaa-bbbb-cccc-123456789aaa, aResourceGroup)_                           | Returns a list of namespaces for the specified resource group and subscription. |
+| _ResourceNames(aResourceGroup, aNamespace)_                                                  | Returns a list of resource names.                                               |
+| _ResourceNames(12345678-aaaa-bbbb-cccc-123456789aaaaResourceGroup, aNamespace)_              | Returns a list of resource names for a specified subscription.                  |
+| _MetricNames(aResourceGroup, aNamespace, aResourceName)_                                     | Returns a list of metric names.                                                 |
+| _MetricNames(12345678-aaaa-bbbb-cccc-123456789aaaaResourceGroup, aNamespace, aResourceName)_ | Returns a list of metric names for a specified subscription.                    |
 
 Examples:
 
@@ -185,8 +201,8 @@ types of template variables.
 
 | Name                               | Description                                                |
 | ---------------------------------- | ---------------------------------------------------------- |
-| *AppInsightsMetricNames()*         | Returns a list of metric names.                            |
-| *AppInsightsGroupBys(aMetricName)* | Returns a list of group bys for the specified metric name. |
+| _AppInsightsMetricNames()_         | Returns a list of metric names.                            |
+| _AppInsightsGroupBys(aMetricName)_ | Returns a list of group bys for the specified metric name. |
 
 Examples:
 
@@ -222,6 +238,8 @@ AzureActivity
 | order by TimeGenerated desc
 ```
 
+If your credentials give you access to multiple subscriptions then choose the appropriate subscription first.
+
 {{< docs-imagebox img="/img/docs/v60/azureloganalytics-service-query-editor.png" class="docs-image--no-shadow" caption="Azure Log Analytics Query Editor" >}}
 
 ### Azure Log Analytics Macros
@@ -229,25 +247,27 @@ AzureActivity
 To make writing queries easier there are several Grafana macros that can be used in the where clause of a query:
 
 - `$__timeFilter()` - Expands to
-    `TimeGenerated ≥ datetime(2018-06-05T18:09:58.907Z) and`
-    `TimeGenerated ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
+  `TimeGenerated ≥ datetime(2018-06-05T18:09:58.907Z) and`
+  `TimeGenerated ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
 
 - `$__timeFilter(datetimeColumn)` - Expands to
-    `datetimeColumn  ≥ datetime(2018-06-05T18:09:58.907Z) and`
-    `datetimeColumn ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
+  `datetimeColumn ≥ datetime(2018-06-05T18:09:58.907Z) and`
+  `datetimeColumn ≤ datetime(2018-06-05T20:09:58.907Z)` where the from and to datetimes are from the Grafana time picker.
+
+- `$__timeFrom()` - Returns the From datetime from the Grafana picker. Example: `datetime(2018-06-05T18:09:58.907Z)`.
+
+- `$__timeTo()` - Returns the From datetime from the Grafana picker. Example: `datetime(2018-06-05T20:09:58.907Z)`.
 
-- `$__escapeMulti($myVar)` - is to be used with multi-value template variables that contains illegal characters. If $myVar has the value  `'\\grafana-vm\Network(eth0)\Total','\\hello!'`, it expands to: `@'\\grafana-vm\Network(eth0)\Total', @'\\hello!'`. If using single value variables there no need for this macro, simply escape the variable inline instead - `@'\$myVar'`
+- `$__escapeMulti($myVar)` - is to be used with multi-value template variables that contain illegal characters. If `$myVar` has the following two values as a string `'\\grafana-vm\Network(eth0)\Total','\\hello!'`, then it expands to: `@'\\grafana-vm\Network(eth0)\Total', @'\\hello!'`. If using single value variables there is no need for this macro, simply escape the variable inline instead - `@'\$myVar'`.
 
-- `$__contains(colName, $myVar)` - is to be used with multi-value template variables. If $myVar has the value `'value1','value2'`, it expands to: `colName in ('value1','value2')`.
+- `$__contains(colName, $myVar)` - is to be used with multi-value template variables. If `$myVar` has the value `'value1','value2'`, it expands to: `colName in ('value1','value2')`.
 
-     If using the `All` option, then check the `Include All Option` checkbox and in the `Custom all value` field type in the following value: `all`. If $myVar has value `all` then the macro will instead expand to `1 == 1`. For template variables with a lot of options, this will increase the query performance by not building a large where..in clause.
+  If using the `All` option, then check the `Include All Option` checkbox and in the `Custom all value` field type in the following value: `all`. If `$myVar` has value `all` then the macro will instead expand to `1 == 1`. For template variables with a lot of options, this will increase the query performance by not building a large where..in clause.
 
 ### Azure Log Analytics Builtin Variables
 
 There are also some Grafana variables that can be used in Azure Log Analytics queries:
 
-- `$__from` - Returns the From datetime from the Grafana picker. Example: `datetime(2018-06-05T18:09:58.907Z)`.
-- `$__to` - Returns the From datetime from the Grafana picker. Example: `datetime(2018-06-05T20:09:58.907Z)`.
 - `$__interval` - Grafana calculates the minimum time grain that can be used to group by time in queries. More details on how it works [here]({{< relref "reference/templating.md#interval-variables" >}}). It returns a time grain like `5m` or `1h` that can be used in the bin function. E.g. `summarize count() by bin(TimeGenerated, $__interval)`
 
 ### Azure Log Analytics Alerting
diff --git a/docs/sources/guides/basic_concepts.md b/docs/sources/guides/basic_concepts.md
index d3f8dd0ba633..3c610e21ce23 100644
--- a/docs/sources/guides/basic_concepts.md
+++ b/docs/sources/guides/basic_concepts.md
@@ -66,7 +66,7 @@ There are a wide variety of styling and formatting options that each Panel expos
 
 Panels can be dragged and dropped and rearranged on the Dashboard. They can also be resized.
 
-There are currently four Panel types: [Graph](/reference/graph/), [Singlestat](/reference/singlestat/), [Dashlist](/reference/dashlist/), [Table](/reference/table_panel/),and [Text](/reference/text/).
+There are currently five Panel types: [Graph](/reference/graph/), [Singlestat](/reference/singlestat/), [Dashlist](/reference/dashlist/), [Table](/reference/table_panel/), and [Text](/reference/text/).
 
 Panels like the [Graph](/reference/graph/) panel allow you to graph as many metrics and series as you want. Other panels like [Singlestat](/reference/singlestat/) require a reduction of a single query into a single number. [Dashlist](/reference/dashlist/) and [Text](/reference/text/) are special panels that do not connect to any Data Source.
 
diff --git a/docs/sources/guides/whats-new-in-v6-2.md b/docs/sources/guides/whats-new-in-v6-2.md
index 00337c8ef2a2..8ee2e7a66c70 100644
--- a/docs/sources/guides/whats-new-in-v6-2.md
+++ b/docs/sources/guides/whats-new-in-v6-2.md
@@ -12,19 +12,21 @@ weight = -13
 
 # What's New in Grafana v6.2
 
-> More content will be added to this guide before the stable release.
-
-Grafana v6.2 Beta is now [available for download](https://grafana.com/grafana/download/beta).
-
 For all details please read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
 
 If you use a password for your datasources please read the [upgrade notes](/installation/upgrading/#upgrading-to-v6-2).
 
+Checkout the [demo dashboard](https://play.grafana.org/d/ZvPm55mWk/new-features-in-v6-2?orgId=1) of some the new features in v6.2.
+
 ## Improved security
 
-- Ensure encryption of datasource secrets
-- Embedding Grafana not allowed per default
-- Disable browser caching for full page requests
+Datasources now store passwords and basic auth passwords in `secureJsonData` encrypted by default. Existing datasource with unencrypted passwords will keep working.
+Read the [upgrade notes](/installation/upgrading/#upgrading-to-v6-2) on how to migrate existing datasources to use encrypted storage.
+
+To mitigate the risk of [Clickjacking](https://www.owasp.org/index.php/Clickjacking), embedding Grafana is no longer allowed per default.
+Read the [upgrade notes](/installation/upgrading/#upgrading-to-v6-2) for further details of how this may affect you.
+
+To mitigate the risk of sensitive information being cached in browser after a user has logged out, browser caching is now disabled for full page requests.
 
 ## Provisioning
 
@@ -79,10 +81,11 @@ This release contains a lot of small features and fixes:
 
 - Explore - Adds user time zone support, reconnect for failing datasources and a fix that prevents killing Prometheus instances when Histogram metrics are loaded.
 - Alerting - Adds support for configuring timeout durations and retries, see [configuration](/installation/configuration/#evaluation-timeout-seconds) for more information.
+- Azure Monitor - Adds support for multiple subscriptions per datasource.
 - Elasticsearch - A small bug fix to properly display percentiles metrics in table panel.
 - InfluxDB - Support for POST HTTP verb.
 - CloudWatch - Important fix for default alias disappearing in v6.1.
-- Search - Works in a scope of dashboard's folder by default when viewing dashboard
+- Search - Works in a scope of dashboard's folder by default when viewing dashboard.
 
 Checkout the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file for a complete list of new features, changes, and bug fixes.
 
diff --git a/docs/sources/http_api/alerting_notification_channels.md b/docs/sources/http_api/alerting_notification_channels.md
index b8db1595aaa1..aa6e7297ac2d 100644
--- a/docs/sources/http_api/alerting_notification_channels.md
+++ b/docs/sources/http_api/alerting_notification_channels.md
@@ -54,7 +54,7 @@ Content-Type: application/json
     "sendReminder": false,
     "disableResolveMessage": false,
     "settings": {
-      "addresses": "carl@grafana.com;dev@grafana.com"
+      "addresses": "dev@grafana.com"
     },
     "created": "2018-04-23T14:44:09+02:00",
     "updated": "2018-08-20T15:47:49+02:00"
@@ -93,7 +93,7 @@ Content-Type: application/json
   "sendReminder": false,
   "disableResolveMessage": false,
   "settings": {
-    "addresses": "carl@grafana.com;dev@grafana.com"
+    "addresses": "dev@grafana.com"
   },
   "created": "2018-04-23T14:44:09+02:00",
   "updated": "2018-08-20T15:47:49+02:00"
@@ -130,7 +130,7 @@ Content-Type: application/json
   "sendReminder": false,
   "disableResolveMessage": false,
   "settings": {
-    "addresses": "carl@grafana.com;dev@grafana.com"
+    "addresses": "dev@grafana.com"
   },
   "created": "2018-04-23T14:44:09+02:00",
   "updated": "2018-08-20T15:47:49+02:00"
@@ -158,7 +158,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
   "isDefault": false,
   "sendReminder": false,
   "settings": {
-    "addresses": "carl@grafana.com;dev@grafana.com"
+    "addresses": "dev@grafana.com"
   }
 }
 ```
@@ -177,7 +177,7 @@ Content-Type: application/json
   "isDefault": false,
   "sendReminder": false,
   "settings": {
-    "addresses": "carl@grafana.com;dev@grafana.com"
+    "addresses": "dev@grafana.com"
   },
   "created": "2018-04-23T14:44:09+02:00",
   "updated": "2018-08-20T15:47:49+02:00"
@@ -206,7 +206,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
   "sendReminder": true,
   "frequency": "15m",
   "settings": {
-    "addresses": "carl@grafana.com;dev@grafana.com"
+    "addresses": "dev@grafana.com"
   }
 }
 ```
@@ -226,7 +226,7 @@ Content-Type: application/json
   "sendReminder": true,
   "frequency": "15m",
   "settings": {
-    "addresses": "carl@grafana.com;dev@grafana.com"
+    "addresses": "dev@grafana.com"
   },
   "created": "2017-01-01 12:34",
   "updated": "2017-01-01 12:34"
@@ -256,7 +256,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
   "sendReminder": true,
   "frequency": "15m",
   "settings": {
-    "addresses": "carl@grafana.com;dev@grafana.com"
+    "addresses": "dev@grafana.com"
   }
 }
 ```
@@ -276,7 +276,7 @@ Content-Type: application/json
   "sendReminder": true,
   "frequency": "15m",
   "settings": {
-    "addresses": "carl@grafana.com;dev@grafana.com"
+    "addresses": "dev@grafana.com"
   },
   "created": "2017-01-01 12:34",
   "updated": "2017-01-01 12:34"
@@ -353,7 +353,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 {
   "type":  "email",
   "settings": {
-    "addresses": "carl@grafana.com;dev@grafana.com"
+    "addresses": "dev@grafana.com"
   }
 }
 ```
diff --git a/docs/sources/http_api/data_source.md b/docs/sources/http_api/data_source.md
index 364b55b0cfcb..4ddeb5a520ed 100644
--- a/docs/sources/http_api/data_source.md
+++ b/docs/sources/http_api/data_source.md
@@ -51,7 +51,7 @@ Content-Type: application/json
 ]
 ```
 
-## Get a single data sources by Id
+## Get a single data source by Id
 
 `GET /api/datasources/:datasourceId`
 
@@ -149,7 +149,7 @@ Content-Type: application/json
 }
 ```
 
-## Create data source
+## Create a data source
 
 `POST /api/datasources`
 
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index 6e249a7130e0..af0261032d4b 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -154,6 +154,15 @@ callback URL to be correct).
 > in front of Grafana that exposes it through a subpath. In that
 > case add the subpath to the end of this URL setting.
 
+### serve_from_sub_path
+
+Serve Grafana from subpath specified in `root_url` setting. By
+default it is set to `false` for compatibility reasons.
+
+By enabling this setting and using a subpath in `root_url` above, e.g.
+`root_url = http://localhost:3000/grafana`, Grafana will be accessible on
+`http://localhost:3000/grafana`.
+
 ### static_root_path
 
 The path to the directory where the front end files (HTML, JS, and CSS
@@ -579,7 +588,7 @@ Service Account keys can be created and downloaded from https://console.develope
 
 Service Account should have "Storage Object Writer" role. The access control model of the bucket needs to be "Set object-level and bucket-level permissions". Grafana itself will make the images public readable.
 
-### bucket name
+### bucket
 Bucket Name on Google Cloud Storage.
 
 ### path
diff --git a/docs/sources/installation/upgrading.md b/docs/sources/installation/upgrading.md
index bd2a5434b25f..22195cb9df50 100644
--- a/docs/sources/installation/upgrading.md
+++ b/docs/sources/installation/upgrading.md
@@ -169,3 +169,9 @@ configuration.
 If you're embedding Grafana in a `<frame>`, `<iframe>`, `<embed>` or `<object>` on a different website it will no longer work due to a new setting
 that per default instructs the browser to not allow Grafana to be embedded. Read more [here](/installation/configuration/#allow-embedding) about
 this new setting.
+
+### Session storage is no longer used
+
+In 6.2 we completely removed the backend session storage since we replaced the previous login session implementation with an auth token.
+If you are using Auth proxy with LDAP an shared cached is used in Grafana so you might want configure [remote_cache] instead. If not
+Grafana will fallback to using the database as an shared cache.
diff --git a/docs/sources/tutorials/ha_setup.md b/docs/sources/tutorials/ha_setup.md
index f20a9933126e..b676d19aa2aa 100644
--- a/docs/sources/tutorials/ha_setup.md
+++ b/docs/sources/tutorials/ha_setup.md
@@ -30,7 +30,8 @@ Currently alerting supports a limited form of high availability. Since v4.2.0, a
 
 ## User sessions
 
-> Beginning with Grafana v6.0 and above the following only applies when using [Auth Proxy Authentication](/auth/auth-proxy/).
+> After Grafana 6.2 you don't need to configure session storage since the database will be used by default.
+> If you want to offload the login session data from the database you can configure [remote_cache]({{< relref "configuration.md" >}}#remote-cache)
 
 The second thing to consider is how to deal with user sessions and how to configure your load balancer in front of Grafana.
 Grafana supports two ways of storing session data: locally on disk or in a database/cache-server.
diff --git a/docs/versions.json b/docs/versions.json
index a0857a7f3afa..e4960ff98ebe 100644
--- a/docs/versions.json
+++ b/docs/versions.json
@@ -1,5 +1,6 @@
 [
-  { "version": "v6.1", "path": "/", "archived": false, "current": 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 },
   { "version": "v5.3", "path": "/v5.3", "archived": true },
diff --git a/go.mod b/go.mod
index fc72780af2f4..1730235d6173 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,6 @@ require (
 	github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737
 	github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
 	github.com/codegangsta/cli v1.20.0
-	github.com/davecgh/go-spew v1.1.1
 	github.com/denisenkom/go-mssqldb v0.0.0-20190315220205-a8ed825ac853
 	github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
 	github.com/facebookgo/inject v0.0.0-20180706035515-f23751cae28b
@@ -48,7 +47,7 @@ require (
 	github.com/onsi/gomega v1.5.0 // indirect
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.8.1 // indirect
 	github.com/prometheus/client_golang v0.9.2
 	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
 	github.com/prometheus/common v0.2.0
diff --git a/latest.json b/latest.json
index ff5fac8e6d55..97724801882c 100644
--- a/latest.json
+++ b/latest.json
@@ -1,4 +1,4 @@
 {
-  "stable": "6.1.6",
-  "testing": "6.2.0-beta1"
+  "stable": "6.2.1",
+  "testing": "6.2.1"
 }
diff --git a/package.json b/package.json
index 69309e2e341b..b4e4ee4f63ee 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "@types/enzyme": "3.9.0",
     "@types/expect-puppeteer": "3.3.1",
     "@types/inquirer": "0.0.43",
-    "@types/jest": "24.0.11",
+    "@types/jest": "24.0.13",
     "@types/jquery": "1.10.35",
     "@types/lodash": "4.14.123",
     "@types/node": "11.13.4",
@@ -44,9 +44,9 @@
     "@types/react-window": "1.7.0",
     "angular-mocks": "1.6.6",
     "autoprefixer": "9.5.0",
-    "axios": "0.18.0",
+    "axios": "0.19.0",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "24.6.0",
+    "babel-jest": "24.8.0",
     "babel-loader": "8.0.5",
     "babel-plugin-angularjs-annotate": "0.10.0",
     "chalk": "2.4.2",
@@ -84,7 +84,7 @@
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
     "inquirer": "6.2.2",
-    "jest": "24.6.0",
+    "jest": "24.8.0",
     "jest-date-mock": "1.0.7",
     "lint-staged": "8.1.5",
     "load-grunt-tasks": "3.5.2",
@@ -122,16 +122,16 @@
     "systemjs": "0.20.19",
     "systemjs-plugin-css": "0.1.37",
     "terser-webpack-plugin": "1.2.3",
-    "ts-jest": "24.0.1",
+    "ts-jest": "24.0.2",
     "ts-loader": "5.3.3",
-    "ts-node": "8.0.2",
+    "ts-node": "8.1.0",
     "tslib": "1.9.3",
     "tslint": "5.14.0",
     "tslint-loader": "3.5.4",
     "tslint-react": "3.6.0",
     "typescript": "3.4.1",
     "webpack": "4.29.6",
-    "webpack-bundle-analyzer": "3.1.0",
+    "webpack-bundle-analyzer": "3.3.2",
     "webpack-cleanup-plugin": "0.5.1",
     "webpack-cli": "3.2.3",
     "webpack-dev-server": "3.2.1",
@@ -140,9 +140,9 @@
   },
   "scripts": {
     "dev": "webpack --progress --colors --mode development --config scripts/webpack/webpack.dev.js",
-    "start": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/index.ts core:start --watchTheme",
-    "start:hot": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/index.ts core:start --hot --watchTheme",
-    "start:ignoreTheme": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/index.ts core:start --hot",
+    "start": "npm run cli -- core:start --watchTheme",
+    "start:hot": "npm run cli -- core:start --hot --watchTheme",
+    "start:ignoreTheme": "npm run cli -- core:start --hot",
     "watch": "yarn start -d watch,start core:start --watchTheme ",
     "build": "grunt build",
     "test": "grunt test",
@@ -155,13 +155,14 @@
     "storybook:build": "cd packages/grafana-ui && yarn storybook:build",
     "themes:generate": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/generateSassVariableFiles.ts",
     "prettier:check": "prettier --list-different \"**/*.{ts,tsx,scss}\"",
+    "prettier:write": "prettier --list-different \"**/*.{ts,tsx,scss}\" --write",
+    "cli": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/index.ts",
     "gui:tslint": "tslint -c ./packages/grafana-ui/tslint.json --project ./packages/grafana-ui/tsconfig.json",
-    "gui:build": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/index.ts gui:build",
-    "gui:releasePrepare": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/index.ts gui:release",
+    "gui:build": "npm run cli -- gui:build",
+    "gui:releasePrepare": "npm run cli -- gui:release",
     "gui:publish": "cd packages/grafana-ui/dist && npm publish --access public",
-    "gui:release": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/index.ts gui:release -p --createVersionCommit",
-    "precommit": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/index.ts precommit",
-    "cli": "ts-node --project ./scripts/cli/tsconfig.json ./scripts/cli/index.ts"
+    "gui:release": "npm run cli -- gui:release -p --createVersionCommit",
+    "precommit": "npm run cli -- precommit"
   },
   "husky": {
     "hooks": {
@@ -187,6 +188,7 @@
   "dependencies": {
     "@babel/polyfill": "7.2.5",
     "@torkelo/react-select": "2.4.1",
+    "@types/react-redux": "^7.0.8",
     "@types/reselect": "2.2.0",
     "angular": "1.6.6",
     "angular-bindonce": "0.3.1",
@@ -201,10 +203,10 @@
     "d3": "4.13.0",
     "d3-scale-chromatic": "1.3.3",
     "eventemitter3": "2.0.3",
-    "file-saver": "1.3.8",
     "fast-text-encoding": "^1.0.0",
+    "file-saver": "1.3.8",
     "immutable": "3.8.2",
-    "jquery": "3.4.0",
+    "jquery": "3.4.1",
     "lodash": "4.17.11",
     "moment": "2.24.0",
     "mousetrap": "1.6.3",
@@ -223,10 +225,12 @@
     "react-sizeme": "2.5.2",
     "react-table": "6.9.2",
     "react-transition-group": "2.6.1",
+    "react-use": "9.0.0",
     "react-virtualized": "9.21.0",
     "react-window": "1.7.1",
     "redux": "4.0.1",
     "redux-logger": "3.0.6",
+    "redux-observable": "1.1.0",
     "redux-thunk": "2.3.0",
     "remarkable": "1.7.1",
     "reselect": "4.0.0",
diff --git a/packages/grafana-runtime/README.md b/packages/grafana-runtime/README.md
new file mode 100644
index 000000000000..f01cd35537c7
--- /dev/null
+++ b/packages/grafana-runtime/README.md
@@ -0,0 +1,3 @@
+# Grafana Runtime library
+
+Interfaces that let you use the runtime...
\ No newline at end of file
diff --git a/packages/grafana-runtime/index.js b/packages/grafana-runtime/index.js
new file mode 100644
index 000000000000..d1a4363350e9
--- /dev/null
+++ b/packages/grafana-runtime/index.js
@@ -0,0 +1,7 @@
+'use strict'
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./index.production.js');
+} else {
+  module.exports = require('./index.development.js');
+}
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
new file mode 100644
index 000000000000..ed390d63b6af
--- /dev/null
+++ b/packages/grafana-runtime/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "@grafana/runtime",
+  "version": "6.0.1-alpha.0",
+  "description": "Grafana Runtime Library",
+  "keywords": [
+    "typescript",
+    "react",
+    "react-component"
+  ],
+  "main": "src/index.ts",
+  "scripts": {
+    "tslint": "tslint -c tslint.json --project tsconfig.json",
+    "typecheck": "tsc --noEmit",
+    "clean": "rimraf ./dist ./compiled",
+    "build": "rollup -c rollup.config.ts"
+  },
+  "author": "Grafana Labs",
+  "license": "Apache-2.0",
+  "dependencies": {
+  },
+  "devDependencies": {
+    "awesome-typescript-loader": "^5.2.1",
+    "lodash": "^4.17.10",
+    "pretty-format": "^24.5.0",
+    "rollup": "1.6.0",
+    "rollup-plugin-commonjs": "9.2.1",
+    "rollup-plugin-node-resolve": "4.0.1",
+    "rollup-plugin-sourcemaps": "0.4.2",
+    "rollup-plugin-terser": "4.0.4",
+    "rollup-plugin-typescript2": "0.19.3",
+    "rollup-plugin-visualizer": "0.9.2",
+    "typescript": "3.4.1"
+  },
+  "resolutions": {
+    "@types/lodash": "4.14.119"
+  }
+}
diff --git a/packages/grafana-runtime/rollup.config.ts b/packages/grafana-runtime/rollup.config.ts
new file mode 100644
index 000000000000..a2d6da109d96
--- /dev/null
+++ b/packages/grafana-runtime/rollup.config.ts
@@ -0,0 +1,50 @@
+import resolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+import sourceMaps from 'rollup-plugin-sourcemaps';
+import { terser } from 'rollup-plugin-terser';
+
+const pkg = require('./package.json');
+
+const libraryName = pkg.name;
+
+const buildCjsPackage = ({ env }) => {
+  return {
+    input: `compiled/index.js`,
+    output: [
+      {
+        file: `dist/index.${env}.js`,
+        name: libraryName,
+        format: 'cjs',
+        sourcemap: true,
+        exports: 'named',
+        globals: {},
+      },
+    ],
+    external: ['lodash'], // Use Lodash from grafana
+    plugins: [
+      commonjs({
+        include: /node_modules/,
+        namedExports: {
+          '../../node_modules/lodash/lodash.js': [
+            'flatten',
+            'find',
+            'upperFirst',
+            'debounce',
+            'isNil',
+            'isNumber',
+            'flattenDeep',
+            'map',
+            'chunk',
+            'sortBy',
+            'uniqueId',
+            'zip',
+          ],
+        },
+      }),
+      resolve(),
+      sourceMaps(),
+      env === 'production' && terser(),
+    ],
+  };
+};
+export default [buildCjsPackage({ env: 'development' }), buildCjsPackage({ env: 'production' })];
diff --git a/packages/grafana-runtime/src/index.ts b/packages/grafana-runtime/src/index.ts
new file mode 100644
index 000000000000..e371345e62d8
--- /dev/null
+++ b/packages/grafana-runtime/src/index.ts
@@ -0,0 +1 @@
+export * from './services';
diff --git a/packages/grafana-runtime/src/services/AngularLoader.ts b/packages/grafana-runtime/src/services/AngularLoader.ts
new file mode 100644
index 000000000000..9565a6d41f43
--- /dev/null
+++ b/packages/grafana-runtime/src/services/AngularLoader.ts
@@ -0,0 +1,19 @@
+export interface AngularComponent {
+  destroy(): void;
+  digest(): void;
+  getScope(): any;
+}
+
+export interface AngularLoader {
+  load(elem: any, scopeProps: any, template: string): AngularComponent;
+}
+
+let instance: AngularLoader;
+
+export function setAngularLoader(v: AngularLoader) {
+  instance = v;
+}
+
+export function getAngularLoader(): AngularLoader {
+  return instance;
+}
diff --git a/packages/grafana-runtime/src/services/LocationSrv.ts b/packages/grafana-runtime/src/services/LocationSrv.ts
new file mode 100644
index 000000000000..5e397d77e355
--- /dev/null
+++ b/packages/grafana-runtime/src/services/LocationSrv.ts
@@ -0,0 +1,36 @@
+export interface LocationUpdate {
+  path?: string;
+  query?: UrlQueryMap;
+
+  /**
+   * Add the query argument to the existing URL
+   */
+  partial?: boolean;
+
+  /**
+   * Do not change this unless you are the angular router
+   */
+  routeParams?: UrlQueryMap;
+
+  /*
+   * If true this will replace url state (ie cause no new browser history)
+   */
+  replace?: boolean;
+}
+
+export type UrlQueryValue = string | number | boolean | string[] | number[] | boolean[];
+export type UrlQueryMap = { [s: string]: UrlQueryValue };
+
+export interface LocationSrv {
+  update(options: LocationUpdate): void;
+}
+
+let singletonInstance: LocationSrv;
+
+export function setLocationSrv(instance: LocationSrv) {
+  singletonInstance = instance;
+}
+
+export function getLocationSrv(): LocationSrv {
+  return singletonInstance;
+}
diff --git a/packages/grafana-runtime/src/services/backendSrv.ts b/packages/grafana-runtime/src/services/backendSrv.ts
new file mode 100644
index 000000000000..a30296eca8cc
--- /dev/null
+++ b/packages/grafana-runtime/src/services/backendSrv.ts
@@ -0,0 +1,42 @@
+/**
+ * Currently implemented with:
+ * https://docs.angularjs.org/api/ng/service/$http#usage
+ * but that will likely change in the future
+ */
+export type BackendSrvRequest = {
+  url: string;
+  retry?: number;
+  headers?: any;
+  method?: string;
+
+  // Show a message with the result
+  showSuccessAlert?: boolean;
+
+  [key: string]: any;
+};
+
+export interface BackendSrv {
+  get(url: string, params?: any): Promise<any>;
+
+  delete(url: string): Promise<any>;
+
+  post(url: string, data: any): Promise<any>;
+
+  patch(url: string, data: any): Promise<any>;
+
+  put(url: string, data: any): Promise<any>;
+
+  // If there is an error, set: err.isHandled = true
+  // otherwise the backend will show a message for you
+  request(options: BackendSrvRequest): Promise<any>;
+}
+
+let singletonInstance: BackendSrv;
+
+export function setBackendSrv(instance: BackendSrv) {
+  singletonInstance = instance;
+}
+
+export function getBackendSrv(): BackendSrv {
+  return singletonInstance;
+}
diff --git a/packages/grafana-runtime/src/services/dataSourceSrv.ts b/packages/grafana-runtime/src/services/dataSourceSrv.ts
new file mode 100644
index 000000000000..1f3bbbb8436b
--- /dev/null
+++ b/packages/grafana-runtime/src/services/dataSourceSrv.ts
@@ -0,0 +1,15 @@
+import { ScopedVars, DataSourceApi } from '@grafana/ui';
+
+export interface DataSourceSrv {
+  get(name?: string, scopedVars?: ScopedVars): Promise<DataSourceApi>;
+}
+
+let singletonInstance: DataSourceSrv;
+
+export function setDataSourceSrv(instance: DataSourceSrv) {
+  singletonInstance = instance;
+}
+
+export function getDataSourceSrv(): DataSourceSrv {
+  return singletonInstance;
+}
diff --git a/packages/grafana-runtime/src/services/index.ts b/packages/grafana-runtime/src/services/index.ts
new file mode 100644
index 000000000000..c92ac500c6a9
--- /dev/null
+++ b/packages/grafana-runtime/src/services/index.ts
@@ -0,0 +1,4 @@
+export * from './backendSrv';
+export * from './AngularLoader';
+export * from './dataSourceSrv';
+export * from './LocationSrv';
diff --git a/packages/grafana-runtime/tsconfig.build.json b/packages/grafana-runtime/tsconfig.build.json
new file mode 100644
index 000000000000..34e37b5d0b84
--- /dev/null
+++ b/packages/grafana-runtime/tsconfig.build.json
@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["dist", "node_modules", "**/*.test.ts", "**/*.test.tsx"]
+}
diff --git a/packages/grafana-runtime/tsconfig.json b/packages/grafana-runtime/tsconfig.json
new file mode 100644
index 000000000000..dcc4fd974360
--- /dev/null
+++ b/packages/grafana-runtime/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": ["src/**/*.ts", "src/**/*.tsx", "../../public/app/types/jquery/*.ts"],
+  "exclude": ["dist", "node_modules"],
+  "compilerOptions": {
+    "rootDirs": ["."],
+    "module": "esnext",
+    "outDir": "compiled",
+    "declaration": true,
+    "declarationDir": "dist",
+    "strict": true,
+    "alwaysStrict": true,
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "typeRoots": ["./node_modules/@types", "types"],
+    "skipLibCheck": true, // Temp workaround for Duplicate identifier tsc errors,
+    "removeComments": false
+  }
+}
diff --git a/packages/grafana-runtime/tslint.json b/packages/grafana-runtime/tslint.json
new file mode 100644
index 000000000000..f51293736244
--- /dev/null
+++ b/packages/grafana-runtime/tslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../../tslint.json",
+  "rules": {
+    "import-blacklist": [true, ["^@grafana/runtime.*"]]
+  }
+}
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 7db50f75168f..1e672eb46ebf 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana/ui",
-  "version": "6.0.1-alpha.0",
+  "version": "6.3.0-alpha.0",
   "description": "Grafana Components Library",
   "keywords": [
     "typescript",
@@ -23,7 +23,7 @@
     "@types/react-color": "2.17.0",
     "classnames": "2.2.6",
     "d3": "5.9.1",
-    "jquery": "3.4.0",
+    "jquery": "3.4.1",
     "lodash": "4.17.11",
     "moment": "2.24.0",
     "papaparse": "4.6.3",
diff --git a/packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx b/packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx
index 620222315fa8..0dea5e2c9b52 100644
--- a/packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx
+++ b/packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx
@@ -1,6 +1,14 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import { BarGauge, Props, getValueColor, getBasicAndGradientStyles, getBarGradient, getTitleStyles } from './BarGauge';
+import {
+  BarGauge,
+  Props,
+  getValueColor,
+  getBasicAndGradientStyles,
+  getBarGradient,
+  getTitleStyles,
+  getValuePercent,
+} from './BarGauge';
 import { VizOrientation, DisplayValue } from '../../types';
 import { getTheme } from '../../themes';
 
@@ -63,6 +71,24 @@ describe('BarGauge', () => {
     });
   });
 
+  describe('Get value percent', () => {
+    it('0 to 100 and value 40', () => {
+      expect(getValuePercent(40, 0, 100)).toEqual(0.4);
+    });
+
+    it('50 to 100 and value 75', () => {
+      expect(getValuePercent(75, 50, 100)).toEqual(0.5);
+    });
+
+    it('-30 to 30 and value 0', () => {
+      expect(getValuePercent(0, -30, 30)).toEqual(0.5);
+    });
+
+    it('-30 to 30 and value 30', () => {
+      expect(getValuePercent(30, -30, 30)).toEqual(1);
+    });
+  });
+
   describe('Vertical bar without title', () => {
     it('should not include title height in height', () => {
       const props = getProps({
diff --git a/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
index 9c5bf6563820..cb08d1b15aba 100644
--- a/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
+++ b/packages/grafana-ui/src/components/BarGauge/BarGauge.tsx
@@ -11,8 +11,9 @@ import { DisplayValue, Themeable, TimeSeriesValue, Threshold, VizOrientation } f
 const MIN_VALUE_HEIGHT = 18;
 const MAX_VALUE_HEIGHT = 50;
 const MIN_VALUE_WIDTH = 50;
-const MAX_VALUE_WIDTH = 100;
-const LINE_HEIGHT = 1.5;
+const MAX_VALUE_WIDTH = 150;
+const TITLE_LINE_HEIGHT = 1.5;
+const VALUE_LINE_HEIGHT = 1;
 
 export interface Props extends Themeable {
   height: number;
@@ -161,7 +162,7 @@ export class BarGauge extends PureComponent<Props> {
     const cells: JSX.Element[] = [];
 
     for (let i = 0; i < cellCount; i++) {
-      const currentValue = (valueRange / cellCount) * i;
+      const currentValue = minValue + (valueRange / cellCount) * i;
       const cellColor = this.getCellColor(currentValue);
       const cellStyles: CSSProperties = {
         borderRadius: '2px',
@@ -227,7 +228,7 @@ function calculateTitleDimensions(props: Props): TitleDimensions {
     return {
       fontSize: 14,
       width: width,
-      height: 14 * LINE_HEIGHT,
+      height: 14 * TITLE_LINE_HEIGHT,
       placement: 'below',
     };
   }
@@ -238,7 +239,7 @@ function calculateTitleDimensions(props: Props): TitleDimensions {
     const titleHeight = Math.max(Math.min(height * maxTitleHeightRatio, MAX_VALUE_HEIGHT), 17);
 
     return {
-      fontSize: titleHeight / LINE_HEIGHT,
+      fontSize: titleHeight / TITLE_LINE_HEIGHT,
       width: 0,
       height: titleHeight,
       placement: 'above',
@@ -251,7 +252,7 @@ function calculateTitleDimensions(props: Props): TitleDimensions {
   const titleHeight = Math.max(height * maxTitleHeightRatio, MIN_VALUE_HEIGHT);
 
   return {
-    fontSize: titleHeight / LINE_HEIGHT,
+    fontSize: titleHeight / TITLE_LINE_HEIGHT,
     height: 0,
     width: Math.min(Math.max(width * maxTitleWidthRatio, 50), 200),
     placement: 'left',
@@ -345,11 +346,6 @@ function calculateBarAndValueDimensions(props: Props): BarAndValueDimensions {
     }
   }
 
-  // console.log('titleDim', titleDim);
-  // console.log('valueWidth', valueWidth);
-  // console.log('width', width);
-  // console.log('total', titleDim.width + maxBarWidth + valueWidth);
-
   return {
     valueWidth,
     valueHeight,
@@ -360,6 +356,10 @@ function calculateBarAndValueDimensions(props: Props): BarAndValueDimensions {
   };
 }
 
+export function getValuePercent(value: number, minValue: number, maxValue: number): number {
+  return Math.min((value - minValue) / (maxValue - minValue), 1);
+}
+
 /**
  * Only exported to for unit test
  */
@@ -367,7 +367,7 @@ export function getBasicAndGradientStyles(props: Props): BasicAndGradientStyles
   const { displayMode, maxValue, minValue, value } = props;
   const { valueWidth, valueHeight, maxBarHeight, maxBarWidth } = calculateBarAndValueDimensions(props);
 
-  const valuePercent = Math.min(value.numeric / (maxValue - minValue), 1);
+  const valuePercent = getValuePercent(value.numeric, minValue, maxValue);
   const valueColor = getValueColor(props);
   const valueStyles = getValueStyles(value.text, valueColor, valueWidth, valueHeight);
   const isBasic = displayMode === 'basic';
@@ -450,7 +450,7 @@ export function getBarGradient(props: Props, maxSize: number): string {
   for (let i = 0; i < thresholds.length; i++) {
     const threshold = thresholds[i];
     const color = getColorFromHexRgbOrName(threshold.color);
-    const valuePercent = Math.min(threshold.value / (maxValue - minValue), 1);
+    const valuePercent = getValuePercent(threshold.value, minValue, maxValue);
     const pos = valuePercent * maxSize;
     const offset = Math.round(pos - (pos - lastpos) / 2);
 
@@ -486,7 +486,7 @@ export function getValueColor(props: Props): string {
  * Only exported to for unit test
  */
 function getValueStyles(value: string, color: string, width: number, height: number): CSSProperties {
-  const heightFont = height / LINE_HEIGHT;
+  const heightFont = height / VALUE_LINE_HEIGHT;
   const guess = width / (value.length * 1.1);
   const fontSize = Math.min(Math.max(guess, 14), heightFont);
 
@@ -496,33 +496,15 @@ function getValueStyles(value: string, color: string, width: number, height: num
     width: `${width}px`,
     display: 'flex',
     alignItems: 'center',
-    fontSize: fontSize.toFixed(2) + 'px',
+    lineHeight: VALUE_LINE_HEIGHT,
+    fontSize: fontSize.toFixed(4) + 'px',
   };
 }
 
-// let canvasElement: HTMLCanvasElement | null = null;
-//
-// interface TextDimensions {
-//   width: number;
-//   height: number;
-// }
-//
-// /**
-//  * Uses canvas.measureText to compute and return the width of the given text of given font in pixels.
-//  *
-//  * @param {String} text The text to be rendered.
-//  * @param {String} font The css font descriptor that text is to be rendered with (e.g. "bold 14px verdana").
-//  *
-//  * @see https://stackoverflow.com/questions/118241/calculate-text-width-with-javascript/21015393#21015393
-//  */
 // function getTextWidth(text: string): number {
-//   // re-use canvas object for better performance
-//   canvasElement = canvasElement || document.createElement('canvas');
-//   const context = canvasElement.getContext('2d');
-//   if (context) {
-//     context.font = 'normal 16px Roboto';
-//     const metrics = context.measureText(text);
-//     return metrics.width;
-//   }
-//   return 16;
+//   const canvas = getTextWidth.canvas || (getTextWidth.canvas = document.createElement("canvas"));
+//   var context = canvas.getContext("2d");
+//   context.font = "'Roboto', 'Helvetica Neue', Arial, sans-serif";
+//   var metrics = context.measureText(text);
+//   return metrics.width;
 // }
diff --git a/packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap b/packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap
index 4bb9395dd96e..1d341a9b0d4c 100644
--- a/packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap
+++ b/packages/grafana-ui/src/components/BarGauge/__snapshots__/BarGauge.test.tsx.snap
@@ -18,8 +18,9 @@ exports[`BarGauge Render with basic options should render 1`] = `
         "alignItems": "center",
         "color": "#73BF69",
         "display": "flex",
-        "fontSize": "27.27px",
+        "fontSize": "27.2727px",
         "height": "300px",
+        "lineHeight": 1,
         "paddingLeft": "10px",
         "width": "60px",
       }
diff --git a/packages/grafana-ui/src/components/Button/AbstractButton.tsx b/packages/grafana-ui/src/components/Button/AbstractButton.tsx
index 38f225273adb..ee59272794e3 100644
--- a/packages/grafana-ui/src/components/Button/AbstractButton.tsx
+++ b/packages/grafana-ui/src/components/Button/AbstractButton.tsx
@@ -75,6 +75,12 @@ const getButtonStyles = (theme: GrafanaTheme, size: ButtonSize, variant: ButtonV
       iconDistance = theme.spacing.xs;
       height = theme.height.sm;
       break;
+    case ButtonSize.Medium:
+      padding = `${theme.spacing.sm} ${theme.spacing.md}`;
+      fontSize = theme.typography.size.md;
+      iconDistance = theme.spacing.sm;
+      height = theme.height.md;
+      break;
     case ButtonSize.Large:
       padding = `${theme.spacing.md} ${theme.spacing.lg}`;
       fontSize = theme.typography.size.lg;
diff --git a/packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx b/packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx
index f2f6b236e14b..3546148f57c7 100644
--- a/packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx
+++ b/packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx
@@ -42,9 +42,10 @@ export class CustomScrollbar extends Component<Props> {
 
   updateScroll() {
     const ref = this.ref.current;
+    const { scrollTop } = this.props;
 
-    if (ref && !isNil(this.props.scrollTop)) {
-      ref.scrollTop(this.props.scrollTop);
+    if (ref && !isNil(scrollTop)) {
+      ref.scrollTop(scrollTop);
     }
   }
 
@@ -70,6 +71,44 @@ export class CustomScrollbar extends Component<Props> {
     this.updateScroll();
   }
 
+  renderTrack = (track: 'track-vertical' | 'track-horizontal', hideTrack: boolean | undefined, passedProps: any) => {
+    return (
+      <div
+        {...passedProps}
+        className={cx(
+          css`
+            visibility: ${hideTrack ? 'none' : 'visible'};
+          `,
+          track
+        )}
+      />
+    );
+  };
+
+  renderThumb = (thumb: 'thumb-horizontal' | 'thumb-vertical', passedProps: any) => {
+    return <div {...passedProps} className={thumb} />;
+  };
+
+  renderTrackHorizontal = (passedProps: any) => {
+    return this.renderTrack('track-horizontal', this.props.hideHorizontalTrack, passedProps);
+  };
+
+  renderTrackVertical = (passedProps: any) => {
+    return this.renderTrack('track-vertical', this.props.hideVerticalTrack, passedProps);
+  };
+
+  renderThumbHorizontal = (passedProps: any) => {
+    return this.renderThumb('thumb-horizontal', passedProps);
+  };
+
+  renderThumbVertical = (passedProps: any) => {
+    return this.renderThumb('thumb-vertical', passedProps);
+  };
+
+  renderView = (passedProps: any) => {
+    return <div {...passedProps} className="view" />;
+  };
+
   render() {
     const {
       className,
@@ -80,8 +119,6 @@ export class CustomScrollbar extends Component<Props> {
       autoHide,
       autoHideTimeout,
       hideTracksWhenNotNeeded,
-      hideHorizontalTrack,
-      hideVerticalTrack,
     } = this.props;
 
     return (
@@ -97,31 +134,11 @@ export class CustomScrollbar extends Component<Props> {
         // Before these where set to inhert but that caused problems with cut of legends in firefox
         autoHeightMax={autoHeightMax}
         autoHeightMin={autoHeightMin}
-        renderTrackHorizontal={props => (
-          <div
-            {...props}
-            className={cx(
-              css`
-                visibility: ${hideHorizontalTrack ? 'none' : 'visible'};
-              `,
-              'track-horizontal'
-            )}
-          />
-        )}
-        renderTrackVertical={props => (
-          <div
-            {...props}
-            className={cx(
-              css`
-                visibility: ${hideVerticalTrack ? 'none' : 'visible'};
-              `,
-              'track-vertical'
-            )}
-          />
-        )}
-        renderThumbHorizontal={props => <div {...props} className="thumb-horizontal" />}
-        renderThumbVertical={props => <div {...props} className="thumb-vertical" />}
-        renderView={props => <div {...props} className="view" />}
+        renderTrackHorizontal={this.renderTrackHorizontal}
+        renderTrackVertical={this.renderTrackVertical}
+        renderThumbHorizontal={this.renderThumbHorizontal}
+        renderThumbVertical={this.renderThumbVertical}
+        renderView={this.renderView}
       >
         {children}
       </Scrollbars>
diff --git a/packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap b/packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap
index b348f7dd8bd0..2d941bb1767b 100644
--- a/packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap
+++ b/packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap
@@ -37,7 +37,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
     </p>
   </div>
   <div
-    className="css-17l4171 track-horizontal"
+    className="css-52gpmd track-horizontal"
     style={
       Object {
         "display": "none",
@@ -58,7 +58,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
     />
   </div>
   <div
-    className="css-17l4171 track-vertical"
+    className="css-52gpmd track-vertical"
     style={
       Object {
         "display": "none",
diff --git a/packages/grafana-ui/src/components/Gauge/Gauge.tsx b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
index b45712ac9b0b..0a0495c4848d 100644
--- a/packages/grafana-ui/src/components/Gauge/Gauge.tsx
+++ b/packages/grafana-ui/src/components/Gauge/Gauge.tsx
@@ -58,7 +58,7 @@ export class Gauge extends PureComponent<Props> {
     if (length > 12) {
       return FONT_SCALE - (length * 5) / 110;
     }
-    return FONT_SCALE - (length * 5) / 100;
+    return FONT_SCALE - (length * 5) / 101;
   }
 
   draw() {
@@ -69,16 +69,17 @@ export class Gauge extends PureComponent<Props> {
 
     const backgroundColor = selectThemeVariant(
       {
-        dark: theme.colors.dark3,
-        light: '#e6e6e6',
+        dark: theme.colors.dark8,
+        light: theme.colors.gray6,
       },
       theme.type
     );
 
     const gaugeWidthReduceRatio = showThresholdLabels ? 1.5 : 1;
-    const gaugeWidth = Math.min(dimension / 6, 40) / gaugeWidthReduceRatio;
+    const gaugeWidth = Math.min(dimension / 5.5, 40) / gaugeWidthReduceRatio;
     const thresholdMarkersWidth = gaugeWidth / 5;
-    const fontSize = Math.min(dimension / 5.5, 100) * (value.text !== null ? this.getFontScale(value.text.length) : 1);
+    const fontSize = Math.min(dimension / 4, 100) * (value.text !== null ? this.getFontScale(value.text.length) : 1);
+
     const thresholdLabelFontSize = fontSize / 2.5;
 
     const options: any = {
@@ -181,7 +182,7 @@ function calculateGaugeAutoProps(width: number, height: number, title: string |
   const titleFontSize = Math.min((width * 0.15) / 1.5, 20); // 20% of height * line-height, max 40px
   const titleHeight = titleFontSize * 1.5;
   const availableHeight = showLabel ? height - titleHeight : height;
-  const gaugeHeight = Math.min(availableHeight * 0.7, width);
+  const gaugeHeight = Math.min(availableHeight, width);
 
   return {
     showLabel,
diff --git a/packages/grafana-ui/src/components/Graph/GraphLegend.tsx b/packages/grafana-ui/src/components/Graph/GraphLegend.tsx
index 451acf4bac80..5b7a0251e052 100644
--- a/packages/grafana-ui/src/components/Graph/GraphLegend.tsx
+++ b/packages/grafana-ui/src/components/Graph/GraphLegend.tsx
@@ -14,10 +14,10 @@ interface GraphLegendProps extends LegendProps {
   displayMode: LegendDisplayMode;
   sortBy?: string;
   sortDesc?: boolean;
-  onSeriesColorChange: SeriesColorChangeHandler;
+  onSeriesColorChange?: SeriesColorChangeHandler;
   onSeriesAxisToggle?: SeriesAxisToggleHandler;
-  onToggleSort: (sortBy: string) => void;
-  onLabelClick: (item: LegendItem, event: React.MouseEvent<HTMLElement>) => void;
+  onToggleSort?: (sortBy: string) => void;
+  onLabelClick?: (item: LegendItem, event: React.MouseEvent<HTMLElement>) => void;
 }
 
 export const GraphLegend: React.FunctionComponent<GraphLegendProps> = ({
@@ -116,3 +116,5 @@ export const GraphLegend: React.FunctionComponent<GraphLegendProps> = ({
     />
   );
 };
+
+GraphLegend.displayName = 'GraphLegend';
diff --git a/packages/grafana-ui/src/components/Graph/GraphLegendItem.tsx b/packages/grafana-ui/src/components/Graph/GraphLegendItem.tsx
index e116287d4d21..37371fe06644 100644
--- a/packages/grafana-ui/src/components/Graph/GraphLegendItem.tsx
+++ b/packages/grafana-ui/src/components/Graph/GraphLegendItem.tsx
@@ -10,9 +10,9 @@ export interface GraphLegendItemProps {
   key?: React.Key;
   item: LegendItem;
   className?: string;
-  onLabelClick: (item: LegendItem, event: React.MouseEvent<HTMLDivElement>) => void;
-  onSeriesColorChange: SeriesColorChangeHandler;
-  onToggleAxis: () => void;
+  onLabelClick?: (item: LegendItem, event: React.MouseEvent<HTMLDivElement>) => void;
+  onSeriesColorChange?: SeriesColorChangeHandler;
+  onToggleAxis?: () => void;
 }
 
 export const GraphLegendListItem: React.FunctionComponent<GraphLegendItemProps> = ({
@@ -21,19 +21,31 @@ export const GraphLegendListItem: React.FunctionComponent<GraphLegendItemProps>
   onToggleAxis,
   onLabelClick,
 }) => {
+  const theme = useContext(ThemeContext);
+
   return (
     <>
       <LegendSeriesIcon
+        disabled={!onSeriesColorChange}
         color={item.color}
-        onColorChange={color => onSeriesColorChange(item.label, color)}
+        onColorChange={color => {
+          if (onSeriesColorChange) {
+            onSeriesColorChange(item.label, color);
+          }
+        }}
         onToggleAxis={onToggleAxis}
         yAxis={item.yAxis}
       />
       <div
-        onClick={event => onLabelClick(item, event)}
+        onClick={event => {
+          if (onLabelClick) {
+            onLabelClick(item, event);
+          }
+        }}
         className={css`
           cursor: pointer;
           white-space: nowrap;
+          color: ${!item.isVisible && theme.colors.linkDisabled};
         `}
       >
         {item.label}
@@ -74,13 +86,22 @@ export const GraphLegendTableRow: React.FunctionComponent<GraphLegendItemProps>
           `}
         >
           <LegendSeriesIcon
+            disabled={!!onSeriesColorChange}
             color={item.color}
-            onColorChange={color => onSeriesColorChange(item.label, color)}
+            onColorChange={color => {
+              if (onSeriesColorChange) {
+                onSeriesColorChange(item.label, color);
+              }
+            }}
             onToggleAxis={onToggleAxis}
             yAxis={item.yAxis}
           />
           <div
-            onClick={event => onLabelClick(item, event)}
+            onClick={event => {
+              if (onLabelClick) {
+                onLabelClick(item, event);
+              }
+            }}
             className={css`
               cursor: pointer;
               white-space: nowrap;
diff --git a/packages/grafana-ui/src/components/Legend/LegendList.tsx b/packages/grafana-ui/src/components/Legend/LegendList.tsx
index d103aa3ed806..f220b10a5876 100644
--- a/packages/grafana-ui/src/components/Legend/LegendList.tsx
+++ b/packages/grafana-ui/src/components/Legend/LegendList.tsx
@@ -28,7 +28,7 @@ export const LegendList: React.FunctionComponent<LegendComponentProps> = ({
     );
   };
 
-  const getItemKey = (item: LegendItem) => item.label;
+  const getItemKey = (item: LegendItem) => `${item.label}`;
 
   const styles = {
     wrapper: cx(
diff --git a/packages/grafana-ui/src/components/Legend/LegendSeriesIcon.tsx b/packages/grafana-ui/src/components/Legend/LegendSeriesIcon.tsx
index 1913c2e500d2..787b818c0030 100644
--- a/packages/grafana-ui/src/components/Legend/LegendSeriesIcon.tsx
+++ b/packages/grafana-ui/src/components/Legend/LegendSeriesIcon.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
+import { css, cx } from 'emotion';
 import { SeriesColorPicker } from '../ColorPicker/ColorPicker';
-import { SeriesIcon } from './SeriesIcon';
+import { SeriesIcon, SeriesIconProps } from './SeriesIcon';
 
 interface LegendSeriesIconProps {
+  disabled: boolean;
   color: string;
   yAxis: number;
   onColorChange: (color: string) => void;
@@ -10,12 +12,36 @@ interface LegendSeriesIconProps {
 }
 
 export const LegendSeriesIcon: React.FunctionComponent<LegendSeriesIconProps> = ({
+  disabled,
   yAxis,
   color,
   onColorChange,
   onToggleAxis,
 }) => {
-  return (
+  let iconProps: SeriesIconProps = {
+    color,
+  };
+
+  if (!disabled) {
+    iconProps = {
+      ...iconProps,
+      className: 'pointer',
+    };
+  }
+
+  return disabled ? (
+    <span
+      className={cx(
+        'graph-legend-icon',
+        disabled &&
+          css`
+            cursor: default;
+          `
+      )}
+    >
+      <SeriesIcon {...iconProps} />
+    </span>
+  ) : (
     <SeriesColorPicker
       yaxis={yAxis}
       color={color}
@@ -25,7 +51,7 @@ export const LegendSeriesIcon: React.FunctionComponent<LegendSeriesIconProps> =
     >
       {({ ref, showColorPicker, hideColorPicker }) => (
         <span ref={ref} onClick={showColorPicker} onMouseLeave={hideColorPicker} className="graph-legend-icon">
-          <SeriesIcon color={color} />
+          <SeriesIcon {...iconProps} />
         </span>
       )}
     </SeriesColorPicker>
diff --git a/packages/grafana-ui/src/components/Legend/SeriesIcon.tsx b/packages/grafana-ui/src/components/Legend/SeriesIcon.tsx
index 091d79f7fd0d..70709a0fcd5c 100644
--- a/packages/grafana-ui/src/components/Legend/SeriesIcon.tsx
+++ b/packages/grafana-ui/src/components/Legend/SeriesIcon.tsx
@@ -1,5 +1,10 @@
 import React from 'react';
+import { cx } from 'emotion';
 
-export const SeriesIcon: React.FunctionComponent<{ color: string }> = ({ color }) => {
-  return <i className="fa fa-minus pointer" style={{ color }} />;
+export interface SeriesIconProps {
+  color: string;
+  className?: string;
+}
+export const SeriesIcon: React.FunctionComponent<SeriesIconProps> = ({ color, className }) => {
+  return <i className={cx('fa', 'fa-minus', className)} style={{ color }} />;
 };
diff --git a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx
index 2046a5a50cee..60a8973ca095 100644
--- a/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx
+++ b/packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx
@@ -5,7 +5,9 @@ import { Tooltip } from '../Tooltip/Tooltip';
 import { ButtonSelect } from '../Select/ButtonSelect';
 
 export const offOption = { label: 'Off', value: '' };
+export const liveOption = { label: 'Live', value: 'LIVE' };
 export const defaultIntervals = ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'];
+export const isLive = (refreshInterval: string): boolean => refreshInterval === liveOption.value;
 
 export interface Props {
   intervals?: string[];
@@ -13,6 +15,7 @@ export interface Props {
   onIntervalChanged: (interval: string) => void;
   value?: string;
   tooltip: string;
+  hasLiveOption?: boolean;
 }
 
 export class RefreshPicker extends PureComponent<Props> {
@@ -36,6 +39,9 @@ export class RefreshPicker extends PureComponent<Props> {
 
   intervalsToOptions = (intervals: string[] = defaultIntervals): Array<SelectOptionItem<string>> => {
     const options = intervals.map(interval => ({ label: interval, value: interval }));
+    if (this.props.hasLiveOption) {
+      options.unshift(liveOption);
+    }
     options.unshift(offOption);
     return options;
   };
@@ -57,6 +63,7 @@ export class RefreshPicker extends PureComponent<Props> {
     const cssClasses = classNames({
       'refresh-picker': true,
       'refresh-picker--off': selectedValue.label === offOption.label,
+      'refresh-picker--live': selectedValue === liveOption,
     });
 
     return (
@@ -68,7 +75,7 @@ export class RefreshPicker extends PureComponent<Props> {
             </button>
           </Tooltip>
           <ButtonSelect
-            className="navbar-button--attached btn--radius-left-0"
+            className="navbar-button--attached btn--radius-left-0$"
             value={selectedValue}
             label={selectedValue.label}
             options={options}
diff --git a/packages/grafana-ui/src/components/RefreshPicker/_RefreshPicker.scss b/packages/grafana-ui/src/components/RefreshPicker/_RefreshPicker.scss
index bfa67d87582c..4dcd204ced3f 100644
--- a/packages/grafana-ui/src/components/RefreshPicker/_RefreshPicker.scss
+++ b/packages/grafana-ui/src/components/RefreshPicker/_RefreshPicker.scss
@@ -30,7 +30,25 @@
     }
   }
 
+  &--live {
+    .select-button-value {
+      animation: liveText 2s infinite;
+    }
+  }
+
   @include media-breakpoint-up(sm) {
     display: block;
   }
 }
+
+@keyframes liveText {
+  0% {
+    color: $orange;
+  }
+  50% {
+    color: $yellow;
+  }
+  100% {
+    color: $orange;
+  }
+}
diff --git a/packages/grafana-ui/src/components/Select/ButtonSelect.tsx b/packages/grafana-ui/src/components/Select/ButtonSelect.tsx
index 7ebfb07c0da0..5ed410067078 100644
--- a/packages/grafana-ui/src/components/Select/ButtonSelect.tsx
+++ b/packages/grafana-ui/src/components/Select/ButtonSelect.tsx
@@ -74,7 +74,7 @@ export class ButtonSelect<T> extends PureComponent<Props<T>> {
         isSearchable={false}
         options={options}
         onChange={this.onChange}
-        defaultValue={value}
+        value={value}
         maxMenuHeight={maxMenuHeight}
         components={combinedComponents}
         className="gf-form-select-box-button-select"
diff --git a/packages/grafana-ui/src/components/Select/Select.tsx b/packages/grafana-ui/src/components/Select/Select.tsx
index f36f78a50fea..d2c784ca8839 100644
--- a/packages/grafana-ui/src/components/Select/Select.tsx
+++ b/packages/grafana-ui/src/components/Select/Select.tsx
@@ -55,11 +55,11 @@ export interface CommonProps<T> {
   onCloseMenu?: () => void;
 }
 
-export interface SelectProps<T> {
+export interface SelectProps<T> extends CommonProps<T> {
   options: Array<SelectOptionItem<T>>;
 }
 
-interface AsyncProps<T> {
+interface AsyncProps<T> extends CommonProps<T> {
   defaultOptions: boolean;
   loadOptions: (query: string) => Promise<Array<SelectOptionItem<T>>>;
   loadingMessage?: () => string;
@@ -95,9 +95,8 @@ export const MenuList = (props: any) => {
   );
 };
 
-export class Select<T> extends PureComponent<CommonProps<T> & SelectProps<T>> {
-  static defaultProps = {
-    width: null,
+export class Select<T> extends PureComponent<SelectProps<T>> {
+  static defaultProps: Partial<SelectProps<any>> = {
     className: '',
     isDisabled: false,
     isSearchable: true,
@@ -108,7 +107,6 @@ export class Select<T> extends PureComponent<CommonProps<T> & SelectProps<T>> {
     isLoading: false,
     backspaceRemovesValue: true,
     maxMenuHeight: 300,
-    menuIsOpen: false,
     components: {
       Option: SelectOption,
       SingleValue,
@@ -201,9 +199,8 @@ export class Select<T> extends PureComponent<CommonProps<T> & SelectProps<T>> {
   }
 }
 
-export class AsyncSelect<T> extends PureComponent<CommonProps<T> & AsyncProps<T>> {
-  static defaultProps = {
-    width: null,
+export class AsyncSelect<T> extends PureComponent<AsyncProps<T>> {
+  static defaultProps: Partial<AsyncProps<any>> = {
     className: '',
     components: {},
     loadingMessage: () => 'Loading...',
diff --git a/packages/grafana-ui/src/components/SetInterval/SetInterval.tsx b/packages/grafana-ui/src/components/SetInterval/SetInterval.tsx
index b44a49f9603e..026aa5600a15 100644
--- a/packages/grafana-ui/src/components/SetInterval/SetInterval.tsx
+++ b/packages/grafana-ui/src/components/SetInterval/SetInterval.tsx
@@ -1,8 +1,10 @@
 import { PureComponent } from 'react';
-import { interval, Subscription, empty, Subject } from 'rxjs';
+import { interval, Subscription, Subject, of, NEVER } from 'rxjs';
 import { tap, switchMap } from 'rxjs/operators';
+import _ from 'lodash';
 
 import { stringToMs } from '../../utils/string';
+import { isLive } from '../RefreshPicker/RefreshPicker';
 
 interface Props {
   func: () => any; // TODO
@@ -24,7 +26,10 @@ export class SetInterval extends PureComponent<Props> {
     this.subscription = this.propsSubject
       .pipe(
         switchMap(props => {
-          return props.loading ? empty() : interval(stringToMs(props.interval));
+          if (isLive(props.interval)) {
+            return of({});
+          }
+          return props.loading ? NEVER : interval(stringToMs(props.interval));
         }),
         tap(() => this.props.func())
       )
@@ -32,7 +37,11 @@ export class SetInterval extends PureComponent<Props> {
     this.propsSubject.next(this.props);
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps: Props) {
+    if ((isLive(prevProps.interval) && isLive(this.props.interval)) || _.isEqual(prevProps, this.props)) {
+      return;
+    }
+
     this.propsSubject.next(this.props);
   }
 
diff --git a/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx b/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx
index 0c7858aef69d..8205599e9368 100644
--- a/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx
+++ b/packages/grafana-ui/src/components/SingleStatShared/FieldPropertiesEditor.tsx
@@ -1,5 +1,5 @@
 // Libraries
-import React, { PureComponent, ChangeEvent } from 'react';
+import React, { ChangeEvent, useState, useCallback } from 'react';
 
 // Components
 import { FormField } from '../FormField/FormField';
@@ -8,7 +8,7 @@ import { UnitPicker } from '../UnitPicker/UnitPicker';
 
 // Types
 import { Field } from '../../types/data';
-import { toNumberString, toIntegerOrUndefined } from '../../utils';
+import { toIntegerOrUndefined } from '../../utils';
 import { SelectOptionItem } from '../Select/Select';
 
 import { VAR_SERIES_NAME, VAR_FIELD_NAME, VAR_CALC, VAR_CELL_PREFIX } from '../../utils/fieldDisplay';
@@ -21,92 +21,108 @@ export interface Props {
   onChange: (value: Partial<Field>, event?: React.SyntheticEvent<HTMLElement>) => void;
 }
 
-export class FieldPropertiesEditor extends PureComponent<Props> {
-  onTitleChange = (event: ChangeEvent<HTMLInputElement>) =>
-    this.props.onChange({ ...this.props.value, title: event.target.value });
+export const FieldPropertiesEditor: React.FC<Props> = ({ value, onChange, showMinMax }) => {
+  const { unit, title } = value;
 
-  // @ts-ignore
-  onUnitChange = (unit: SelectOptionItem<string>) => this.props.onChange({ ...this.props.value, unit: unit.value });
+  const [decimals, setDecimals] = useState(
+    value.decimals !== undefined && value.decimals !== null ? value.decimals.toString() : ''
+  );
+  const [min, setMin] = useState(value.min !== undefined && value.min !== null ? value.min.toString() : '');
+  const [max, setMax] = useState(value.max !== undefined && value.max !== null ? value.max.toString() : '');
 
-  onDecimalChange = (event: ChangeEvent<HTMLInputElement>) => {
-    this.props.onChange({
-      ...this.props.value,
-      decimals: toIntegerOrUndefined(event.target.value),
-    });
+  const onTitleChange = (event: ChangeEvent<HTMLInputElement>) => {
+    onChange({ ...value, title: event.target.value });
   };
 
-  onMinChange = (event: ChangeEvent<HTMLInputElement>) => {
-    this.props.onChange({
-      ...this.props.value,
-      min: toIntegerOrUndefined(event.target.value),
-    });
+  const onDecimalChange = useCallback(
+    (event: ChangeEvent<HTMLInputElement>) => {
+      setDecimals(event.target.value);
+    },
+    [value.decimals, onChange]
+  );
+
+  const onMinChange = useCallback(
+    (event: ChangeEvent<HTMLInputElement>) => {
+      setMin(event.target.value);
+    },
+    [value.min, onChange]
+  );
+
+  const onMaxChange = useCallback(
+    (event: ChangeEvent<HTMLInputElement>) => {
+      setMax(event.target.value);
+    },
+    [value.max, onChange]
+  );
+
+  const onUnitChange = (unit: SelectOptionItem<string>) => {
+    onChange({ ...value, unit: unit.value });
   };
 
-  onMaxChange = (event: ChangeEvent<HTMLInputElement>) => {
-    this.props.onChange({
-      ...this.props.value,
-      max: toIntegerOrUndefined(event.target.value),
+  const commitChanges = useCallback(() => {
+    onChange({
+      ...value,
+      decimals: toIntegerOrUndefined(decimals),
+      min: toIntegerOrUndefined(min),
+      max: toIntegerOrUndefined(max),
     });
-  };
+  }, [min, max, decimals]);
 
-  render() {
-    const { showMinMax } = this.props;
-    const { unit, decimals, min, max } = this.props.value;
+  const titleTooltip = (
+    <div>
+      Template Variables:
+      <br />
+      {'$' + VAR_SERIES_NAME}
+      <br />
+      {'$' + VAR_FIELD_NAME}
+      <br />
+      {'$' + VAR_CELL_PREFIX + '{N}'} / {'$' + VAR_CALC}
+    </div>
+  );
+  return (
+    <>
+      <FormField
+        label="Title"
+        labelWidth={labelWidth}
+        onChange={onTitleChange}
+        value={title}
+        tooltip={titleTooltip}
+        placeholder="Auto"
+      />
 
-    const titleTooltip = (
-      <div>
-        Template Variables:
-        <br />
-        {'$' + VAR_SERIES_NAME}
-        <br />
-        {'$' + VAR_FIELD_NAME}
-        <br />
-        {'$' + VAR_CELL_PREFIX + '{N}'} / {'$' + VAR_CALC}
+      <div className="gf-form">
+        <FormLabel width={labelWidth}>Unit</FormLabel>
+        <UnitPicker defaultValue={unit} onChange={onUnitChange} />
       </div>
-    );
-
-    return (
-      <>
-        <FormField
-          label="Title"
-          labelWidth={labelWidth}
-          onChange={this.onTitleChange}
-          value={this.props.value.title}
-          tooltip={titleTooltip}
-          placeholder="Auto"
-        />
-
-        <div className="gf-form">
-          <FormLabel width={labelWidth}>Unit</FormLabel>
-          <UnitPicker defaultValue={unit} onChange={this.onUnitChange} />
-        </div>
-        {showMinMax && (
-          <>
-            <FormField
-              label="Min"
-              labelWidth={labelWidth}
-              onChange={this.onMinChange}
-              value={toNumberString(min)}
-              type="number"
-            />
-            <FormField
-              label="Max"
-              labelWidth={labelWidth}
-              onChange={this.onMaxChange}
-              value={toNumberString(max)}
-              type="number"
-            />
-          </>
-        )}
-        <FormField
-          label="Decimals"
-          labelWidth={labelWidth}
-          placeholder="auto"
-          onChange={this.onDecimalChange}
-          value={toNumberString(decimals)}
-          type="number"
-        />
-      </>
-    );
-  }
-}
+      {showMinMax && (
+        <>
+          <FormField
+            label="Min"
+            labelWidth={labelWidth}
+            onChange={onMinChange}
+            onBlur={commitChanges}
+            value={min}
+            type="number"
+          />
+          <FormField
+            label="Max"
+            labelWidth={labelWidth}
+            onChange={onMaxChange}
+            onBlur={commitChanges}
+            value={max}
+            type="number"
+          />
+        </>
+      )}
+      <FormField
+        label="Decimals"
+        labelWidth={labelWidth}
+        placeholder="auto"
+        onChange={onDecimalChange}
+        onBlur={commitChanges}
+        value={decimals}
+        type="number"
+      />
+    </>
+  );
+};
diff --git a/packages/grafana-ui/src/components/Table/Table.test.tsx b/packages/grafana-ui/src/components/Table/Table.test.tsx
new file mode 100644
index 000000000000..43947c9455f8
--- /dev/null
+++ b/packages/grafana-ui/src/components/Table/Table.test.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+
+import { readCSV } from '../../utils/csv';
+import { Table, Props } from './Table';
+import { getTheme } from '../../themes/index';
+import { GrafanaThemeType } from '../../types/theme';
+import renderer from 'react-test-renderer';
+
+const series = readCSV('a,b,c\n1,2,3\n4,5,6')[0];
+const setup = (propOverrides?: object) => {
+  const props: Props = {
+    data: series,
+
+    minColumnWidth: 100,
+    showHeader: true,
+    fixedHeader: true,
+    fixedColumns: 0,
+    rotate: false,
+    styles: [],
+    replaceVariables: (value: string) => value,
+    width: 600,
+    height: 800,
+
+    theme: getTheme(GrafanaThemeType.Dark),
+  }; // partial
+
+  Object.assign(props, propOverrides);
+
+  const tree = renderer.create(<Table {...props} />);
+  const instance = (tree.getInstance() as unknown) as Table;
+
+  return {
+    tree,
+    instance,
+  };
+};
+
+describe('Table', () => {
+  it('ignore invalid properties', () => {
+    const { tree, instance } = setup();
+    expect(tree.toJSON() + '').toEqual(
+      setup({
+        id: 3, // Don't pass invalid parameters to MultiGrid
+      }).tree.toJSON() + ''
+    );
+    expect(instance.measurer.has(0, 0)).toBeTruthy();
+  });
+});
diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index 72b7d6392b93..71e96b486fd4 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -282,14 +282,16 @@ export class Table extends Component<Props, State> {
       this.scrollToTop = false;
     }
 
+    // Force MultiGrid to rerender if these options change
+    // See: https://github.com/bvaughn/react-virtualized#pass-thru-props
+    const refreshKeys = {
+      ...this.state, // Includes data and sort parameters
+      d1: this.props.data,
+      s0: this.props.styles,
+    };
     return (
       <MultiGrid
-        {
-          ...this.state /** Force MultiGrid to update when data changes */
-        }
-        {
-          ...this.props /** Force MultiGrid to update when data changes */
-        }
+        {...refreshKeys}
         scrollToRow={scrollToRow}
         columnCount={columnCount}
         scrollToColumn={scrollToColumn}
diff --git a/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx b/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx
index f7e54d7bb5d7..1fff51127f5c 100644
--- a/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx
+++ b/packages/grafana-ui/src/components/Table/TableCellBuilder.tsx
@@ -157,10 +157,7 @@ class CellBuilderWithStyle {
     private column: Field,
     private replaceVariables: InterpolateFunction,
     private fmt?: ValueFormatter
-  ) {
-    //
-    console.log('COLUMN', column.name, theme);
-  }
+  ) {}
 
   getColorForValue = (value: any): string | null => {
     const { thresholds, colors } = this.style;
diff --git a/packages/grafana-ui/src/components/Table/_Table.scss b/packages/grafana-ui/src/components/Table/_Table.scss
index d9fb2dafe6c7..bb82d021b4b5 100644
--- a/packages/grafana-ui/src/components/Table/_Table.scss
+++ b/packages/grafana-ui/src/components/Table/_Table.scss
@@ -70,6 +70,7 @@
 
   text-overflow: ellipsis;
   white-space: nowrap;
+  overflow: hidden;
 
   border-right: 2px solid $body-bg;
   border-bottom: 2px solid $body-bg;
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 5a4f58626c6a..860dd5a97ab0 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -45,10 +45,20 @@ export { TableInputCSV } from './Table/TableInputCSV';
 export { BigValue } from './BigValue/BigValue';
 export { Gauge } from './Gauge/Gauge';
 export { Graph } from './Graph/Graph';
+export { GraphLegend } from './Graph/GraphLegend';
 export { GraphWithLegend } from './Graph/GraphWithLegend';
 export { BarGauge } from './BarGauge/BarGauge';
 export { VizRepeater } from './VizRepeater/VizRepeater';
-export { LegendOptions, LegendBasicOptions, LegendRenderOptions, LegendList, LegendTable } from './Legend/Legend';
+export {
+  LegendOptions,
+  LegendBasicOptions,
+  LegendRenderOptions,
+  LegendList,
+  LegendTable,
+  LegendItem,
+  LegendPlacement,
+  LegendDisplayMode,
+} from './Legend/Legend';
 // Panel editors
 export { ThresholdsEditor } from './ThresholdsEditor/ThresholdsEditor';
 export { ClickOutsideWrapper } from './ClickOutsideWrapper/ClickOutsideWrapper';
diff --git a/packages/grafana-ui/src/types/app.ts b/packages/grafana-ui/src/types/app.ts
index 01dd6e1a40a9..79d6fce50664 100644
--- a/packages/grafana-ui/src/types/app.ts
+++ b/packages/grafana-ui/src/types/app.ts
@@ -1,12 +1,12 @@
 import { ComponentClass } from 'react';
 import { NavModel } from './navModel';
-import { PluginMeta, PluginIncludeType, GrafanaPlugin } from './plugin';
+import { PluginMeta, PluginIncludeType, GrafanaPlugin, KeyValue } from './plugin';
 
-export interface AppRootProps {
-  meta: AppPluginMeta;
+export interface AppRootProps<T = KeyValue> {
+  meta: AppPluginMeta<T>;
 
   path: string; // The URL path to this page
-  query: { [s: string]: any }; // The URL query parameters
+  query: KeyValue; // The URL query parameters
 
   /**
    * Pass the nav model to the container... is there a better way?
@@ -14,23 +14,30 @@ export interface AppRootProps {
   onNavChanged: (nav: NavModel) => void;
 }
 
-export interface AppPluginMeta extends PluginMeta {
+export interface AppPluginMeta<T = KeyValue> extends PluginMeta<T> {
   // TODO anything specific to apps?
 }
 
-export class AppPlugin extends GrafanaPlugin<AppPluginMeta> {
+export class AppPlugin<T = KeyValue> extends GrafanaPlugin<AppPluginMeta<T>> {
   // Content under: /a/${plugin-id}/*
-  root?: ComponentClass<AppRootProps>;
+  root?: ComponentClass<AppRootProps<T>>;
   rootNav?: NavModel; // Initial navigation model
 
   // Old style pages
   angularPages?: { [component: string]: any };
 
+  /**
+   * Called after the module has loaded, and before the app is used.
+   * This function may be called multiple times on the same instance.
+   * The first time, `this.meta` will be undefined
+   */
+  init(meta: AppPluginMeta) {}
+
   /**
    * Set the component displayed under:
    *   /a/${plugin-id}/*
    */
-  setRootPage(root: ComponentClass<AppRootProps>, rootNav?: NavModel) {
+  setRootPage(root: ComponentClass<AppRootProps<T>>, rootNav?: NavModel) {
     this.root = root;
     this.rootNav = rootNav;
     return this;
diff --git a/packages/grafana-ui/src/types/data.ts b/packages/grafana-ui/src/types/data.ts
index 678efc40f007..d1a1a7857776 100644
--- a/packages/grafana-ui/src/types/data.ts
+++ b/packages/grafana-ui/src/types/data.ts
@@ -21,7 +21,7 @@ export interface QueryResultMeta {
   requestId?: string;
 
   // Used in Explore for highlighting
-  search?: string;
+  searchWords?: string[];
 
   // Used in Explore to show limit applied to search result
   limit?: number;
@@ -47,7 +47,6 @@ export interface Field {
   unit?: string;
   dateFormat?: string; // Source data format
   decimals?: number | null; // Significant digits (for display)
-  color?: string;
   min?: number | null;
   max?: number | null;
 }
diff --git a/packages/grafana-ui/src/types/datasource.ts b/packages/grafana-ui/src/types/datasource.ts
index 2622efd3ed50..22bf4b060b92 100644
--- a/packages/grafana-ui/src/types/datasource.ts
+++ b/packages/grafana-ui/src/types/datasource.ts
@@ -3,6 +3,7 @@ import { TimeRange } from './time';
 import { PluginMeta, GrafanaPlugin } from './plugin';
 import { TableData, TimeSeries, SeriesData, LoadingState } from './data';
 import { PanelData } from './panel';
+import { LogRowModel } from './logs';
 
 // NOTE: this seems more general than just DataSource
 export interface DataSourcePluginOptionsEditorProps<TOptions> {
@@ -49,6 +50,16 @@ export class DataSourcePlugin<
     return this;
   }
 
+  setExploreMetricsQueryField(ExploreQueryField: ComponentClass<ExploreQueryFieldProps<DSType, TQuery, TOptions>>) {
+    this.components.ExploreMetricsQueryField = ExploreQueryField;
+    return this;
+  }
+
+  setExploreLogsQueryField(ExploreQueryField: ComponentClass<ExploreQueryFieldProps<DSType, TQuery, TOptions>>) {
+    this.components.ExploreLogsQueryField = ExploreQueryField;
+    return this;
+  }
+
   setExploreStartPage(ExploreStartPage: ComponentClass<ExploreStartPageProps>) {
     this.components.ExploreStartPage = ExploreStartPage;
     return this;
@@ -74,15 +85,22 @@ export class DataSourcePlugin<
 export interface DataSourcePluginMeta extends PluginMeta {
   builtIn?: boolean; // Is this for all
   metrics?: boolean;
-  tables?: boolean;
   logs?: boolean;
-  explore?: boolean;
   annotations?: boolean;
+  alerting?: boolean;
   mixed?: boolean;
   hasQueryHelp?: boolean;
   category?: string;
   queryOptions?: PluginMetaQueryOptions;
   sort?: number;
+  streaming?: boolean;
+
+  /**
+   * By default, hidden queries are not passed to the datasource
+   * Set this to true in plugin.json to have hidden queries passed to the
+   * DataSource query method
+   */
+  hiddenQueries?: boolean;
 }
 
 interface PluginMetaQueryOptions {
@@ -101,6 +119,8 @@ export interface DataSourcePluginComponents<
   VariableQueryEditor?: any;
   QueryEditor?: ComponentType<QueryEditorProps<DSType, TQuery, TOptions>>;
   ExploreQueryField?: ComponentClass<ExploreQueryFieldProps<DSType, TQuery, TOptions>>;
+  ExploreMetricsQueryField?: ComponentClass<ExploreQueryFieldProps<DSType, TQuery, TOptions>>;
+  ExploreLogsQueryField?: ComponentClass<ExploreQueryFieldProps<DSType, TQuery, TOptions>>;
   ExploreStartPage?: ComponentClass<ExploreStartPageProps>;
   ConfigEditor?: ComponentType<DataSourcePluginOptionsEditorProps<DataSourceSettings<TOptions>>>;
 }
@@ -171,6 +191,14 @@ export abstract class DataSourceApi<
    */
   getQueryDisplayText?(query: TQuery): string;
 
+  /**
+   * Retrieve context for a given log row
+   */
+  getLogRowContext?: <TContextQueryOptions extends {}>(
+    row: LogRowModel,
+    options?: TContextQueryOptions
+  ) => Promise<DataQueryResponse>;
+
   /**
    * Set after constructor call, as the data source instance is the most common thing to pass around
    * we attach the components to this instance for easy access
@@ -181,14 +209,25 @@ export abstract class DataSourceApi<
    * static information about the datasource
    */
   meta?: DataSourcePluginMeta;
-}
 
-export abstract class ExploreDataSourceApi<
-  TQuery extends DataQuery = DataQuery,
-  TOptions extends DataSourceJsonData = DataSourceJsonData
-> extends DataSourceApi<TQuery, TOptions> {
+  /**
+   * Used by alerting to check if query contains template variables
+   */
+  targetContainsTemplate?(query: TQuery): boolean;
+
+  /**
+   * Used in explore
+   */
   modifyQuery?(query: TQuery, action: QueryFixAction): TQuery;
-  getHighlighterExpression?(query: TQuery): string;
+
+  /**
+   * Used in explore
+   */
+  getHighlighterExpression?(query: TQuery): string[];
+
+  /**
+   * Used in explore
+   */
   languageProvider?: any;
 }
 
diff --git a/packages/grafana-ui/src/types/logs.ts b/packages/grafana-ui/src/types/logs.ts
index 63f264fff4f3..3d8cc0951b83 100644
--- a/packages/grafana-ui/src/types/logs.ts
+++ b/packages/grafana-ui/src/types/logs.ts
@@ -1,3 +1,5 @@
+import { Labels, TimeSeries } from './data';
+
 /**
  * Mapping of log level abbreviation to canonical log level.
  * Supported levels are reduce to limit color variation.
@@ -19,3 +21,85 @@ export enum LogLevel {
   trace = 'trace',
   unknown = 'unknown',
 }
+
+export enum LogsMetaKind {
+  Number,
+  String,
+  LabelsMap,
+}
+
+export interface LogsMetaItem {
+  label: string;
+  value: string | number | Labels;
+  kind: LogsMetaKind;
+}
+
+export interface LogRowModel {
+  duplicates?: number;
+  entry: string;
+  hasAnsi: boolean;
+  labels: Labels;
+  logLevel: LogLevel;
+  raw: string;
+  searchWords?: string[];
+  timestamp: string; // ISO with nanosec precision
+  timeFromNow: string;
+  timeEpochMs: number;
+  timeLocal: string;
+  uniqueLabels?: Labels;
+}
+
+export interface LogsModel {
+  hasUniqueLabels: boolean;
+  meta?: LogsMetaItem[];
+  rows: LogRowModel[];
+  series?: TimeSeries[];
+}
+
+export interface LogSearchMatch {
+  start: number;
+  length: number;
+  text: string;
+}
+
+export interface LogLabelStatsModel {
+  active?: boolean;
+  count: number;
+  proportion: number;
+  value: string;
+}
+
+export enum LogsDedupStrategy {
+  none = 'none',
+  exact = 'exact',
+  numbers = 'numbers',
+  signature = 'signature',
+}
+
+export interface LogsParser {
+  /**
+   * Value-agnostic matcher for a field label.
+   * Used to filter rows, and first capture group contains the value.
+   */
+  buildMatcher: (label: string) => RegExp;
+
+  /**
+   * Returns all parsable substrings from a line, used for highlighting
+   */
+  getFields: (line: string) => string[];
+
+  /**
+   * Gets the label name from a parsable substring of a line
+   */
+  getLabelFromField: (field: string) => string;
+
+  /**
+   * Gets the label value from a parsable substring of a line
+   */
+  getValueFromField: (field: string) => string;
+  /**
+   * Function to verify if this is a valid parser for the given line.
+   * The parser accepts the line unless it returns undefined.
+   */
+  test: (line: string) => any;
+}
diff --git a/packages/grafana-ui/src/types/navModel.ts b/packages/grafana-ui/src/types/navModel.ts
index 2f1018eed9ce..7d23f222e149 100644
--- a/packages/grafana-ui/src/types/navModel.ts
+++ b/packages/grafana-ui/src/types/navModel.ts
@@ -7,11 +7,13 @@ export interface NavModelItem {
   id?: string;
   active?: boolean;
   hideFromTabs?: boolean;
+  hideFromMenu?: boolean;
   divider?: boolean;
   children?: NavModelItem[];
   breadcrumbs?: NavModelBreadcrumb[];
   target?: string;
   parentItem?: NavModelItem;
+  showOrgSwitcher?: boolean;
 }
 
 export interface NavModel {
diff --git a/packages/grafana-ui/src/types/panel.ts b/packages/grafana-ui/src/types/panel.ts
index a1756ff02fea..aedb5b30a877 100644
--- a/packages/grafana-ui/src/types/panel.ts
+++ b/packages/grafana-ui/src/types/panel.ts
@@ -31,6 +31,7 @@ export interface PanelProps<T = any> {
   options: T;
   onOptionsChange: (options: T) => void;
   renderCounter: number;
+  transparent: boolean;
   width: number;
   height: number;
   replaceVariables: InterpolateFunction;
diff --git a/packages/grafana-ui/src/types/plugin.ts b/packages/grafana-ui/src/types/plugin.ts
index c083fd95be38..a9885e00cf82 100644
--- a/packages/grafana-ui/src/types/plugin.ts
+++ b/packages/grafana-ui/src/types/plugin.ts
@@ -11,7 +11,9 @@ export enum PluginType {
   app = 'app',
 }
 
-export interface PluginMeta {
+export type KeyValue<T = any> = { [s: string]: T };
+
+export interface PluginMeta<T extends {} = KeyValue> {
   id: string;
   name: string;
   type: PluginType;
@@ -27,8 +29,8 @@ export interface PluginMeta {
   dependencies?: PluginDependencies;
 
   // Filled in by the backend
-  jsonData?: { [str: string]: any };
-  secureJsonData?: { [str: string]: any };
+  jsonData?: T;
+  secureJsonData?: KeyValue;
   enabled?: boolean;
   defaultNavUrl?: string;
   hasUpdate?: boolean;
@@ -91,17 +93,17 @@ export interface PluginMetaInfo {
   version: string;
 }
 
-export interface PluginConfigTabProps<T extends PluginMeta> {
-  meta: T;
-  query: { [s: string]: any }; // The URL query parameters
+export interface PluginConfigPageProps<T extends GrafanaPlugin> {
+  plugin: T;
+  query: KeyValue; // The URL query parameters
 }
 
-export interface PluginConfigTab<T extends PluginMeta> {
+export interface PluginConfigPage<T extends GrafanaPlugin> {
   title: string; // Display
   icon?: string;
   id: string; // Unique, in URL
 
-  body: ComponentClass<PluginConfigTabProps<T>>;
+  body: ComponentClass<PluginConfigPageProps<T>>;
 }
 
 export class GrafanaPlugin<T extends PluginMeta = PluginMeta> {
@@ -112,14 +114,14 @@ export class GrafanaPlugin<T extends PluginMeta = PluginMeta> {
   angularConfigCtrl?: any;
 
   // Show configuration tabs on the plugin page
-  configTabs?: Array<PluginConfigTab<T>>;
+  configPages?: Array<PluginConfigPage<GrafanaPlugin>>;
 
   // Tabs on the plugin page
-  addConfigTab(tab: PluginConfigTab<T>) {
-    if (!this.configTabs) {
-      this.configTabs = [];
+  addConfigPage(tab: PluginConfigPage<GrafanaPlugin>) {
+    if (!this.configPages) {
+      this.configPages = [];
     }
-    this.configTabs.push(tab);
+    this.configPages.push(tab);
     return this;
   }
 }
diff --git a/packages/grafana-ui/src/utils/displayValue.test.ts b/packages/grafana-ui/src/utils/displayValue.test.ts
index 63c78e979826..139286acc017 100644
--- a/packages/grafana-ui/src/utils/displayValue.test.ts
+++ b/packages/grafana-ui/src/utils/displayValue.test.ts
@@ -18,7 +18,7 @@ describe('Process simple display values', () => {
     getDisplayProcessor(),
 
     // Add a simple option that is not used (uses a different base class)
-    getDisplayProcessor({ field: { color: '#FFF' } }),
+    getDisplayProcessor({ field: { min: 0, max: 100 } }),
 
     // Add a simple option that is not used (uses a different base class)
     getDisplayProcessor({ field: { unit: 'locale' } }),
diff --git a/packages/grafana-ui/src/utils/displayValue.ts b/packages/grafana-ui/src/utils/displayValue.ts
index 59a04fefc2b9..6565985f4451 100644
--- a/packages/grafana-ui/src/utils/displayValue.ts
+++ b/packages/grafana-ui/src/utils/displayValue.ts
@@ -42,7 +42,7 @@ export function getDisplayProcessor(options?: DisplayValueOptions): DisplayProce
 
     return (value: any) => {
       const { mappings, thresholds, theme } = options;
-      let color = field.color;
+      let color;
 
       let text = _.toString(value);
       let numeric = toNumber(value);
@@ -76,7 +76,7 @@ export function getDisplayProcessor(options?: DisplayValueOptions): DisplayProce
           const { decimals, scaledDecimals } = getDecimalsForValue(value, field.decimals);
           text = formatFunc(numeric, decimals, scaledDecimals, options.isUtc);
         }
-        if (thresholds && thresholds.length > 0) {
+        if (thresholds && thresholds.length) {
           color = getColorFromThreshold(numeric, thresholds, theme);
         }
       }
diff --git a/packages/grafana-ui/src/utils/logs.ts b/packages/grafana-ui/src/utils/logs.ts
index fb8c7977e2ad..b5c45b635daf 100644
--- a/packages/grafana-ui/src/utils/logs.ts
+++ b/packages/grafana-ui/src/utils/logs.ts
@@ -23,6 +23,15 @@ export function getLogLevel(line: string): LogLevel {
   return LogLevel.unknown;
 }
 
+export function getLogLevelFromKey(key: string): LogLevel {
+  const level = (LogLevel as any)[key];
+  if (level) {
+    return level;
+  }
+
+  return LogLevel.unknown;
+}
+
 export function addLogLevelToSeries(series: SeriesData, lineIndex: number): SeriesData {
   return {
     ...series, // Keeps Tags, RefID etc
diff --git a/packages/grafana-ui/src/utils/moment_wrapper.ts b/packages/grafana-ui/src/utils/moment_wrapper.ts
index 063c427372b6..755f92a899af 100644
--- a/packages/grafana-ui/src/utils/moment_wrapper.ts
+++ b/packages/grafana-ui/src/utils/moment_wrapper.ts
@@ -43,6 +43,9 @@ export interface DateTimeLocale {
 
 export interface DateTimeDuration {
   asHours: () => number;
+  hours: () => number;
+  minutes: () => number;
+  seconds: () => number;
 }
 
 export interface DateTime extends Object {
diff --git a/packages/grafana-ui/src/utils/processSeriesData.test.ts b/packages/grafana-ui/src/utils/processSeriesData.test.ts
index 96afa79aa8c0..ea582e89b3a8 100644
--- a/packages/grafana-ui/src/utils/processSeriesData.test.ts
+++ b/packages/grafana-ui/src/utils/processSeriesData.test.ts
@@ -6,7 +6,7 @@ import {
   guessFieldTypes,
   guessFieldTypeFromValue,
 } from './processSeriesData';
-import { FieldType, TimeSeries } from '../types/data';
+import { FieldType, TimeSeries, SeriesData, TableData } from '../types/data';
 import { dateTime } from './moment_wrapper';
 
 describe('toSeriesData', () => {
@@ -99,4 +99,25 @@ describe('SerisData backwards compatibility', () => {
     expect(isTableData(roundtrip)).toBeTruthy();
     expect(roundtrip).toMatchObject(table);
   });
+
+  it('converts SeriesData to TableData to series and back again', () => {
+    const series: SeriesData = {
+      refId: 'Z',
+      meta: {
+        somethign: 8,
+      },
+      fields: [
+        { name: 'T', type: FieldType.time }, // first
+        { name: 'N', type: FieldType.number, filterable: true },
+        { name: 'S', type: FieldType.string, filterable: true },
+      ],
+      rows: [[1, 100, '1'], [2, 200, '2'], [3, 300, '3']],
+    };
+    const table = toLegacyResponseData(series) as TableData;
+    expect(table.meta).toBe(series.meta);
+    expect(table.refId).toBe(series.refId);
+
+    const names = table.columns.map(c => c.text);
+    expect(names).toEqual(['T', 'N', 'S']);
+  });
 });
diff --git a/packages/grafana-ui/src/utils/processSeriesData.ts b/packages/grafana-ui/src/utils/processSeriesData.ts
index 1ba31e3bbdee..38e9abf91358 100644
--- a/packages/grafana-ui/src/utils/processSeriesData.ts
+++ b/packages/grafana-ui/src/utils/processSeriesData.ts
@@ -4,7 +4,7 @@ import isString from 'lodash/isString';
 import isBoolean from 'lodash/isBoolean';
 
 // Types
-import { SeriesData, Field, TimeSeries, FieldType, TableData } from '../types/index';
+import { SeriesData, Field, TimeSeries, FieldType, TableData, Column } from '../types/index';
 import { isDateTime } from './moment_wrapper';
 
 function convertTableToSeriesData(table: TableData): SeriesData {
@@ -160,6 +160,7 @@ export const toLegacyResponseData = (series: SeriesData): TimeSeries | TableData
     const type = guessFieldTypeFromSeries(series, 1);
     if (type === FieldType.time) {
       return {
+        alias: fields[0].name || series.name,
         target: fields[0].name || series.name,
         datapoints: rows,
         unit: fields[0].unit,
@@ -171,14 +172,12 @@ export const toLegacyResponseData = (series: SeriesData): TimeSeries | TableData
 
   return {
     columns: fields.map(f => {
-      return {
-        text: f.name,
-        filterable: f.filterable,
-        unit: f.unit,
-        refId: series.refId,
-        meta: series.meta,
-      };
+      const { name, ...column } = f;
+      (column as Column).text = name;
+      return column as Column;
     }),
+    refId: series.refId,
+    meta: series.meta,
     rows,
   };
 };
diff --git a/packages/grafana-ui/tslint.json b/packages/grafana-ui/tslint.json
index 937aa29800e5..1033e1962fc7 100644
--- a/packages/grafana-ui/tslint.json
+++ b/packages/grafana-ui/tslint.json
@@ -1,6 +1,6 @@
 {
   "extends": "../../tslint.json",
   "rules": {
-    "import-blacklist": [true, "moment", ["^@grafana/ui.*"]]
+    "import-blacklist": [true, "moment", ["^@grafana/ui.*"], ["^@grafana/runtime.*"]]
   }
 }
diff --git a/pkg/api/admin_ldap.go b/pkg/api/admin_ldap.go
index 6e1b40bfa3e8..8aca63c5394f 100644
--- a/pkg/api/admin_ldap.go
+++ b/pkg/api/admin_ldap.go
@@ -4,7 +4,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/ldap"
 )
 
-func (server *HTTPServer) ReloadLdapCfg() Response {
+func (server *HTTPServer) ReloadLDAPCfg() Response {
 	if !ldap.IsEnabled() {
 		return Error(400, "LDAP is not enabled", nil)
 	}
@@ -13,5 +13,5 @@ func (server *HTTPServer) ReloadLdapCfg() Response {
 	if err != nil {
 		return Error(500, "Failed to reload ldap config.", err)
 	}
-	return Success("Ldap config reloaded")
+	return Success("LDAP config reloaded")
 }
diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go
index 76193771eb91..9fedbc4ddf52 100644
--- a/pkg/api/admin_users.go
+++ b/pkg/api/admin_users.go
@@ -4,12 +4,12 @@ import (
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/util"
 )
 
-func AdminCreateUser(c *m.ReqContext, form dtos.AdminCreateUserForm) {
-	cmd := m.CreateUserCommand{
+func AdminCreateUser(c *models.ReqContext, form dtos.AdminCreateUserForm) {
+	cmd := models.CreateUserCommand{
 		Login:    form.Login,
 		Email:    form.Email,
 		Password: form.Password,
@@ -38,7 +38,7 @@ func AdminCreateUser(c *m.ReqContext, form dtos.AdminCreateUserForm) {
 
 	user := cmd.Result
 
-	result := m.UserIdDTO{
+	result := models.UserIdDTO{
 		Message: "User created",
 		Id:      user.Id,
 	}
@@ -46,7 +46,7 @@ func AdminCreateUser(c *m.ReqContext, form dtos.AdminCreateUserForm) {
 	c.JSON(200, result)
 }
 
-func AdminUpdateUserPassword(c *m.ReqContext, form dtos.AdminUpdateUserPasswordForm) {
+func AdminUpdateUserPassword(c *models.ReqContext, form dtos.AdminUpdateUserPasswordForm) {
 	userID := c.ParamsInt64(":id")
 
 	if len(form.Password) < 4 {
@@ -54,7 +54,7 @@ func AdminUpdateUserPassword(c *m.ReqContext, form dtos.AdminUpdateUserPasswordF
 		return
 	}
 
-	userQuery := m.GetUserByIdQuery{Id: userID}
+	userQuery := models.GetUserByIdQuery{Id: userID}
 
 	if err := bus.Dispatch(&userQuery); err != nil {
 		c.JsonApiErr(500, "Could not read user from database", err)
@@ -63,7 +63,7 @@ func AdminUpdateUserPassword(c *m.ReqContext, form dtos.AdminUpdateUserPasswordF
 
 	passwordHashed := util.EncodePassword(form.Password, userQuery.Result.Salt)
 
-	cmd := m.ChangeUserPasswordCommand{
+	cmd := models.ChangeUserPasswordCommand{
 		UserId:      userID,
 		NewPassword: passwordHashed,
 	}
@@ -77,17 +77,17 @@ func AdminUpdateUserPassword(c *m.ReqContext, form dtos.AdminUpdateUserPasswordF
 }
 
 // PUT /api/admin/users/:id/permissions
-func AdminUpdateUserPermissions(c *m.ReqContext, form dtos.AdminUpdateUserPermissionsForm) {
+func AdminUpdateUserPermissions(c *models.ReqContext, form dtos.AdminUpdateUserPermissionsForm) {
 	userID := c.ParamsInt64(":id")
 
-	cmd := m.UpdateUserPermissionsCommand{
+	cmd := models.UpdateUserPermissionsCommand{
 		UserId:         userID,
 		IsGrafanaAdmin: form.IsGrafanaAdmin,
 	}
 
 	if err := bus.Dispatch(&cmd); err != nil {
-		if err == m.ErrLastGrafanaAdmin {
-			c.JsonApiErr(400, m.ErrLastGrafanaAdmin.Error(), nil)
+		if err == models.ErrLastGrafanaAdmin {
+			c.JsonApiErr(400, models.ErrLastGrafanaAdmin.Error(), nil)
 			return
 		}
 
@@ -98,10 +98,10 @@ func AdminUpdateUserPermissions(c *m.ReqContext, form dtos.AdminUpdateUserPermis
 	c.JsonOK("User permissions updated")
 }
 
-func AdminDeleteUser(c *m.ReqContext) {
+func AdminDeleteUser(c *models.ReqContext) {
 	userID := c.ParamsInt64(":id")
 
-	cmd := m.DeleteUserCommand{UserId: userID}
+	cmd := models.DeleteUserCommand{UserId: userID}
 
 	if err := bus.Dispatch(&cmd); err != nil {
 		c.JsonApiErr(500, "Failed to delete user", err)
@@ -111,8 +111,49 @@ func AdminDeleteUser(c *m.ReqContext) {
 	c.JsonOK("User deleted")
 }
 
+// POST /api/admin/users/:id/disable
+func (server *HTTPServer) AdminDisableUser(c *models.ReqContext) Response {
+	userID := c.ParamsInt64(":id")
+
+	// External users shouldn't be disabled from API
+	authInfoQuery := &models.GetAuthInfoQuery{UserId: userID}
+	if err := bus.Dispatch(authInfoQuery); err != models.ErrUserNotFound {
+		return Error(500, "Could not disable external user", nil)
+	}
+
+	disableCmd := models.DisableUserCommand{UserId: userID, IsDisabled: true}
+	if err := bus.Dispatch(&disableCmd); err != nil {
+		return Error(500, "Failed to disable user", err)
+	}
+
+	err := server.AuthTokenService.RevokeAllUserTokens(c.Req.Context(), userID)
+	if err != nil {
+		return Error(500, "Failed to disable user", err)
+	}
+
+	return Success("User disabled")
+}
+
+// POST /api/admin/users/:id/enable
+func AdminEnableUser(c *models.ReqContext) Response {
+	userID := c.ParamsInt64(":id")
+
+	// External users shouldn't be disabled from API
+	authInfoQuery := &models.GetAuthInfoQuery{UserId: userID}
+	if err := bus.Dispatch(authInfoQuery); err != models.ErrUserNotFound {
+		return Error(500, "Could not enable external user", nil)
+	}
+
+	disableCmd := models.DisableUserCommand{UserId: userID, IsDisabled: false}
+	if err := bus.Dispatch(&disableCmd); err != nil {
+		return Error(500, "Failed to enable user", err)
+	}
+
+	return Success("User enabled")
+}
+
 // POST /api/admin/users/:id/logout
-func (server *HTTPServer) AdminLogoutUser(c *m.ReqContext) Response {
+func (server *HTTPServer) AdminLogoutUser(c *models.ReqContext) Response {
 	userID := c.ParamsInt64(":id")
 
 	if c.UserId == userID {
@@ -123,13 +164,13 @@ func (server *HTTPServer) AdminLogoutUser(c *m.ReqContext) Response {
 }
 
 // GET /api/admin/users/:id/auth-tokens
-func (server *HTTPServer) AdminGetUserAuthTokens(c *m.ReqContext) Response {
+func (server *HTTPServer) AdminGetUserAuthTokens(c *models.ReqContext) Response {
 	userID := c.ParamsInt64(":id")
 	return server.getUserAuthTokensInternal(c, userID)
 }
 
 // POST /api/admin/users/:id/revoke-auth-token
-func (server *HTTPServer) AdminRevokeUserAuthToken(c *m.ReqContext, cmd m.RevokeAuthTokenCmd) Response {
+func (server *HTTPServer) AdminRevokeUserAuthToken(c *models.ReqContext, cmd models.RevokeAuthTokenCmd) Response {
 	userID := c.ParamsInt64(":id")
 	return server.revokeUserAuthTokenInternal(c, userID, cmd)
 }
diff --git a/pkg/api/admin_users_test.go b/pkg/api/admin_users_test.go
index b94f09b0b753..4d858183545f 100644
--- a/pkg/api/admin_users_test.go
+++ b/pkg/api/admin_users_test.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/components/simplejson"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/auth"
 
@@ -84,6 +85,36 @@ func TestAdminApiEndpoint(t *testing.T) {
 			So(userId, ShouldEqual, 200)
 		})
 	})
+
+	Convey("When a server admin attempts to disable/enable external user", t, func() {
+		userId := int64(0)
+		bus.AddHandler("test", func(cmd *m.GetAuthInfoQuery) error {
+			userId = cmd.UserId
+			return nil
+		})
+
+		adminDisableUserScenario("Should return Could not disable external user error", "disable", "/api/admin/users/42/disable", "/api/admin/users/:id/disable", func(sc *scenarioContext) {
+			sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+			So(sc.resp.Code, ShouldEqual, 500)
+
+			respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
+			So(err, ShouldBeNil)
+			So(respJSON.Get("message").MustString(), ShouldEqual, "Could not disable external user")
+
+			So(userId, ShouldEqual, 42)
+		})
+
+		adminDisableUserScenario("Should return Could not enable external user error", "enable", "/api/admin/users/42/enable", "/api/admin/users/:id/enable", func(sc *scenarioContext) {
+			sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+			So(sc.resp.Code, ShouldEqual, 500)
+
+			respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
+			So(err, ShouldBeNil)
+			So(respJSON.Get("message").MustString(), ShouldEqual, "Could not enable external user")
+
+			So(userId, ShouldEqual, 42)
+		})
+	})
 }
 
 func putAdminScenario(desc string, url string, routePattern string, role m.RoleType, cmd dtos.AdminUpdateUserPermissionsForm, fn scenarioFunc) {
@@ -186,3 +217,32 @@ func adminGetUserAuthTokensScenario(desc string, url string, routePattern string
 		fn(sc)
 	})
 }
+
+func adminDisableUserScenario(desc string, action string, url string, routePattern string, fn scenarioFunc) {
+	Convey(desc+" "+url, func() {
+		defer bus.ClearBusHandlers()
+
+		fakeAuthTokenService := auth.NewFakeUserAuthTokenService()
+
+		hs := HTTPServer{
+			Bus:              bus.GetBus(),
+			AuthTokenService: fakeAuthTokenService,
+		}
+
+		sc := setupScenarioContext(url)
+		sc.defaultHandler = Wrap(func(c *m.ReqContext) Response {
+			sc.context = c
+			sc.context.UserId = TestUserID
+
+			if action == "enable" {
+				return AdminEnableUser(c)
+			}
+
+			return hs.AdminDisableUser(c)
+		})
+
+		sc.m.Post(routePattern, sc.defaultHandler)
+
+		fn(sc)
+	})
+}
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
index 0cd00d3b015f..e5e943260275 100644
--- a/pkg/api/alerting.go
+++ b/pkg/api/alerting.go
@@ -131,9 +131,9 @@ func AlertTest(c *m.ReqContext, dto dtos.AlertTestCommand) Response {
 	}
 
 	backendCmd := alerting.AlertTestCommand{
-		OrgId:     c.OrgId,
+		OrgID:     c.OrgId,
 		Dashboard: dto.Dashboard,
-		PanelId:   dto.PanelId,
+		PanelID:   dto.PanelId,
 		User:      c.SignedInUser,
 	}
 
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 9b5aae105cba..9f80f1cb4fba 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -381,6 +381,8 @@ func (hs *HTTPServer) registerRoutes() {
 		adminRoute.Put("/users/:id/password", bind(dtos.AdminUpdateUserPasswordForm{}), AdminUpdateUserPassword)
 		adminRoute.Put("/users/:id/permissions", bind(dtos.AdminUpdateUserPermissionsForm{}), AdminUpdateUserPermissions)
 		adminRoute.Delete("/users/:id", AdminDeleteUser)
+		adminRoute.Post("/users/:id/disable", Wrap(hs.AdminDisableUser))
+		adminRoute.Post("/users/:id/enable", Wrap(AdminEnableUser))
 		adminRoute.Get("/users/:id/quotas", Wrap(GetUserQuotas))
 		adminRoute.Put("/users/:id/quotas/:target", bind(m.UpdateUserQuotaCmd{}), Wrap(UpdateUserQuota))
 		adminRoute.Get("/stats", AdminGetStats)
@@ -393,7 +395,7 @@ func (hs *HTTPServer) registerRoutes() {
 		adminRoute.Post("/provisioning/dashboards/reload", Wrap(hs.AdminProvisioningReloadDasboards))
 		adminRoute.Post("/provisioning/datasources/reload", Wrap(hs.AdminProvisioningReloadDatasources))
 		adminRoute.Post("/provisioning/notifications/reload", Wrap(hs.AdminProvisioningReloadNotifications))
-		adminRoute.Post("/ldap/reload", Wrap(hs.ReloadLdapCfg))
+		adminRoute.Post("/ldap/reload", Wrap(hs.ReloadLDAPCfg))
 	}, reqGrafanaAdmin)
 
 	// rendering
diff --git a/pkg/api/app_routes.go b/pkg/api/app_routes.go
index e85a19dbce81..8e462e176fcb 100644
--- a/pkg/api/app_routes.go
+++ b/pkg/api/app_routes.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/api/pluginproxy"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
diff --git a/pkg/api/avatar/avatar.go b/pkg/api/avatar/avatar.go
index 6cf164285bfb..e01982c8fdab 100644
--- a/pkg/api/avatar/avatar.go
+++ b/pkg/api/avatar/avatar.go
@@ -22,7 +22,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"gopkg.in/macaron.v1"
 
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 212b56842809..27f70d4d388a 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -14,8 +14,8 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/dashdiffs"
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/guardian"
@@ -316,6 +316,7 @@ func GetHomeDashboard(c *m.ReqContext) Response {
 	if err != nil {
 		return Error(500, "Failed to load home dashboard", err)
 	}
+	defer file.Close()
 
 	dash := dtos.DashboardFullWithMeta{}
 	dash.Meta.IsHome = true
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index e4fb0ed34c01..643a53d18fbd 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -7,7 +7,7 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/setting"
@@ -176,7 +176,7 @@ func (hs *HTTPServer) getFrontendSettingsMap(c *m.ReqContext) (map[string]interf
 		"appSubUrl":                  setting.AppSubUrl,
 		"allowOrgCreate":             (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
 		"authProxyEnabled":           setting.AuthProxyEnabled,
-		"ldapEnabled":                setting.LdapEnabled,
+		"ldapEnabled":                setting.LDAPEnabled,
 		"alertingEnabled":            setting.AlertingEnabled,
 		"alertingErrorOrTimeout":     setting.AlertingErrorOrTimeout,
 		"alertingNoDataOrNullValues": setting.AlertingNoDataOrNullValues,
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 4f368d8bb0a3..d2094b33cb1a 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -16,8 +16,8 @@ import (
 	httpstatic "github.com/grafana/grafana/pkg/api/static"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/remotecache"
-	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/middleware"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
@@ -30,7 +30,7 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"gopkg.in/macaron.v1"
+	macaron "gopkg.in/macaron.v1"
 )
 
 func init() {
@@ -227,6 +227,10 @@ func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
 
 	m.Use(middleware.AddDefaultResponseHeaders())
 
+	if setting.ServeFromSubPath && setting.AppSubUrl != "" {
+		m.SetURLPrefix(setting.AppSubUrl)
+	}
+
 	m.Use(macaron.Renderer(macaron.RenderOptions{
 		Directory:  path.Join(setting.StaticRootPath, "views"),
 		IndentJSON: macaron.Env != macaron.PROD,
diff --git a/pkg/api/live/conn.go b/pkg/api/live/conn.go
index 0fae7f75b73c..f6450fa1d63d 100644
--- a/pkg/api/live/conn.go
+++ b/pkg/api/live/conn.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 )
 
 const (
diff --git a/pkg/api/live/hub.go b/pkg/api/live/hub.go
index 9708bc515d1c..10eaca4f79d6 100644
--- a/pkg/api/live/hub.go
+++ b/pkg/api/live/hub.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 )
 
 type hub struct {
diff --git a/pkg/api/live/stream_manager.go b/pkg/api/live/stream_manager.go
index 00d98286882e..2369bb1f9b51 100644
--- a/pkg/api/live/stream_manager.go
+++ b/pkg/api/live/stream_manager.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 )
 
diff --git a/pkg/api/login.go b/pkg/api/login.go
index ebf4cc8db07c..fe4b8f5d1be2 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/login"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
@@ -105,6 +105,10 @@ func (hs *HTTPServer) LoginPost(c *m.ReqContext, cmd dtos.LoginCommand) Response
 			return Error(401, "Invalid username or password", err)
 		}
 
+		if err == login.ErrUserDisabled {
+			return Error(401, "User is disabled", err)
+		}
+
 		return Error(500, "Error while trying to authenticate user", err)
 	}
 
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index a3599bc7a24e..8c5ca6fc7d1d 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -16,8 +16,8 @@ import (
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/login"
 	"github.com/grafana/grafana/pkg/login/social"
 	m "github.com/grafana/grafana/pkg/models"
diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go
index 6e5ae0f8761b..0bdf7496489d 100644
--- a/pkg/api/metrics.go
+++ b/pkg/api/metrics.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"sort"
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
@@ -66,7 +67,14 @@ func (hs *HTTPServer) QueryMetrics(c *m.ReqContext, reqDto dtos.MetricRequest) R
 func GetTestDataScenarios(c *m.ReqContext) Response {
 	result := make([]interface{}, 0)
 
-	for _, scenario := range testdata.ScenarioRegistry {
+	scenarioIds := make([]string, 0)
+	for id := range testdata.ScenarioRegistry {
+		scenarioIds = append(scenarioIds, id)
+	}
+	sort.Strings(scenarioIds)
+
+	for _, scenarioId := range scenarioIds {
+		scenario := testdata.ScenarioRegistry[scenarioId]
 		result = append(result, map[string]interface{}{
 			"id":          scenario.Id,
 			"name":        scenario.Name,
@@ -81,6 +89,7 @@ func GetTestDataScenarios(c *m.ReqContext) Response {
 // Generates a index out of range error
 func GenerateError(c *m.ReqContext) Response {
 	var array []string
+	// nolint: govet
 	return JSON(200, array[20])
 }
 
diff --git a/pkg/api/password.go b/pkg/api/password.go
index 4776c6a30649..278408ee9afe 100644
--- a/pkg/api/password.go
+++ b/pkg/api/password.go
@@ -9,7 +9,7 @@ import (
 )
 
 func SendResetPasswordEmail(c *m.ReqContext, form dtos.SendResetPasswordEmailForm) Response {
-	if setting.LdapEnabled || setting.AuthProxyEnabled {
+	if setting.LDAPEnabled || setting.AuthProxyEnabled {
 		return Error(401, "Not allowed to reset password when LDAP or Auth Proxy is enabled", nil)
 	}
 	if setting.DisableLoginForm {
diff --git a/pkg/api/playlist.go b/pkg/api/playlist.go
index 0963df7d4c47..bb429847dc01 100644
--- a/pkg/api/playlist.go
+++ b/pkg/api/playlist.go
@@ -2,7 +2,7 @@ package api
 
 import (
 	"github.com/grafana/grafana/pkg/bus"
-	_ "github.com/grafana/grafana/pkg/log"
+	_ "github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 )
 
diff --git a/pkg/api/playlist_play.go b/pkg/api/playlist_play.go
index 21c91a1288da..53eab8908d78 100644
--- a/pkg/api/playlist_play.go
+++ b/pkg/api/playlist_play.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/bus"
-	_ "github.com/grafana/grafana/pkg/log"
+	_ "github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/search"
 )
diff --git a/pkg/api/pluginproxy/ds_proxy.go b/pkg/api/pluginproxy/ds_proxy.go
index fe79fa565950..98fd30cc1c9b 100644
--- a/pkg/api/pluginproxy/ds_proxy.go
+++ b/pkg/api/pluginproxy/ds_proxy.go
@@ -17,7 +17,7 @@ import (
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/login/social"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
diff --git a/pkg/api/pluginproxy/ds_proxy_test.go b/pkg/api/pluginproxy/ds_proxy_test.go
index c3eccb4a57c9..13c3be3214b8 100644
--- a/pkg/api/pluginproxy/ds_proxy_test.go
+++ b/pkg/api/pluginproxy/ds_proxy_test.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/login/social"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
diff --git a/pkg/api/pluginproxy/pluginproxy.go b/pkg/api/pluginproxy/pluginproxy.go
index 4ee4e5b8db3a..a9a2b1bfc0bd 100644
--- a/pkg/api/pluginproxy/pluginproxy.go
+++ b/pkg/api/pluginproxy/pluginproxy.go
@@ -10,7 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/util"
@@ -129,11 +129,6 @@ func NewApiPluginProxy(ctx *m.ReqContext, proxyPath string, route *plugins.AppPl
 			req.URL.Host = targetURL.Host
 			req.Host = targetURL.Host
 			req.URL.Path = util.JoinURLFragments(targetURL.Path, proxyPath)
-
-			if err != nil {
-				ctx.JsonApiErr(500, "Could not interpolate plugin route url", err)
-				return
-			}
 		}
 
 		// reqBytes, _ := httputil.DumpRequestOut(req, true);
diff --git a/pkg/api/team_members.go b/pkg/api/team_members.go
index 54a4d8220e5a..bc622f8662ae 100644
--- a/pkg/api/team_members.go
+++ b/pkg/api/team_members.go
@@ -21,7 +21,7 @@ func GetTeamMembers(c *m.ReqContext) Response {
 		member.AvatarUrl = dtos.GetGravatarUrl(member.Email)
 		member.Labels = []string{}
 
-		if setting.IsEnterprise && setting.LdapEnabled && member.External {
+		if setting.IsEnterprise && setting.LDAPEnabled && member.External {
 			member.Labels = append(member.Labels, "LDAP")
 		}
 	}
diff --git a/pkg/api/user.go b/pkg/api/user.go
index 9eb7e75eab0e..cde5b7b92fdd 100644
--- a/pkg/api/user.go
+++ b/pkg/api/user.go
@@ -202,7 +202,7 @@ func (hs *HTTPServer) ChangeActiveOrgAndRedirectToHome(c *m.ReqContext) {
 }
 
 func ChangeUserPassword(c *m.ReqContext, cmd m.ChangeUserPasswordCommand) Response {
-	if setting.LdapEnabled || setting.AuthProxyEnabled {
+	if setting.LDAPEnabled || setting.AuthProxyEnabled {
 		return Error(400, "Not allowed to change password when LDAP or Auth Proxy is enabled", nil)
 	}
 
diff --git a/pkg/bus/bus.go b/pkg/bus/bus.go
index 9cf930aeb821..9aa0dedf11cd 100644
--- a/pkg/bus/bus.go
+++ b/pkg/bus/bus.go
@@ -6,16 +6,24 @@ import (
 	"reflect"
 )
 
+// HandlerFunc defines a handler function interface.
 type HandlerFunc interface{}
+
+// CtxHandlerFunc defines a context handler function.
 type CtxHandlerFunc func()
+
+// Msg defines a message interface.
 type Msg interface{}
 
+// ErrHandlerNotFound defines an error if a handler is not found
 var ErrHandlerNotFound = errors.New("handler not found")
 
+// TransactionManager defines a transaction interface
 type TransactionManager interface {
 	InTransaction(ctx context.Context, fn func(ctx context.Context) error) error
 }
 
+// Bus type defines the bus interface structure
 type Bus interface {
 	Dispatch(msg Msg) error
 	DispatchCtx(ctx context.Context, msg Msg) error
@@ -38,10 +46,12 @@ type Bus interface {
 	SetTransactionManager(tm TransactionManager)
 }
 
+// InTransaction defines an in transaction function
 func (b *InProcBus) InTransaction(ctx context.Context, fn func(ctx context.Context) error) error {
 	return b.txMng.InTransaction(ctx, fn)
 }
 
+// InProcBus defines the bus structure
 type InProcBus struct {
 	handlers          map[string]HandlerFunc
 	handlersWithCtx   map[string]HandlerFunc
@@ -53,6 +63,7 @@ type InProcBus struct {
 // temp stuff, not sure how to handle bus instance, and init yet
 var globalBus = New()
 
+// New initialize the bus
 func New() Bus {
 	bus := &InProcBus{}
 	bus.handlers = make(map[string]HandlerFunc)
@@ -69,10 +80,12 @@ func GetBus() Bus {
 	return globalBus
 }
 
+// SetTransactionManager function assign a transaction manager to the bus.
 func (b *InProcBus) SetTransactionManager(tm TransactionManager) {
 	b.txMng = tm
 }
 
+// DispatchCtx function dispatch a message to the bus context.
 func (b *InProcBus) DispatchCtx(ctx context.Context, msg Msg) error {
 	var msgName = reflect.TypeOf(msg).Elem().Name()
 
@@ -93,6 +106,7 @@ func (b *InProcBus) DispatchCtx(ctx context.Context, msg Msg) error {
 	return err.(error)
 }
 
+// Dispatch function dispatch a message to the bus.
 func (b *InProcBus) Dispatch(msg Msg) error {
 	var msgName = reflect.TypeOf(msg).Elem().Name()
 
@@ -122,6 +136,7 @@ func (b *InProcBus) Dispatch(msg Msg) error {
 	return err.(error)
 }
 
+// Publish function publish a message to the bus listener.
 func (b *InProcBus) Publish(msg Msg) error {
 	var msgName = reflect.TypeOf(msg).Elem().Name()
 	var listeners = b.listeners[msgName]
@@ -174,21 +189,25 @@ func (b *InProcBus) AddEventListener(handler HandlerFunc) {
 	b.listeners[eventName] = append(b.listeners[eventName], handler)
 }
 
-// Package level functions
+// AddHandler attach a handler function to the global bus
+// Package level function
 func AddHandler(implName string, handler HandlerFunc) {
 	globalBus.AddHandler(handler)
 }
 
+// AddHandlerCtx attach a handler function to the global bus context
 // Package level functions
 func AddHandlerCtx(implName string, handler HandlerFunc) {
 	globalBus.AddHandlerCtx(handler)
 }
 
+// AddEventListener attach a handler function to the event listener
 // Package level functions
 func AddEventListener(handler HandlerFunc) {
 	globalBus.AddEventListener(handler)
 }
 
+// AddWildcardListener attach a handler function to the wildcard listener
 func AddWildcardListener(handler HandlerFunc) {
 	globalBus.AddWildcardListener(handler)
 }
diff --git a/pkg/bus/bus_test.go b/pkg/bus/bus_test.go
index 9f41a5154df1..8ce4f3dd4fa2 100644
--- a/pkg/bus/bus_test.go
+++ b/pkg/bus/bus_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 type testQuery struct {
-	Id   int64
+	ID   int64
 	Resp string
 }
 
@@ -64,9 +64,9 @@ func TestQueryHandlerReturnsError(t *testing.T) {
 	err := bus.Dispatch(&testQuery{})
 
 	if err == nil {
-		t.Fatal("Send query failed " + err.Error())
+		t.Fatal("Send query failed")
 	} else {
-		t.Log("Handler error received ok")
+		t.Log("Handler error received ok " + err.Error())
 	}
 }
 
@@ -93,7 +93,7 @@ func TestEventListeners(t *testing.T) {
 	count := 0
 
 	bus.AddEventListener(func(query *testQuery) error {
-		count += 1
+		count++
 		return nil
 	})
 
diff --git a/pkg/cmd/grafana-cli/commands/commands.go b/pkg/cmd/grafana-cli/commands/commands.go
index d5add2b71684..ebaee5573482 100644
--- a/pkg/cmd/grafana-cli/commands/commands.go
+++ b/pkg/cmd/grafana-cli/commands/commands.go
@@ -7,14 +7,16 @@ import (
 	"github.com/codegangsta/cli"
 	"github.com/fatih/color"
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands/datamigrations"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-func runDbCommand(command func(commandLine CommandLine) error) func(context *cli.Context) {
+func runDbCommand(command func(commandLine utils.CommandLine, sqlStore *sqlstore.SqlStore) error) func(context *cli.Context) {
 	return func(context *cli.Context) {
-		cmd := &contextCommandLine{context}
+		cmd := &utils.ContextCommandLine{Context: context}
 
 		cfg := setting.NewCfg()
 		cfg.Load(&setting.CommandLineArgs{
@@ -28,7 +30,7 @@ func runDbCommand(command func(commandLine CommandLine) error) func(context *cli
 		engine.Bus = bus.GetBus()
 		engine.Init()
 
-		if err := command(cmd); err != nil {
+		if err := command(cmd, engine); err != nil {
 			logger.Errorf("\n%s: ", color.RedString("Error"))
 			logger.Errorf("%s\n\n", err)
 
@@ -40,10 +42,10 @@ func runDbCommand(command func(commandLine CommandLine) error) func(context *cli
 	}
 }
 
-func runPluginCommand(command func(commandLine CommandLine) error) func(context *cli.Context) {
+func runPluginCommand(command func(commandLine utils.CommandLine) error) func(context *cli.Context) {
 	return func(context *cli.Context) {
 
-		cmd := &contextCommandLine{context}
+		cmd := &utils.ContextCommandLine{Context: context}
 		if err := command(cmd); err != nil {
 			logger.Errorf("\n%s: ", color.RedString("Error"))
 			logger.Errorf("%s %s\n\n", color.RedString("✗"), err)
@@ -107,6 +109,17 @@ var adminCommands = []cli.Command{
 			},
 		},
 	},
+	{
+		Name:  "data-migration",
+		Usage: "Runs a script that migrates or cleanups data in your db",
+		Subcommands: []cli.Command{
+			{
+				Name:   "encrypt-datasource-passwords",
+				Usage:  "Migrates passwords from unsecured fields to secure_json_data field. Return ok unless there is an error. Safe to execute multiple times.",
+				Action: runDbCommand(datamigrations.EncryptDatasourcePaswords),
+			},
+		},
+	},
 }
 
 var Commands = []cli.Command{
diff --git a/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords.go b/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords.go
new file mode 100644
index 000000000000..e55fa2d70b88
--- /dev/null
+++ b/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords.go
@@ -0,0 +1,126 @@
+package datamigrations
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/fatih/color"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/util/errutil"
+)
+
+var (
+	datasourceTypes = []string{
+		"mysql",
+		"influxdb",
+		"elasticsearch",
+		"graphite",
+		"prometheus",
+		"opentsdb",
+	}
+)
+
+// EncryptDatasourcePaswords migrates un-encrypted secrets on datasources
+// to the secureJson Column.
+func EncryptDatasourcePaswords(c utils.CommandLine, sqlStore *sqlstore.SqlStore) error {
+	return sqlStore.WithDbSession(context.Background(), func(session *sqlstore.DBSession) error {
+		passwordsUpdated, err := migrateColumn(session, "password")
+		if err != nil {
+			return err
+		}
+
+		basicAuthUpdated, err := migrateColumn(session, "basic_auth_password")
+		if err != nil {
+			return err
+		}
+
+		logger.Info("\n")
+		if passwordsUpdated > 0 {
+			logger.Infof("%s Encrypted password field for %d datasources \n", color.GreenString("✔"), passwordsUpdated)
+		}
+
+		if basicAuthUpdated > 0 {
+			logger.Infof("%s Encrypted basic_auth_password field for %d datasources \n", color.GreenString("✔"), basicAuthUpdated)
+		}
+
+		if passwordsUpdated == 0 && basicAuthUpdated == 0 {
+			logger.Infof("%s All datasources secrets are allready encrypted\n", color.GreenString("✔"))
+		}
+
+		logger.Info("\n")
+
+		logger.Warn("Warning: Datasource provisioning files need to be manually changed to prevent overwriting of " +
+			"the data during provisioning. See https://grafana.com/docs/installation/upgrading/#upgrading-to-v6-2 for " +
+			"details")
+		return nil
+	})
+}
+
+func migrateColumn(session *sqlstore.DBSession, column string) (int, error) {
+	var rows []map[string]string
+
+	session.Cols("id", column, "secure_json_data")
+	session.Table("data_source")
+	session.In("type", datasourceTypes)
+	session.Where(column + " IS NOT NULL AND " + column + " != ''")
+	err := session.Find(&rows)
+
+	if err != nil {
+		return 0, errutil.Wrapf(err, "failed to select column: %s", column)
+	}
+
+	rowsUpdated, err := updateRows(session, rows, column)
+	return rowsUpdated, errutil.Wrapf(err, "failed to update column: %s", column)
+}
+
+func updateRows(session *sqlstore.DBSession, rows []map[string]string, passwordFieldName string) (int, error) {
+	var rowsUpdated int
+
+	for _, row := range rows {
+		newSecureJSONData, err := getUpdatedSecureJSONData(row, passwordFieldName)
+		if err != nil {
+			return 0, err
+		}
+
+		data, err := json.Marshal(newSecureJSONData)
+		if err != nil {
+			return 0, errutil.Wrap("marshaling newSecureJsonData failed", err)
+		}
+
+		newRow := map[string]interface{}{"secure_json_data": data, passwordFieldName: ""}
+		session.Table("data_source")
+		session.Where("id = ?", row["id"])
+		// Setting both columns while having value only for secure_json_data should clear the [passwordFieldName] column
+		session.Cols("secure_json_data", passwordFieldName)
+
+		_, err = session.Update(newRow)
+		if err != nil {
+			return 0, err
+		}
+
+		rowsUpdated++
+	}
+	return rowsUpdated, nil
+}
+
+func getUpdatedSecureJSONData(row map[string]string, passwordFieldName string) (map[string]interface{}, error) {
+	encryptedPassword, err := util.Encrypt([]byte(row[passwordFieldName]), setting.SecretKey)
+	if err != nil {
+		return nil, err
+	}
+
+	var secureJSONData map[string]interface{}
+
+	if err := json.Unmarshal([]byte(row["secure_json_data"]), &secureJSONData); err != nil {
+		return nil, err
+	}
+
+	jsonFieldName := util.ToCamelCase(passwordFieldName)
+	secureJSONData[jsonFieldName] = encryptedPassword
+	return secureJSONData, nil
+}
diff --git a/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords_test.go b/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords_test.go
new file mode 100644
index 000000000000..64987423decd
--- /dev/null
+++ b/pkg/cmd/grafana-cli/commands/datamigrations/encrypt_datasource_passwords_test.go
@@ -0,0 +1,67 @@
+package datamigrations
+
+import (
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/commands/commandstest"
+	"github.com/grafana/grafana/pkg/components/securejsondata"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPasswordMigrationCommand(t *testing.T) {
+	//setup datasources with password, basic_auth and none
+	sqlstore := sqlstore.InitTestDB(t)
+	session := sqlstore.NewSession()
+	defer session.Close()
+
+	datasources := []*models.DataSource{
+		{Type: "influxdb", Name: "influxdb", Password: "foobar"},
+		{Type: "graphite", Name: "graphite", BasicAuthPassword: "foobar"},
+		{Type: "prometheus", Name: "prometheus", SecureJsonData: securejsondata.GetEncryptedJsonData(map[string]string{})},
+	}
+
+	// set required default values
+	for _, ds := range datasources {
+		ds.Created = time.Now()
+		ds.Updated = time.Now()
+		ds.SecureJsonData = securejsondata.GetEncryptedJsonData(map[string]string{})
+	}
+
+	_, err := session.Insert(&datasources)
+	assert.Nil(t, err)
+
+	//run migration
+	err = EncryptDatasourcePaswords(&commandstest.FakeCommandLine{}, sqlstore)
+	assert.Nil(t, err)
+
+	//verify that no datasources still have password or basic_auth
+	var dss []*models.DataSource
+	err = session.SQL("select * from data_source").Find(&dss)
+	assert.Nil(t, err)
+	assert.Equal(t, len(dss), 3)
+
+	for _, ds := range dss {
+		sj := ds.SecureJsonData.Decrypt()
+
+		if ds.Name == "influxdb" {
+			assert.Equal(t, ds.Password, "")
+			v, exist := sj["password"]
+			assert.True(t, exist)
+			assert.Equal(t, v, "foobar", "expected password to be moved to securejson")
+		}
+
+		if ds.Name == "graphite" {
+			assert.Equal(t, ds.BasicAuthPassword, "")
+			v, exist := sj["basicAuthPassword"]
+			assert.True(t, exist)
+			assert.Equal(t, v, "foobar", "expected basic_auth_password to be moved to securejson")
+		}
+
+		if ds.Name == "prometheus" {
+			assert.Equal(t, len(sj), 0)
+		}
+	}
+}
diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go
index 99cef15e50e3..db3907682638 100644
--- a/pkg/cmd/grafana-cli/commands/install_command.go
+++ b/pkg/cmd/grafana-cli/commands/install_command.go
@@ -14,13 +14,14 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 )
 
-func validateInput(c CommandLine, pluginFolder string) error {
+func validateInput(c utils.CommandLine, pluginFolder string) error {
 	arg := c.Args().First()
 	if arg == "" {
 		return errors.New("please specify plugin to install")
@@ -46,7 +47,7 @@ func validateInput(c CommandLine, pluginFolder string) error {
 	return nil
 }
 
-func installCommand(c CommandLine) error {
+func installCommand(c utils.CommandLine) error {
 	pluginFolder := c.PluginDirectory()
 	if err := validateInput(c, pluginFolder); err != nil {
 		return err
@@ -60,7 +61,7 @@ func installCommand(c CommandLine) error {
 
 // InstallPlugin downloads the plugin code as a zip file from the Grafana.com API
 // and then extracts the zip into the plugins directory.
-func InstallPlugin(pluginName, version string, c CommandLine) error {
+func InstallPlugin(pluginName, version string, c utils.CommandLine) error {
 	pluginFolder := c.PluginDirectory()
 	downloadURL := c.PluginURL()
 	if downloadURL == "" {
diff --git a/pkg/cmd/grafana-cli/commands/listremote_command.go b/pkg/cmd/grafana-cli/commands/listremote_command.go
index 4798369def11..7351ee58a371 100644
--- a/pkg/cmd/grafana-cli/commands/listremote_command.go
+++ b/pkg/cmd/grafana-cli/commands/listremote_command.go
@@ -3,9 +3,10 @@ package commands
 import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
-func listremoteCommand(c CommandLine) error {
+func listremoteCommand(c utils.CommandLine) error {
 	plugin, err := s.ListAllPlugins(c.RepoDirectory())
 
 	if err != nil {
diff --git a/pkg/cmd/grafana-cli/commands/listversions_command.go b/pkg/cmd/grafana-cli/commands/listversions_command.go
index 95c536e94f0a..78d681c06a3a 100644
--- a/pkg/cmd/grafana-cli/commands/listversions_command.go
+++ b/pkg/cmd/grafana-cli/commands/listversions_command.go
@@ -5,9 +5,10 @@ import (
 
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
-func validateVersionInput(c CommandLine) error {
+func validateVersionInput(c utils.CommandLine) error {
 	arg := c.Args().First()
 	if arg == "" {
 		return errors.New("please specify plugin to list versions for")
@@ -16,7 +17,7 @@ func validateVersionInput(c CommandLine) error {
 	return nil
 }
 
-func listversionsCommand(c CommandLine) error {
+func listversionsCommand(c utils.CommandLine) error {
 	if err := validateVersionInput(c); err != nil {
 		return err
 	}
diff --git a/pkg/cmd/grafana-cli/commands/ls_command.go b/pkg/cmd/grafana-cli/commands/ls_command.go
index 30745ce3172d..63492d732e98 100644
--- a/pkg/cmd/grafana-cli/commands/ls_command.go
+++ b/pkg/cmd/grafana-cli/commands/ls_command.go
@@ -8,6 +8,7 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
 var ls_getPlugins func(path string) []m.InstalledPlugin = s.GetLocalPlugins
@@ -31,7 +32,7 @@ var validateLsCommand = func(pluginDir string) error {
 	return nil
 }
 
-func lsCommand(c CommandLine) error {
+func lsCommand(c utils.CommandLine) error {
 	pluginDir := c.PluginDirectory()
 	if err := validateLsCommand(pluginDir); err != nil {
 		return err
diff --git a/pkg/cmd/grafana-cli/commands/remove_command.go b/pkg/cmd/grafana-cli/commands/remove_command.go
index e51929dc95cb..eb536d7b8c7a 100644
--- a/pkg/cmd/grafana-cli/commands/remove_command.go
+++ b/pkg/cmd/grafana-cli/commands/remove_command.go
@@ -5,12 +5,13 @@ import (
 	"fmt"
 	"strings"
 
-	services "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
 var removePlugin func(pluginPath, id string) error = services.RemoveInstalledPlugin
 
-func removeCommand(c CommandLine) error {
+func removeCommand(c utils.CommandLine) error {
 	pluginPath := c.PluginDirectory()
 
 	plugin := c.Args().First()
diff --git a/pkg/cmd/grafana-cli/commands/reset_password_command.go b/pkg/cmd/grafana-cli/commands/reset_password_command.go
index af2b8b3f89ae..4a6a4b674f2e 100644
--- a/pkg/cmd/grafana-cli/commands/reset_password_command.go
+++ b/pkg/cmd/grafana-cli/commands/reset_password_command.go
@@ -6,13 +6,15 @@ import (
 	"github.com/fatih/color"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/util"
 )
 
 const AdminUserId = 1
 
-func resetPasswordCommand(c CommandLine) error {
+func resetPasswordCommand(c utils.CommandLine, sqlStore *sqlstore.SqlStore) error {
 	newPassword := c.Args().First()
 
 	password := models.Password(newPassword)
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
index e01df2dab602..a5aadbbb0c23 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_all_command.go
@@ -4,6 +4,7 @@ import (
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 	"github.com/hashicorp/go-version"
 )
 
@@ -27,7 +28,7 @@ func ShouldUpgrade(installed string, remote m.Plugin) bool {
 	return false
 }
 
-func upgradeAllCommand(c CommandLine) error {
+func upgradeAllCommand(c utils.CommandLine) error {
 	pluginsDir := c.PluginDirectory()
 
 	localPlugins := s.GetLocalPlugins(pluginsDir)
diff --git a/pkg/cmd/grafana-cli/commands/upgrade_command.go b/pkg/cmd/grafana-cli/commands/upgrade_command.go
index 396371d35772..f32961ce5895 100644
--- a/pkg/cmd/grafana-cli/commands/upgrade_command.go
+++ b/pkg/cmd/grafana-cli/commands/upgrade_command.go
@@ -4,9 +4,10 @@ import (
 	"github.com/fatih/color"
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 	s "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 )
 
-func upgradeCommand(c CommandLine) error {
+func upgradeCommand(c utils.CommandLine) error {
 	pluginsDir := c.PluginDirectory()
 	pluginName := c.Args().First()
 
diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go
index 1bc1fb7fb105..a0d9d082a37f 100644
--- a/pkg/cmd/grafana-cli/services/services.go
+++ b/pkg/cmd/grafana-cli/services/services.go
@@ -18,10 +18,10 @@ import (
 )
 
 var (
-	IoHelper       m.IoUtil = IoUtilImp{}
-	HttpClient     http.Client
-	grafanaVersion string
-	NotFoundError  = errors.New("404 not found error")
+	IoHelper         m.IoUtil = IoUtilImp{}
+	HttpClient       http.Client
+	grafanaVersion   string
+	ErrNotFoundError = errors.New("404 not found error")
 )
 
 func Init(version string, skipTLSVerify bool) {
@@ -56,10 +56,6 @@ func ListAllPlugins(repoUrl string) (m.PluginRepo, error) {
 		return m.PluginRepo{}, fmt.Errorf("Failed to send request. error: %v", err)
 	}
 
-	if err != nil {
-		return m.PluginRepo{}, err
-	}
-
 	var data m.PluginRepo
 	err = json.Unmarshal(body, &data)
 	if err != nil {
@@ -131,16 +127,12 @@ func GetPlugin(pluginId, repoUrl string) (m.Plugin, error) {
 
 	if err != nil {
 		logger.Info("Failed to send request: ", err)
-		if err == NotFoundError {
+		if err == ErrNotFoundError {
 			return m.Plugin{}, fmt.Errorf("Failed to find requested plugin, check if the plugin_id is correct. error: %v", err)
 		}
 		return m.Plugin{}, fmt.Errorf("Failed to send request. error: %v", err)
 	}
 
-	if err != nil {
-		return m.Plugin{}, err
-	}
-
 	var data m.Plugin
 	err = json.Unmarshal(body, &data)
 	if err != nil {
@@ -174,7 +166,7 @@ func sendRequest(repoUrl string, subPaths ...string) ([]byte, error) {
 	}
 
 	if res.StatusCode == 404 {
-		return []byte{}, NotFoundError
+		return []byte{}, ErrNotFoundError
 	}
 	if res.StatusCode/100 != 2 {
 		return []byte{}, fmt.Errorf("Api returned invalid status: %s", res.Status)
diff --git a/pkg/cmd/grafana-cli/commands/command_line.go b/pkg/cmd/grafana-cli/utils/command_line.go
similarity index 64%
rename from pkg/cmd/grafana-cli/commands/command_line.go
rename to pkg/cmd/grafana-cli/utils/command_line.go
index d487aff8aaaa..d3142d0f195e 100644
--- a/pkg/cmd/grafana-cli/commands/command_line.go
+++ b/pkg/cmd/grafana-cli/utils/command_line.go
@@ -1,4 +1,4 @@
-package commands
+package utils
 
 import (
 	"github.com/codegangsta/cli"
@@ -22,30 +22,30 @@ type CommandLine interface {
 	PluginURL() string
 }
 
-type contextCommandLine struct {
+type ContextCommandLine struct {
 	*cli.Context
 }
 
-func (c *contextCommandLine) ShowHelp() {
+func (c *ContextCommandLine) ShowHelp() {
 	cli.ShowCommandHelp(c.Context, c.Command.Name)
 }
 
-func (c *contextCommandLine) ShowVersion() {
+func (c *ContextCommandLine) ShowVersion() {
 	cli.ShowVersion(c.Context)
 }
 
-func (c *contextCommandLine) Application() *cli.App {
+func (c *ContextCommandLine) Application() *cli.App {
 	return c.App
 }
 
-func (c *contextCommandLine) PluginDirectory() string {
+func (c *ContextCommandLine) PluginDirectory() string {
 	return c.GlobalString("pluginsDir")
 }
 
-func (c *contextCommandLine) RepoDirectory() string {
+func (c *ContextCommandLine) RepoDirectory() string {
 	return c.GlobalString("repo")
 }
 
-func (c *contextCommandLine) PluginURL() string {
+func (c *ContextCommandLine) PluginURL() string {
 	return c.GlobalString("pluginUrl")
 }
diff --git a/pkg/cmd/grafana-cli/utils/grafana_path.go b/pkg/cmd/grafana-cli/utils/grafana_path.go
index 5f5c944f52b5..373120a50c40 100644
--- a/pkg/cmd/grafana-cli/utils/grafana_path.go
+++ b/pkg/cmd/grafana-cli/utils/grafana_path.go
@@ -2,35 +2,40 @@ package utils
 
 import (
 	"os"
+	"path"
+	"path/filepath"
 
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
 )
 
 func GetGrafanaPluginDir(currentOS string) string {
-	//currentOS := runtime.GOOS
-
-	if currentOS == "windows" {
-		return returnOsDefault(currentOS)
-	}
-
-	pwd, err := os.Getwd()
-
-	if err != nil {
-		logger.Error("Could not get current path. using default")
-		return returnOsDefault(currentOS)
-	}
-
-	if isDevenvironment(pwd) {
+	if isDevEnvironment() {
 		return "../data/plugins"
 	}
 
 	return returnOsDefault(currentOS)
 }
 
-func isDevenvironment(pwd string) bool {
+func isDevEnvironment() bool {
 	// if ../conf/defaults.ini exists, grafana is not installed as package
 	// that its in development environment.
-	_, err := os.Stat("../conf/defaults.ini")
+	ex, err := os.Executable()
+	if err != nil {
+		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
+		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.
+	defaultsPath := filepath.Join(exPath, "../../conf/defaults.ini")
+	_, err = os.Stat(defaultsPath)
 	return err == nil
 }
 
diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go
index 825d48e00764..d836f9a7d703 100644
--- a/pkg/cmd/grafana-server/main.go
+++ b/pkg/cmd/grafana-server/main.go
@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/extensions"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/log"
 	_ "github.com/grafana/grafana/pkg/services/alerting/conditions"
 	_ "github.com/grafana/grafana/pkg/services/alerting/notifiers"
 	"github.com/grafana/grafana/pkg/setting"
diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index 2ac326ed35d6..f1823260e16d 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -18,12 +18,12 @@ import (
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/bus"
 	_ "github.com/grafana/grafana/pkg/extensions"
+	"github.com/grafana/grafana/pkg/infra/log"
 	_ "github.com/grafana/grafana/pkg/infra/metrics"
 	_ "github.com/grafana/grafana/pkg/infra/remotecache"
 	_ "github.com/grafana/grafana/pkg/infra/serverlock"
 	_ "github.com/grafana/grafana/pkg/infra/tracing"
 	_ "github.com/grafana/grafana/pkg/infra/usagestats"
-	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/login"
 	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/middleware"
diff --git a/pkg/components/gtime/gtime.go b/pkg/components/gtime/gtime.go
new file mode 100644
index 000000000000..e3e4e449f661
--- /dev/null
+++ b/pkg/components/gtime/gtime.go
@@ -0,0 +1,28 @@
+package gtime
+
+import (
+	"regexp"
+	"strconv"
+	"time"
+)
+
+// ParseInterval parses and interval with support for all units that Grafana uses.
+func ParseInterval(interval string) (time.Duration, error) {
+	re := regexp.MustCompile(`(\d+)([wdy])`)
+	result := re.FindSubmatch([]byte(interval))
+
+	if len(result) == 3 {
+		num, _ := strconv.Atoi(string(result[1]))
+		period := string(result[2])
+
+		if period == `d` {
+			return time.Hour * 24 * time.Duration(num), nil
+		} else if period == `w` {
+			return time.Hour * 24 * 7 * time.Duration(num), nil
+		} else {
+			return time.Hour * 24 * 7 * 365 * time.Duration(num), nil
+		}
+	} else {
+		return time.ParseDuration(interval)
+	}
+}
diff --git a/pkg/components/gtime/gtime_test.go b/pkg/components/gtime/gtime_test.go
new file mode 100644
index 000000000000..e683184023fa
--- /dev/null
+++ b/pkg/components/gtime/gtime_test.go
@@ -0,0 +1,34 @@
+package gtime
+
+import (
+	"errors"
+	"fmt"
+	"testing"
+	"time"
+)
+
+func TestParseInterval(t *testing.T) {
+	tcs := []struct {
+		interval string
+		duration time.Duration
+		err      error
+	}{
+		{interval: "1d", duration: time.Hour * 24},
+		{interval: "1w", duration: time.Hour * 24 * 7},
+		{interval: "1y", duration: time.Hour * 24 * 7 * 365},
+		{interval: "1M", err: errors.New("time: unknown unit M in duration 1M")},
+		{interval: "invalid-duration", err: errors.New("time: invalid duration invalid-duration")},
+	}
+
+	for i, tc := range tcs {
+		t.Run(fmt.Sprintf("testcase %d", i), func(t *testing.T) {
+			res, err := ParseInterval(tc.interval)
+			if err != nil && err.Error() != tc.err.Error() {
+				t.Fatalf("expected '%v' got '%v'", tc.err, err)
+			}
+			if res != tc.duration {
+				t.Errorf("expected %v got %v", tc.duration, res)
+			}
+		})
+	}
+}
diff --git a/pkg/components/imguploader/azureblobuploader.go b/pkg/components/imguploader/azureblobuploader.go
index b37763931c89..938a4248b93b 100644
--- a/pkg/components/imguploader/azureblobuploader.go
+++ b/pkg/components/imguploader/azureblobuploader.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -46,10 +46,11 @@ func (az *AzureBlobUploader) Upload(ctx context.Context, imageDiskPath string) (
 	blob := NewStorageClient(az.account_name, az.account_key)
 
 	file, err := os.Open(imageDiskPath)
-
 	if err != nil {
 		return "", err
 	}
+	defer file.Close()
+
 	randomFileName := util.GetRandomString(30) + ".png"
 	// upload image
 	az.log.Debug("Uploading image to azure_blob", "container_name", az.container_name, "blob_name", randomFileName)
@@ -71,10 +72,6 @@ func (az *AzureBlobUploader) Upload(ctx context.Context, imageDiskPath string) (
 		return "", aerr
 	}
 
-	if err != nil {
-		return "", err
-	}
-
 	url := fmt.Sprintf("https://%s.blob.core.windows.net/%s/%s", az.account_name, az.container_name, randomFileName)
 	return url, nil
 }
diff --git a/pkg/components/imguploader/gcsuploader.go b/pkg/components/imguploader/gcsuploader.go
index 4513019ad98a..443534ff76ad 100644
--- a/pkg/components/imguploader/gcsuploader.go
+++ b/pkg/components/imguploader/gcsuploader.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/util"
 	"golang.org/x/oauth2/google"
 )
@@ -67,6 +67,7 @@ func (u *GCSUploader) uploadFile(client *http.Client, imageDiskPath, key string)
 	if err != nil {
 		return err
 	}
+	defer fileReader.Close()
 
 	reqUrl := fmt.Sprintf(uploadUrl, u.bucket, key)
 	u.log.Debug("Request URL: ", reqUrl)
diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go
index 422a03d3501a..9aeb4eefb42f 100644
--- a/pkg/components/imguploader/imguploader.go
+++ b/pkg/components/imguploader/imguploader.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
diff --git a/pkg/components/imguploader/s3uploader.go b/pkg/components/imguploader/s3uploader.go
index 9c8af21e39e9..7ad8a0f7bebc 100644
--- a/pkg/components/imguploader/s3uploader.go
+++ b/pkg/components/imguploader/s3uploader.go
@@ -15,7 +15,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -69,6 +69,7 @@ func (u *S3Uploader) Upload(ctx context.Context, imageDiskPath string) (string,
 	if err != nil {
 		return "", err
 	}
+	defer file.Close()
 
 	sess, err = session.NewSession(cfg)
 	if err != nil {
diff --git a/pkg/components/securejsondata/securejsondata.go b/pkg/components/securejsondata/securejsondata.go
index 4e7f63601739..dae9584995ad 100644
--- a/pkg/components/securejsondata/securejsondata.go
+++ b/pkg/components/securejsondata/securejsondata.go
@@ -1,7 +1,7 @@
 package securejsondata
 
 import (
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
diff --git a/pkg/log/file.go b/pkg/infra/log/file.go
similarity index 100%
rename from pkg/log/file.go
rename to pkg/infra/log/file.go
diff --git a/pkg/log/file_test.go b/pkg/infra/log/file_test.go
similarity index 100%
rename from pkg/log/file_test.go
rename to pkg/infra/log/file_test.go
diff --git a/pkg/log/handlers.go b/pkg/infra/log/handlers.go
similarity index 100%
rename from pkg/log/handlers.go
rename to pkg/infra/log/handlers.go
diff --git a/pkg/log/interface.go b/pkg/infra/log/interface.go
similarity index 100%
rename from pkg/log/interface.go
rename to pkg/infra/log/interface.go
diff --git a/pkg/log/log.go b/pkg/infra/log/log.go
similarity index 100%
rename from pkg/log/log.go
rename to pkg/infra/log/log.go
diff --git a/pkg/log/log_writer.go b/pkg/infra/log/log_writer.go
similarity index 100%
rename from pkg/log/log_writer.go
rename to pkg/infra/log/log_writer.go
diff --git a/pkg/log/log_writer_test.go b/pkg/infra/log/log_writer_test.go
similarity index 100%
rename from pkg/log/log_writer_test.go
rename to pkg/infra/log/log_writer_test.go
diff --git a/pkg/log/syslog.go b/pkg/infra/log/syslog.go
similarity index 100%
rename from pkg/log/syslog.go
rename to pkg/infra/log/syslog.go
diff --git a/pkg/log/syslog_windows.go b/pkg/infra/log/syslog_windows.go
similarity index 100%
rename from pkg/log/syslog_windows.go
rename to pkg/infra/log/syslog_windows.go
diff --git a/pkg/infra/metrics/service.go b/pkg/infra/metrics/service.go
index ac1d934e375f..6f981085ffb6 100644
--- a/pkg/infra/metrics/service.go
+++ b/pkg/infra/metrics/service.go
@@ -3,8 +3,8 @@ package metrics
 import (
 	"context"
 
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics/graphitebridge"
-	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/setting"
 )
diff --git a/pkg/infra/remotecache/database_storage.go b/pkg/infra/remotecache/database_storage.go
index 16c42054df09..03ac0f0c5e8e 100644
--- a/pkg/infra/remotecache/database_storage.go
+++ b/pkg/infra/remotecache/database_storage.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 )
 
@@ -39,10 +39,14 @@ func (dc *databaseCache) Run(ctx context.Context) error {
 }
 
 func (dc *databaseCache) internalRunGC() {
-	now := getTime().Unix()
-	sql := `DELETE FROM cache_data WHERE (? - created_at) >= expires AND expires <> 0`
+	err := dc.SQLStore.WithDbSession(context.Background(), func(session *sqlstore.DBSession) error {
+		now := getTime().Unix()
+		sql := `DELETE FROM cache_data WHERE (? - created_at) >= expires AND expires <> 0`
+
+		_, err := session.Exec(sql, now)
+		return err
+	})
 
-	_, err := dc.SQLStore.NewSession().Exec(sql, now)
 	if err != nil {
 		dc.log.Error("failed to run garbage collect", "error", err)
 	}
@@ -80,44 +84,48 @@ func (dc *databaseCache) Get(key string) (interface{}, error) {
 }
 
 func (dc *databaseCache) Set(key string, value interface{}, expire time.Duration) error {
-	item := &cachedItem{Val: value}
-	data, err := encodeGob(item)
-	if err != nil {
-		return err
-	}
-
-	session := dc.SQLStore.NewSession()
+	return dc.SQLStore.WithTransactionalDbSession(context.Background(), func(session *sqlstore.DBSession) error {
+		item := &cachedItem{Val: value}
+		data, err := encodeGob(item)
+		if err != nil {
+			return err
+		}
 
-	var cacheHit CacheData
-	has, err := session.Where("cache_key = ?", key).Get(&cacheHit)
-	if err != nil {
-		return err
-	}
+		var cacheHit CacheData
+		has, err := session.Where("cache_key = ?", key).Get(&cacheHit)
+		if err != nil {
+			return err
+		}
 
-	var expiresInSeconds int64
-	if expire != 0 {
-		expiresInSeconds = int64(expire) / int64(time.Second)
-	}
+		var expiresInSeconds int64
+		if expire != 0 {
+			expiresInSeconds = int64(expire) / int64(time.Second)
+		}
 
-	// insert or update depending on if item already exist
-	if has {
-		sql := `UPDATE cache_data SET data=?, created_at=?, expires=? WHERE cache_key=?`
-		_, err = session.Exec(sql, data, getTime().Unix(), expiresInSeconds, key)
-	} else {
-		sql := `INSERT INTO cache_data (cache_key,data,created_at,expires) VALUES(?,?,?,?)`
-		_, err = session.Exec(sql, key, data, getTime().Unix(), expiresInSeconds)
-	}
+		// insert or update depending on if item already exist
+		if has {
+			sql := `UPDATE cache_data SET data=?, created_at=?, expires=? WHERE cache_key=?`
+			_, err = session.Exec(sql, data, getTime().Unix(), expiresInSeconds, key)
+		} else {
+			sql := `INSERT INTO cache_data (cache_key,data,created_at,expires) VALUES(?,?,?,?)`
+			_, err = session.Exec(sql, key, data, getTime().Unix(), expiresInSeconds)
+		}
 
-	return err
+		return err
+	})
 }
 
 func (dc *databaseCache) Delete(key string) error {
-	sql := "DELETE FROM cache_data WHERE cache_key=?"
-	_, err := dc.SQLStore.NewSession().Exec(sql, key)
+	return dc.SQLStore.WithDbSession(context.Background(), func(session *sqlstore.DBSession) error {
+		sql := "DELETE FROM cache_data WHERE cache_key=?"
+		_, err := session.Exec(sql, key)
+
+		return err
+	})
 
-	return err
 }
 
+// CacheData is the struct representing the table in the database
 type CacheData struct {
 	CacheKey  string
 	Data      []byte
diff --git a/pkg/infra/remotecache/database_storage_test.go b/pkg/infra/remotecache/database_storage_test.go
index 6e3c8fd4844e..ea7192f93383 100644
--- a/pkg/infra/remotecache/database_storage_test.go
+++ b/pkg/infra/remotecache/database_storage_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/pkg/infra/remotecache/redis_storage.go b/pkg/infra/remotecache/redis_storage.go
index bd54b8431199..7448cb27697e 100644
--- a/pkg/infra/remotecache/redis_storage.go
+++ b/pkg/infra/remotecache/redis_storage.go
@@ -43,16 +43,10 @@ func (s *redisStorage) Get(key string) (interface{}, error) {
 	if err == nil {
 		return item.Val, nil
 	}
-
 	if err.Error() == "EOF" {
 		return nil, ErrCacheItemNotFound
 	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return item.Val, nil
+	return nil, err
 }
 
 // Delete delete a key from session.
diff --git a/pkg/infra/remotecache/remotecache.go b/pkg/infra/remotecache/remotecache.go
index c5049f8b27fb..0c04277192f5 100644
--- a/pkg/infra/remotecache/remotecache.go
+++ b/pkg/infra/remotecache/remotecache.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
diff --git a/pkg/infra/serverlock/serverlock.go b/pkg/infra/serverlock/serverlock.go
index 824fa0484b28..497575681570 100644
--- a/pkg/infra/serverlock/serverlock.go
+++ b/pkg/infra/serverlock/serverlock.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 )
diff --git a/pkg/infra/serverlock/serverlock_integration_test.go b/pkg/infra/serverlock/serverlock_integration_test.go
index 8bcd9c2ca256..60c3cf17875d 100644
--- a/pkg/infra/serverlock/serverlock_integration_test.go
+++ b/pkg/infra/serverlock/serverlock_integration_test.go
@@ -7,34 +7,29 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/smartystreets/goconvey/convey"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestServerLok(t *testing.T) {
 	sl := createTestableServerLock(t)
 
-	Convey("Server lock integration tests", t, func() {
-		counter := 0
-		var err error
-		incCounter := func() { counter++ }
-		atInterval := time.Second * 1
-		ctx := context.Background()
-
-		//this time `fn` should be executed
-		So(sl.LockAndExecute(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
-
-		//this should not execute `fn`
-		So(sl.LockAndExecute(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
-		So(sl.LockAndExecute(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
-		So(sl.LockAndExecute(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
-		So(sl.LockAndExecute(ctx, "test-operation", atInterval, incCounter), ShouldBeNil)
-
-		// wait 5 second.
-		<-time.After(atInterval * 2)
-
-		// now `fn` should be executed again
-		err = sl.LockAndExecute(ctx, "test-operation", atInterval, incCounter)
-		So(err, ShouldBeNil)
-		So(counter, ShouldEqual, 2)
-	})
+	counter := 0
+	fn := func() { counter++ }
+	atInterval := time.Second * 1
+	ctx := context.Background()
+
+	//this time `fn` should be executed
+	assert.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
+
+	//this should not execute `fn`
+	assert.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
+	assert.Nil(t, sl.LockAndExecute(ctx, "test-operation", atInterval, fn))
+
+	// wait 2 second.
+	<-time.After(time.Second * 2)
+
+	// now `fn` should be executed again
+	err := sl.LockAndExecute(ctx, "test-operation", atInterval, fn)
+	assert.Nil(t, err)
+	assert.Equal(t, counter, 2)
 }
diff --git a/pkg/infra/serverlock/serverlock_test.go b/pkg/infra/serverlock/serverlock_test.go
index ccd1c252090d..d72f2a357d95 100644
--- a/pkg/infra/serverlock/serverlock_test.go
+++ b/pkg/infra/serverlock/serverlock_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	. "github.com/smartystreets/goconvey/convey"
 )
diff --git a/pkg/infra/tracing/tracing.go b/pkg/infra/tracing/tracing.go
index 99a1f902eedd..d1511a533411 100644
--- a/pkg/infra/tracing/tracing.go
+++ b/pkg/infra/tracing/tracing.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/setting"
 
diff --git a/pkg/infra/usagestats/service.go b/pkg/infra/usagestats/service.go
index ccebf6a17f48..7cda2cbef4b6 100644
--- a/pkg/infra/usagestats/service.go
+++ b/pkg/infra/usagestats/service.go
@@ -8,7 +8,7 @@ import (
 	"github.com/grafana/grafana/pkg/login/social"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/setting"
 )
diff --git a/pkg/infra/usagestats/usage_stats.go b/pkg/infra/usagestats/usage_stats.go
index 8b20391cbb43..e5b9e8fd8cb7 100644
--- a/pkg/infra/usagestats/usage_stats.go
+++ b/pkg/infra/usagestats/usage_stats.go
@@ -132,7 +132,7 @@ func (uss *UsageStatsService) sendUsageStats(oauthProviders map[string]bool) {
 	authTypes := map[string]bool{}
 	authTypes["anonymous"] = setting.AnonymousEnabled
 	authTypes["basic_auth"] = setting.BasicAuthEnabled
-	authTypes["ldap"] = setting.LdapEnabled
+	authTypes["ldap"] = setting.LDAPEnabled
 	authTypes["auth_proxy"] = setting.AuthProxyEnabled
 
 	for provider, enabled := range oauthProviders {
diff --git a/pkg/infra/usagestats/usage_stats_test.go b/pkg/infra/usagestats/usage_stats_test.go
index ea5b95d6ef08..07f2df221924 100644
--- a/pkg/infra/usagestats/usage_stats_test.go
+++ b/pkg/infra/usagestats/usage_stats_test.go
@@ -182,7 +182,7 @@ func TestMetrics(t *testing.T) {
 			setting.BuildVersion = "5.0.0"
 			setting.AnonymousEnabled = true
 			setting.BasicAuthEnabled = true
-			setting.LdapEnabled = true
+			setting.LDAPEnabled = true
 			setting.AuthProxyEnabled = true
 			setting.Packaging = "deb"
 
diff --git a/pkg/login/auth.go b/pkg/login/auth.go
index 56f614d92dea..ca5b572deb83 100644
--- a/pkg/login/auth.go
+++ b/pkg/login/auth.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 
 	"github.com/grafana/grafana/pkg/bus"
-	m "github.com/grafana/grafana/pkg/models"
-	LDAP "github.com/grafana/grafana/pkg/services/ldap"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/ldap"
 )
 
 var (
@@ -19,13 +19,15 @@ var (
 	ErrPasswordEmpty         = errors.New("No password provided")
 	ErrUsersQuotaReached     = errors.New("Users quota reached")
 	ErrGettingUserQuota      = errors.New("Error getting user quota")
+	ErrUserDisabled          = errors.New("User is disabled")
 )
 
 func Init() {
 	bus.AddHandler("auth", AuthenticateUser)
 }
 
-func AuthenticateUser(query *m.LoginUserQuery) error {
+// AuthenticateUser authenticates the user via username & password
+func AuthenticateUser(query *models.LoginUserQuery) error {
 	if err := validateLoginAttempts(query.Username); err != nil {
 		return err
 	}
@@ -35,29 +37,33 @@ func AuthenticateUser(query *m.LoginUserQuery) error {
 	}
 
 	err := loginUsingGrafanaDB(query)
-	if err == nil || (err != m.ErrUserNotFound && err != ErrInvalidCredentials) {
+	if err == nil || (err != models.ErrUserNotFound && err != ErrInvalidCredentials && err != ErrUserDisabled) {
 		return err
 	}
 
-	ldapEnabled, ldapErr := loginUsingLdap(query)
+	ldapEnabled, ldapErr := loginUsingLDAP(query)
 	if ldapEnabled {
-		if ldapErr == nil || ldapErr != LDAP.ErrInvalidCredentials {
+		if ldapErr == nil || ldapErr != ldap.ErrInvalidCredentials {
 			return ldapErr
 		}
 
-		err = ldapErr
+		if err != ErrUserDisabled || ldapErr != ldap.ErrInvalidCredentials {
+			err = ldapErr
+		}
 	}
 
-	if err == ErrInvalidCredentials || err == LDAP.ErrInvalidCredentials {
+	if err == ErrInvalidCredentials || err == ldap.ErrInvalidCredentials {
 		saveInvalidLoginAttempt(query)
+		return ErrInvalidCredentials
 	}
 
-	if err == m.ErrUserNotFound {
+	if err == models.ErrUserNotFound {
 		return ErrInvalidCredentials
 	}
 
 	return err
 }
+
 func validatePasswordSet(password string) error {
 	if len(password) == 0 {
 		return ErrPasswordEmpty
diff --git a/pkg/login/auth_test.go b/pkg/login/auth_test.go
index 85ad3bc07dce..06a78cc6d5df 100644
--- a/pkg/login/auth_test.go
+++ b/pkg/login/auth_test.go
@@ -6,8 +6,8 @@ import (
 
 	. "github.com/smartystreets/goconvey/convey"
 
-	m "github.com/grafana/grafana/pkg/models"
-	LDAP "github.com/grafana/grafana/pkg/services/ldap"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/ldap"
 )
 
 func TestAuthenticateUser(t *testing.T) {
@@ -15,9 +15,9 @@ func TestAuthenticateUser(t *testing.T) {
 		authScenario("When a user authenticates without setting a password", func(sc *authScenarioContext) {
 			mockLoginAttemptValidation(nil, sc)
 			mockLoginUsingGrafanaDB(nil, sc)
-			mockLoginUsingLdap(false, nil, sc)
+			mockLoginUsingLDAP(false, nil, sc)
 
-			loginQuery := m.LoginUserQuery{
+			loginQuery := models.LoginUserQuery{
 				Username: "user",
 				Password: "",
 			}
@@ -33,7 +33,7 @@ func TestAuthenticateUser(t *testing.T) {
 		authScenario("When a user authenticates having too many login attempts", func(sc *authScenarioContext) {
 			mockLoginAttemptValidation(ErrTooManyLoginAttempts, sc)
 			mockLoginUsingGrafanaDB(nil, sc)
-			mockLoginUsingLdap(true, nil, sc)
+			mockLoginUsingLDAP(true, nil, sc)
 			mockSaveInvalidLoginAttempt(sc)
 
 			err := AuthenticateUser(sc.loginUserQuery)
@@ -50,7 +50,7 @@ func TestAuthenticateUser(t *testing.T) {
 		authScenario("When grafana user authenticate with valid credentials", func(sc *authScenarioContext) {
 			mockLoginAttemptValidation(nil, sc)
 			mockLoginUsingGrafanaDB(nil, sc)
-			mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+			mockLoginUsingLDAP(true, ErrInvalidCredentials, sc)
 			mockSaveInvalidLoginAttempt(sc)
 
 			err := AuthenticateUser(sc.loginUserQuery)
@@ -68,7 +68,7 @@ func TestAuthenticateUser(t *testing.T) {
 			customErr := errors.New("custom")
 			mockLoginAttemptValidation(nil, sc)
 			mockLoginUsingGrafanaDB(customErr, sc)
-			mockLoginUsingLdap(true, ErrInvalidCredentials, sc)
+			mockLoginUsingLDAP(true, ErrInvalidCredentials, sc)
 			mockSaveInvalidLoginAttempt(sc)
 
 			err := AuthenticateUser(sc.loginUserQuery)
@@ -84,8 +84,8 @@ func TestAuthenticateUser(t *testing.T) {
 
 		authScenario("When a non-existing grafana user authenticate and ldap disabled", func(sc *authScenarioContext) {
 			mockLoginAttemptValidation(nil, sc)
-			mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
-			mockLoginUsingLdap(false, nil, sc)
+			mockLoginUsingGrafanaDB(models.ErrUserNotFound, sc)
+			mockLoginUsingLDAP(false, nil, sc)
 			mockSaveInvalidLoginAttempt(sc)
 
 			err := AuthenticateUser(sc.loginUserQuery)
@@ -101,14 +101,14 @@ func TestAuthenticateUser(t *testing.T) {
 
 		authScenario("When a non-existing grafana user authenticate and invalid ldap credentials", func(sc *authScenarioContext) {
 			mockLoginAttemptValidation(nil, sc)
-			mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
-			mockLoginUsingLdap(true, LDAP.ErrInvalidCredentials, sc)
+			mockLoginUsingGrafanaDB(models.ErrUserNotFound, sc)
+			mockLoginUsingLDAP(true, ldap.ErrInvalidCredentials, sc)
 			mockSaveInvalidLoginAttempt(sc)
 
 			err := AuthenticateUser(sc.loginUserQuery)
 
 			Convey("it should result in", func() {
-				So(err, ShouldEqual, LDAP.ErrInvalidCredentials)
+				So(err, ShouldEqual, ErrInvalidCredentials)
 				So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
 				So(sc.grafanaLoginWasCalled, ShouldBeTrue)
 				So(sc.ldapLoginWasCalled, ShouldBeTrue)
@@ -118,8 +118,8 @@ func TestAuthenticateUser(t *testing.T) {
 
 		authScenario("When a non-existing grafana user authenticate and valid ldap credentials", func(sc *authScenarioContext) {
 			mockLoginAttemptValidation(nil, sc)
-			mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
-			mockLoginUsingLdap(true, nil, sc)
+			mockLoginUsingGrafanaDB(models.ErrUserNotFound, sc)
+			mockLoginUsingLDAP(true, nil, sc)
 			mockSaveInvalidLoginAttempt(sc)
 
 			err := AuthenticateUser(sc.loginUserQuery)
@@ -136,8 +136,8 @@ func TestAuthenticateUser(t *testing.T) {
 		authScenario("When a non-existing grafana user authenticate and ldap returns unexpected error", func(sc *authScenarioContext) {
 			customErr := errors.New("custom")
 			mockLoginAttemptValidation(nil, sc)
-			mockLoginUsingGrafanaDB(m.ErrUserNotFound, sc)
-			mockLoginUsingLdap(true, customErr, sc)
+			mockLoginUsingGrafanaDB(models.ErrUserNotFound, sc)
+			mockLoginUsingLDAP(true, customErr, sc)
 			mockSaveInvalidLoginAttempt(sc)
 
 			err := AuthenticateUser(sc.loginUserQuery)
@@ -154,13 +154,13 @@ func TestAuthenticateUser(t *testing.T) {
 		authScenario("When grafana user authenticate with invalid credentials and invalid ldap credentials", func(sc *authScenarioContext) {
 			mockLoginAttemptValidation(nil, sc)
 			mockLoginUsingGrafanaDB(ErrInvalidCredentials, sc)
-			mockLoginUsingLdap(true, LDAP.ErrInvalidCredentials, sc)
+			mockLoginUsingLDAP(true, ldap.ErrInvalidCredentials, sc)
 			mockSaveInvalidLoginAttempt(sc)
 
 			err := AuthenticateUser(sc.loginUserQuery)
 
 			Convey("it should result in", func() {
-				So(err, ShouldEqual, LDAP.ErrInvalidCredentials)
+				So(err, ShouldEqual, ErrInvalidCredentials)
 				So(sc.loginAttemptValidationWasCalled, ShouldBeTrue)
 				So(sc.grafanaLoginWasCalled, ShouldBeTrue)
 				So(sc.ldapLoginWasCalled, ShouldBeTrue)
@@ -171,7 +171,7 @@ func TestAuthenticateUser(t *testing.T) {
 }
 
 type authScenarioContext struct {
-	loginUserQuery                   *m.LoginUserQuery
+	loginUserQuery                   *models.LoginUserQuery
 	grafanaLoginWasCalled            bool
 	ldapLoginWasCalled               bool
 	loginAttemptValidationWasCalled  bool
@@ -181,14 +181,14 @@ type authScenarioContext struct {
 type authScenarioFunc func(sc *authScenarioContext)
 
 func mockLoginUsingGrafanaDB(err error, sc *authScenarioContext) {
-	loginUsingGrafanaDB = func(query *m.LoginUserQuery) error {
+	loginUsingGrafanaDB = func(query *models.LoginUserQuery) error {
 		sc.grafanaLoginWasCalled = true
 		return err
 	}
 }
 
-func mockLoginUsingLdap(enabled bool, err error, sc *authScenarioContext) {
-	loginUsingLdap = func(query *m.LoginUserQuery) (bool, error) {
+func mockLoginUsingLDAP(enabled bool, err error, sc *authScenarioContext) {
+	loginUsingLDAP = func(query *models.LoginUserQuery) (bool, error) {
 		sc.ldapLoginWasCalled = true
 		return enabled, err
 	}
@@ -202,7 +202,7 @@ func mockLoginAttemptValidation(err error, sc *authScenarioContext) {
 }
 
 func mockSaveInvalidLoginAttempt(sc *authScenarioContext) {
-	saveInvalidLoginAttempt = func(query *m.LoginUserQuery) {
+	saveInvalidLoginAttempt = func(query *models.LoginUserQuery) {
 		sc.saveInvalidLoginAttemptWasCalled = true
 	}
 }
@@ -210,12 +210,12 @@ func mockSaveInvalidLoginAttempt(sc *authScenarioContext) {
 func authScenario(desc string, fn authScenarioFunc) {
 	Convey(desc, func() {
 		origLoginUsingGrafanaDB := loginUsingGrafanaDB
-		origLoginUsingLdap := loginUsingLdap
+		origLoginUsingLDAP := loginUsingLDAP
 		origValidateLoginAttempts := validateLoginAttempts
 		origSaveInvalidLoginAttempt := saveInvalidLoginAttempt
 
 		sc := &authScenarioContext{
-			loginUserQuery: &m.LoginUserQuery{
+			loginUserQuery: &models.LoginUserQuery{
 				Username:  "user",
 				Password:  "pwd",
 				IpAddress: "192.168.1.1:56433",
@@ -224,7 +224,7 @@ func authScenario(desc string, fn authScenarioFunc) {
 
 		defer func() {
 			loginUsingGrafanaDB = origLoginUsingGrafanaDB
-			loginUsingLdap = origLoginUsingLdap
+			loginUsingLDAP = origLoginUsingLDAP
 			validateLoginAttempts = origValidateLoginAttempts
 			saveInvalidLoginAttempt = origSaveInvalidLoginAttempt
 		}()
diff --git a/pkg/login/grafana_login.go b/pkg/login/grafana_login.go
index e8594fdd190d..64bd4b201e7b 100644
--- a/pkg/login/grafana_login.go
+++ b/pkg/login/grafana_login.go
@@ -26,6 +26,10 @@ var loginUsingGrafanaDB = func(query *m.LoginUserQuery) error {
 
 	user := userQuery.Result
 
+	if user.IsDisabled {
+		return ErrUserDisabled
+	}
+
 	if err := validatePassword(query.Password, user.Password, user.Salt); err != nil {
 		return err
 	}
diff --git a/pkg/login/grafana_login_test.go b/pkg/login/grafana_login_test.go
index 2c189ae00729..eddc6e12f5f6 100644
--- a/pkg/login/grafana_login_test.go
+++ b/pkg/login/grafana_login_test.go
@@ -63,6 +63,23 @@ func TestGrafanaLogin(t *testing.T) {
 				So(sc.loginUserQuery.User.Password, ShouldEqual, sc.loginUserQuery.Password)
 			})
 		})
+
+		grafanaLoginScenario("When login with disabled user", func(sc *grafanaLoginScenarioContext) {
+			sc.withDisabledUser()
+			err := loginUsingGrafanaDB(sc.loginUserQuery)
+
+			Convey("it should return user is disabled error", func() {
+				So(err, ShouldEqual, ErrUserDisabled)
+			})
+
+			Convey("it should not call password validation", func() {
+				So(sc.validatePasswordCalled, ShouldBeFalse)
+			})
+
+			Convey("it should not pupulate user object", func() {
+				So(sc.loginUserQuery.User, ShouldBeNil)
+			})
+		})
 	})
 }
 
@@ -138,3 +155,9 @@ func (sc *grafanaLoginScenarioContext) withInvalidPassword() {
 	})
 	mockPasswordValidation(false, sc)
 }
+
+func (sc *grafanaLoginScenarioContext) withDisabledUser() {
+	sc.getUserByLoginQueryReturns(&m.User{
+		IsDisabled: true,
+	})
+}
diff --git a/pkg/login/ldap_login.go b/pkg/login/ldap_login.go
index abd861cbe6dd..33693212ac7f 100644
--- a/pkg/login/ldap_login.go
+++ b/pkg/login/ldap_login.go
@@ -2,17 +2,24 @@ package login
 
 import (
 	"github.com/grafana/grafana/pkg/models"
-	LDAP "github.com/grafana/grafana/pkg/services/ldap"
+	"github.com/grafana/grafana/pkg/services/multildap"
+	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
-var newLDAP = LDAP.New
-var getLDAPConfig = LDAP.GetConfig
-var isLDAPEnabled = LDAP.IsEnabled
+// getLDAPConfig gets LDAP config
+var getLDAPConfig = multildap.GetConfig
 
-// loginUsingLdap logs in user using LDAP. It returns whether LDAP is enabled and optional error and query arg will be
+// isLDAPEnabled checks if LDAP is enabled
+var isLDAPEnabled = multildap.IsEnabled
+
+// newLDAP creates multiple LDAP instance
+var newLDAP = multildap.New
+
+// loginUsingLDAP logs in user using LDAP. It returns whether LDAP is enabled and optional error and query arg will be
 // populated with the logged in user if successful.
-var loginUsingLdap = func(query *models.LoginUserQuery) (bool, error) {
+var loginUsingLDAP = func(query *models.LoginUserQuery) (bool, error) {
 	enabled := isLDAPEnabled()
 
 	if !enabled {
@@ -23,18 +30,21 @@ var loginUsingLdap = func(query *models.LoginUserQuery) (bool, error) {
 	if err != nil {
 		return true, errutil.Wrap("Failed to get LDAP config", err)
 	}
-	if len(config.Servers) == 0 {
-		return true, ErrNoLDAPServers
-	}
 
-	for _, server := range config.Servers {
-		auth := newLDAP(server)
+	externalUser, err := newLDAP(config.Servers).Login(query)
+	if err != nil {
+		return true, err
+	}
 
-		err := auth.Login(query)
-		if err == nil || err != LDAP.ErrInvalidCredentials {
-			return true, err
-		}
+	login, err := user.Upsert(&user.UpsertArgs{
+		ExternalUser:  externalUser,
+		SignupAllowed: setting.LDAPAllowSignup,
+	})
+	if err != nil {
+		return true, err
 	}
 
-	return true, LDAP.ErrInvalidCredentials
+	query.User = login
+
+	return true, nil
 }
diff --git a/pkg/login/ldap_login_test.go b/pkg/login/ldap_login_test.go
index 3ea82d0a8ed6..ac5ba49e2f1d 100644
--- a/pkg/login/ldap_login_test.go
+++ b/pkg/login/ldap_login_test.go
@@ -6,50 +6,51 @@ import (
 
 	. "github.com/smartystreets/goconvey/convey"
 
-	m "github.com/grafana/grafana/pkg/models"
-	LDAP "github.com/grafana/grafana/pkg/services/ldap"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/ldap"
+	"github.com/grafana/grafana/pkg/services/multildap"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 var errTest = errors.New("Test error")
 
-func TestLdapLogin(t *testing.T) {
+func TestLDAPLogin(t *testing.T) {
 	Convey("Login using ldap", t, func() {
 		Convey("Given ldap enabled and no server configured", func() {
-			setting.LdapEnabled = true
+			setting.LDAPEnabled = true
 
-			ldapLoginScenario("When login", func(sc *ldapLoginScenarioContext) {
+			LDAPLoginScenario("When login", func(sc *LDAPLoginScenarioContext) {
 				sc.withLoginResult(false)
-				getLDAPConfig = func() (*LDAP.Config, error) {
-					config := &LDAP.Config{
-						Servers: []*LDAP.ServerConfig{},
+				getLDAPConfig = func() (*ldap.Config, error) {
+					config := &ldap.Config{
+						Servers: []*ldap.ServerConfig{},
 					}
 
 					return config, nil
 				}
 
-				enabled, err := loginUsingLdap(sc.loginUserQuery)
+				enabled, err := loginUsingLDAP(sc.loginUserQuery)
 
 				Convey("it should return true", func() {
 					So(enabled, ShouldBeTrue)
 				})
 
 				Convey("it should return no LDAP servers error", func() {
-					So(err, ShouldEqual, ErrNoLDAPServers)
+					So(err, ShouldEqual, errTest)
 				})
 
 				Convey("it should not call ldap login", func() {
-					So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeFalse)
+					So(sc.LDAPAuthenticatorMock.loginCalled, ShouldBeTrue)
 				})
 			})
 		})
 
 		Convey("Given ldap disabled", func() {
-			setting.LdapEnabled = false
+			setting.LDAPEnabled = false
 
-			ldapLoginScenario("When login", func(sc *ldapLoginScenarioContext) {
+			LDAPLoginScenario("When login", func(sc *LDAPLoginScenarioContext) {
 				sc.withLoginResult(false)
-				enabled, err := loginUsingLdap(&m.LoginUserQuery{
+				enabled, err := loginUsingLDAP(&models.LoginUserQuery{
 					Username: "user",
 					Password: "pwd",
 				})
@@ -63,75 +64,88 @@ func TestLdapLogin(t *testing.T) {
 				})
 
 				Convey("it should not call ldap login", func() {
-					So(sc.ldapAuthenticatorMock.loginCalled, ShouldBeFalse)
+					So(sc.LDAPAuthenticatorMock.loginCalled, ShouldBeFalse)
 				})
 			})
 		})
 	})
 }
 
-func mockLdapAuthenticator(valid bool) *mockAuth {
-	mock := &mockAuth{
-		validLogin: valid,
-	}
-
-	newLDAP = func(server *LDAP.ServerConfig) LDAP.IAuth {
-		return mock
-	}
-
-	return mock
-}
-
 type mockAuth struct {
 	validLogin  bool
 	loginCalled bool
 }
 
-func (auth *mockAuth) Login(query *m.LoginUserQuery) error {
+func (auth *mockAuth) Login(query *models.LoginUserQuery) (
+	*models.ExternalUserInfo,
+	error,
+) {
 	auth.loginCalled = true
 
 	if !auth.validLogin {
-		return errTest
+		return nil, errTest
 	}
 
-	return nil
+	return nil, nil
 }
 
-func (auth *mockAuth) Users() ([]*LDAP.UserInfo, error) {
+func (auth *mockAuth) Users(logins []string) (
+	[]*models.ExternalUserInfo,
+	error,
+) {
 	return nil, nil
 }
 
-func (auth *mockAuth) SyncUser(query *m.LoginUserQuery) error {
+func (auth *mockAuth) User(login string) (
+	*models.ExternalUserInfo,
+	error,
+) {
+	return nil, nil
+}
+
+func (auth *mockAuth) Add(dn string, values map[string][]string) error {
 	return nil
 }
 
-func (auth *mockAuth) GetGrafanaUserFor(ctx *m.ReqContext, ldapUser *LDAP.UserInfo) (*m.User, error) {
-	return nil, nil
+func (auth *mockAuth) Remove(dn string) error {
+	return nil
+}
+
+func mockLDAPAuthenticator(valid bool) *mockAuth {
+	mock := &mockAuth{
+		validLogin: valid,
+	}
+
+	newLDAP = func(servers []*ldap.ServerConfig) multildap.IMultiLDAP {
+		return mock
+	}
+
+	return mock
 }
 
-type ldapLoginScenarioContext struct {
-	loginUserQuery        *m.LoginUserQuery
-	ldapAuthenticatorMock *mockAuth
+type LDAPLoginScenarioContext struct {
+	loginUserQuery        *models.LoginUserQuery
+	LDAPAuthenticatorMock *mockAuth
 }
 
-type ldapLoginScenarioFunc func(c *ldapLoginScenarioContext)
+type LDAPLoginScenarioFunc func(c *LDAPLoginScenarioContext)
 
-func ldapLoginScenario(desc string, fn ldapLoginScenarioFunc) {
+func LDAPLoginScenario(desc string, fn LDAPLoginScenarioFunc) {
 	Convey(desc, func() {
 		mock := &mockAuth{}
 
-		sc := &ldapLoginScenarioContext{
-			loginUserQuery: &m.LoginUserQuery{
+		sc := &LDAPLoginScenarioContext{
+			loginUserQuery: &models.LoginUserQuery{
 				Username:  "user",
 				Password:  "pwd",
 				IpAddress: "192.168.1.1:56433",
 			},
-			ldapAuthenticatorMock: mock,
+			LDAPAuthenticatorMock: mock,
 		}
 
-		getLDAPConfig = func() (*LDAP.Config, error) {
-			config := &LDAP.Config{
-				Servers: []*LDAP.ServerConfig{
+		getLDAPConfig = func() (*ldap.Config, error) {
+			config := &ldap.Config{
+				Servers: []*ldap.ServerConfig{
 					{
 						Host: "",
 					},
@@ -141,19 +155,19 @@ func ldapLoginScenario(desc string, fn ldapLoginScenarioFunc) {
 			return config, nil
 		}
 
-		newLDAP = func(server *LDAP.ServerConfig) LDAP.IAuth {
+		newLDAP = func(server []*ldap.ServerConfig) multildap.IMultiLDAP {
 			return mock
 		}
 
 		defer func() {
-			newLDAP = LDAP.New
-			getLDAPConfig = LDAP.GetConfig
+			newLDAP = multildap.New
+			getLDAPConfig = multildap.GetConfig
 		}()
 
 		fn(sc)
 	})
 }
 
-func (sc *ldapLoginScenarioContext) withLoginResult(valid bool) {
-	sc.ldapAuthenticatorMock = mockLdapAuthenticator(valid)
+func (sc *LDAPLoginScenarioContext) withLoginResult(valid bool) {
+	sc.LDAPAuthenticatorMock = mockLDAPAuthenticator(valid)
 }
diff --git a/pkg/login/social/common.go b/pkg/login/social/common.go
index cf2fa3711492..b813e07ab795 100644
--- a/pkg/login/social/common.go
+++ b/pkg/login/social/common.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 )
 
 type HttpGetResponse struct {
diff --git a/pkg/login/social/social.go b/pkg/login/social/social.go
index e73e9229a2af..46192ba861e0 100644
--- a/pkg/login/social/social.go
+++ b/pkg/login/social/social.go
@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go
index 6dc69dda8b5f..9ec5852b73dc 100644
--- a/pkg/middleware/auth_proxy.go
+++ b/pkg/middleware/auth_proxy.go
@@ -20,24 +20,26 @@ func initContextWithAuthProxy(store *remotecache.RemoteCache, ctx *m.ReqContext,
 	})
 
 	// Bail if auth proxy is not enabled
-	if auth.IsEnabled() == false {
+	if !auth.IsEnabled() {
 		return false
 	}
 
 	// If the there is no header - we can't move forward
-	if auth.HasHeader() == false {
+	if !auth.HasHeader() {
 		return false
 	}
 
 	// Check if allowed to continue with this IP
-	if result, err := auth.IsAllowedIP(); result == false {
+	if result, err := auth.IsAllowedIP(); !result {
+		ctx.Logger.Error("auth proxy: failed to check whitelisted ip addresses", "message", err.Error(), "error", err.DetailsError)
 		ctx.Handle(407, err.Error(), err.DetailsError)
 		return true
 	}
 
-	// Try to get user id from various sources
-	id, err := auth.GetUserID()
+	// Try to log in user from various providers
+	id, err := auth.Login()
 	if err != nil {
+		ctx.Logger.Error("auth proxy: failed to login", "message", err.Error(), "error", err.DetailsError)
 		ctx.Handle(500, err.Error(), err.DetailsError)
 		return true
 	}
@@ -45,6 +47,7 @@ func initContextWithAuthProxy(store *remotecache.RemoteCache, ctx *m.ReqContext,
 	// Get full user info
 	user, err := auth.GetSignedUser(id)
 	if err != nil {
+		ctx.Logger.Error("auth proxy: failed to get signed in user", "message", err.Error(), "error", err.DetailsError)
 		ctx.Handle(500, err.Error(), err.DetailsError)
 		return true
 	}
@@ -54,7 +57,8 @@ func initContextWithAuthProxy(store *remotecache.RemoteCache, ctx *m.ReqContext,
 	ctx.IsSignedIn = true
 
 	// Remember user data it in cache
-	if err := auth.Remember(); err != nil {
+	if err := auth.Remember(id); err != nil {
+		ctx.Logger.Error("auth proxy: failed to store user in cache", "message", err.Error(), "error", err.DetailsError)
 		ctx.Handle(500, err.Error(), err.DetailsError)
 		return true
 	}
diff --git a/pkg/middleware/auth_proxy/auth_proxy.go b/pkg/middleware/auth_proxy/auth_proxy.go
index b9e71d1b480d..e078aaf84251 100644
--- a/pkg/middleware/auth_proxy/auth_proxy.go
+++ b/pkg/middleware/auth_proxy/auth_proxy.go
@@ -12,6 +12,8 @@ import (
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/ldap"
+	"github.com/grafana/grafana/pkg/services/multildap"
+	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
@@ -21,10 +23,14 @@ const (
 	CachePrefix = "auth-proxy-sync-ttl:%s"
 )
 
-var (
-	getLDAPConfig = ldap.GetConfig
-	isLDAPEnabled = ldap.IsEnabled
-)
+// getLDAPConfig gets LDAP config
+var getLDAPConfig = ldap.GetConfig
+
+// isLDAPEnabled checks if LDAP is enabled
+var isLDAPEnabled = ldap.IsEnabled
+
+// newLDAP creates multiple LDAP instance
+var newLDAP = multildap.New
 
 // AuthProxy struct
 type AuthProxy struct {
@@ -33,13 +39,13 @@ type AuthProxy struct {
 	orgID  int64
 	header string
 
-	LDAP func(server *ldap.ServerConfig) ldap.IAuth
-
-	enabled     bool
-	whitelistIP string
-	headerType  string
-	headers     map[string]string
-	cacheTTL    int
+	enabled             bool
+	LDAPAllowSignup     bool
+	AuthProxyAutoSignUp bool
+	whitelistIP         string
+	headerType          string
+	headers             map[string]string
+	cacheTTL            int
 }
 
 // Error auth proxy specific error
@@ -58,7 +64,7 @@ func newError(message string, err error) *Error {
 
 // Error returns a Error error string
 func (err *Error) Error() string {
-	return fmt.Sprintf("%s", err.Message)
+	return err.Message
 }
 
 // Options for the AuthProxy
@@ -78,13 +84,13 @@ func New(options *Options) *AuthProxy {
 		orgID:  options.OrgID,
 		header: header,
 
-		LDAP: ldap.New,
-
-		enabled:     setting.AuthProxyEnabled,
-		headerType:  setting.AuthProxyHeaderProperty,
-		headers:     setting.AuthProxyHeaders,
-		whitelistIP: setting.AuthProxyWhitelist,
-		cacheTTL:    setting.AuthProxyLdapSyncTtl,
+		enabled:             setting.AuthProxyEnabled,
+		headerType:          setting.AuthProxyHeaderProperty,
+		headers:             setting.AuthProxyHeaders,
+		whitelistIP:         setting.AuthProxyWhitelist,
+		cacheTTL:            setting.AuthProxyLDAPSyncTtl,
+		LDAPAllowSignup:     setting.LDAPAllowSignup,
+		AuthProxyAutoSignUp: setting.AuthProxyAutoSignUp,
 	}
 }
 
@@ -92,20 +98,12 @@ func New(options *Options) *AuthProxy {
 func (auth *AuthProxy) IsEnabled() bool {
 
 	// Bail if the setting is not enabled
-	if auth.enabled == false {
-		return false
-	}
-
-	return true
+	return auth.enabled
 }
 
 // HasHeader checks if the we have specified header
 func (auth *AuthProxy) HasHeader() bool {
-	if len(auth.header) == 0 {
-		return false
-	}
-
-	return true
+	return len(auth.header) != 0
 }
 
 // IsAllowedIP compares presented IP with the whitelist one
@@ -144,34 +142,22 @@ func (auth *AuthProxy) IsAllowedIP() (bool, *Error) {
 	return false, newError("Proxy authentication required", err)
 }
 
-// InCache checks if we have user in cache
-func (auth *AuthProxy) InCache() bool {
-	userID, _ := auth.GetUserIDViaCache()
-
-	if userID == 0 {
-		return false
-	}
-
-	return true
-}
-
 // getKey forms a key for the cache
 func (auth *AuthProxy) getKey() string {
 	return fmt.Sprintf(CachePrefix, auth.header)
 }
 
-// GetUserID gets user id with whatever means possible
-func (auth *AuthProxy) GetUserID() (int64, *Error) {
-	if auth.InCache() {
+// Login logs in user id with whatever means possible
+func (auth *AuthProxy) Login() (int64, *Error) {
 
+	id, _ := auth.GetUserViaCache()
+	if id != 0 {
 		// Error here means absent cache - we don't need to handle that
-		id, _ := auth.GetUserIDViaCache()
-
 		return id, nil
 	}
 
 	if isLDAPEnabled() {
-		id, err := auth.GetUserIDViaLDAP()
+		id, err := auth.LoginViaLDAP()
 
 		if err == ldap.ErrInvalidCredentials {
 			return 0, newError(
@@ -181,16 +167,16 @@ func (auth *AuthProxy) GetUserID() (int64, *Error) {
 		}
 
 		if err != nil {
-			return 0, newError("Failed to sync user", err)
+			return 0, newError("Failed to get the user", err)
 		}
 
 		return id, nil
 	}
 
-	id, err := auth.GetUserIDViaHeader()
+	id, err := auth.LoginViaHeader()
 	if err != nil {
 		return 0, newError(
-			"Failed to login as user specified in auth proxy header",
+			"Failed to log in as user, specified in auth proxy header",
 			err,
 		)
 	}
@@ -198,8 +184,8 @@ func (auth *AuthProxy) GetUserID() (int64, *Error) {
 	return id, nil
 }
 
-// GetUserIDViaCache gets the user from cache
-func (auth *AuthProxy) GetUserIDViaCache() (int64, error) {
+// GetUserViaCache gets user id from cache
+func (auth *AuthProxy) GetUserViaCache() (int64, error) {
 	var (
 		cacheKey    = auth.getKey()
 		userID, err = auth.store.Get(cacheKey)
@@ -212,33 +198,34 @@ func (auth *AuthProxy) GetUserIDViaCache() (int64, error) {
 	return userID.(int64), nil
 }
 
-// GetUserIDViaLDAP gets user via LDAP request
-func (auth *AuthProxy) GetUserIDViaLDAP() (int64, *Error) {
-	query := &models.LoginUserQuery{
-		ReqContext: auth.ctx,
-		Username:   auth.header,
-	}
-
+// LoginViaLDAP logs in user via LDAP request
+func (auth *AuthProxy) LoginViaLDAP() (int64, *Error) {
 	config, err := getLDAPConfig()
 	if err != nil {
 		return 0, newError("Failed to get LDAP config", nil)
 	}
-	if len(config.Servers) == 0 {
-		return 0, newError("No LDAP servers available", nil)
+
+	extUser, err := newLDAP(config.Servers).User(auth.header)
+	if err != nil {
+		return 0, newError(err.Error(), nil)
 	}
 
-	for _, server := range config.Servers {
-		author := auth.LDAP(server)
-		if err := author.SyncUser(query); err != nil {
-			return 0, newError(err.Error(), nil)
-		}
+	// Have to sync grafana and LDAP user during log in
+	user, err := user.Upsert(&user.UpsertArgs{
+		ReqContext:    auth.ctx,
+		SignupAllowed: auth.LDAPAllowSignup,
+		ExternalUser:  extUser,
+	})
+	if err != nil {
+		return 0, newError(err.Error(), nil)
 	}
 
-	return query.User.Id, nil
+	return user.Id, nil
 }
 
-// GetUserIDViaHeader gets user from the header only
-func (auth *AuthProxy) GetUserIDViaHeader() (int64, error) {
+// LoginViaHeader logs in user from the header only
+// TODO: refactor - cyclomatic complexity should be much lower
+func (auth *AuthProxy) LoginViaHeader() (int64, error) {
 	extUser := &models.ExternalUserInfo{
 		AuthModule: "authproxy",
 		AuthId:     auth.header,
@@ -269,18 +256,16 @@ func (auth *AuthProxy) GetUserIDViaHeader() (int64, error) {
 		}
 	}
 
-	// add/update user in grafana
-	cmd := &models.UpsertUserCommand{
+	result, err := user.Upsert(&user.UpsertArgs{
 		ReqContext:    auth.ctx,
+		SignupAllowed: true,
 		ExternalUser:  extUser,
-		SignupAllowed: setting.AuthProxyAutoSignUp,
-	}
-	err := bus.Dispatch(cmd)
+	})
 	if err != nil {
 		return 0, err
 	}
 
-	return cmd.Result.Id, nil
+	return result.Id, nil
 }
 
 // GetSignedUser get full signed user info
@@ -298,21 +283,18 @@ func (auth *AuthProxy) GetSignedUser(userID int64) (*models.SignedInUser, *Error
 }
 
 // Remember user in cache
-func (auth *AuthProxy) Remember() *Error {
+func (auth *AuthProxy) Remember(id int64) *Error {
+	key := auth.getKey()
 
-	// Make sure we do not rewrite the expiration time
-	if auth.InCache() {
+	// Check if user already in cache
+	userID, _ := auth.store.Get(key)
+	if userID != nil {
 		return nil
 	}
 
-	var (
-		key        = auth.getKey()
-		value, _   = auth.GetUserIDViaCache()
-		expiration = time.Duration(-auth.cacheTTL) * time.Minute
-
-		err = auth.store.Set(key, value, expiration)
-	)
+	expiration := time.Duration(-auth.cacheTTL) * time.Minute
 
+	err := auth.store.Set(key, id, expiration)
 	if err != nil {
 		return newError(err.Error(), nil)
 	}
diff --git a/pkg/middleware/auth_proxy/auth_proxy_test.go b/pkg/middleware/auth_proxy/auth_proxy_test.go
index fbddca81d401..4a1edc66ba5a 100644
--- a/pkg/middleware/auth_proxy/auth_proxy_test.go
+++ b/pkg/middleware/auth_proxy/auth_proxy_test.go
@@ -1,6 +1,7 @@
 package authproxy
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"testing"
@@ -8,24 +9,40 @@ import (
 	. "github.com/smartystreets/goconvey/convey"
 	"gopkg.in/macaron.v1"
 
+	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/infra/remotecache"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/ldap"
+	"github.com/grafana/grafana/pkg/services/multildap"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-type TestLDAP struct {
-	ldap.Auth
-	ID         int64
-	syncCalled bool
+type TestMultiLDAP struct {
+	multildap.MultiLDAP
+	ID          int64
+	userCalled  bool
+	loginCalled bool
 }
 
-func (stub *TestLDAP) SyncUser(query *models.LoginUserQuery) error {
-	stub.syncCalled = true
-	query.User = &models.User{
-		Id: stub.ID,
+func (stub *TestMultiLDAP) Login(query *models.LoginUserQuery) (
+	*models.ExternalUserInfo, error,
+) {
+	stub.loginCalled = true
+	result := &models.ExternalUserInfo{
+		UserId: stub.ID,
 	}
-	return nil
+	return result, nil
+}
+
+func (stub *TestMultiLDAP) User(login string) (
+	*models.ExternalUserInfo,
+	error,
+) {
+	stub.userCalled = true
+	result := &models.ExternalUserInfo{
+		UserId: stub.ID,
+	}
+	return result, nil
 }
 
 func TestMiddlewareContext(t *testing.T) {
@@ -44,7 +61,7 @@ func TestMiddlewareContext(t *testing.T) {
 			},
 		}
 
-		Convey("gets data from the cache", func() {
+		Convey("logs in user from the cache", func() {
 			store := remotecache.NewFakeStore(t)
 			key := fmt.Sprintf(CachePrefix, name)
 			store.Set(key, int64(33), 0)
@@ -55,53 +72,64 @@ func TestMiddlewareContext(t *testing.T) {
 				OrgID: 4,
 			})
 
-			id, err := auth.GetUserID()
+			id, err := auth.Login()
 
 			So(err, ShouldBeNil)
 			So(id, ShouldEqual, 33)
 		})
 
 		Convey("LDAP", func() {
-			Convey("gets data from the LDAP", func() {
+			Convey("logs in via LDAP", func() {
+				bus.AddHandler("test", func(cmd *models.UpsertUserCommand) error {
+					cmd.Result = &models.User{
+						Id: 42,
+					}
+
+					return nil
+				})
+
 				isLDAPEnabled = func() bool {
 					return true
 				}
 
+				stub := &TestMultiLDAP{
+					ID: 42,
+				}
+
 				getLDAPConfig = func() (*ldap.Config, error) {
 					config := &ldap.Config{
 						Servers: []*ldap.ServerConfig{
-							{},
+							{
+								SearchBaseDNs: []string{"BaseDNHere"},
+							},
 						},
 					}
 					return config, nil
 				}
 
+				newLDAP = func(servers []*ldap.ServerConfig) multildap.IMultiLDAP {
+					return stub
+				}
+
 				defer func() {
+					newLDAP = multildap.New
 					isLDAPEnabled = ldap.IsEnabled
 					getLDAPConfig = ldap.GetConfig
 				}()
 
 				store := remotecache.NewFakeStore(t)
 
-				auth := New(&Options{
+				server := New(&Options{
 					Store: store,
 					Ctx:   ctx,
 					OrgID: 4,
 				})
 
-				stub := &TestLDAP{
-					ID: 42,
-				}
-
-				auth.LDAP = func(server *ldap.ServerConfig) ldap.IAuth {
-					return stub
-				}
-
-				id, err := auth.GetUserID()
+				id, err := server.Login()
 
 				So(err, ShouldBeNil)
 				So(id, ShouldEqual, 42)
-				So(stub.syncCalled, ShouldEqual, true)
+				So(stub.userCalled, ShouldEqual, true)
 			})
 
 			Convey("gets nice error if ldap is enabled but not configured", func() {
@@ -110,13 +138,11 @@ func TestMiddlewareContext(t *testing.T) {
 				}
 
 				getLDAPConfig = func() (*ldap.Config, error) {
-					config := &ldap.Config{
-						Servers: []*ldap.ServerConfig{},
-					}
-					return config, nil
+					return nil, errors.New("Something went wrong")
 				}
 
 				defer func() {
+					newLDAP = multildap.New
 					isLDAPEnabled = ldap.IsEnabled
 					getLDAPConfig = ldap.GetConfig
 				}()
@@ -129,20 +155,20 @@ func TestMiddlewareContext(t *testing.T) {
 					OrgID: 4,
 				})
 
-				stub := &TestLDAP{
+				stub := &TestMultiLDAP{
 					ID: 42,
 				}
 
-				auth.LDAP = func(server *ldap.ServerConfig) ldap.IAuth {
+				newLDAP = func(servers []*ldap.ServerConfig) multildap.IMultiLDAP {
 					return stub
 				}
 
-				id, err := auth.GetUserID()
+				id, err := auth.Login()
 
 				So(err, ShouldNotBeNil)
-				So(err.Error(), ShouldContainSubstring, "Failed to sync user")
+				So(err.Error(), ShouldContainSubstring, "Failed to get the user")
 				So(id, ShouldNotEqual, 42)
-				So(stub.syncCalled, ShouldEqual, false)
+				So(stub.loginCalled, ShouldEqual, false)
 			})
 
 		})
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index f4f60c015593..1b465e7a4e54 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -7,14 +7,15 @@ import (
 	"strings"
 	"time"
 
+	macaron "gopkg.in/macaron.v1"
+
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/apikeygen"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/remotecache"
-	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
-	macaron "gopkg.in/macaron.v1"
 )
 
 var (
diff --git a/pkg/middleware/middleware_test.go b/pkg/middleware/middleware_test.go
index 694ecef14f41..c50960569b63 100644
--- a/pkg/middleware/middleware_test.go
+++ b/pkg/middleware/middleware_test.go
@@ -300,7 +300,7 @@ func TestMiddlewareContext(t *testing.T) {
 			setting.AuthProxyEnabled = true
 			setting.AuthProxyWhitelist = ""
 			setting.AuthProxyAutoSignUp = true
-			setting.LdapEnabled = true
+			setting.LDAPEnabled = true
 			setting.AuthProxyHeaderName = "X-WEBAUTH-USER"
 			setting.AuthProxyHeaderProperty = "username"
 			name := "markelog"
@@ -326,7 +326,7 @@ func TestMiddlewareContext(t *testing.T) {
 			})
 
 			middlewareScenario(t, "should create an user from a header", func(sc *scenarioContext) {
-				setting.LdapEnabled = false
+				setting.LDAPEnabled = false
 				setting.AuthProxyAutoSignUp = true
 
 				bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
@@ -354,7 +354,7 @@ func TestMiddlewareContext(t *testing.T) {
 			})
 
 			middlewareScenario(t, "should get an existing user from header", func(sc *scenarioContext) {
-				setting.LdapEnabled = false
+				setting.LDAPEnabled = false
 
 				bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
 					query.Result = &m.SignedInUser{OrgId: 2, UserId: 12}
@@ -379,7 +379,7 @@ func TestMiddlewareContext(t *testing.T) {
 
 			middlewareScenario(t, "should allow the request from whitelist IP", func(sc *scenarioContext) {
 				setting.AuthProxyWhitelist = "192.168.1.0/24, 2001::0/120"
-				setting.LdapEnabled = false
+				setting.LDAPEnabled = false
 
 				bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
 					query.Result = &m.SignedInUser{OrgId: 4, UserId: 33}
@@ -405,7 +405,7 @@ func TestMiddlewareContext(t *testing.T) {
 
 			middlewareScenario(t, "should not allow the request from whitelist IP", func(sc *scenarioContext) {
 				setting.AuthProxyWhitelist = "8.8.8.8"
-				setting.LdapEnabled = false
+				setting.LDAPEnabled = false
 
 				bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
 					query.Result = &m.SignedInUser{OrgId: 4, UserId: 33}
diff --git a/pkg/middleware/recovery.go b/pkg/middleware/recovery.go
index b8ca85fb45b2..33ceff8bc7ef 100644
--- a/pkg/middleware/recovery.go
+++ b/pkg/middleware/recovery.go
@@ -23,7 +23,7 @@ import (
 
 	"gopkg.in/macaron.v1"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 )
diff --git a/pkg/models/context.go b/pkg/models/context.go
index 947e442c2006..f4b8d2c87d5d 100644
--- a/pkg/models/context.go
+++ b/pkg/models/context.go
@@ -3,7 +3,7 @@ package models
 import (
 	"strings"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/prometheus/client_golang/prometheus"
 	"gopkg.in/macaron.v1"
diff --git a/pkg/models/user.go b/pkg/models/user.go
index 69031e403386..de61150512d2 100644
--- a/pkg/models/user.go
+++ b/pkg/models/user.go
@@ -30,6 +30,7 @@ type User struct {
 	EmailVerified bool
 	Theme         string
 	HelpFlags1    HelpFlags1
+	IsDisabled    bool
 
 	IsAdmin bool
 	OrgId   int64
@@ -88,6 +89,16 @@ type UpdateUserPermissionsCommand struct {
 	UserId         int64 `json:"-"`
 }
 
+type DisableUserCommand struct {
+	UserId     int64
+	IsDisabled bool
+}
+
+type BatchDisableUsersCommand struct {
+	UserIds    []int64
+	IsDisabled bool
+}
+
 type DeleteUserCommand struct {
 	UserId int64
 }
@@ -203,6 +214,7 @@ type UserProfileDTO struct {
 	Theme          string `json:"theme"`
 	OrgId          int64  `json:"orgId"`
 	IsGrafanaAdmin bool   `json:"isGrafanaAdmin"`
+	IsDisabled     bool   `json:"isDisabled"`
 }
 
 type UserSearchHitDTO struct {
@@ -212,6 +224,7 @@ type UserSearchHitDTO struct {
 	Email         string    `json:"email"`
 	AvatarUrl     string    `json:"avatarUrl"`
 	IsAdmin       bool      `json:"isAdmin"`
+	IsDisabled    bool      `json:"isDisabled"`
 	LastSeenAt    time.Time `json:"lastSeenAt"`
 	LastSeenAtAge string    `json:"lastSeenAtAge"`
 }
diff --git a/pkg/models/user_auth.go b/pkg/models/user_auth.go
index 11018c7fd716..e6f02212ebad 100644
--- a/pkg/models/user_auth.go
+++ b/pkg/models/user_auth.go
@@ -6,6 +6,10 @@ import (
 	"golang.org/x/oauth2"
 )
 
+const (
+	AuthModuleLDAP = "ldap"
+)
+
 type UserAuth struct {
 	Id                int64
 	UserId            int64
@@ -29,6 +33,7 @@ type ExternalUserInfo struct {
 	Groups         []string
 	OrgRoles       map[int64]RoleType
 	IsGrafanaAdmin *bool // This is a pointer to know if we should sync this or not (nil = ignore sync)
+	IsDisabled     bool
 }
 
 // ---------------------
@@ -81,6 +86,12 @@ type GetUserByAuthInfoQuery struct {
 	Result *User
 }
 
+type GetExternalUserInfoByLoginQuery struct {
+	LoginOrEmail string
+
+	Result *ExternalUserInfo
+}
+
 type GetAuthInfoQuery struct {
 	UserId     int64
 	AuthModule string
diff --git a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
index 0af727e14df0..cc88f90f2730 100644
--- a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
+++ b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
@@ -8,7 +8,7 @@ import (
 	"github.com/grafana/grafana-plugin-model/go/datasource"
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
diff --git a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
index e312913fc562..2086ea4b9911 100644
--- a/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
+++ b/pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana-plugin-model/go/datasource"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
 
diff --git a/pkg/plugins/datasource_plugin.go b/pkg/plugins/datasource_plugin.go
index dd4ae6972aaa..1379daf5a6da 100644
--- a/pkg/plugins/datasource_plugin.go
+++ b/pkg/plugins/datasource_plugin.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana-plugin-model/go/datasource"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins/datasource/wrapper"
 	"github.com/grafana/grafana/pkg/tsdb"
@@ -18,16 +18,18 @@ import (
 // DataSourcePlugin contains all metadata about a datasource plugin
 type DataSourcePlugin struct {
 	FrontendPluginBase
-	Annotations  bool              `json:"annotations"`
-	Metrics      bool              `json:"metrics"`
-	Alerting     bool              `json:"alerting"`
-	Explore      bool              `json:"explore"`
-	Table        bool              `json:"tables"`
-	Logs         bool              `json:"logs"`
-	QueryOptions map[string]bool   `json:"queryOptions,omitempty"`
-	BuiltIn      bool              `json:"builtIn,omitempty"`
-	Mixed        bool              `json:"mixed,omitempty"`
-	Routes       []*AppPluginRoute `json:"routes"`
+	Annotations   bool              `json:"annotations"`
+	Metrics       bool              `json:"metrics"`
+	Alerting      bool              `json:"alerting"`
+	Explore       bool              `json:"explore"`
+	Table         bool              `json:"tables"`
+	HiddenQueries bool              `json:"hiddenQueries"`
+	Logs          bool              `json:"logs"`
+	QueryOptions  map[string]bool   `json:"queryOptions,omitempty"`
+	BuiltIn       bool              `json:"builtIn,omitempty"`
+	Mixed         bool              `json:"mixed,omitempty"`
+	Routes        []*AppPluginRoute `json:"routes"`
+	Streaming     bool              `json:"streaming"`
 
 	Backend    bool   `json:"backend,omitempty"`
 	Executable string `json:"executable,omitempty"`
diff --git a/pkg/plugins/hclog-wrapper.go b/pkg/plugins/hclog-wrapper.go
index ac50d15f3d88..7bd031565c16 100644
--- a/pkg/plugins/hclog-wrapper.go
+++ b/pkg/plugins/hclog-wrapper.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"log"
 
-	glog "github.com/grafana/grafana/pkg/log"
+	glog "github.com/grafana/grafana/pkg/infra/log"
 	hclog "github.com/hashicorp/go-hclog"
 )
 
diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go
index 0a031e3a5041..4c75e6b3d581 100644
--- a/pkg/plugins/plugins.go
+++ b/pkg/plugins/plugins.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
diff --git a/pkg/plugins/update_checker.go b/pkg/plugins/update_checker.go
index e61f4cf1df74..1d4cad1399ec 100644
--- a/pkg/plugins/update_checker.go
+++ b/pkg/plugins/update_checker.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/hashicorp/go-version"
 )
diff --git a/pkg/services/alerting/commands.go b/pkg/services/alerting/commands.go
index dd2ff5658d60..887334ec7290 100644
--- a/pkg/services/alerting/commands.go
+++ b/pkg/services/alerting/commands.go
@@ -2,7 +2,7 @@ package alerting
 
 import (
 	"github.com/grafana/grafana/pkg/bus"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 )
 
 func init() {
@@ -10,14 +10,14 @@ func init() {
 	bus.AddHandler("alerting", validateDashboardAlerts)
 }
 
-func validateDashboardAlerts(cmd *m.ValidateDashboardAlertsCommand) error {
+func validateDashboardAlerts(cmd *models.ValidateDashboardAlertsCommand) error {
 	extractor := NewDashAlertExtractor(cmd.Dashboard, cmd.OrgId, cmd.User)
 
 	return extractor.ValidateAlerts()
 }
 
-func updateDashboardAlerts(cmd *m.UpdateDashboardAlertsCommand) error {
-	saveAlerts := m.SaveAlertsCommand{
+func updateDashboardAlerts(cmd *models.UpdateDashboardAlertsCommand) error {
+	saveAlerts := models.SaveAlertsCommand{
 		OrgId:       cmd.OrgId,
 		UserId:      cmd.User.UserId,
 		DashboardId: cmd.Dashboard.Id,
diff --git a/pkg/services/alerting/conditions/evaluator.go b/pkg/services/alerting/conditions/evaluator.go
index eef593d39e23..3045b633f1e4 100644
--- a/pkg/services/alerting/conditions/evaluator.go
+++ b/pkg/services/alerting/conditions/evaluator.go
@@ -14,22 +14,25 @@ var (
 	rangedTypes  = []string{"within_range", "outside_range"}
 )
 
+// AlertEvaluator evaluates the reduced value of a timeserie.
+// Returning true if a timeserie is violating the condition
+// ex: ThresholdEvaluator, NoValueEvaluator, RangeEvaluator
 type AlertEvaluator interface {
 	Eval(reducedValue null.Float) bool
 }
 
-type NoValueEvaluator struct{}
+type noValueEvaluator struct{}
 
-func (e *NoValueEvaluator) Eval(reducedValue null.Float) bool {
+func (e *noValueEvaluator) Eval(reducedValue null.Float) bool {
 	return !reducedValue.Valid
 }
 
-type ThresholdEvaluator struct {
+type thresholdEvaluator struct {
 	Type      string
 	Threshold float64
 }
 
-func newThresholdEvaluator(typ string, model *simplejson.Json) (*ThresholdEvaluator, error) {
+func newThresholdEvaluator(typ string, model *simplejson.Json) (*thresholdEvaluator, error) {
 	params := model.Get("params").MustArray()
 	if len(params) == 0 {
 		return nil, fmt.Errorf("Evaluator missing threshold parameter")
@@ -40,12 +43,12 @@ func newThresholdEvaluator(typ string, model *simplejson.Json) (*ThresholdEvalua
 		return nil, fmt.Errorf("Evaluator has invalid parameter")
 	}
 
-	defaultEval := &ThresholdEvaluator{Type: typ}
+	defaultEval := &thresholdEvaluator{Type: typ}
 	defaultEval.Threshold, _ = firstParam.Float64()
 	return defaultEval, nil
 }
 
-func (e *ThresholdEvaluator) Eval(reducedValue null.Float) bool {
+func (e *thresholdEvaluator) Eval(reducedValue null.Float) bool {
 	if !reducedValue.Valid {
 		return false
 	}
@@ -60,13 +63,13 @@ func (e *ThresholdEvaluator) Eval(reducedValue null.Float) bool {
 	return false
 }
 
-type RangedEvaluator struct {
+type rangedEvaluator struct {
 	Type  string
 	Lower float64
 	Upper float64
 }
 
-func newRangedEvaluator(typ string, model *simplejson.Json) (*RangedEvaluator, error) {
+func newRangedEvaluator(typ string, model *simplejson.Json) (*rangedEvaluator, error) {
 	params := model.Get("params").MustArray()
 	if len(params) == 0 {
 		return nil, alerting.ValidationError{Reason: "Evaluator missing threshold parameter"}
@@ -82,13 +85,13 @@ func newRangedEvaluator(typ string, model *simplejson.Json) (*RangedEvaluator, e
 		return nil, alerting.ValidationError{Reason: "Evaluator has invalid second parameter"}
 	}
 
-	rangedEval := &RangedEvaluator{Type: typ}
+	rangedEval := &rangedEvaluator{Type: typ}
 	rangedEval.Lower, _ = firstParam.Float64()
 	rangedEval.Upper, _ = secondParam.Float64()
 	return rangedEval, nil
 }
 
-func (e *RangedEvaluator) Eval(reducedValue null.Float) bool {
+func (e *rangedEvaluator) Eval(reducedValue null.Float) bool {
 	if !reducedValue.Valid {
 		return false
 	}
@@ -105,6 +108,8 @@ func (e *RangedEvaluator) Eval(reducedValue null.Float) bool {
 	return false
 }
 
+// NewAlertEvaluator is a factory function for returning
+// an `AlertEvaluator` depending on the json model.
 func NewAlertEvaluator(model *simplejson.Json) (AlertEvaluator, error) {
 	typ := model.Get("type").MustString()
 	if typ == "" {
@@ -120,7 +125,7 @@ func NewAlertEvaluator(model *simplejson.Json) (AlertEvaluator, error) {
 	}
 
 	if typ == "no_value" {
-		return &NoValueEvaluator{}, nil
+		return &noValueEvaluator{}, nil
 	}
 
 	return nil, fmt.Errorf("Evaluator invalid evaluator type: %s", typ)
diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go
index 7d1a276c42e6..b29f39b49169 100644
--- a/pkg/services/alerting/conditions/query.go
+++ b/pkg/services/alerting/conditions/query.go
@@ -10,33 +10,38 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
 
 func init() {
 	alerting.RegisterCondition("query", func(model *simplejson.Json, index int) (alerting.Condition, error) {
-		return NewQueryCondition(model, index)
+		return newQueryCondition(model, index)
 	})
 }
 
+// QueryCondition is responsible for issue and query, reduce the
+// timeseries into single values and evaluate if they are firing or not.
 type QueryCondition struct {
 	Index         int
 	Query         AlertQuery
-	Reducer       QueryReducer
+	Reducer       *queryReducer
 	Evaluator     AlertEvaluator
 	Operator      string
 	HandleRequest tsdb.HandleRequestFunc
 }
 
+// AlertQuery contains information about what datasource a query
+// should be sent to and the query object.
 type AlertQuery struct {
 	Model        *simplejson.Json
-	DatasourceId int64
+	DatasourceID int64
 	From         string
 	To           string
 }
 
+// Eval evaluates the `QueryCondition`.
 func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.ConditionResult, error) {
 	timeRange := tsdb.NewTimeRange(c.Query.From, c.Query.To)
 
@@ -100,9 +105,9 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.Conditio
 }
 
 func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *tsdb.TimeRange) (tsdb.TimeSeriesSlice, error) {
-	getDsInfo := &m.GetDataSourceByIdQuery{
-		Id:    c.Query.DatasourceId,
-		OrgId: context.Rule.OrgId,
+	getDsInfo := &models.GetDataSourceByIdQuery{
+		Id:    c.Query.DatasourceID,
+		OrgId: context.Rule.OrgID,
 	}
 
 	if err := bus.Dispatch(getDsInfo); err != nil {
@@ -139,7 +144,7 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *
 	return result, nil
 }
 
-func (c *QueryCondition) getRequestForAlertRule(datasource *m.DataSource, timeRange *tsdb.TimeRange) *tsdb.TsdbQuery {
+func (c *QueryCondition) getRequestForAlertRule(datasource *models.DataSource, timeRange *tsdb.TimeRange) *tsdb.TsdbQuery {
 	req := &tsdb.TsdbQuery{
 		TimeRange: timeRange,
 		Queries: []*tsdb.Query{
@@ -154,16 +159,16 @@ func (c *QueryCondition) getRequestForAlertRule(datasource *m.DataSource, timeRa
 	return req
 }
 
-func NewQueryCondition(model *simplejson.Json, index int) (*QueryCondition, error) {
+func newQueryCondition(model *simplejson.Json, index int) (*QueryCondition, error) {
 	condition := QueryCondition{}
 	condition.Index = index
 	condition.HandleRequest = tsdb.HandleRequest
 
-	queryJson := model.Get("query")
+	queryJSON := model.Get("query")
 
-	condition.Query.Model = queryJson.Get("model")
-	condition.Query.From = queryJson.Get("params").MustArray()[1].(string)
-	condition.Query.To = queryJson.Get("params").MustArray()[2].(string)
+	condition.Query.Model = queryJSON.Get("model")
+	condition.Query.From = queryJSON.Get("params").MustArray()[1].(string)
+	condition.Query.To = queryJSON.Get("params").MustArray()[2].(string)
 
 	if err := validateFromValue(condition.Query.From); err != nil {
 		return nil, err
@@ -173,20 +178,20 @@ func NewQueryCondition(model *simplejson.Json, index int) (*QueryCondition, erro
 		return nil, err
 	}
 
-	condition.Query.DatasourceId = queryJson.Get("datasourceId").MustInt64()
+	condition.Query.DatasourceID = queryJSON.Get("datasourceId").MustInt64()
 
-	reducerJson := model.Get("reducer")
-	condition.Reducer = NewSimpleReducer(reducerJson.Get("type").MustString())
+	reducerJSON := model.Get("reducer")
+	condition.Reducer = newSimpleReducer(reducerJSON.Get("type").MustString())
 
-	evaluatorJson := model.Get("evaluator")
-	evaluator, err := NewAlertEvaluator(evaluatorJson)
+	evaluatorJSON := model.Get("evaluator")
+	evaluator, err := NewAlertEvaluator(evaluatorJSON)
 	if err != nil {
 		return nil, err
 	}
 	condition.Evaluator = evaluator
 
-	operatorJson := model.Get("operator")
-	operator := operatorJson.Get("type").MustString("and")
+	operatorJSON := model.Get("operator")
+	operator := operatorJSON.Get("type").MustString("and")
 	condition.Operator = operator
 
 	return &condition, nil
diff --git a/pkg/services/alerting/conditions/query_test.go b/pkg/services/alerting/conditions/query_test.go
index 0ea6470bc2d8..4c2b1689277a 100644
--- a/pkg/services/alerting/conditions/query_test.go
+++ b/pkg/services/alerting/conditions/query_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/tsdb"
 	. "github.com/smartystreets/goconvey/convey"
@@ -27,16 +27,15 @@ func TestQueryCondition(t *testing.T) {
 
 				So(ctx.condition.Query.From, ShouldEqual, "5m")
 				So(ctx.condition.Query.To, ShouldEqual, "now")
-				So(ctx.condition.Query.DatasourceId, ShouldEqual, 1)
+				So(ctx.condition.Query.DatasourceID, ShouldEqual, 1)
 
 				Convey("Can read query reducer", func() {
-					reducer, ok := ctx.condition.Reducer.(*SimpleReducer)
-					So(ok, ShouldBeTrue)
+					reducer := ctx.condition.Reducer
 					So(reducer.Type, ShouldEqual, "avg")
 				})
 
 				Convey("Can read evaluator", func() {
-					evaluator, ok := ctx.condition.Evaluator.(*ThresholdEvaluator)
+					evaluator, ok := ctx.condition.Evaluator.(*thresholdEvaluator)
 					So(ok, ShouldBeTrue)
 					So(evaluator.Type, ShouldEqual, "gt")
 				})
@@ -163,12 +162,12 @@ func (ctx *queryConditionTestContext) exec() (*alerting.ConditionResult, error)
           }`))
 	So(err, ShouldBeNil)
 
-	condition, err := NewQueryCondition(jsonModel, 0)
+	condition, err := newQueryCondition(jsonModel, 0)
 	So(err, ShouldBeNil)
 
 	ctx.condition = condition
 
-	condition.HandleRequest = func(context context.Context, dsInfo *m.DataSource, req *tsdb.TsdbQuery) (*tsdb.Response, error) {
+	condition.HandleRequest = func(context context.Context, dsInfo *models.DataSource, req *tsdb.TsdbQuery) (*tsdb.Response, error) {
 		return &tsdb.Response{
 			Results: map[string]*tsdb.QueryResult{
 				"A": {Series: ctx.series},
@@ -182,8 +181,8 @@ func (ctx *queryConditionTestContext) exec() (*alerting.ConditionResult, error)
 func queryConditionScenario(desc string, fn queryConditionScenarioFunc) {
 	Convey(desc, func() {
 
-		bus.AddHandler("test", func(query *m.GetDataSourceByIdQuery) error {
-			query.Result = &m.DataSource{Id: 1, Type: "graphite"}
+		bus.AddHandler("test", func(query *models.GetDataSourceByIdQuery) error {
+			query.Result = &models.DataSource{Id: 1, Type: "graphite"}
 			return nil
 		})
 
diff --git a/pkg/services/alerting/conditions/reducer.go b/pkg/services/alerting/conditions/reducer.go
index f55545be311f..bf57110ea1c9 100644
--- a/pkg/services/alerting/conditions/reducer.go
+++ b/pkg/services/alerting/conditions/reducer.go
@@ -9,15 +9,15 @@ import (
 	"github.com/grafana/grafana/pkg/tsdb"
 )
 
-type QueryReducer interface {
-	Reduce(timeSeries *tsdb.TimeSeries) null.Float
-}
+// queryReducer reduces an timeserie to a nullable float
+type queryReducer struct {
 
-type SimpleReducer struct {
+	// Type is how the timeserie should be reduced.
+	// Ex avg, sum, max, min, count
 	Type string
 }
 
-func (s *SimpleReducer) Reduce(series *tsdb.TimeSeries) null.Float {
+func (s *queryReducer) Reduce(series *tsdb.TimeSeries) null.Float {
 	if len(series.Points) == 0 {
 		return null.FloatFromPtr(nil)
 	}
@@ -31,7 +31,7 @@ func (s *SimpleReducer) Reduce(series *tsdb.TimeSeries) null.Float {
 		for _, point := range series.Points {
 			if point[0].Valid {
 				value += point[0].Float64
-				validPointsCount += 1
+				validPointsCount++
 				allNull = false
 			}
 		}
@@ -117,8 +117,8 @@ func (s *SimpleReducer) Reduce(series *tsdb.TimeSeries) null.Float {
 	return null.FloatFrom(value)
 }
 
-func NewSimpleReducer(typ string) *SimpleReducer {
-	return &SimpleReducer{Type: typ}
+func newSimpleReducer(t string) *queryReducer {
+	return &queryReducer{Type: t}
 }
 
 func calculateDiff(series *tsdb.TimeSeries, allNull bool, value float64, fn func(float64, float64) float64) (bool, float64) {
diff --git a/pkg/services/alerting/conditions/reducer_test.go b/pkg/services/alerting/conditions/reducer_test.go
index d2c21771d0b1..eac71378f3d7 100644
--- a/pkg/services/alerting/conditions/reducer_test.go
+++ b/pkg/services/alerting/conditions/reducer_test.go
@@ -53,7 +53,7 @@ func TestSimpleReducer(t *testing.T) {
 		})
 
 		Convey("median should ignore null values", func() {
-			reducer := NewSimpleReducer("median")
+			reducer := newSimpleReducer("median")
 			series := &tsdb.TimeSeries{
 				Name: "test time serie",
 			}
@@ -76,7 +76,7 @@ func TestSimpleReducer(t *testing.T) {
 		})
 
 		Convey("avg with only nulls", func() {
-			reducer := NewSimpleReducer("avg")
+			reducer := newSimpleReducer("avg")
 			series := &tsdb.TimeSeries{
 				Name: "test time serie",
 			}
@@ -87,7 +87,7 @@ func TestSimpleReducer(t *testing.T) {
 
 		Convey("count_non_null", func() {
 			Convey("with null values and real values", func() {
-				reducer := NewSimpleReducer("count_non_null")
+				reducer := newSimpleReducer("count_non_null")
 				series := &tsdb.TimeSeries{
 					Name: "test time serie",
 				}
@@ -102,7 +102,7 @@ func TestSimpleReducer(t *testing.T) {
 			})
 
 			Convey("with null values", func() {
-				reducer := NewSimpleReducer("count_non_null")
+				reducer := newSimpleReducer("count_non_null")
 				series := &tsdb.TimeSeries{
 					Name: "test time serie",
 				}
@@ -115,7 +115,7 @@ func TestSimpleReducer(t *testing.T) {
 		})
 
 		Convey("avg of number values and null values should ignore nulls", func() {
-			reducer := NewSimpleReducer("avg")
+			reducer := newSimpleReducer("avg")
 			series := &tsdb.TimeSeries{
 				Name: "test time serie",
 			}
@@ -144,7 +144,7 @@ func TestSimpleReducer(t *testing.T) {
 		})
 
 		Convey("diff with only nulls", func() {
-			reducer := NewSimpleReducer("diff")
+			reducer := newSimpleReducer("diff")
 			series := &tsdb.TimeSeries{
 				Name: "test time serie",
 			}
@@ -171,7 +171,7 @@ func TestSimpleReducer(t *testing.T) {
 		})
 
 		Convey("percent_diff with only nulls", func() {
-			reducer := NewSimpleReducer("percent_diff")
+			reducer := newSimpleReducer("percent_diff")
 			series := &tsdb.TimeSeries{
 				Name: "test time serie",
 			}
@@ -184,8 +184,8 @@ func TestSimpleReducer(t *testing.T) {
 	})
 }
 
-func testReducer(typ string, datapoints ...float64) float64 {
-	reducer := NewSimpleReducer(typ)
+func testReducer(reducerType string, datapoints ...float64) float64 {
+	reducer := newSimpleReducer(reducerType)
 	series := &tsdb.TimeSeries{
 		Name: "test time serie",
 	}
diff --git a/pkg/services/alerting/engine.go b/pkg/services/alerting/engine.go
index db8079583878..8794eb51c325 100644
--- a/pkg/services/alerting/engine.go
+++ b/pkg/services/alerting/engine.go
@@ -10,52 +10,51 @@ import (
 	tlog "github.com/opentracing/opentracing-go/log"
 
 	"github.com/benbjohnson/clock"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/rendering"
 	"github.com/grafana/grafana/pkg/setting"
 	"golang.org/x/sync/errgroup"
 )
 
-type AlertingService struct {
+// AlertEngine is the background process that
+// schedules alert evaluations and makes sure notifications
+// are sent.
+type AlertEngine struct {
 	RenderService rendering.Service `inject:""`
 
-	execQueue chan *Job
-	//clock         clock.Clock
+	execQueue     chan *Job
 	ticker        *Ticker
-	scheduler     Scheduler
-	evalHandler   EvalHandler
-	ruleReader    RuleReader
+	scheduler     scheduler
+	evalHandler   evalHandler
+	ruleReader    ruleReader
 	log           log.Logger
-	resultHandler ResultHandler
+	resultHandler resultHandler
 }
 
 func init() {
-	registry.RegisterService(&AlertingService{})
+	registry.RegisterService(&AlertEngine{})
 }
 
-func NewEngine() *AlertingService {
-	e := &AlertingService{}
-	e.Init()
-	return e
-}
-
-func (e *AlertingService) IsDisabled() bool {
+// IsDisabled returns true if the alerting service is disable for this instance.
+func (e *AlertEngine) IsDisabled() bool {
 	return !setting.AlertingEnabled || !setting.ExecuteAlerts
 }
 
-func (e *AlertingService) Init() error {
+// Init initalizes the AlertingService.
+func (e *AlertEngine) Init() error {
 	e.ticker = NewTicker(time.Now(), time.Second*0, clock.New())
 	e.execQueue = make(chan *Job, 1000)
-	e.scheduler = NewScheduler()
+	e.scheduler = newScheduler()
 	e.evalHandler = NewEvalHandler()
-	e.ruleReader = NewRuleReader()
+	e.ruleReader = newRuleReader()
 	e.log = log.New("alerting.engine")
-	e.resultHandler = NewResultHandler(e.RenderService)
+	e.resultHandler = newResultHandler(e.RenderService)
 	return nil
 }
 
-func (e *AlertingService) Run(ctx context.Context) error {
+// Run starts the alerting service background process.
+func (e *AlertEngine) Run(ctx context.Context) error {
 	alertGroup, ctx := errgroup.WithContext(ctx)
 	alertGroup.Go(func() error { return e.alertingTicker(ctx) })
 	alertGroup.Go(func() error { return e.runJobDispatcher(ctx) })
@@ -64,7 +63,7 @@ func (e *AlertingService) Run(ctx context.Context) error {
 	return err
 }
 
-func (e *AlertingService) alertingTicker(grafanaCtx context.Context) error {
+func (e *AlertEngine) alertingTicker(grafanaCtx context.Context) error {
 	defer func() {
 		if err := recover(); err != nil {
 			e.log.Error("Scheduler Panic: stopping alertingTicker", "error", err, "stack", log.Stack(1))
@@ -80,7 +79,7 @@ func (e *AlertingService) alertingTicker(grafanaCtx context.Context) error {
 		case tick := <-e.ticker.C:
 			// TEMP SOLUTION update rules ever tenth tick
 			if tickIndex%10 == 0 {
-				e.scheduler.Update(e.ruleReader.Fetch())
+				e.scheduler.Update(e.ruleReader.fetch())
 			}
 
 			e.scheduler.Tick(tick, e.execQueue)
@@ -89,7 +88,7 @@ func (e *AlertingService) alertingTicker(grafanaCtx context.Context) error {
 	}
 }
 
-func (e *AlertingService) runJobDispatcher(grafanaCtx context.Context) error {
+func (e *AlertEngine) runJobDispatcher(grafanaCtx context.Context) error {
 	dispatcherGroup, alertCtx := errgroup.WithContext(grafanaCtx)
 
 	for {
@@ -106,7 +105,7 @@ var (
 	unfinishedWorkTimeout = time.Second * 5
 )
 
-func (e *AlertingService) processJobWithRetry(grafanaCtx context.Context, job *Job) error {
+func (e *AlertEngine) processJobWithRetry(grafanaCtx context.Context, job *Job) error {
 	defer func() {
 		if err := recover(); err != nil {
 			e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1))
@@ -141,7 +140,7 @@ func (e *AlertingService) processJobWithRetry(grafanaCtx context.Context, job *J
 	}
 }
 
-func (e *AlertingService) endJob(err error, cancelChan chan context.CancelFunc, job *Job) error {
+func (e *AlertEngine) endJob(err error, cancelChan chan context.CancelFunc, job *Job) error {
 	job.Running = false
 	close(cancelChan)
 	for cancelFn := range cancelChan {
@@ -150,7 +149,7 @@ func (e *AlertingService) endJob(err error, cancelChan chan context.CancelFunc,
 	return err
 }
 
-func (e *AlertingService) processJob(attemptID int, attemptChan chan int, cancelChan chan context.CancelFunc, job *Job) {
+func (e *AlertEngine) processJob(attemptID int, attemptChan chan int, cancelChan chan context.CancelFunc, job *Job) {
 	defer func() {
 		if err := recover(); err != nil {
 			e.log.Error("Alert Panic", "error", err, "stack", log.Stack(1))
@@ -181,8 +180,8 @@ func (e *AlertingService) processJob(attemptID int, attemptChan chan int, cancel
 
 		e.evalHandler.Eval(evalContext)
 
-		span.SetTag("alertId", evalContext.Rule.Id)
-		span.SetTag("dashboardId", evalContext.Rule.DashboardId)
+		span.SetTag("alertId", evalContext.Rule.ID)
+		span.SetTag("dashboardId", evalContext.Rule.DashboardID)
 		span.SetTag("firing", evalContext.Firing)
 		span.SetTag("nodatapoints", evalContext.NoDataFound)
 		span.SetTag("attemptID", attemptID)
@@ -195,7 +194,7 @@ func (e *AlertingService) processJob(attemptID int, attemptChan chan int, cancel
 			)
 			if attemptID < setting.AlertingMaxAttempts {
 				span.Finish()
-				e.log.Debug("Job Execution attempt triggered retry", "timeMs", evalContext.GetDurationMs(), "alertId", evalContext.Rule.Id, "name", evalContext.Rule.Name, "firing", evalContext.Firing, "attemptID", attemptID)
+				e.log.Debug("Job Execution attempt triggered retry", "timeMs", evalContext.GetDurationMs(), "alertId", evalContext.Rule.ID, "name", evalContext.Rule.Name, "firing", evalContext.Firing, "attemptID", attemptID)
 				attemptChan <- (attemptID + 1)
 				return
 			}
@@ -211,9 +210,9 @@ func (e *AlertingService) processJob(attemptID int, attemptChan chan int, cancel
 		// dont reuse the evalContext and get its own context.
 		evalContext.Ctx = resultHandleCtx
 		evalContext.Rule.State = evalContext.GetNewState()
-		e.resultHandler.Handle(evalContext)
+		e.resultHandler.handle(evalContext)
 		span.Finish()
-		e.log.Debug("Job Execution completed", "timeMs", evalContext.GetDurationMs(), "alertId", evalContext.Rule.Id, "name", evalContext.Rule.Name, "firing", evalContext.Firing, "attemptID", attemptID)
+		e.log.Debug("Job Execution completed", "timeMs", evalContext.GetDurationMs(), "alertId", evalContext.Rule.ID, "name", evalContext.Rule.Name, "firing", evalContext.Firing, "attemptID", attemptID)
 		close(attemptChan)
 	}()
 }
diff --git a/pkg/services/alerting/engine_integration_test.go b/pkg/services/alerting/engine_integration_test.go
index 3d54bdc3b4af..6b6fab389d02 100644
--- a/pkg/services/alerting/engine_integration_test.go
+++ b/pkg/services/alerting/engine_integration_test.go
@@ -17,7 +17,8 @@ import (
 
 func TestEngineTimeouts(t *testing.T) {
 	Convey("Alerting engine timeout tests", t, func() {
-		engine := NewEngine()
+		engine := &AlertEngine{}
+		engine.Init()
 		setting.AlertingNotificationTimeout = 30 * time.Second
 		setting.AlertingMaxAttempts = 3
 		engine.resultHandler = &FakeResultHandler{}
@@ -89,7 +90,7 @@ func (handler *FakeCommonTimeoutHandler) Eval(evalContext *EvalContext) {
 	evalContext.Error = errors.New("Fake evaluation timeout test failure; wrong response")
 }
 
-func (handler *FakeCommonTimeoutHandler) Handle(evalContext *EvalContext) error {
+func (handler *FakeCommonTimeoutHandler) handle(evalContext *EvalContext) error {
 	// 1. prepare mock server
 	path := "/resulthandle"
 	srv := runBusyServer(path, handler.ServerBusySleepDuration)
diff --git a/pkg/services/alerting/engine_test.go b/pkg/services/alerting/engine_test.go
index 2e2ed0c9b163..86980c21bd48 100644
--- a/pkg/services/alerting/engine_test.go
+++ b/pkg/services/alerting/engine_test.go
@@ -6,9 +6,10 @@ import (
 	"math"
 	"testing"
 
+	"time"
+
 	"github.com/grafana/grafana/pkg/setting"
 	. "github.com/smartystreets/goconvey/convey"
-	"time"
 )
 
 type FakeEvalHandler struct {
@@ -32,13 +33,14 @@ func (handler *FakeEvalHandler) Eval(evalContext *EvalContext) {
 
 type FakeResultHandler struct{}
 
-func (handler *FakeResultHandler) Handle(evalContext *EvalContext) error {
+func (handler *FakeResultHandler) handle(evalContext *EvalContext) error {
 	return nil
 }
 
 func TestEngineProcessJob(t *testing.T) {
 	Convey("Alerting engine job processing", t, func() {
-		engine := NewEngine()
+		engine := &AlertEngine{}
+		engine.Init()
 		setting.AlertingEvaluationTimeout = 30 * time.Second
 		setting.AlertingNotificationTimeout = 30 * time.Second
 		setting.AlertingMaxAttempts = 3
diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
index 02b9955662f0..8436e9c9a780 100644
--- a/pkg/services/alerting/eval_context.go
+++ b/pkg/services/alerting/eval_context.go
@@ -6,11 +6,12 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
+// EvalContext is the context object for an alert evaluation.
 type EvalContext struct {
 	Firing         bool
 	IsTestRun      bool
@@ -23,16 +24,17 @@ type EvalContext struct {
 	Rule           *Rule
 	log            log.Logger
 
-	dashboardRef *m.DashboardRef
+	dashboardRef *models.DashboardRef
 
-	ImagePublicUrl  string
+	ImagePublicURL  string
 	ImageOnDiskPath string
 	NoDataFound     bool
-	PrevAlertState  m.AlertStateType
+	PrevAlertState  models.AlertStateType
 
 	Ctx context.Context
 }
 
+// NewEvalContext is the EvalContext constructor.
 func NewEvalContext(alertCtx context.Context, rule *Rule) *EvalContext {
 	return &EvalContext{
 		Ctx:            alertCtx,
@@ -45,30 +47,32 @@ func NewEvalContext(alertCtx context.Context, rule *Rule) *EvalContext {
 	}
 }
 
+// StateDescription contains visual information about the alert state.
 type StateDescription struct {
 	Color string
 	Text  string
 	Data  string
 }
 
+// GetStateModel returns the `StateDescription` based on current state.
 func (c *EvalContext) GetStateModel() *StateDescription {
 	switch c.Rule.State {
-	case m.AlertStateOK:
+	case models.AlertStateOK:
 		return &StateDescription{
 			Color: "#36a64f",
 			Text:  "OK",
 		}
-	case m.AlertStateNoData:
+	case models.AlertStateNoData:
 		return &StateDescription{
 			Color: "#888888",
 			Text:  "No Data",
 		}
-	case m.AlertStateAlerting:
+	case models.AlertStateAlerting:
 		return &StateDescription{
 			Color: "#D63232",
 			Text:  "Alerting",
 		}
-	case m.AlertStateUnknown:
+	case models.AlertStateUnknown:
 		return &StateDescription{
 			Color: "#888888",
 			Text:  "Unknown",
@@ -78,24 +82,27 @@ func (c *EvalContext) GetStateModel() *StateDescription {
 	}
 }
 
-func (c *EvalContext) ShouldUpdateAlertState() bool {
+func (c *EvalContext) shouldUpdateAlertState() bool {
 	return c.Rule.State != c.PrevAlertState
 }
 
-func (a *EvalContext) GetDurationMs() float64 {
-	return float64(a.EndTime.Nanosecond()-a.StartTime.Nanosecond()) / float64(1000000)
+// GetDurationMs returns the duration of the alert evaluation.
+func (c *EvalContext) GetDurationMs() float64 {
+	return float64(c.EndTime.Nanosecond()-c.StartTime.Nanosecond()) / float64(1000000)
 }
 
+// GetNotificationTitle returns the title of the alert rule including alert state.
 func (c *EvalContext) GetNotificationTitle() string {
 	return "[" + c.GetStateModel().Text + "] " + c.Rule.Name
 }
 
-func (c *EvalContext) GetDashboardUID() (*m.DashboardRef, error) {
+// GetDashboardUID returns the dashboard uid for the alert rule.
+func (c *EvalContext) GetDashboardUID() (*models.DashboardRef, error) {
 	if c.dashboardRef != nil {
 		return c.dashboardRef, nil
 	}
 
-	uidQuery := &m.GetDashboardRefByIdQuery{Id: c.Rule.DashboardId}
+	uidQuery := &models.GetDashboardRefByIdQuery{Id: c.Rule.DashboardID}
 	if err := bus.Dispatch(uidQuery); err != nil {
 		return nil, err
 	}
@@ -106,7 +113,8 @@ func (c *EvalContext) GetDashboardUID() (*m.DashboardRef, error) {
 
 const urlFormat = "%s?fullscreen&edit&tab=alert&panelId=%d&orgId=%d"
 
-func (c *EvalContext) GetRuleUrl() (string, error) {
+// GetRuleURL returns the url to the dashboard containing the alert.
+func (c *EvalContext) GetRuleURL() (string, error) {
 	if c.IsTestRun {
 		return setting.AppUrl, nil
 	}
@@ -115,57 +123,57 @@ func (c *EvalContext) GetRuleUrl() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return fmt.Sprintf(urlFormat, m.GetFullDashboardUrl(ref.Uid, ref.Slug), c.Rule.PanelId, c.Rule.OrgId), nil
+	return fmt.Sprintf(urlFormat, models.GetFullDashboardUrl(ref.Uid, ref.Slug), c.Rule.PanelID, c.Rule.OrgID), nil
 }
 
-// GetNewState returns the new state from the alert rule evaluation
-func (c *EvalContext) GetNewState() m.AlertStateType {
+// GetNewState returns the new state from the alert rule evaluation.
+func (c *EvalContext) GetNewState() models.AlertStateType {
 	ns := getNewStateInternal(c)
-	if ns != m.AlertStateAlerting || c.Rule.For == 0 {
+	if ns != models.AlertStateAlerting || c.Rule.For == 0 {
 		return ns
 	}
 
 	since := time.Since(c.Rule.LastStateChange)
-	if c.PrevAlertState == m.AlertStatePending && since > c.Rule.For {
-		return m.AlertStateAlerting
+	if c.PrevAlertState == models.AlertStatePending && since > c.Rule.For {
+		return models.AlertStateAlerting
 	}
 
-	if c.PrevAlertState == m.AlertStateAlerting {
-		return m.AlertStateAlerting
+	if c.PrevAlertState == models.AlertStateAlerting {
+		return models.AlertStateAlerting
 	}
 
-	return m.AlertStatePending
+	return models.AlertStatePending
 }
 
-func getNewStateInternal(c *EvalContext) m.AlertStateType {
+func getNewStateInternal(c *EvalContext) models.AlertStateType {
 	if c.Error != nil {
 		c.log.Error("Alert Rule Result Error",
-			"ruleId", c.Rule.Id,
+			"ruleId", c.Rule.ID,
 			"name", c.Rule.Name,
 			"error", c.Error,
 			"changing state to", c.Rule.ExecutionErrorState.ToAlertState())
 
-		if c.Rule.ExecutionErrorState == m.ExecutionErrorKeepState {
+		if c.Rule.ExecutionErrorState == models.ExecutionErrorKeepState {
 			return c.PrevAlertState
 		}
 		return c.Rule.ExecutionErrorState.ToAlertState()
 	}
 
 	if c.Firing {
-		return m.AlertStateAlerting
+		return models.AlertStateAlerting
 	}
 
 	if c.NoDataFound {
 		c.log.Info("Alert Rule returned no data",
-			"ruleId", c.Rule.Id,
+			"ruleId", c.Rule.ID,
 			"name", c.Rule.Name,
 			"changing state to", c.Rule.NoDataState.ToAlertState())
 
-		if c.Rule.NoDataState == m.NoDataKeepState {
+		if c.Rule.NoDataState == models.NoDataKeepState {
 			return c.PrevAlertState
 		}
 		return c.Rule.NoDataState.ToAlertState()
 	}
 
-	return m.AlertStateOK
+	return models.AlertStateOK
 }
diff --git a/pkg/services/alerting/eval_context_test.go b/pkg/services/alerting/eval_context_test.go
index 06d3ae16ed80..76cbc90c640c 100644
--- a/pkg/services/alerting/eval_context_test.go
+++ b/pkg/services/alerting/eval_context_test.go
@@ -18,7 +18,7 @@ func TestStateIsUpdatedWhenNeeded(t *testing.T) {
 		ctx.PrevAlertState = models.AlertStateOK
 		ctx.Rule.State = models.AlertStateAlerting
 
-		if !ctx.ShouldUpdateAlertState() {
+		if !ctx.shouldUpdateAlertState() {
 			t.Fatalf("expected should updated to be true")
 		}
 	})
@@ -27,7 +27,7 @@ func TestStateIsUpdatedWhenNeeded(t *testing.T) {
 		ctx.PrevAlertState = models.AlertStateOK
 		ctx.Rule.State = models.AlertStateOK
 
-		if ctx.ShouldUpdateAlertState() {
+		if ctx.shouldUpdateAlertState() {
 			t.Fatalf("expected should updated to be false")
 		}
 	})
diff --git a/pkg/services/alerting/eval_handler.go b/pkg/services/alerting/eval_handler.go
index 097f4bcb2b6b..572345362a86 100644
--- a/pkg/services/alerting/eval_handler.go
+++ b/pkg/services/alerting/eval_handler.go
@@ -5,15 +5,17 @@ import (
 	"strings"
 	"time"
 
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/log"
 )
 
+// DefaultEvalHandler is responsible for evaluating the alert rule.
 type DefaultEvalHandler struct {
 	log             log.Logger
 	alertJobTimeout time.Duration
 }
 
+// NewEvalHandler is the `DefaultEvalHandler` constructor.
 func NewEvalHandler() *DefaultEvalHandler {
 	return &DefaultEvalHandler{
 		log:             log.New("alerting.evalHandler"),
@@ -21,6 +23,7 @@ func NewEvalHandler() *DefaultEvalHandler {
 	}
 }
 
+// Eval evaluated the alert rule.
 func (e *DefaultEvalHandler) Eval(context *EvalContext) {
 	firing := true
 	noDataFound := true
diff --git a/pkg/services/alerting/extractor.go b/pkg/services/alerting/extractor.go
index 5b911c5a9adb..6fb109d71a23 100644
--- a/pkg/services/alerting/extractor.go
+++ b/pkg/services/alerting/extractor.go
@@ -7,20 +7,20 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 )
 
-// DashAlertExtractor extracts alerts from the dashboard json
+// DashAlertExtractor extracts alerts from the dashboard json.
 type DashAlertExtractor struct {
-	User  *m.SignedInUser
-	Dash  *m.Dashboard
+	User  *models.SignedInUser
+	Dash  *models.Dashboard
 	OrgID int64
 	log   log.Logger
 }
 
-// NewDashAlertExtractor returns a new DashAlertExtractor
-func NewDashAlertExtractor(dash *m.Dashboard, orgID int64, user *m.SignedInUser) *DashAlertExtractor {
+// NewDashAlertExtractor returns a new DashAlertExtractor.
+func NewDashAlertExtractor(dash *models.Dashboard, orgID int64, user *models.SignedInUser) *DashAlertExtractor {
 	return &DashAlertExtractor{
 		User:  user,
 		Dash:  dash,
@@ -29,9 +29,9 @@ func NewDashAlertExtractor(dash *m.Dashboard, orgID int64, user *m.SignedInUser)
 	}
 }
 
-func (e *DashAlertExtractor) lookupDatasourceID(dsName string) (*m.DataSource, error) {
+func (e *DashAlertExtractor) lookupDatasourceID(dsName string) (*models.DataSource, error) {
 	if dsName == "" {
-		query := &m.GetDataSourcesQuery{OrgId: e.OrgID}
+		query := &models.GetDataSourcesQuery{OrgId: e.OrgID}
 		if err := bus.Dispatch(query); err != nil {
 			return nil, err
 		}
@@ -42,7 +42,7 @@ func (e *DashAlertExtractor) lookupDatasourceID(dsName string) (*m.DataSource, e
 			}
 		}
 	} else {
-		query := &m.GetDataSourceByNameQuery{Name: dsName, OrgId: e.OrgID}
+		query := &models.GetDataSourceByNameQuery{Name: dsName, OrgId: e.OrgID}
 		if err := bus.Dispatch(query); err != nil {
 			return nil, err
 		}
@@ -73,8 +73,8 @@ func copyJSON(in *simplejson.Json) (*simplejson.Json, error) {
 	return simplejson.NewJson(rawJSON)
 }
 
-func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json, validateAlertFunc func(*m.Alert) bool) ([]*m.Alert, error) {
-	alerts := make([]*m.Alert, 0)
+func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json, validateAlertFunc func(*models.Alert) bool) ([]*models.Alert, error) {
+	alerts := make([]*models.Alert, 0)
 
 	for _, panelObj := range jsonWithPanels.Get("panels").MustArray() {
 		panel := simplejson.NewFromAny(panelObj)
@@ -124,7 +124,7 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
 			}
 		}
 
-		alert := &m.Alert{
+		alert := &models.Alert{
 			DashboardId: e.Dash.Id,
 			OrgId:       e.OrgID,
 			PanelId:     panelID,
@@ -161,9 +161,9 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
 				return nil, ValidationError{Reason: fmt.Sprintf("Data source used by alert rule not found, alertName=%v, datasource=%s", alert.Name, dsName)}
 			}
 
-			dsFilterQuery := m.DatasourcesPermissionFilterQuery{
+			dsFilterQuery := models.DatasourcesPermissionFilterQuery{
 				User:        e.User,
-				Datasources: []*m.DataSource{datasource},
+				Datasources: []*models.DataSource{datasource},
 			}
 
 			if err := bus.Dispatch(&dsFilterQuery); err != nil {
@@ -172,7 +172,7 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
 				}
 			} else {
 				if len(dsFilterQuery.Result) == 0 {
-					return nil, m.ErrDataSourceAccessDenied
+					return nil, models.ErrDataSourceAccessDenied
 				}
 			}
 
@@ -203,22 +203,22 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
 	return alerts, nil
 }
 
-func validateAlertRule(alert *m.Alert) bool {
+func validateAlertRule(alert *models.Alert) bool {
 	return alert.ValidToSave()
 }
 
-// GetAlerts extracts alerts from the dashboard json and does full validation on the alert json data
-func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) {
+// GetAlerts extracts alerts from the dashboard json and does full validation on the alert json data.
+func (e *DashAlertExtractor) GetAlerts() ([]*models.Alert, error) {
 	return e.extractAlerts(validateAlertRule)
 }
 
-func (e *DashAlertExtractor) extractAlerts(validateFunc func(alert *m.Alert) bool) ([]*m.Alert, error) {
+func (e *DashAlertExtractor) extractAlerts(validateFunc func(alert *models.Alert) bool) ([]*models.Alert, error) {
 	dashboardJSON, err := copyJSON(e.Dash.Data)
 	if err != nil {
 		return nil, err
 	}
 
-	alerts := make([]*m.Alert, 0)
+	alerts := make([]*models.Alert, 0)
 
 	// We extract alerts from rows to be backwards compatible
 	// with the old dashboard json model.
@@ -247,8 +247,8 @@ func (e *DashAlertExtractor) extractAlerts(validateFunc func(alert *m.Alert) boo
 }
 
 // ValidateAlerts validates alerts in the dashboard json but does not require a valid dashboard id
-// in the first validation pass
+// in the first validation pass.
 func (e *DashAlertExtractor) ValidateAlerts() error {
-	_, err := e.extractAlerts(func(alert *m.Alert) bool { return alert.OrgId != 0 && alert.PanelId != 0 })
+	_, err := e.extractAlerts(func(alert *models.Alert) bool { return alert.OrgId != 0 && alert.PanelId != 0 })
 	return err
 }
diff --git a/pkg/services/alerting/extractor_test.go b/pkg/services/alerting/extractor_test.go
index 9c689fec921b..86f0725e4cec 100644
--- a/pkg/services/alerting/extractor_test.go
+++ b/pkg/services/alerting/extractor_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	. "github.com/smartystreets/goconvey/convey"
 )
@@ -21,17 +21,17 @@ func TestAlertRuleExtraction(t *testing.T) {
 		})
 
 		// mock data
-		defaultDs := &m.DataSource{Id: 12, OrgId: 1, Name: "I am default", IsDefault: true}
-		graphite2Ds := &m.DataSource{Id: 15, OrgId: 1, Name: "graphite2"}
-		influxDBDs := &m.DataSource{Id: 16, OrgId: 1, Name: "InfluxDB"}
-		prom := &m.DataSource{Id: 17, OrgId: 1, Name: "Prometheus"}
+		defaultDs := &models.DataSource{Id: 12, OrgId: 1, Name: "I am default", IsDefault: true}
+		graphite2Ds := &models.DataSource{Id: 15, OrgId: 1, Name: "graphite2"}
+		influxDBDs := &models.DataSource{Id: 16, OrgId: 1, Name: "InfluxDB"}
+		prom := &models.DataSource{Id: 17, OrgId: 1, Name: "Prometheus"}
 
-		bus.AddHandler("test", func(query *m.GetDataSourcesQuery) error {
-			query.Result = []*m.DataSource{defaultDs, graphite2Ds}
+		bus.AddHandler("test", func(query *models.GetDataSourcesQuery) error {
+			query.Result = []*models.DataSource{defaultDs, graphite2Ds}
 			return nil
 		})
 
-		bus.AddHandler("test", func(query *m.GetDataSourceByNameQuery) error {
+		bus.AddHandler("test", func(query *models.GetDataSourceByNameQuery) error {
 			if query.Name == defaultDs.Name {
 				query.Result = defaultDs
 			}
@@ -52,10 +52,10 @@ func TestAlertRuleExtraction(t *testing.T) {
 		So(err, ShouldBeNil)
 
 		Convey("Extractor should not modify the original json", func() {
-			dashJson, err := simplejson.NewJson(json)
+			dashJSON, err := simplejson.NewJson(json)
 			So(err, ShouldBeNil)
 
-			dash := m.NewDashboardFromJson(dashJson)
+			dash := models.NewDashboardFromJson(dashJSON)
 
 			getTarget := func(j *simplejson.Json) string {
 				rowObj := j.Get("rows").MustArray()[0]
@@ -68,23 +68,23 @@ func TestAlertRuleExtraction(t *testing.T) {
 			}
 
 			Convey("Dashboard json rows.panels.alert.query.model.target should be empty", func() {
-				So(getTarget(dashJson), ShouldEqual, "")
+				So(getTarget(dashJSON), ShouldEqual, "")
 			})
 
 			extractor := NewDashAlertExtractor(dash, 1, nil)
 			_, _ = extractor.GetAlerts()
 
 			Convey("Dashboard json should not be updated after extracting rules", func() {
-				So(getTarget(dashJson), ShouldEqual, "")
+				So(getTarget(dashJSON), ShouldEqual, "")
 			})
 		})
 
 		Convey("Parsing and validating dashboard containing graphite alerts", func() {
 
-			dashJson, err := simplejson.NewJson(json)
+			dashJSON, err := simplejson.NewJson(json)
 			So(err, ShouldBeNil)
 
-			dash := m.NewDashboardFromJson(dashJson)
+			dash := models.NewDashboardFromJson(dashJSON)
 			extractor := NewDashAlertExtractor(dash, 1, nil)
 
 			alerts, err := extractor.GetAlerts()
@@ -147,12 +147,12 @@ func TestAlertRuleExtraction(t *testing.T) {
 		})
 
 		Convey("Panels missing id should return error", func() {
-			panelWithoutId, err := ioutil.ReadFile("./testdata/panels-missing-id.json")
+			panelWithoutID, err := ioutil.ReadFile("./testdata/panels-missing-id.json")
 			So(err, ShouldBeNil)
 
-			dashJson, err := simplejson.NewJson(panelWithoutId)
+			dashJSON, err := simplejson.NewJson(panelWithoutID)
 			So(err, ShouldBeNil)
-			dash := m.NewDashboardFromJson(dashJson)
+			dash := models.NewDashboardFromJson(dashJSON)
 			extractor := NewDashAlertExtractor(dash, 1, nil)
 
 			_, err = extractor.GetAlerts()
@@ -163,12 +163,12 @@ func TestAlertRuleExtraction(t *testing.T) {
 		})
 
 		Convey("Panel with id set to zero should return error", func() {
-			panelWithIdZero, err := ioutil.ReadFile("./testdata/panel-with-id-0.json")
+			panelWithIDZero, err := ioutil.ReadFile("./testdata/panel-with-id-0.json")
 			So(err, ShouldBeNil)
 
-			dashJson, err := simplejson.NewJson(panelWithIdZero)
+			dashJSON, err := simplejson.NewJson(panelWithIDZero)
 			So(err, ShouldBeNil)
-			dash := m.NewDashboardFromJson(dashJson)
+			dash := models.NewDashboardFromJson(dashJSON)
 			extractor := NewDashAlertExtractor(dash, 1, nil)
 
 			_, err = extractor.GetAlerts()
@@ -182,9 +182,9 @@ func TestAlertRuleExtraction(t *testing.T) {
 			json, err := ioutil.ReadFile("./testdata/v5-dashboard.json")
 			So(err, ShouldBeNil)
 
-			dashJson, err := simplejson.NewJson(json)
+			dashJSON, err := simplejson.NewJson(json)
 			So(err, ShouldBeNil)
-			dash := m.NewDashboardFromJson(dashJson)
+			dash := models.NewDashboardFromJson(dashJSON)
 			extractor := NewDashAlertExtractor(dash, 1, nil)
 
 			alerts, err := extractor.GetAlerts()
@@ -200,10 +200,10 @@ func TestAlertRuleExtraction(t *testing.T) {
 
 		Convey("Alert notifications are in DB", func() {
 			sqlstore.InitTestDB(t)
-			firstNotification := m.CreateAlertNotificationCommand{Uid: "notifier1", OrgId: 1, Name: "1"}
+			firstNotification := models.CreateAlertNotificationCommand{Uid: "notifier1", OrgId: 1, Name: "1"}
 			err = sqlstore.CreateAlertNotificationCommand(&firstNotification)
 			So(err, ShouldBeNil)
-			secondNotification := m.CreateAlertNotificationCommand{Uid: "notifier2", OrgId: 1, Name: "2"}
+			secondNotification := models.CreateAlertNotificationCommand{Uid: "notifier2", OrgId: 1, Name: "2"}
 			err = sqlstore.CreateAlertNotificationCommand(&secondNotification)
 			So(err, ShouldBeNil)
 
@@ -211,9 +211,9 @@ func TestAlertRuleExtraction(t *testing.T) {
 				json, err := ioutil.ReadFile("./testdata/influxdb-alert.json")
 				So(err, ShouldBeNil)
 
-				dashJson, err := simplejson.NewJson(json)
+				dashJSON, err := simplejson.NewJson(json)
 				So(err, ShouldBeNil)
-				dash := m.NewDashboardFromJson(dashJson)
+				dash := models.NewDashboardFromJson(dashJSON)
 				extractor := NewDashAlertExtractor(dash, 1, nil)
 
 				alerts, err := extractor.GetAlerts()
@@ -240,10 +240,10 @@ func TestAlertRuleExtraction(t *testing.T) {
 				json, err := ioutil.ReadFile("./testdata/collapsed-panels.json")
 				So(err, ShouldBeNil)
 
-				dashJson, err := simplejson.NewJson(json)
+				dashJSON, err := simplejson.NewJson(json)
 				So(err, ShouldBeNil)
 
-				dash := m.NewDashboardFromJson(dashJson)
+				dash := models.NewDashboardFromJson(dashJSON)
 				extractor := NewDashAlertExtractor(dash, 1, nil)
 
 				alerts, err := extractor.GetAlerts()
@@ -263,7 +263,7 @@ func TestAlertRuleExtraction(t *testing.T) {
 
 				dashJSON, err := simplejson.NewJson(json)
 				So(err, ShouldBeNil)
-				dash := m.NewDashboardFromJson(dashJSON)
+				dash := models.NewDashboardFromJson(dashJSON)
 				extractor := NewDashAlertExtractor(dash, 1, nil)
 
 				err = extractor.ValidateAlerts()
diff --git a/pkg/services/alerting/interfaces.go b/pkg/services/alerting/interfaces.go
index bd7ca0877699..93d3127d6bdd 100644
--- a/pkg/services/alerting/interfaces.go
+++ b/pkg/services/alerting/interfaces.go
@@ -7,15 +7,16 @@ import (
 	"github.com/grafana/grafana/pkg/models"
 )
 
-type EvalHandler interface {
+type evalHandler interface {
 	Eval(evalContext *EvalContext)
 }
 
-type Scheduler interface {
+type scheduler interface {
 	Tick(time time.Time, execQueue chan *Job)
 	Update(rules []*Rule)
 }
 
+// Notifier is responsible for sending alert notifications.
 type Notifier interface {
 	Notify(evalContext *EvalContext) error
 	GetType() string
@@ -24,7 +25,7 @@ type Notifier interface {
 	// ShouldNotify checks this evaluation should send an alert notification
 	ShouldNotify(ctx context.Context, evalContext *EvalContext, notificationState *models.AlertNotificationState) bool
 
-	GetNotifierUid() string
+	GetNotifierUID() string
 	GetIsDefault() bool
 	GetSendReminder() bool
 	GetDisableResolveMessage() bool
@@ -48,6 +49,7 @@ func (notifiers notifierStateSlice) ShouldUploadImage() bool {
 	return false
 }
 
+// ConditionResult is the result of a condition evaluation.
 type ConditionResult struct {
 	Firing      bool
 	NoDataFound bool
@@ -55,6 +57,7 @@ type ConditionResult struct {
 	EvalMatches []*EvalMatch
 }
 
+// Condition is responsible for evaluating an alert condition.
 type Condition interface {
 	Eval(result *EvalContext) (*ConditionResult, error)
 }
diff --git a/pkg/services/alerting/models.go b/pkg/services/alerting/models.go
index bbd8b98eea27..e802ab5a7a17 100644
--- a/pkg/services/alerting/models.go
+++ b/pkg/services/alerting/models.go
@@ -2,6 +2,8 @@ package alerting
 
 import "github.com/grafana/grafana/pkg/components/null"
 
+// Job holds state about when the alert rule should
+// be evaluated.
 type Job struct {
 	Offset     int64
 	OffsetWait bool
@@ -10,18 +12,15 @@ type Job struct {
 	Rule       *Rule
 }
 
+// ResultLogEntry represents log data for the alert evaluation.
 type ResultLogEntry struct {
 	Message string
 	Data    interface{}
 }
 
+// EvalMatch represents the serie violating the threshold.
 type EvalMatch struct {
 	Value  null.Float        `json:"value"`
 	Metric string            `json:"metric"`
 	Tags   map[string]string `json:"tags"`
 }
-
-type Level struct {
-	Operator string
-	Value    float64
-}
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
index c28ac49b8945..84a26e9a64a0 100644
--- a/pkg/services/alerting/notifier.go
+++ b/pkg/services/alerting/notifier.go
@@ -6,14 +6,14 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/imguploader"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/rendering"
 	"github.com/grafana/grafana/pkg/setting"
-
-	m "github.com/grafana/grafana/pkg/models"
 )
 
+// NotifierPlugin holds meta information about a notifier.
 type NotifierPlugin struct {
 	Type            string          `json:"type"`
 	Name            string          `json:"name"`
@@ -22,11 +22,7 @@ type NotifierPlugin struct {
 	Factory         NotifierFactory `json:"-"`
 }
 
-type NotificationService interface {
-	SendIfNeeded(context *EvalContext) error
-}
-
-func NewNotificationService(renderService rendering.Service) NotificationService {
+func newNotificationService(renderService rendering.Service) *notificationService {
 	return &notificationService{
 		log:           log.New("alerting.notifier"),
 		renderService: renderService,
@@ -39,7 +35,7 @@ type notificationService struct {
 }
 
 func (n *notificationService) SendIfNeeded(context *EvalContext) error {
-	notifierStates, err := n.getNeededNotifiers(context.Rule.OrgId, context.Rule.Notifications, context)
+	notifierStates, err := n.getNeededNotifiers(context.Rule.OrgID, context.Rule.Notifications, context)
 	if err != nil {
 		return err
 	}
@@ -60,20 +56,20 @@ func (n *notificationService) SendIfNeeded(context *EvalContext) error {
 func (n *notificationService) sendAndMarkAsComplete(evalContext *EvalContext, notifierState *notifierState) error {
 	notifier := notifierState.notifier
 
-	n.log.Debug("Sending notification", "type", notifier.GetType(), "uid", notifier.GetNotifierUid(), "isDefault", notifier.GetIsDefault())
+	n.log.Debug("Sending notification", "type", notifier.GetType(), "uid", notifier.GetNotifierUID(), "isDefault", notifier.GetIsDefault())
 	metrics.M_Alerting_Notification_Sent.WithLabelValues(notifier.GetType()).Inc()
 
 	err := notifier.Notify(evalContext)
 
 	if err != nil {
-		n.log.Error("failed to send notification", "uid", notifier.GetNotifierUid(), "error", err)
+		n.log.Error("failed to send notification", "uid", notifier.GetNotifierUID(), "error", err)
 	}
 
 	if evalContext.IsTestRun {
 		return nil
 	}
 
-	cmd := &m.SetAlertNotificationStateToCompleteCommand{
+	cmd := &models.SetAlertNotificationStateToCompleteCommand{
 		Id:      notifierState.state.Id,
 		Version: notifierState.state.Version,
 	}
@@ -83,14 +79,14 @@ func (n *notificationService) sendAndMarkAsComplete(evalContext *EvalContext, no
 
 func (n *notificationService) sendNotification(evalContext *EvalContext, notifierState *notifierState) error {
 	if !evalContext.IsTestRun {
-		setPendingCmd := &m.SetAlertNotificationStateToPendingCommand{
+		setPendingCmd := &models.SetAlertNotificationStateToPendingCommand{
 			Id:                           notifierState.state.Id,
 			Version:                      notifierState.state.Version,
 			AlertRuleStateUpdatedVersion: evalContext.Rule.StateChanges,
 		}
 
 		err := bus.DispatchCtx(evalContext.Ctx, setPendingCmd)
-		if err == m.ErrAlertNotificationStateVersionConflict {
+		if err == models.ErrAlertNotificationStateVersionConflict {
 			return nil
 		}
 
@@ -110,7 +106,7 @@ func (n *notificationService) sendNotifications(evalContext *EvalContext, notifi
 	for _, notifierState := range notifierStates {
 		err := n.sendNotification(evalContext, notifierState)
 		if err != nil {
-			n.log.Error("failed to send notification", "uid", notifierState.notifier.GetNotifierUid(), "error", err)
+			n.log.Error("failed to send notification", "uid", notifierState.notifier.GetNotifierUID(), "error", err)
 		}
 	}
 
@@ -127,8 +123,8 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
 		Width:           1000,
 		Height:          500,
 		Timeout:         setting.AlertingEvaluationTimeout,
-		OrgId:           context.Rule.OrgId,
-		OrgRole:         m.ROLE_ADMIN,
+		OrgId:           context.Rule.OrgID,
+		OrgRole:         models.ROLE_ADMIN,
 		ConcurrentLimit: setting.AlertingRenderLimit,
 	}
 
@@ -137,7 +133,7 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
 		return err
 	}
 
-	renderOpts.Path = fmt.Sprintf("d-solo/%s/%s?orgId=%d&panelId=%d", ref.Uid, ref.Slug, context.Rule.OrgId, context.Rule.PanelId)
+	renderOpts.Path = fmt.Sprintf("d-solo/%s/%s?orgId=%d&panelId=%d", ref.Uid, ref.Slug, context.Rule.OrgID, context.Rule.PanelID)
 
 	result, err := n.renderService.Render(context.Ctx, renderOpts)
 	if err != nil {
@@ -145,20 +141,20 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
 	}
 
 	context.ImageOnDiskPath = result.FilePath
-	context.ImagePublicUrl, err = uploader.Upload(context.Ctx, context.ImageOnDiskPath)
+	context.ImagePublicURL, err = uploader.Upload(context.Ctx, context.ImageOnDiskPath)
 	if err != nil {
 		return err
 	}
 
-	if context.ImagePublicUrl != "" {
-		n.log.Info("uploaded screenshot of alert to external image store", "url", context.ImagePublicUrl)
+	if context.ImagePublicURL != "" {
+		n.log.Info("uploaded screenshot of alert to external image store", "url", context.ImagePublicURL)
 	}
 
 	return nil
 }
 
-func (n *notificationService) getNeededNotifiers(orgId int64, notificationUids []string, evalContext *EvalContext) (notifierStateSlice, error) {
-	query := &m.GetAlertNotificationsWithUidToSendQuery{OrgId: orgId, Uids: notificationUids}
+func (n *notificationService) getNeededNotifiers(orgID int64, notificationUids []string, evalContext *EvalContext) (notifierStateSlice, error) {
+	query := &models.GetAlertNotificationsWithUidToSendQuery{OrgId: orgID, Uids: notificationUids}
 
 	if err := bus.Dispatch(query); err != nil {
 		return nil, err
@@ -172,10 +168,10 @@ func (n *notificationService) getNeededNotifiers(orgId int64, notificationUids [
 			continue
 		}
 
-		query := &m.GetOrCreateNotificationStateQuery{
+		query := &models.GetOrCreateNotificationStateQuery{
 			NotifierId: notification.Id,
-			AlertId:    evalContext.Rule.Id,
-			OrgId:      evalContext.Rule.OrgId,
+			AlertId:    evalContext.Rule.ID,
+			OrgId:      evalContext.Rule.OrgID,
 		}
 
 		err = bus.DispatchCtx(evalContext.Ctx, query)
@@ -195,8 +191,8 @@ func (n *notificationService) getNeededNotifiers(orgId int64, notificationUids [
 	return result, nil
 }
 
-// InitNotifier instantiate a new notifier based on the model
-func InitNotifier(model *m.AlertNotification) (Notifier, error) {
+// InitNotifier instantiate a new notifier based on the model.
+func InitNotifier(model *models.AlertNotification) (Notifier, error) {
 	notifierPlugin, found := notifierFactories[model.Type]
 	if !found {
 		return nil, errors.New("Unsupported notification type")
@@ -205,7 +201,8 @@ func InitNotifier(model *m.AlertNotification) (Notifier, error) {
 	return notifierPlugin.Factory(model)
 }
 
-type NotifierFactory func(notification *m.AlertNotification) (Notifier, error)
+// NotifierFactory is a signature for creating notifiers.
+type NotifierFactory func(notification *models.AlertNotification) (Notifier, error)
 
 var notifierFactories = make(map[string]*NotifierPlugin)
 
@@ -214,6 +211,7 @@ func RegisterNotifier(plugin *NotifierPlugin) {
 	notifierFactories[plugin.Type] = plugin
 }
 
+// GetNotifiers returns a list of metadata about available notifiers.
 func GetNotifiers() []*NotifierPlugin {
 	list := make([]*NotifierPlugin, 0)
 
diff --git a/pkg/services/alerting/notifiers/alertmanager.go b/pkg/services/alerting/notifiers/alertmanager.go
index 2caa4d5ab587..a8fd7db2f5ee 100644
--- a/pkg/services/alerting/notifiers/alertmanager.go
+++ b/pkg/services/alerting/notifiers/alertmanager.go
@@ -2,12 +2,13 @@ package notifiers
 
 import (
 	"context"
+	"regexp"
 	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -27,7 +28,8 @@ func init() {
 	})
 }
 
-func NewAlertmanagerNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewAlertmanagerNotifier returns a new Alertmanager notifier
+func NewAlertmanagerNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	url := model.Settings.Get("url").MustString()
 	if url == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
@@ -35,38 +37,42 @@ func NewAlertmanagerNotifier(model *m.AlertNotification) (alerting.Notifier, err
 
 	return &AlertmanagerNotifier{
 		NotifierBase: NewNotifierBase(model),
-		Url:          url,
+		URL:          url,
 		log:          log.New("alerting.notifier.prometheus-alertmanager"),
 	}, nil
 }
 
+// AlertmanagerNotifier sends alert notifications to the alert manager
 type AlertmanagerNotifier struct {
 	NotifierBase
-	Url string
+	URL string
 	log log.Logger
 }
 
-func (this *AlertmanagerNotifier) ShouldNotify(ctx context.Context, evalContext *alerting.EvalContext, notificationState *m.AlertNotificationState) bool {
-	this.log.Debug("Should notify", "ruleId", evalContext.Rule.Id, "state", evalContext.Rule.State, "previousState", evalContext.PrevAlertState)
+// ShouldNotify returns true if the notifiers should be used depending on state
+func (am *AlertmanagerNotifier) ShouldNotify(ctx context.Context, evalContext *alerting.EvalContext, notificationState *models.AlertNotificationState) bool {
+	am.log.Debug("Should notify", "ruleId", evalContext.Rule.ID, "state", evalContext.Rule.State, "previousState", evalContext.PrevAlertState)
 
 	// Do not notify when we become OK for the first time.
-	if (evalContext.PrevAlertState == m.AlertStatePending) && (evalContext.Rule.State == m.AlertStateOK) {
+	if (evalContext.PrevAlertState == models.AlertStatePending) && (evalContext.Rule.State == models.AlertStateOK) {
 		return false
 	}
+
 	// Notify on Alerting -> OK to resolve before alertmanager timeout.
-	if (evalContext.PrevAlertState == m.AlertStateAlerting) && (evalContext.Rule.State == m.AlertStateOK) {
+	if (evalContext.PrevAlertState == models.AlertStateAlerting) && (evalContext.Rule.State == models.AlertStateOK) {
 		return true
 	}
-	return evalContext.Rule.State == m.AlertStateAlerting
+
+	return evalContext.Rule.State == models.AlertStateAlerting
 }
 
-func (this *AlertmanagerNotifier) createAlert(evalContext *alerting.EvalContext, match *alerting.EvalMatch, ruleUrl string) *simplejson.Json {
+func (am *AlertmanagerNotifier) createAlert(evalContext *alerting.EvalContext, match *alerting.EvalMatch, ruleURL string) *simplejson.Json {
 	alertJSON := simplejson.New()
 	alertJSON.Set("startsAt", evalContext.StartTime.UTC().Format(time.RFC3339))
-	if evalContext.Rule.State == m.AlertStateOK {
+	if evalContext.Rule.State == models.AlertStateOK {
 		alertJSON.Set("endsAt", time.Now().UTC().Format(time.RFC3339))
 	}
-	alertJSON.Set("generatorURL", ruleUrl)
+	alertJSON.Set("generatorURL", ruleURL)
 
 	// Annotations (summary and description are very commonly used).
 	alertJSON.SetPath([]string{"annotations", "summary"}, evalContext.Rule.Name)
@@ -83,8 +89,8 @@ func (this *AlertmanagerNotifier) createAlert(evalContext *alerting.EvalContext,
 	if description != "" {
 		alertJSON.SetPath([]string{"annotations", "description"}, description)
 	}
-	if evalContext.ImagePublicUrl != "" {
-		alertJSON.SetPath([]string{"annotations", "image"}, evalContext.ImagePublicUrl)
+	if evalContext.ImagePublicURL != "" {
+		alertJSON.SetPath([]string{"annotations", "image"}, evalContext.ImagePublicURL)
 	}
 
 	// Labels (from metrics tags + mandatory alertname).
@@ -94,7 +100,7 @@ func (this *AlertmanagerNotifier) createAlert(evalContext *alerting.EvalContext,
 			tags["metric"] = match.Metric
 		} else {
 			for k, v := range match.Tags {
-				tags[k] = v
+				tags[replaceIllegalCharsInLabelname(k)] = v
 			}
 		}
 	}
@@ -103,41 +109,50 @@ func (this *AlertmanagerNotifier) createAlert(evalContext *alerting.EvalContext,
 	return alertJSON
 }
 
-func (this *AlertmanagerNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Sending Alertmanager alert", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+// Notify sends alert notifications to the alert manager
+func (am *AlertmanagerNotifier) Notify(evalContext *alerting.EvalContext) error {
+	am.log.Info("Sending Alertmanager alert", "ruleId", evalContext.Rule.ID, "notification", am.Name)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		am.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
 	// Send one alert per matching series.
 	alerts := make([]interface{}, 0)
 	for _, match := range evalContext.EvalMatches {
-		alert := this.createAlert(evalContext, match, ruleUrl)
+		alert := am.createAlert(evalContext, match, ruleURL)
 		alerts = append(alerts, alert)
 	}
 
 	// This happens on ExecutionError or NoData
 	if len(alerts) == 0 {
-		alert := this.createAlert(evalContext, nil, ruleUrl)
+		alert := am.createAlert(evalContext, nil, ruleURL)
 		alerts = append(alerts, alert)
 	}
 
 	bodyJSON := simplejson.NewFromAny(alerts)
 	body, _ := bodyJSON.MarshalJSON()
 
-	cmd := &m.SendWebhookSync{
-		Url:        this.Url + "/api/v1/alerts",
+	cmd := &models.SendWebhookSync{
+		Url:        am.URL + "/api/v1/alerts",
 		HttpMethod: "POST",
 		Body:       string(body),
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send alertmanager", "error", err, "alertmanager", this.Name)
+		am.log.Error("Failed to send alertmanager", "error", err, "alertmanager", am.Name)
 		return err
 	}
 
 	return nil
 }
+
+// regexp that matches all none valid label name characters
+// https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
+var labelNamePattern = regexp.MustCompile(`[^a-zA-Z0-9_]`)
+
+func replaceIllegalCharsInLabelname(input string) string {
+	return labelNamePattern.ReplaceAllString(input, "_")
+}
diff --git a/pkg/services/alerting/notifiers/alertmanager_test.go b/pkg/services/alerting/notifiers/alertmanager_test.go
index 7510742ed172..32379caac31f 100644
--- a/pkg/services/alerting/notifiers/alertmanager_test.go
+++ b/pkg/services/alerting/notifiers/alertmanager_test.go
@@ -4,51 +4,73 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
+func TestReplaceIllegalCharswithUnderscore(t *testing.T) {
+	cases := []struct {
+		input    string
+		expected string
+	}{
+		{
+			input:    "foobar",
+			expected: "foobar",
+		},
+		{
+			input:    `foo.,\][!?#="~*^&+|<>\'bar09_09`,
+			expected: "foo____________________bar09_09",
+		},
+	}
+
+	for _, c := range cases {
+		assert.Equal(t, replaceIllegalCharsInLabelname(c.input), c.expected)
+	}
+}
+
 func TestWhenAlertManagerShouldNotify(t *testing.T) {
 	tcs := []struct {
-		prevState m.AlertStateType
-		newState  m.AlertStateType
+		prevState models.AlertStateType
+		newState  models.AlertStateType
 
 		expect bool
 	}{
 		{
-			prevState: m.AlertStatePending,
-			newState:  m.AlertStateOK,
+			prevState: models.AlertStatePending,
+			newState:  models.AlertStateOK,
 			expect:    false,
 		},
 		{
-			prevState: m.AlertStateAlerting,
-			newState:  m.AlertStateOK,
+			prevState: models.AlertStateAlerting,
+			newState:  models.AlertStateOK,
 			expect:    true,
 		},
 		{
-			prevState: m.AlertStateOK,
-			newState:  m.AlertStatePending,
+			prevState: models.AlertStateOK,
+			newState:  models.AlertStatePending,
 			expect:    false,
 		},
 		{
-			prevState: m.AlertStateUnknown,
-			newState:  m.AlertStatePending,
+			prevState: models.AlertStateUnknown,
+			newState:  models.AlertStatePending,
 			expect:    false,
 		},
 	}
 
 	for _, tc := range tcs {
 		am := &AlertmanagerNotifier{log: log.New("test.logger")}
-		evalContext := alerting.NewEvalContext(context.TODO(), &alerting.Rule{
+		evalContext := alerting.NewEvalContext(context.Background(), &alerting.Rule{
 			State: tc.prevState,
 		})
 
 		evalContext.Rule.State = tc.newState
 
-		res := am.ShouldNotify(context.TODO(), evalContext, &m.AlertNotificationState{})
+		res := am.ShouldNotify(context.TODO(), evalContext, &models.AlertNotificationState{})
 		if res != tc.expect {
 			t.Errorf("got %v expected %v", res, tc.expect)
 		}
@@ -63,7 +85,7 @@ func TestAlertmanagerNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "alertmanager",
 					Type:     "alertmanager",
 					Settings: settingsJSON,
@@ -77,7 +99,7 @@ func TestAlertmanagerNotifier(t *testing.T) {
 				json := `{ "url": "http://127.0.0.1:9093/" }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "alertmanager",
 					Type:     "alertmanager",
 					Settings: settingsJSON,
@@ -87,7 +109,7 @@ func TestAlertmanagerNotifier(t *testing.T) {
 				alertmanagerNotifier := not.(*AlertmanagerNotifier)
 
 				So(err, ShouldBeNil)
-				So(alertmanagerNotifier.Url, ShouldEqual, "http://127.0.0.1:9093/")
+				So(alertmanagerNotifier.URL, ShouldEqual, "http://127.0.0.1:9093/")
 			})
 		})
 	})
diff --git a/pkg/services/alerting/notifiers/base.go b/pkg/services/alerting/notifiers/base.go
index 800505b63801..f31c8b36d9c0 100644
--- a/pkg/services/alerting/notifiers/base.go
+++ b/pkg/services/alerting/notifiers/base.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
@@ -13,10 +13,11 @@ const (
 	triggMetrString = "Triggered metrics:\n\n"
 )
 
+// NotifierBase is the base implementation of a notifier.
 type NotifierBase struct {
 	Name                  string
 	Type                  string
-	Uid                   string
+	UID                   string
 	IsDeault              bool
 	UploadImage           bool
 	SendReminder          bool
@@ -26,6 +27,7 @@ type NotifierBase struct {
 	log log.Logger
 }
 
+// NewNotifierBase returns a new `NotifierBase`.
 func NewNotifierBase(model *models.AlertNotification) NotifierBase {
 	uploadImage := true
 	value, exist := model.Settings.CheckGet("uploadImage")
@@ -34,7 +36,7 @@ func NewNotifierBase(model *models.AlertNotification) NotifierBase {
 	}
 
 	return NotifierBase{
-		Uid:                   model.Uid,
+		UID:                   model.Uid,
 		Name:                  model.Name,
 		IsDeault:              model.IsDefault,
 		Type:                  model.Type,
@@ -108,30 +110,40 @@ func (n *NotifierBase) ShouldNotify(ctx context.Context, context *alerting.EvalC
 	return true
 }
 
+// GetType returns the notifier type.
 func (n *NotifierBase) GetType() string {
 	return n.Type
 }
 
+// NeedsImage returns true if an image is expected in the notification.
 func (n *NotifierBase) NeedsImage() bool {
 	return n.UploadImage
 }
 
-func (n *NotifierBase) GetNotifierUid() string {
-	return n.Uid
+// GetNotifierUID returns the notifier `uid`.
+func (n *NotifierBase) GetNotifierUID() string {
+	return n.UID
 }
 
+// GetIsDefault returns true if the notifiers should
+// be used for all alerts.
 func (n *NotifierBase) GetIsDefault() bool {
 	return n.IsDeault
 }
 
+// GetSendReminder returns true if reminders should be sent.
 func (n *NotifierBase) GetSendReminder() bool {
 	return n.SendReminder
 }
 
+// GetDisableResolveMessage returns true if ok alert notifications
+// should be skipped.
 func (n *NotifierBase) GetDisableResolveMessage() bool {
 	return n.DisableResolveMessage
 }
 
+// GetFrequency returns the freqency for how often
+// alerts should be evaluated.
 func (n *NotifierBase) GetFrequency() time.Duration {
 	return n.Frequency
 }
diff --git a/pkg/services/alerting/notifiers/base_test.go b/pkg/services/alerting/notifiers/base_test.go
index 84294bfb29d5..799a843de2d4 100644
--- a/pkg/services/alerting/notifiers/base_test.go
+++ b/pkg/services/alerting/notifiers/base_test.go
@@ -178,24 +178,24 @@ func TestShouldSendAlertNotification(t *testing.T) {
 
 func TestBaseNotifier(t *testing.T) {
 	Convey("default constructor for notifiers", t, func() {
-		bJson := simplejson.New()
+		bJSON := simplejson.New()
 
 		model := &models.AlertNotification{
 			Uid:      "1",
 			Name:     "name",
 			Type:     "email",
-			Settings: bJson,
+			Settings: bJSON,
 		}
 
 		Convey("can parse false value", func() {
-			bJson.Set("uploadImage", false)
+			bJSON.Set("uploadImage", false)
 
 			base := NewNotifierBase(model)
 			So(base.UploadImage, ShouldBeFalse)
 		})
 
 		Convey("can parse true value", func() {
-			bJson.Set("uploadImage", true)
+			bJSON.Set("uploadImage", true)
 
 			base := NewNotifierBase(model)
 			So(base.UploadImage, ShouldBeTrue)
diff --git a/pkg/services/alerting/notifiers/dingding.go b/pkg/services/alerting/notifiers/dingding.go
index 3e3496622b7e..fc8ce477ecb9 100644
--- a/pkg/services/alerting/notifiers/dingding.go
+++ b/pkg/services/alerting/notifiers/dingding.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
-const DefaultDingdingMsgType = "link"
-const DingdingOptionsTemplate = `
+const defaultDingdingMsgType = "link"
+const dingdingOptionsTemplate = `
       <h3 class="page-heading">DingDing settings</h3>
       <div class="gf-form">
         <span class="gf-form-label width-10">Url</span>
@@ -21,7 +21,7 @@ const DingdingOptionsTemplate = `
       </div>
       <div class="gf-form">
         <span class="gf-form-label width-10">MessageType</span>
-        <select class="gf-form-input max-width-14" ng-model="ctrl.model.settings.msgType" ng-options="s for s in ['link','actionCard']" ng-init="ctrl.model.settings.msgType=ctrl.model.settings.msgType || '` + DefaultDingdingMsgType + `'"></select>
+        <select class="gf-form-input max-width-14" ng-model="ctrl.model.settings.msgType" ng-options="s for s in ['link','actionCard']" ng-init="ctrl.model.settings.msgType=ctrl.model.settings.msgType || '` + defaultDingdingMsgType + `'"></select>
       </div>
 `
 
@@ -30,57 +30,59 @@ func init() {
 		Type:            "dingding",
 		Name:            "DingDing",
 		Description:     "Sends HTTP POST request to DingDing",
-		Factory:         NewDingDingNotifier,
-		OptionsTemplate: DingdingOptionsTemplate,
+		Factory:         newDingDingNotifier,
+		OptionsTemplate: dingdingOptionsTemplate,
 	})
 
 }
 
-func NewDingDingNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+func newDingDingNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	url := model.Settings.Get("url").MustString()
 	if url == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
 	}
 
-	msgType := model.Settings.Get("msgType").MustString(DefaultDingdingMsgType)
+	msgType := model.Settings.Get("msgType").MustString(defaultDingdingMsgType)
 
 	return &DingDingNotifier{
 		NotifierBase: NewNotifierBase(model),
 		MsgType:      msgType,
-		Url:          url,
+		URL:          url,
 		log:          log.New("alerting.notifier.dingding"),
 	}, nil
 }
 
+// DingDingNotifier is responsible for sending alert notifications to ding ding.
 type DingDingNotifier struct {
 	NotifierBase
 	MsgType string
-	Url     string
+	URL     string
 	log     log.Logger
 }
 
-func (this *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Sending dingding")
+// Notify sends the alert notification to dingding.
+func (dd *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
+	dd.log.Info("Sending dingding")
 
-	messageUrl, err := evalContext.GetRuleUrl()
+	messageURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed to get messageUrl", "error", err, "dingding", this.Name)
-		messageUrl = ""
+		dd.log.Error("Failed to get messageUrl", "error", err, "dingding", dd.Name)
+		messageURL = ""
 	}
 
 	q := url.Values{
 		"pc_slide": {"false"},
-		"url":      {messageUrl},
+		"url":      {messageURL},
 	}
 
 	// Use special link to auto open the message url outside of Dingding
 	// Refer: https://open-doc.dingtalk.com/docs/doc.htm?treeId=385&articleId=104972&docType=1#s9
-	messageUrl = "dingtalk://dingtalkclient/page/link?" + q.Encode()
+	messageURL = "dingtalk://dingtalkclient/page/link?" + q.Encode()
 
-	this.log.Info("messageUrl:" + messageUrl)
+	dd.log.Info("messageUrl:" + messageURL)
 
 	message := evalContext.Rule.Message
-	picUrl := evalContext.ImagePublicUrl
+	picURL := evalContext.ImagePublicURL
 	title := evalContext.GetNotificationTitle()
 	if message == "" {
 		message = title
@@ -91,10 +93,10 @@ func (this *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
 	}
 
 	var bodyStr string
-	if this.MsgType == "actionCard" {
+	if dd.MsgType == "actionCard" {
 		// Embed the pic into the markdown directly because actionCard doesn't have a picUrl field
-		if picUrl != "" {
-			message = "![](" + picUrl + ")\\n\\n" + message
+		if picURL != "" {
+			message = "![](" + picURL + ")\\n\\n" + message
 		}
 
 		bodyStr = `{
@@ -103,7 +105,7 @@ func (this *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
 				"text": "` + strings.Replace(message, `"`, "'", -1) + `",
 				"title": "` + strings.Replace(title, `"`, "'", -1) + `",
 				"singleTitle": "More",
-				"singleURL": "` + messageUrl + `"
+				"singleURL": "` + messageURL + `"
 			}
 		}`
 	} else {
@@ -112,8 +114,8 @@ func (this *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
 			"link": {
 				"text": "` + message + `",
 				"title": "` + title + `",
-				"picUrl": "` + picUrl + `",
-				"messageUrl": "` + messageUrl + `"
+				"picUrl": "` + picURL + `",
+				"messageUrl": "` + messageURL + `"
 			}
 		}`
 	}
@@ -121,7 +123,7 @@ func (this *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
 	bodyJSON, err := simplejson.NewJson([]byte(bodyStr))
 
 	if err != nil {
-		this.log.Error("Failed to create Json data", "error", err, "dingding", this.Name)
+		dd.log.Error("Failed to create Json data", "error", err, "dingding", dd.Name)
 	}
 
 	body, err := bodyJSON.MarshalJSON()
@@ -129,13 +131,13 @@ func (this *DingDingNotifier) Notify(evalContext *alerting.EvalContext) error {
 		return err
 	}
 
-	cmd := &m.SendWebhookSync{
-		Url:  this.Url,
+	cmd := &models.SendWebhookSync{
+		Url:  dd.URL,
 		Body: string(body),
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send DingDing", "error", err, "dingding", this.Name)
+		dd.log.Error("Failed to send DingDing", "error", err, "dingding", dd.Name)
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/dingding_test.go b/pkg/services/alerting/notifiers/dingding_test.go
index f89bf6382ce9..09101af2f8f6 100644
--- a/pkg/services/alerting/notifiers/dingding_test.go
+++ b/pkg/services/alerting/notifiers/dingding_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -14,13 +14,13 @@ func TestDingDingNotifier(t *testing.T) {
 			json := `{ }`
 
 			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &m.AlertNotification{
+			model := &models.AlertNotification{
 				Name:     "dingding_testing",
 				Type:     "dingding",
 				Settings: settingsJSON,
 			}
 
-			_, err := NewDingDingNotifier(model)
+			_, err := newDingDingNotifier(model)
 			So(err, ShouldNotBeNil)
 
 		})
@@ -28,20 +28,19 @@ func TestDingDingNotifier(t *testing.T) {
 			json := `{ "url": "https://www.google.com" }`
 
 			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &m.AlertNotification{
+			model := &models.AlertNotification{
 				Name:     "dingding_testing",
 				Type:     "dingding",
 				Settings: settingsJSON,
 			}
 
-			not, err := NewDingDingNotifier(model)
+			not, err := newDingDingNotifier(model)
 			notifier := not.(*DingDingNotifier)
 
 			So(err, ShouldBeNil)
 			So(notifier.Name, ShouldEqual, "dingding_testing")
 			So(notifier.Type, ShouldEqual, "dingding")
-			So(notifier.Url, ShouldEqual, "https://www.google.com")
+			So(notifier.URL, ShouldEqual, "https://www.google.com")
 		})
-
 	})
 }
diff --git a/pkg/services/alerting/notifiers/discord.go b/pkg/services/alerting/notifiers/discord.go
index c7178211f0ea..e011ec0c3e93 100644
--- a/pkg/services/alerting/notifiers/discord.go
+++ b/pkg/services/alerting/notifiers/discord.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -21,18 +21,30 @@ func init() {
 		Type:        "discord",
 		Name:        "Discord",
 		Description: "Sends notifications to Discord",
-		Factory:     NewDiscordNotifier,
+		Factory:     newDiscordNotifier,
 		OptionsTemplate: `
       <h3 class="page-heading">Discord settings</h3>
-      <div class="gf-form">
-        <span class="gf-form-label width-14">Webhook URL</span>
-        <input type="text" required class="gf-form-input max-width-22" ng-model="ctrl.model.settings.url" placeholder="Discord webhook URL"></input>
+      <div class="gf-form max-width-30">
+        <span class="gf-form-label width-10">Message Content</span>
+        <input type="text"
+          class="gf-form-input max-width-30"
+          ng-model="ctrl.model.settings.content"
+          data-placement="right">
+        </input>
+        <info-popover mode="right-absolute">
+          Mention a group using @ or a user using <@ID> when notifying in a channel
+        </info-popover>
+      </div>
+      <div class="gf-form  max-width-30">
+        <span class="gf-form-label width-10">Webhook URL</span>
+        <input type="text" required class="gf-form-input max-width-30" ng-model="ctrl.model.settings.url" placeholder="Discord webhook URL"></input>
       </div>
     `,
 	})
 }
 
-func NewDiscordNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+func newDiscordNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
+	content := model.Settings.Get("content").MustString()
 	url := model.Settings.Get("url").MustString()
 	if url == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find webhook url property in settings"}
@@ -40,29 +52,38 @@ func NewDiscordNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 
 	return &DiscordNotifier{
 		NotifierBase: NewNotifierBase(model),
+		Content:      content,
 		WebhookURL:   url,
 		log:          log.New("alerting.notifier.discord"),
 	}, nil
 }
 
+// DiscordNotifier is responsible for sending alert
+// notifications to discord.
 type DiscordNotifier struct {
 	NotifierBase
+	Content    string
 	WebhookURL string
 	log        log.Logger
 }
 
-func (this *DiscordNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Sending alert notification to", "webhook_url", this.WebhookURL)
+// Notify send an alert notification to Discord.
+func (dn *DiscordNotifier) Notify(evalContext *alerting.EvalContext) error {
+	dn.log.Info("Sending alert notification to", "webhook_url", dn.WebhookURL)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		dn.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
 	bodyJSON := simplejson.New()
 	bodyJSON.Set("username", "Grafana")
 
+	if dn.Content != "" {
+		bodyJSON.Set("content", dn.Content)
+	}
+
 	fields := make([]map[string]interface{}, 0)
 
 	for _, evt := range evalContext.EvalMatches {
@@ -85,7 +106,7 @@ func (this *DiscordNotifier) Notify(evalContext *alerting.EvalContext) error {
 	embed.Set("title", evalContext.GetNotificationTitle())
 	//Discord takes integer for color
 	embed.Set("color", color)
-	embed.Set("url", ruleUrl)
+	embed.Set("url", ruleURL)
 	embed.Set("description", evalContext.Rule.Message)
 	embed.Set("type", "rich")
 	embed.Set("fields", fields)
@@ -94,9 +115,9 @@ func (this *DiscordNotifier) Notify(evalContext *alerting.EvalContext) error {
 	var image map[string]interface{}
 	var embeddedImage = false
 
-	if evalContext.ImagePublicUrl != "" {
+	if evalContext.ImagePublicURL != "" {
 		image = map[string]interface{}{
-			"url": evalContext.ImagePublicUrl,
+			"url": evalContext.ImagePublicURL,
 		}
 		embed.Set("image", image)
 	} else {
@@ -111,8 +132,8 @@ func (this *DiscordNotifier) Notify(evalContext *alerting.EvalContext) error {
 
 	json, _ := bodyJSON.MarshalJSON()
 
-	cmd := &m.SendWebhookSync{
-		Url:         this.WebhookURL,
+	cmd := &models.SendWebhookSync{
+		Url:         dn.WebhookURL,
 		HttpMethod:  "POST",
 		ContentType: "application/json",
 	}
@@ -120,22 +141,22 @@ func (this *DiscordNotifier) Notify(evalContext *alerting.EvalContext) error {
 	if !embeddedImage {
 		cmd.Body = string(json)
 	} else {
-		err := this.embedImage(cmd, evalContext.ImageOnDiskPath, json)
+		err := dn.embedImage(cmd, evalContext.ImageOnDiskPath, json)
 		if err != nil {
-			this.log.Error("failed to embed image", "error", err)
+			dn.log.Error("failed to embed image", "error", err)
 			return err
 		}
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send notification to Discord", "error", err)
+		dn.log.Error("Failed to send notification to Discord", "error", err)
 		return err
 	}
 
 	return nil
 }
 
-func (this *DiscordNotifier) embedImage(cmd *m.SendWebhookSync, imagePath string, existingJSONBody []byte) error {
+func (dn *DiscordNotifier) embedImage(cmd *models.SendWebhookSync, imagePath string, existingJSONBody []byte) error {
 	f, err := os.Open(imagePath)
 	defer f.Close()
 	if err != nil {
@@ -171,7 +192,7 @@ func (this *DiscordNotifier) embedImage(cmd *m.SendWebhookSync, imagePath string
 
 	w.Close()
 
-	cmd.Body = string(b.Bytes())
+	cmd.Body = b.String()
 	cmd.ContentType = w.FormDataContentType()
 
 	return nil
diff --git a/pkg/services/alerting/notifiers/discord_test.go b/pkg/services/alerting/notifiers/discord_test.go
index fe925aab362e..d1cbff6b859a 100644
--- a/pkg/services/alerting/notifiers/discord_test.go
+++ b/pkg/services/alerting/notifiers/discord_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,35 +16,37 @@ func TestDiscordNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "discord_testing",
 					Type:     "discord",
 					Settings: settingsJSON,
 				}
 
-				_, err := NewDiscordNotifier(model)
+				_, err := newDiscordNotifier(model)
 				So(err, ShouldNotBeNil)
 			})
 
 			Convey("settings should trigger incident", func() {
 				json := `
 				{
-          "url": "https://web.hook/"
+					"content": "@everyone Please check this notification",
+					"url": "https://web.hook/"
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "discord_testing",
 					Type:     "discord",
 					Settings: settingsJSON,
 				}
 
-				not, err := NewDiscordNotifier(model)
+				not, err := newDiscordNotifier(model)
 				discordNotifier := not.(*DiscordNotifier)
 
 				So(err, ShouldBeNil)
 				So(discordNotifier.Name, ShouldEqual, "discord_testing")
 				So(discordNotifier.Type, ShouldEqual, "discord")
+				So(discordNotifier.Content, ShouldEqual, "@everyone Please check this notification")
 				So(discordNotifier.WebhookURL, ShouldEqual, "https://web.hook/")
 			})
 		})
diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go
index 6c7bf5edb297..5d3422e608b5 100644
--- a/pkg/services/alerting/notifiers/email.go
+++ b/pkg/services/alerting/notifiers/email.go
@@ -5,8 +5,9 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
+
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -29,13 +30,17 @@ func init() {
 	})
 }
 
+// EmailNotifier is responsible for sending
+// alert notifications over email.
 type EmailNotifier struct {
 	NotifierBase
 	Addresses []string
 	log       log.Logger
 }
 
-func NewEmailNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewEmailNotifier is the constructor function
+// for the EmailNotifier.
+func NewEmailNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	addressesString := model.Settings.Get("addresses").MustString()
 
 	if addressesString == "" {
@@ -58,12 +63,13 @@ func NewEmailNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 	}, nil
 }
 
-func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Sending alert notification to", "addresses", this.Addresses)
+// Notify sends the alert notification.
+func (en *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
+	en.log.Info("Sending alert notification to", "addresses", en.Addresses)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		en.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
@@ -72,8 +78,8 @@ func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
 		error = evalContext.Error.Error()
 	}
 
-	cmd := &m.SendEmailCommandSync{
-		SendEmailCommand: m.SendEmailCommand{
+	cmd := &models.SendEmailCommandSync{
+		SendEmailCommand: models.SendEmailCommand{
 			Subject: evalContext.GetNotificationTitle(),
 			Data: map[string]interface{}{
 				"Title":         evalContext.GetNotificationTitle(),
@@ -82,20 +88,20 @@ func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
 				"StateModel":    evalContext.GetStateModel(),
 				"Message":       evalContext.Rule.Message,
 				"Error":         error,
-				"RuleUrl":       ruleUrl,
+				"RuleUrl":       ruleURL,
 				"ImageLink":     "",
 				"EmbeddedImage": "",
 				"AlertPageUrl":  setting.AppUrl + "alerting",
 				"EvalMatches":   evalContext.EvalMatches,
 			},
-			To:           this.Addresses,
+			To:           en.Addresses,
 			Template:     "alert_notification.html",
 			EmbededFiles: []string{},
 		},
 	}
 
-	if evalContext.ImagePublicUrl != "" {
-		cmd.Data["ImageLink"] = evalContext.ImagePublicUrl
+	if evalContext.ImagePublicURL != "" {
+		cmd.Data["ImageLink"] = evalContext.ImagePublicURL
 	} else {
 		file, err := os.Stat(evalContext.ImageOnDiskPath)
 		if err == nil {
@@ -107,9 +113,9 @@ func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
 	err = bus.DispatchCtx(evalContext.Ctx, cmd)
 
 	if err != nil {
-		this.log.Error("Failed to send alert notification email", "error", err)
+		en.log.Error("Failed to send alert notification email", "error", err)
 		return err
 	}
-	return nil
 
+	return nil
 }
diff --git a/pkg/services/alerting/notifiers/email_test.go b/pkg/services/alerting/notifiers/email_test.go
index 9750cbc2833c..b0c57f2f254d 100644
--- a/pkg/services/alerting/notifiers/email_test.go
+++ b/pkg/services/alerting/notifiers/email_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,7 +16,7 @@ func TestEmailNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "email",
 					Settings: settingsJSON,
@@ -33,7 +33,7 @@ func TestEmailNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "email",
 					Settings: settingsJSON,
@@ -57,7 +57,7 @@ func TestEmailNotifier(t *testing.T) {
 				settingsJSON, err := simplejson.NewJson([]byte(json))
 				So(err, ShouldBeNil)
 
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "email",
 					Settings: settingsJSON,
diff --git a/pkg/services/alerting/notifiers/googlechat.go b/pkg/services/alerting/notifiers/googlechat.go
index 1aba15a79282..2d81787fb916 100644
--- a/pkg/services/alerting/notifiers/googlechat.go
+++ b/pkg/services/alerting/notifiers/googlechat.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -18,7 +18,7 @@ func init() {
 		Name: "Google Hangouts Chat",
 		Description: "Sends notifications to Google Hangouts Chat via webhooks based on the official JSON message " +
 			"format (https://developers.google.com/hangouts/chat/reference/message-formats/).",
-		Factory: NewGoogleChatNotifier,
+		Factory: newGoogleChatNotifier,
 		OptionsTemplate: `
       <h3 class="page-heading">Google Hangouts Chat settings</h3>
       <div class="gf-form max-width-30">
@@ -29,7 +29,7 @@ func init() {
 	})
 }
 
-func NewGoogleChatNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+func newGoogleChatNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	url := model.Settings.Get("url").MustString()
 	if url == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
@@ -37,14 +37,16 @@ func NewGoogleChatNotifier(model *m.AlertNotification) (alerting.Notifier, error
 
 	return &GoogleChatNotifier{
 		NotifierBase: NewNotifierBase(model),
-		Url:          url,
+		URL:          url,
 		log:          log.New("alerting.notifier.googlechat"),
 	}, nil
 }
 
+// GoogleChatNotifier is responsible for sending
+// alert notifications to Google chat.
 type GoogleChatNotifier struct {
 	NotifierBase
-	Url string
+	URL string
 	log log.Logger
 }
 
@@ -90,7 +92,7 @@ type imageWidget struct {
 }
 
 type image struct {
-	ImageUrl string `json:"imageUrl"`
+	ImageURL string `json:"imageUrl"`
 }
 
 type button struct {
@@ -107,19 +109,20 @@ type onClick struct {
 }
 
 type openLink struct {
-	Url string `json:"url"`
+	URL string `json:"url"`
 }
 
-func (this *GoogleChatNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Executing Google Chat notification")
+// Notify send an alert notification to Google Chat.
+func (gcn *GoogleChatNotifier) Notify(evalContext *alerting.EvalContext) error {
+	gcn.log.Info("Executing Google Chat notification")
 
 	headers := map[string]string{
 		"Content-Type": "application/json; charset=UTF-8",
 	}
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("evalContext returned an invalid rule URL")
+		gcn.log.Error("evalContext returned an invalid rule URL")
 	}
 
 	// add a text paragraph widget for the message
@@ -149,14 +152,14 @@ func (this *GoogleChatNotifier) Notify(evalContext *alerting.EvalContext) error
 	widgets = append(widgets, fields)
 
 	// if an image exists, add it as an image widget
-	if evalContext.ImagePublicUrl != "" {
+	if evalContext.ImagePublicURL != "" {
 		widgets = append(widgets, imageWidget{
 			Image: image{
-				ImageUrl: evalContext.ImagePublicUrl,
+				ImageURL: evalContext.ImagePublicURL,
 			},
 		})
 	} else {
-		this.log.Info("Could not retrieve a public image URL.")
+		gcn.log.Info("Could not retrieve a public image URL.")
 	}
 
 	// add a button widget (link to Grafana)
@@ -167,7 +170,7 @@ func (this *GoogleChatNotifier) Notify(evalContext *alerting.EvalContext) error
 					Text: "OPEN IN GRAFANA",
 					OnClick: onClick{
 						OpenLink: openLink{
-							Url: ruleUrl,
+							URL: ruleURL,
 						},
 					},
 				},
@@ -199,15 +202,15 @@ func (this *GoogleChatNotifier) Notify(evalContext *alerting.EvalContext) error
 	}
 	body, _ := json.Marshal(res1D)
 
-	cmd := &m.SendWebhookSync{
-		Url:        this.Url,
+	cmd := &models.SendWebhookSync{
+		Url:        gcn.URL,
 		HttpMethod: "POST",
 		HttpHeader: headers,
 		Body:       string(body),
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send Google Hangouts Chat alert", "error", err, "webhook", this.Name)
+		gcn.log.Error("Failed to send Google Hangouts Chat alert", "error", err, "webhook", gcn.Name)
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/googlechat_test.go b/pkg/services/alerting/notifiers/googlechat_test.go
index 1fdce878926f..25dd5053397d 100644
--- a/pkg/services/alerting/notifiers/googlechat_test.go
+++ b/pkg/services/alerting/notifiers/googlechat_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,13 +16,13 @@ func TestGoogleChatNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "googlechat",
 					Settings: settingsJSON,
 				}
 
-				_, err := NewGoogleChatNotifier(model)
+				_, err := newGoogleChatNotifier(model)
 				So(err, ShouldNotBeNil)
 			})
 
@@ -33,21 +33,20 @@ func TestGoogleChatNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "googlechat",
 					Settings: settingsJSON,
 				}
 
-				not, err := NewGoogleChatNotifier(model)
+				not, err := newGoogleChatNotifier(model)
 				webhookNotifier := not.(*GoogleChatNotifier)
 
 				So(err, ShouldBeNil)
 				So(webhookNotifier.Name, ShouldEqual, "ops")
 				So(webhookNotifier.Type, ShouldEqual, "googlechat")
-				So(webhookNotifier.Url, ShouldEqual, "http://google.com")
+				So(webhookNotifier.URL, ShouldEqual, "http://google.com")
 			})
-
 		})
 	})
 }
diff --git a/pkg/services/alerting/notifiers/hipchat.go b/pkg/services/alerting/notifiers/hipchat.go
index 388cec795976..2e8be00576bb 100644
--- a/pkg/services/alerting/notifiers/hipchat.go
+++ b/pkg/services/alerting/notifiers/hipchat.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
@@ -46,6 +46,8 @@ const (
 	maxFieldCount int = 4
 )
 
+// NewHipChatNotifier is the constructor functions
+// for the HipChatNotifier
 func NewHipChatNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	url := model.Settings.Get("url").MustString()
 	if strings.HasSuffix(url, "/") {
@@ -56,31 +58,34 @@ func NewHipChatNotifier(model *models.AlertNotification) (alerting.Notifier, err
 	}
 
 	apikey := model.Settings.Get("apikey").MustString()
-	roomId := model.Settings.Get("roomid").MustString()
+	roomID := model.Settings.Get("roomid").MustString()
 
 	return &HipChatNotifier{
 		NotifierBase: NewNotifierBase(model),
-		Url:          url,
-		ApiKey:       apikey,
-		RoomId:       roomId,
+		URL:          url,
+		APIKey:       apikey,
+		RoomID:       roomID,
 		log:          log.New("alerting.notifier.hipchat"),
 	}, nil
 }
 
+// HipChatNotifier is responsible for sending
+// alert notifications to Hipchat.
 type HipChatNotifier struct {
 	NotifierBase
-	Url    string
-	ApiKey string
-	RoomId string
+	URL    string
+	APIKey string
+	RoomID string
 	log    log.Logger
 }
 
-func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Executing hipchat notification", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+// Notify sends an alert notification to HipChat
+func (hc *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
+	hc.log.Info("Executing hipchat notification", "ruleId", evalContext.Rule.ID, "notification", hc.Name)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		hc.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
@@ -133,7 +138,7 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 	// Add a card with link to the dashboard
 	card := map[string]interface{}{
 		"style":       "application",
-		"url":         ruleUrl,
+		"url":         ruleURL,
 		"id":          "1",
 		"title":       evalContext.GetNotificationTitle(),
 		"description": message,
@@ -143,10 +148,10 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 		"date":       evalContext.EndTime.Unix(),
 		"attributes": attributes,
 	}
-	if evalContext.ImagePublicUrl != "" {
+	if evalContext.ImagePublicURL != "" {
 		card["thumbnail"] = map[string]interface{}{
-			"url":    evalContext.ImagePublicUrl,
-			"url@2x": evalContext.ImagePublicUrl,
+			"url":    evalContext.ImagePublicURL,
+			"url@2x": evalContext.ImagePublicURL,
 			"width":  1193,
 			"height": 564,
 		}
@@ -160,13 +165,13 @@ func (this *HipChatNotifier) Notify(evalContext *alerting.EvalContext) error {
 		"card":           card,
 	}
 
-	hipUrl := fmt.Sprintf("%s/v2/room/%s/notification?auth_token=%s", this.Url, this.RoomId, this.ApiKey)
+	hipURL := fmt.Sprintf("%s/v2/room/%s/notification?auth_token=%s", hc.URL, hc.RoomID, hc.APIKey)
 	data, _ := json.Marshal(&body)
-	this.log.Info("Request payload", "json", string(data))
-	cmd := &models.SendWebhookSync{Url: hipUrl, Body: string(data)}
+	hc.log.Info("Request payload", "json", string(data))
+	cmd := &models.SendWebhookSync{Url: hipURL, Body: string(data)}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send hipchat notification", "error", err, "webhook", this.Name)
+		hc.log.Error("Failed to send hipchat notification", "error", err, "webhook", hc.Name)
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/hipchat_test.go b/pkg/services/alerting/notifiers/hipchat_test.go
index 1597be12eb8b..6d9b38f83933 100644
--- a/pkg/services/alerting/notifiers/hipchat_test.go
+++ b/pkg/services/alerting/notifiers/hipchat_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,7 +16,7 @@ func TestHipChatNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "hipchat",
 					Settings: settingsJSON,
@@ -33,7 +33,7 @@ func TestHipChatNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "hipchat",
 					Settings: settingsJSON,
@@ -45,9 +45,9 @@ func TestHipChatNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(hipchatNotifier.Name, ShouldEqual, "ops")
 				So(hipchatNotifier.Type, ShouldEqual, "hipchat")
-				So(hipchatNotifier.Url, ShouldEqual, "http://google.com")
-				So(hipchatNotifier.ApiKey, ShouldEqual, "")
-				So(hipchatNotifier.RoomId, ShouldEqual, "")
+				So(hipchatNotifier.URL, ShouldEqual, "http://google.com")
+				So(hipchatNotifier.APIKey, ShouldEqual, "")
+				So(hipchatNotifier.RoomID, ShouldEqual, "")
 			})
 
 			Convey("from settings with Recipient and Mention", func() {
@@ -59,7 +59,7 @@ func TestHipChatNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "hipchat",
 					Settings: settingsJSON,
@@ -71,11 +71,10 @@ func TestHipChatNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(hipchatNotifier.Name, ShouldEqual, "ops")
 				So(hipchatNotifier.Type, ShouldEqual, "hipchat")
-				So(hipchatNotifier.Url, ShouldEqual, "http://www.hipchat.com")
-				So(hipchatNotifier.ApiKey, ShouldEqual, "1234")
-				So(hipchatNotifier.RoomId, ShouldEqual, "1234")
+				So(hipchatNotifier.URL, ShouldEqual, "http://www.hipchat.com")
+				So(hipchatNotifier.APIKey, ShouldEqual, "1234")
+				So(hipchatNotifier.RoomID, ShouldEqual, "1234")
 			})
-
 		})
 	})
 }
diff --git a/pkg/services/alerting/notifiers/kafka.go b/pkg/services/alerting/notifiers/kafka.go
index a8a424c87a7c..ed795453c42a 100644
--- a/pkg/services/alerting/notifiers/kafka.go
+++ b/pkg/services/alerting/notifiers/kafka.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -32,7 +32,8 @@ func init() {
 	})
 }
 
-func NewKafkaNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewKafkaNotifier is the constructor function for the Kafka notifier.
+func NewKafkaNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	endpoint := model.Settings.Get("kafkaRestProxy").MustString()
 	if endpoint == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find kafka rest proxy endpoint property in settings"}
@@ -50,6 +51,8 @@ func NewKafkaNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 	}, nil
 }
 
+// KafkaNotifier is responsible for sending
+// alert notifications to Kafka.
 type KafkaNotifier struct {
 	NotifierBase
 	Endpoint string
@@ -57,8 +60,8 @@ type KafkaNotifier struct {
 	log      log.Logger
 }
 
-func (this *KafkaNotifier) Notify(evalContext *alerting.EvalContext) error {
-
+// Notify sends the alert notification.
+func (kn *KafkaNotifier) Notify(evalContext *alerting.EvalContext) error {
 	state := evalContext.Rule.State
 
 	customData := triggMetrString
@@ -66,7 +69,7 @@ func (this *KafkaNotifier) Notify(evalContext *alerting.EvalContext) error {
 		customData = customData + fmt.Sprintf("%s: %v\n", evt.Metric, evt.Value)
 	}
 
-	this.log.Info("Notifying Kafka", "alert_state", state)
+	kn.log.Info("Notifying Kafka", "alert_state", state)
 
 	recordJSON := simplejson.New()
 	records := make([]interface{}, 1)
@@ -75,20 +78,20 @@ func (this *KafkaNotifier) Notify(evalContext *alerting.EvalContext) error {
 	bodyJSON.Set("description", evalContext.Rule.Name+" - "+evalContext.Rule.Message)
 	bodyJSON.Set("client", "Grafana")
 	bodyJSON.Set("details", customData)
-	bodyJSON.Set("incident_key", "alertId-"+strconv.FormatInt(evalContext.Rule.Id, 10))
+	bodyJSON.Set("incident_key", "alertId-"+strconv.FormatInt(evalContext.Rule.ID, 10))
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		kn.log.Error("Failed get rule link", "error", err)
 		return err
 	}
-	bodyJSON.Set("client_url", ruleUrl)
+	bodyJSON.Set("client_url", ruleURL)
 
-	if evalContext.ImagePublicUrl != "" {
+	if evalContext.ImagePublicURL != "" {
 		contexts := make([]interface{}, 1)
 		imageJSON := simplejson.New()
 		imageJSON.Set("type", "image")
-		imageJSON.Set("src", evalContext.ImagePublicUrl)
+		imageJSON.Set("src", evalContext.ImagePublicURL)
 		contexts[0] = imageJSON
 		bodyJSON.Set("contexts", contexts)
 	}
@@ -99,10 +102,10 @@ func (this *KafkaNotifier) Notify(evalContext *alerting.EvalContext) error {
 	recordJSON.Set("records", records)
 	body, _ := recordJSON.MarshalJSON()
 
-	topicUrl := this.Endpoint + "/topics/" + this.Topic
+	topicURL := kn.Endpoint + "/topics/" + kn.Topic
 
-	cmd := &m.SendWebhookSync{
-		Url:        topicUrl,
+	cmd := &models.SendWebhookSync{
+		Url:        topicURL,
 		Body:       string(body),
 		HttpMethod: "POST",
 		HttpHeader: map[string]string{
@@ -112,7 +115,7 @@ func (this *KafkaNotifier) Notify(evalContext *alerting.EvalContext) error {
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send notification to Kafka", "error", err, "body", string(body))
+		kn.log.Error("Failed to send notification to Kafka", "error", err, "body", string(body))
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/kafka_test.go b/pkg/services/alerting/notifiers/kafka_test.go
index 045976cb14ba..ba3b60ec23e9 100644
--- a/pkg/services/alerting/notifiers/kafka_test.go
+++ b/pkg/services/alerting/notifiers/kafka_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,7 +16,7 @@ func TestKafkaNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "kafka_testing",
 					Type:     "kafka",
 					Settings: settingsJSON,
@@ -34,7 +34,7 @@ func TestKafkaNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "kafka_testing",
 					Type:     "kafka",
 					Settings: settingsJSON,
@@ -49,7 +49,6 @@ func TestKafkaNotifier(t *testing.T) {
 				So(kafkaNotifier.Endpoint, ShouldEqual, "http://localhost:8082")
 				So(kafkaNotifier.Topic, ShouldEqual, "topic1")
 			})
-
 		})
 	})
 }
diff --git a/pkg/services/alerting/notifiers/line.go b/pkg/services/alerting/notifiers/line.go
index 9e3888b8f954..2048495b6465 100644
--- a/pkg/services/alerting/notifiers/line.go
+++ b/pkg/services/alerting/notifiers/line.go
@@ -5,8 +5,8 @@ import (
 	"net/url"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -29,10 +29,11 @@ func init() {
 }
 
 const (
-	lineNotifyUrl string = "https://notify-api.line.me/api/notify"
+	lineNotifyURL string = "https://notify-api.line.me/api/notify"
 )
 
-func NewLINENotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewLINENotifier is the constructor for the LINE notifier
+func NewLINENotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	token := model.Settings.Get("token").MustString()
 	if token == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find token in settings"}
@@ -45,52 +46,55 @@ func NewLINENotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 	}, nil
 }
 
+// LineNotifier is responsible for sending
+// alert notifications to LINE.
 type LineNotifier struct {
 	NotifierBase
 	Token string
 	log   log.Logger
 }
 
-func (this *LineNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Executing line notification", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+// Notify send an alert notification to LINE
+func (ln *LineNotifier) Notify(evalContext *alerting.EvalContext) error {
+	ln.log.Info("Executing line notification", "ruleId", evalContext.Rule.ID, "notification", ln.Name)
 
 	var err error
 	switch evalContext.Rule.State {
-	case m.AlertStateAlerting:
-		err = this.createAlert(evalContext)
+	case models.AlertStateAlerting:
+		err = ln.createAlert(evalContext)
 	}
 	return err
 }
 
-func (this *LineNotifier) createAlert(evalContext *alerting.EvalContext) error {
-	this.log.Info("Creating Line notify", "ruleId", evalContext.Rule.Id, "notification", this.Name)
-	ruleUrl, err := evalContext.GetRuleUrl()
+func (ln *LineNotifier) createAlert(evalContext *alerting.EvalContext) error {
+	ln.log.Info("Creating Line notify", "ruleId", evalContext.Rule.ID, "notification", ln.Name)
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		ln.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
 	form := url.Values{}
-	body := fmt.Sprintf("%s - %s\n%s", evalContext.Rule.Name, ruleUrl, evalContext.Rule.Message)
+	body := fmt.Sprintf("%s - %s\n%s", evalContext.Rule.Name, ruleURL, evalContext.Rule.Message)
 	form.Add("message", body)
 
-	if evalContext.ImagePublicUrl != "" {
-		form.Add("imageThumbnail", evalContext.ImagePublicUrl)
-		form.Add("imageFullsize", evalContext.ImagePublicUrl)
+	if evalContext.ImagePublicURL != "" {
+		form.Add("imageThumbnail", evalContext.ImagePublicURL)
+		form.Add("imageFullsize", evalContext.ImagePublicURL)
 	}
 
-	cmd := &m.SendWebhookSync{
-		Url:        lineNotifyUrl,
+	cmd := &models.SendWebhookSync{
+		Url:        lineNotifyURL,
 		HttpMethod: "POST",
 		HttpHeader: map[string]string{
-			"Authorization": fmt.Sprintf("Bearer %s", this.Token),
+			"Authorization": fmt.Sprintf("Bearer %s", ln.Token),
 			"Content-Type":  "application/x-www-form-urlencoded;charset=UTF-8",
 		},
 		Body: form.Encode(),
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send notification to LINE", "error", err, "body", body)
+		ln.log.Error("Failed to send notification to LINE", "error", err, "body", body)
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/line_test.go b/pkg/services/alerting/notifiers/line_test.go
index 6630665e9924..f8f50cc9b958 100644
--- a/pkg/services/alerting/notifiers/line_test.go
+++ b/pkg/services/alerting/notifiers/line_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -14,7 +14,7 @@ func TestLineNotifier(t *testing.T) {
 			json := `{ }`
 
 			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &m.AlertNotification{
+			model := &models.AlertNotification{
 				Name:     "line_testing",
 				Type:     "line",
 				Settings: settingsJSON,
@@ -30,7 +30,7 @@ func TestLineNotifier(t *testing.T) {
   "token": "abcdefgh0123456789"
 			}`
 			settingsJSON, _ := simplejson.NewJson([]byte(json))
-			model := &m.AlertNotification{
+			model := &models.AlertNotification{
 				Name:     "line_testing",
 				Type:     "line",
 				Settings: settingsJSON,
@@ -44,6 +44,5 @@ func TestLineNotifier(t *testing.T) {
 			So(lineNotifier.Type, ShouldEqual, "line")
 			So(lineNotifier.Token, ShouldEqual, "abcdefgh0123456789")
 		})
-
 	})
 }
diff --git a/pkg/services/alerting/notifiers/opsgenie.go b/pkg/services/alerting/notifiers/opsgenie.go
index 629968b51023..833927dee9f5 100644
--- a/pkg/services/alerting/notifiers/opsgenie.go
+++ b/pkg/services/alerting/notifiers/opsgenie.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -44,54 +44,57 @@ var (
 	opsgenieAlertURL = "https://api.opsgenie.com/v2/alerts"
 )
 
-func NewOpsGenieNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewOpsGenieNotifier is the constructor for OpsGenie.
+func NewOpsGenieNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	autoClose := model.Settings.Get("autoClose").MustBool(true)
 	apiKey := model.Settings.Get("apiKey").MustString()
-	apiUrl := model.Settings.Get("apiUrl").MustString()
+	apiURL := model.Settings.Get("apiUrl").MustString()
 	if apiKey == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find api key property in settings"}
 	}
-	if apiUrl == "" {
-		apiUrl = opsgenieAlertURL
+	if apiURL == "" {
+		apiURL = opsgenieAlertURL
 	}
 
 	return &OpsGenieNotifier{
 		NotifierBase: NewNotifierBase(model),
-		ApiKey:       apiKey,
-		ApiUrl:       apiUrl,
+		APIKey:       apiKey,
+		APIUrl:       apiURL,
 		AutoClose:    autoClose,
 		log:          log.New("alerting.notifier.opsgenie"),
 	}, nil
 }
 
+// OpsGenieNotifier is responsible for sending
+// alert notifications to OpsGenie
 type OpsGenieNotifier struct {
 	NotifierBase
-	ApiKey    string
-	ApiUrl    string
+	APIKey    string
+	APIUrl    string
 	AutoClose bool
 	log       log.Logger
 }
 
-func (this *OpsGenieNotifier) Notify(evalContext *alerting.EvalContext) error {
-
+// Notify sends an alert notification to OpsGenie.
+func (on *OpsGenieNotifier) Notify(evalContext *alerting.EvalContext) error {
 	var err error
 	switch evalContext.Rule.State {
-	case m.AlertStateOK:
-		if this.AutoClose {
-			err = this.closeAlert(evalContext)
+	case models.AlertStateOK:
+		if on.AutoClose {
+			err = on.closeAlert(evalContext)
 		}
-	case m.AlertStateAlerting:
-		err = this.createAlert(evalContext)
+	case models.AlertStateAlerting:
+		err = on.createAlert(evalContext)
 	}
 	return err
 }
 
-func (this *OpsGenieNotifier) createAlert(evalContext *alerting.EvalContext) error {
-	this.log.Info("Creating OpsGenie alert", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+func (on *OpsGenieNotifier) createAlert(evalContext *alerting.EvalContext) error {
+	on.log.Info("Creating OpsGenie alert", "ruleId", evalContext.Rule.ID, "notification", on.Name)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		on.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
@@ -103,54 +106,54 @@ func (this *OpsGenieNotifier) createAlert(evalContext *alerting.EvalContext) err
 	bodyJSON := simplejson.New()
 	bodyJSON.Set("message", evalContext.Rule.Name)
 	bodyJSON.Set("source", "Grafana")
-	bodyJSON.Set("alias", "alertId-"+strconv.FormatInt(evalContext.Rule.Id, 10))
-	bodyJSON.Set("description", fmt.Sprintf("%s - %s\n%s\n%s", evalContext.Rule.Name, ruleUrl, evalContext.Rule.Message, customData))
+	bodyJSON.Set("alias", "alertId-"+strconv.FormatInt(evalContext.Rule.ID, 10))
+	bodyJSON.Set("description", fmt.Sprintf("%s - %s\n%s\n%s", evalContext.Rule.Name, ruleURL, evalContext.Rule.Message, customData))
 
 	details := simplejson.New()
-	details.Set("url", ruleUrl)
-	if evalContext.ImagePublicUrl != "" {
-		details.Set("image", evalContext.ImagePublicUrl)
+	details.Set("url", ruleURL)
+	if evalContext.ImagePublicURL != "" {
+		details.Set("image", evalContext.ImagePublicURL)
 	}
 
 	bodyJSON.Set("details", details)
 	body, _ := bodyJSON.MarshalJSON()
 
-	cmd := &m.SendWebhookSync{
-		Url:        this.ApiUrl,
+	cmd := &models.SendWebhookSync{
+		Url:        on.APIUrl,
 		Body:       string(body),
 		HttpMethod: "POST",
 		HttpHeader: map[string]string{
 			"Content-Type":  "application/json",
-			"Authorization": fmt.Sprintf("GenieKey %s", this.ApiKey),
+			"Authorization": fmt.Sprintf("GenieKey %s", on.APIKey),
 		},
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
+		on.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
 	}
 
 	return nil
 }
 
-func (this *OpsGenieNotifier) closeAlert(evalContext *alerting.EvalContext) error {
-	this.log.Info("Closing OpsGenie alert", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+func (on *OpsGenieNotifier) closeAlert(evalContext *alerting.EvalContext) error {
+	on.log.Info("Closing OpsGenie alert", "ruleId", evalContext.Rule.ID, "notification", on.Name)
 
 	bodyJSON := simplejson.New()
 	bodyJSON.Set("source", "Grafana")
 	body, _ := bodyJSON.MarshalJSON()
 
-	cmd := &m.SendWebhookSync{
-		Url:        fmt.Sprintf("%s/alertId-%d/close?identifierType=alias", this.ApiUrl, evalContext.Rule.Id),
+	cmd := &models.SendWebhookSync{
+		Url:        fmt.Sprintf("%s/alertId-%d/close?identifierType=alias", on.APIUrl, evalContext.Rule.ID),
 		Body:       string(body),
 		HttpMethod: "POST",
 		HttpHeader: map[string]string{
 			"Content-Type":  "application/json",
-			"Authorization": fmt.Sprintf("GenieKey %s", this.ApiKey),
+			"Authorization": fmt.Sprintf("GenieKey %s", on.APIKey),
 		},
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
+		on.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/opsgenie_test.go b/pkg/services/alerting/notifiers/opsgenie_test.go
index 9dcb9f3c600e..1df57676b38b 100644
--- a/pkg/services/alerting/notifiers/opsgenie_test.go
+++ b/pkg/services/alerting/notifiers/opsgenie_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,7 +16,7 @@ func TestOpsGenieNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "opsgenie_testing",
 					Type:     "opsgenie",
 					Settings: settingsJSON,
@@ -33,7 +33,7 @@ func TestOpsGenieNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "opsgenie_testing",
 					Type:     "opsgenie",
 					Settings: settingsJSON,
@@ -45,7 +45,7 @@ func TestOpsGenieNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(opsgenieNotifier.Name, ShouldEqual, "opsgenie_testing")
 				So(opsgenieNotifier.Type, ShouldEqual, "opsgenie")
-				So(opsgenieNotifier.ApiKey, ShouldEqual, "abcdefgh0123456789")
+				So(opsgenieNotifier.APIKey, ShouldEqual, "abcdefgh0123456789")
 			})
 		})
 	})
diff --git a/pkg/services/alerting/notifiers/pagerduty.go b/pkg/services/alerting/notifiers/pagerduty.go
index 9f6ce3c2dc89..d771bfd1ad68 100644
--- a/pkg/services/alerting/notifiers/pagerduty.go
+++ b/pkg/services/alerting/notifiers/pagerduty.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -40,10 +40,11 @@ func init() {
 }
 
 var (
-	pagerdutyEventApiUrl = "https://events.pagerduty.com/v2/enqueue"
+	pagerdutyEventAPIURL = "https://events.pagerduty.com/v2/enqueue"
 )
 
-func NewPagerdutyNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewPagerdutyNotifier is the constructor for the PagerDuty notifier
+func NewPagerdutyNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	autoResolve := model.Settings.Get("autoResolve").MustBool(false)
 	key := model.Settings.Get("integrationKey").MustString()
 	if key == "" {
@@ -58,6 +59,8 @@ func NewPagerdutyNotifier(model *m.AlertNotification) (alerting.Notifier, error)
 	}, nil
 }
 
+// PagerdutyNotifier is responsible for sending
+// alert notifications to pagerduty
 type PagerdutyNotifier struct {
 	NotifierBase
 	Key         string
@@ -65,15 +68,16 @@ type PagerdutyNotifier struct {
 	log         log.Logger
 }
 
-func (this *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error {
+// Notify sends an alert notification to PagerDuty
+func (pn *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error {
 
-	if evalContext.Rule.State == m.AlertStateOK && !this.AutoResolve {
-		this.log.Info("Not sending a trigger to Pagerduty", "state", evalContext.Rule.State, "auto resolve", this.AutoResolve)
+	if evalContext.Rule.State == models.AlertStateOK && !pn.AutoResolve {
+		pn.log.Info("Not sending a trigger to Pagerduty", "state", evalContext.Rule.State, "auto resolve", pn.AutoResolve)
 		return nil
 	}
 
 	eventType := "trigger"
-	if evalContext.Rule.State == m.AlertStateOK {
+	if evalContext.Rule.State == models.AlertStateOK {
 		eventType = "resolve"
 	}
 	customData := triggMetrString
@@ -81,7 +85,7 @@ func (this *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error {
 		customData = customData + fmt.Sprintf("%s: %v\n", evt.Metric, evt.Value)
 	}
 
-	this.log.Info("Notifying Pagerduty", "event_type", eventType)
+	pn.log.Info("Notifying Pagerduty", "event_type", eventType)
 
 	payloadJSON := simplejson.New()
 	payloadJSON.Set("summary", evalContext.Rule.Name+" - "+evalContext.Rule.Message)
@@ -94,36 +98,36 @@ func (this *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error {
 	payloadJSON.Set("custom_details", customData)
 
 	bodyJSON := simplejson.New()
-	bodyJSON.Set("routing_key", this.Key)
+	bodyJSON.Set("routing_key", pn.Key)
 	bodyJSON.Set("event_action", eventType)
-	bodyJSON.Set("dedup_key", "alertId-"+strconv.FormatInt(evalContext.Rule.Id, 10))
+	bodyJSON.Set("dedup_key", "alertId-"+strconv.FormatInt(evalContext.Rule.ID, 10))
 	bodyJSON.Set("payload", payloadJSON)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		pn.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 	links := make([]interface{}, 1)
 	linkJSON := simplejson.New()
-	linkJSON.Set("href", ruleUrl)
-	bodyJSON.Set("client_url", ruleUrl)
+	linkJSON.Set("href", ruleURL)
+	bodyJSON.Set("client_url", ruleURL)
 	bodyJSON.Set("client", "Grafana")
 	links[0] = linkJSON
 	bodyJSON.Set("links", links)
 
-	if evalContext.ImagePublicUrl != "" {
+	if evalContext.ImagePublicURL != "" {
 		contexts := make([]interface{}, 1)
 		imageJSON := simplejson.New()
-		imageJSON.Set("src", evalContext.ImagePublicUrl)
+		imageJSON.Set("src", evalContext.ImagePublicURL)
 		contexts[0] = imageJSON
 		bodyJSON.Set("images", contexts)
 	}
 
 	body, _ := bodyJSON.MarshalJSON()
 
-	cmd := &m.SendWebhookSync{
-		Url:        pagerdutyEventApiUrl,
+	cmd := &models.SendWebhookSync{
+		Url:        pagerdutyEventAPIURL,
 		Body:       string(body),
 		HttpMethod: "POST",
 		HttpHeader: map[string]string{
@@ -132,7 +136,7 @@ func (this *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error {
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send notification to Pagerduty", "error", err, "body", string(body))
+		pn.log.Error("Failed to send notification to Pagerduty", "error", err, "body", string(body))
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/pagerduty_test.go b/pkg/services/alerting/notifiers/pagerduty_test.go
index 1d2eeec4a522..1698ec7605ac 100644
--- a/pkg/services/alerting/notifiers/pagerduty_test.go
+++ b/pkg/services/alerting/notifiers/pagerduty_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -15,7 +15,7 @@ func TestPagerdutyNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "pageduty_testing",
 					Type:     "pagerduty",
 					Settings: settingsJSON,
@@ -29,7 +29,7 @@ func TestPagerdutyNotifier(t *testing.T) {
 				json := `{ "integrationKey": "abcdefgh0123456789" }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "pagerduty_testing",
 					Type:     "pagerduty",
 					Settings: settingsJSON,
@@ -53,7 +53,7 @@ func TestPagerdutyNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "pagerduty_testing",
 					Type:     "pagerduty",
 					Settings: settingsJSON,
diff --git a/pkg/services/alerting/notifiers/pushover.go b/pkg/services/alerting/notifiers/pushover.go
index 8e1903f68ac0..5da1a457e679 100644
--- a/pkg/services/alerting/notifiers/pushover.go
+++ b/pkg/services/alerting/notifiers/pushover.go
@@ -9,12 +9,12 @@ import (
 	"strconv"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
-const PUSHOVER_ENDPOINT = "https://api.pushover.net/1/messages.json"
+const pushoverEndpoint = "https://api.pushover.net/1/messages.json"
 
 func init() {
 	sounds := ` 
@@ -95,9 +95,10 @@ func init() {
 	})
 }
 
-func NewPushoverNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewPushoverNotifier is the constructor for the Pushover Notifier
+func NewPushoverNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	userKey := model.Settings.Get("userKey").MustString()
-	apiToken := model.Settings.Get("apiToken").MustString()
+	APIToken := model.Settings.Get("apiToken").MustString()
 	device := model.Settings.Get("device").MustString()
 	priority, _ := strconv.Atoi(model.Settings.Get("priority").MustString())
 	retry, _ := strconv.Atoi(model.Settings.Get("retry").MustString())
@@ -109,13 +110,13 @@ func NewPushoverNotifier(model *m.AlertNotification) (alerting.Notifier, error)
 	if userKey == "" {
 		return nil, alerting.ValidationError{Reason: "User key not given"}
 	}
-	if apiToken == "" {
+	if APIToken == "" {
 		return nil, alerting.ValidationError{Reason: "API token not given"}
 	}
 	return &PushoverNotifier{
 		NotifierBase:  NewNotifierBase(model),
 		UserKey:       userKey,
-		ApiToken:      apiToken,
+		APIToken:      APIToken,
 		Priority:      priority,
 		Retry:         retry,
 		Expire:        expire,
@@ -127,10 +128,12 @@ func NewPushoverNotifier(model *m.AlertNotification) (alerting.Notifier, error)
 	}, nil
 }
 
+// PushoverNotifier is responsible for sending
+// alert notifications to Pushover
 type PushoverNotifier struct {
 	NotifierBase
 	UserKey       string
-	ApiToken      string
+	APIToken      string
 	Priority      int
 	Retry         int
 	Expire        int
@@ -141,10 +144,11 @@ type PushoverNotifier struct {
 	log           log.Logger
 }
 
-func (this *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error {
-	ruleUrl, err := evalContext.GetRuleUrl()
+// Notify sends a alert notification to Pushover
+func (pn *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error {
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		pn.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
@@ -163,34 +167,34 @@ func (this *PushoverNotifier) Notify(evalContext *alerting.EvalContext) error {
 		message = "Notification message missing (Set a notification message to replace this text.)"
 	}
 
-	headers, uploadBody, err := this.genPushoverBody(evalContext, message, ruleUrl)
+	headers, uploadBody, err := pn.genPushoverBody(evalContext, message, ruleURL)
 	if err != nil {
-		this.log.Error("Failed to generate body for pushover", "error", err)
+		pn.log.Error("Failed to generate body for pushover", "error", err)
 		return err
 	}
 
-	cmd := &m.SendWebhookSync{
-		Url:        PUSHOVER_ENDPOINT,
+	cmd := &models.SendWebhookSync{
+		Url:        pushoverEndpoint,
 		HttpMethod: "POST",
 		HttpHeader: headers,
 		Body:       uploadBody.String(),
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send pushover notification", "error", err, "webhook", this.Name)
+		pn.log.Error("Failed to send pushover notification", "error", err, "webhook", pn.Name)
 		return err
 	}
 
 	return nil
 }
 
-func (this *PushoverNotifier) genPushoverBody(evalContext *alerting.EvalContext, message string, ruleUrl string) (map[string]string, bytes.Buffer, error) {
+func (pn *PushoverNotifier) genPushoverBody(evalContext *alerting.EvalContext, message string, ruleURL string) (map[string]string, bytes.Buffer, error) {
 	var b bytes.Buffer
 	var err error
 	w := multipart.NewWriter(&b)
 
 	// Add image only if requested and available
-	if this.Upload && evalContext.ImageOnDiskPath != "" {
+	if pn.Upload && evalContext.ImageOnDiskPath != "" {
 		f, err := os.Open(evalContext.ImageOnDiskPath)
 		if err != nil {
 			return nil, b, err
@@ -209,47 +213,47 @@ func (this *PushoverNotifier) genPushoverBody(evalContext *alerting.EvalContext,
 	}
 
 	// Add the user token
-	err = w.WriteField("user", this.UserKey)
+	err = w.WriteField("user", pn.UserKey)
 	if err != nil {
 		return nil, b, err
 	}
 
 	// Add the api token
-	err = w.WriteField("token", this.ApiToken)
+	err = w.WriteField("token", pn.APIToken)
 	if err != nil {
 		return nil, b, err
 	}
 
 	// Add priority
-	err = w.WriteField("priority", strconv.Itoa(this.Priority))
+	err = w.WriteField("priority", strconv.Itoa(pn.Priority))
 	if err != nil {
 		return nil, b, err
 	}
 
-	if this.Priority == 2 {
-		err = w.WriteField("retry", strconv.Itoa(this.Retry))
+	if pn.Priority == 2 {
+		err = w.WriteField("retry", strconv.Itoa(pn.Retry))
 		if err != nil {
 			return nil, b, err
 		}
 
-		err = w.WriteField("expire", strconv.Itoa(this.Expire))
+		err = w.WriteField("expire", strconv.Itoa(pn.Expire))
 		if err != nil {
 			return nil, b, err
 		}
 	}
 
 	// Add device
-	if this.Device != "" {
-		err = w.WriteField("device", this.Device)
+	if pn.Device != "" {
+		err = w.WriteField("device", pn.Device)
 		if err != nil {
 			return nil, b, err
 		}
 	}
 
 	// Add sound
-	sound := this.AlertingSound
-	if evalContext.Rule.State == m.AlertStateOK {
-		sound = this.OkSound
+	sound := pn.AlertingSound
+	if evalContext.Rule.State == models.AlertStateOK {
+		sound = pn.OkSound
 	}
 	if sound != "default" {
 		err = w.WriteField("sound", sound)
@@ -265,7 +269,7 @@ func (this *PushoverNotifier) genPushoverBody(evalContext *alerting.EvalContext,
 	}
 
 	// Add URL
-	err = w.WriteField("url", ruleUrl)
+	err = w.WriteField("url", ruleURL)
 	if err != nil {
 		return nil, b, err
 	}
diff --git a/pkg/services/alerting/notifiers/pushover_test.go b/pkg/services/alerting/notifiers/pushover_test.go
index 5228491cccd5..7b2d51a176f3 100644
--- a/pkg/services/alerting/notifiers/pushover_test.go
+++ b/pkg/services/alerting/notifiers/pushover_test.go
@@ -2,12 +2,13 @@ package notifiers
 
 import (
 	"context"
-	"github.com/grafana/grafana/pkg/services/alerting"
 	"strings"
 	"testing"
 
+	"github.com/grafana/grafana/pkg/services/alerting"
+
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -19,7 +20,7 @@ func TestPushoverNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "Pushover",
 					Type:     "pushover",
 					Settings: settingsJSON,
@@ -40,7 +41,7 @@ func TestPushoverNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "Pushover",
 					Type:     "pushover",
 					Settings: settingsJSON,
@@ -52,7 +53,7 @@ func TestPushoverNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(pushoverNotifier.Name, ShouldEqual, "Pushover")
 				So(pushoverNotifier.Type, ShouldEqual, "pushover")
-				So(pushoverNotifier.ApiToken, ShouldEqual, "4SrUFQL4A5V5TQ1z5Pg9nxHXPXSTve")
+				So(pushoverNotifier.APIToken, ShouldEqual, "4SrUFQL4A5V5TQ1z5Pg9nxHXPXSTve")
 				So(pushoverNotifier.UserKey, ShouldEqual, "tzNZYf36y0ohWwXo4XoUrB61rz1A4o")
 				So(pushoverNotifier.Priority, ShouldEqual, 1)
 				So(pushoverNotifier.AlertingSound, ShouldEqual, "pushover")
@@ -73,7 +74,7 @@ func TestGenPushoverBody(t *testing.T) {
 			Convey("When alert is firing - should use siren sound", func() {
 				evalContext := alerting.NewEvalContext(context.Background(),
 					&alerting.Rule{
-						State: m.AlertStateAlerting,
+						State: models.AlertStateAlerting,
 					})
 				_, pushoverBody, err := notifier.genPushoverBody(evalContext, "", "")
 
@@ -84,7 +85,7 @@ func TestGenPushoverBody(t *testing.T) {
 			Convey("When alert is ok - should use success sound", func() {
 				evalContext := alerting.NewEvalContext(context.Background(),
 					&alerting.Rule{
-						State: m.AlertStateOK,
+						State: models.AlertStateOK,
 					})
 				_, pushoverBody, err := notifier.genPushoverBody(evalContext, "", "")
 
diff --git a/pkg/services/alerting/notifiers/sensu.go b/pkg/services/alerting/notifiers/sensu.go
index 21d5d3d9d9e5..7f60178d10f5 100644
--- a/pkg/services/alerting/notifiers/sensu.go
+++ b/pkg/services/alerting/notifiers/sensu.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -44,7 +44,8 @@ func init() {
 
 }
 
-func NewSensuNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewSensuNotifier is the constructor for the Sensu Notifier.
+func NewSensuNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	url := model.Settings.Get("url").MustString()
 	if url == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
@@ -52,7 +53,7 @@ func NewSensuNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 
 	return &SensuNotifier{
 		NotifierBase: NewNotifierBase(model),
-		Url:          url,
+		URL:          url,
 		User:         model.Settings.Get("username").MustString(),
 		Source:       model.Settings.Get("source").MustString(),
 		Password:     model.Settings.Get("password").MustString(),
@@ -61,9 +62,11 @@ func NewSensuNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 	}, nil
 }
 
+// SensuNotifier is responsible for sending
+// alert notifications to Sensu.
 type SensuNotifier struct {
 	NotifierBase
-	Url      string
+	URL      string
 	Source   string
 	User     string
 	Password string
@@ -71,19 +74,20 @@ type SensuNotifier struct {
 	log      log.Logger
 }
 
-func (this *SensuNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Sending sensu result")
+// Notify send alert notification to Sensu
+func (sn *SensuNotifier) Notify(evalContext *alerting.EvalContext) error {
+	sn.log.Info("Sending sensu result")
 
 	bodyJSON := simplejson.New()
-	bodyJSON.Set("ruleId", evalContext.Rule.Id)
+	bodyJSON.Set("ruleId", evalContext.Rule.ID)
 	// Sensu alerts cannot have spaces in them
 	bodyJSON.Set("name", strings.Replace(evalContext.Rule.Name, " ", "_", -1))
 	// Sensu alerts require a source. We set it to the user-specified value (optional),
 	// else we fallback and use the grafana ruleID.
-	if this.Source != "" {
-		bodyJSON.Set("source", this.Source)
+	if sn.Source != "" {
+		bodyJSON.Set("source", sn.Source)
 	} else {
-		bodyJSON.Set("source", "grafana_rule_"+strconv.FormatInt(evalContext.Rule.Id, 10))
+		bodyJSON.Set("source", "grafana_rule_"+strconv.FormatInt(evalContext.Rule.ID, 10))
 	}
 	// Finally, sensu expects an output
 	// We set it to a default output
@@ -98,17 +102,17 @@ func (this *SensuNotifier) Notify(evalContext *alerting.EvalContext) error {
 		bodyJSON.Set("status", 0)
 	}
 
-	if this.Handler != "" {
-		bodyJSON.Set("handler", this.Handler)
+	if sn.Handler != "" {
+		bodyJSON.Set("handler", sn.Handler)
 	}
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err == nil {
-		bodyJSON.Set("ruleUrl", ruleUrl)
+		bodyJSON.Set("ruleUrl", ruleURL)
 	}
 
-	if evalContext.ImagePublicUrl != "" {
-		bodyJSON.Set("imageUrl", evalContext.ImagePublicUrl)
+	if evalContext.ImagePublicURL != "" {
+		bodyJSON.Set("imageUrl", evalContext.ImagePublicURL)
 	}
 
 	if evalContext.Rule.Message != "" {
@@ -117,16 +121,16 @@ func (this *SensuNotifier) Notify(evalContext *alerting.EvalContext) error {
 
 	body, _ := bodyJSON.MarshalJSON()
 
-	cmd := &m.SendWebhookSync{
-		Url:        this.Url,
-		User:       this.User,
-		Password:   this.Password,
+	cmd := &models.SendWebhookSync{
+		Url:        sn.URL,
+		User:       sn.User,
+		Password:   sn.Password,
 		Body:       string(body),
 		HttpMethod: "POST",
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send sensu event", "error", err, "sensu", this.Name)
+		sn.log.Error("Failed to send sensu event", "error", err, "sensu", sn.Name)
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/sensu_test.go b/pkg/services/alerting/notifiers/sensu_test.go
index 40e3b1e1cc31..0c73a493ee8b 100644
--- a/pkg/services/alerting/notifiers/sensu_test.go
+++ b/pkg/services/alerting/notifiers/sensu_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,7 +16,7 @@ func TestSensuNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "sensu",
 					Type:     "sensu",
 					Settings: settingsJSON,
@@ -35,7 +35,7 @@ func TestSensuNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "sensu",
 					Type:     "sensu",
 					Settings: settingsJSON,
@@ -47,7 +47,7 @@ func TestSensuNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(sensuNotifier.Name, ShouldEqual, "sensu")
 				So(sensuNotifier.Type, ShouldEqual, "sensu")
-				So(sensuNotifier.Url, ShouldEqual, "http://sensu-api.example.com:4567/results")
+				So(sensuNotifier.URL, ShouldEqual, "http://sensu-api.example.com:4567/results")
 				So(sensuNotifier.Source, ShouldEqual, "grafana_instance_01")
 				So(sensuNotifier.Handler, ShouldEqual, "myhandler")
 			})
diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go
index ca5f47a322f5..f86314d07263 100644
--- a/pkg/services/alerting/notifiers/slack.go
+++ b/pkg/services/alerting/notifiers/slack.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -99,7 +99,8 @@ func init() {
 
 }
 
-func NewSlackNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewSlackNotifier is the constructor for the Slack notifier
+func NewSlackNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	url := model.Settings.Get("url").MustString()
 	if url == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
@@ -108,18 +109,18 @@ func NewSlackNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 	recipient := model.Settings.Get("recipient").MustString()
 	username := model.Settings.Get("username").MustString()
 	iconEmoji := model.Settings.Get("icon_emoji").MustString()
-	iconUrl := model.Settings.Get("icon_url").MustString()
+	iconURL := model.Settings.Get("icon_url").MustString()
 	mention := model.Settings.Get("mention").MustString()
 	token := model.Settings.Get("token").MustString()
 	uploadImage := model.Settings.Get("uploadImage").MustBool(true)
 
 	return &SlackNotifier{
 		NotifierBase: NewNotifierBase(model),
-		Url:          url,
+		URL:          url,
 		Recipient:    recipient,
 		Username:     username,
 		IconEmoji:    iconEmoji,
-		IconUrl:      iconUrl,
+		IconURL:      iconURL,
 		Mention:      mention,
 		Token:        token,
 		Upload:       uploadImage,
@@ -127,25 +128,28 @@ func NewSlackNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 	}, nil
 }
 
+// SlackNotifier is responsible for sending
+// alert notification to Slack.
 type SlackNotifier struct {
 	NotifierBase
-	Url       string
+	URL       string
 	Recipient string
 	Username  string
 	IconEmoji string
-	IconUrl   string
+	IconURL   string
 	Mention   string
 	Token     string
 	Upload    bool
 	log       log.Logger
 }
 
-func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Executing slack notification", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+// Notify send alert notification to Slack.
+func (sn *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
+	sn.log.Info("Executing slack notification", "ruleId", evalContext.Rule.ID, "notification", sn.Name)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		sn.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
@@ -170,14 +174,14 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 		})
 	}
 
-	message := this.Mention
-	if evalContext.Rule.State != m.AlertStateOK { //don't add message when going back to alert state ok.
+	message := sn.Mention
+	if evalContext.Rule.State != models.AlertStateOK { //don't add message when going back to alert state ok.
 		message += " " + evalContext.Rule.Message
 	}
-	image_url := ""
+	imageURL := ""
 	// default to file.upload API method if a token is provided
-	if this.Token == "" {
-		image_url = evalContext.ImagePublicUrl
+	if sn.Token == "" {
+		imageURL = evalContext.ImagePublicURL
 	}
 
 	body := map[string]interface{}{
@@ -186,10 +190,10 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 				"fallback":    evalContext.GetNotificationTitle(),
 				"color":       evalContext.GetStateModel().Color,
 				"title":       evalContext.GetNotificationTitle(),
-				"title_link":  ruleUrl,
+				"title_link":  ruleURL,
 				"text":        message,
 				"fields":      fields,
-				"image_url":   image_url,
+				"image_url":   imageURL,
 				"footer":      "Grafana v" + setting.BuildVersion,
 				"footer_icon": "https://grafana.com/assets/img/fav32.png",
 				"ts":          time.Now().Unix(),
@@ -199,26 +203,26 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 	}
 
 	//recipient override
-	if this.Recipient != "" {
-		body["channel"] = this.Recipient
+	if sn.Recipient != "" {
+		body["channel"] = sn.Recipient
 	}
-	if this.Username != "" {
-		body["username"] = this.Username
+	if sn.Username != "" {
+		body["username"] = sn.Username
 	}
-	if this.IconEmoji != "" {
-		body["icon_emoji"] = this.IconEmoji
+	if sn.IconEmoji != "" {
+		body["icon_emoji"] = sn.IconEmoji
 	}
-	if this.IconUrl != "" {
-		body["icon_url"] = this.IconUrl
+	if sn.IconURL != "" {
+		body["icon_url"] = sn.IconURL
 	}
 	data, _ := json.Marshal(&body)
-	cmd := &m.SendWebhookSync{Url: this.Url, Body: string(data)}
+	cmd := &models.SendWebhookSync{Url: sn.URL, Body: string(data)}
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send slack notification", "error", err, "webhook", this.Name)
+		sn.log.Error("Failed to send slack notification", "error", err, "webhook", sn.Name)
 		return err
 	}
-	if this.Token != "" && this.UploadImage {
-		err = SlackFileUpload(evalContext, this.log, "https://slack.com/api/files.upload", this.Recipient, this.Token)
+	if sn.Token != "" && sn.UploadImage {
+		err = slackFileUpload(evalContext, sn.log, "https://slack.com/api/files.upload", sn.Recipient, sn.Token)
 		if err != nil {
 			return err
 		}
@@ -226,27 +230,24 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
 	return nil
 }
 
-func SlackFileUpload(evalContext *alerting.EvalContext, log log.Logger, url string, recipient string, token string) error {
+func slackFileUpload(evalContext *alerting.EvalContext, log log.Logger, url string, recipient string, token string) error {
 	if evalContext.ImageOnDiskPath == "" {
 		evalContext.ImageOnDiskPath = filepath.Join(setting.HomePath, "public/img/mixed_styles.png")
 	}
 	log.Info("Uploading to slack via file.upload API")
-	headers, uploadBody, err := GenerateSlackBody(evalContext.ImageOnDiskPath, token, recipient)
+	headers, uploadBody, err := generateSlackBody(evalContext.ImageOnDiskPath, token, recipient)
 	if err != nil {
 		return err
 	}
-	cmd := &m.SendWebhookSync{Url: url, Body: uploadBody.String(), HttpHeader: headers, HttpMethod: "POST"}
+	cmd := &models.SendWebhookSync{Url: url, Body: uploadBody.String(), HttpHeader: headers, HttpMethod: "POST"}
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
 		log.Error("Failed to upload slack image", "error", err, "webhook", "file.upload")
 		return err
 	}
-	if err != nil {
-		return err
-	}
 	return nil
 }
 
-func GenerateSlackBody(file string, token string, recipient string) (map[string]string, bytes.Buffer, error) {
+func generateSlackBody(file string, token string, recipient string) (map[string]string, bytes.Buffer, error) {
 	// Slack requires all POSTs to files.upload to present
 	// an "application/x-www-form-urlencoded" encoded querystring
 	// See https://api.slack.com/methods/files.upload
diff --git a/pkg/services/alerting/notifiers/slack_test.go b/pkg/services/alerting/notifiers/slack_test.go
index 17362bc850b6..c8c5b1220cf6 100644
--- a/pkg/services/alerting/notifiers/slack_test.go
+++ b/pkg/services/alerting/notifiers/slack_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,7 +16,7 @@ func TestSlackNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "slack",
 					Settings: settingsJSON,
@@ -33,7 +33,7 @@ func TestSlackNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "slack",
 					Settings: settingsJSON,
@@ -45,11 +45,11 @@ func TestSlackNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(slackNotifier.Name, ShouldEqual, "ops")
 				So(slackNotifier.Type, ShouldEqual, "slack")
-				So(slackNotifier.Url, ShouldEqual, "http://google.com")
+				So(slackNotifier.URL, ShouldEqual, "http://google.com")
 				So(slackNotifier.Recipient, ShouldEqual, "")
 				So(slackNotifier.Username, ShouldEqual, "")
 				So(slackNotifier.IconEmoji, ShouldEqual, "")
-				So(slackNotifier.IconUrl, ShouldEqual, "")
+				So(slackNotifier.IconURL, ShouldEqual, "")
 				So(slackNotifier.Mention, ShouldEqual, "")
 				So(slackNotifier.Token, ShouldEqual, "")
 			})
@@ -67,7 +67,7 @@ func TestSlackNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "slack",
 					Settings: settingsJSON,
@@ -79,11 +79,11 @@ func TestSlackNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(slackNotifier.Name, ShouldEqual, "ops")
 				So(slackNotifier.Type, ShouldEqual, "slack")
-				So(slackNotifier.Url, ShouldEqual, "http://google.com")
+				So(slackNotifier.URL, ShouldEqual, "http://google.com")
 				So(slackNotifier.Recipient, ShouldEqual, "#ds-opentsdb")
 				So(slackNotifier.Username, ShouldEqual, "Grafana Alerts")
 				So(slackNotifier.IconEmoji, ShouldEqual, ":smile:")
-				So(slackNotifier.IconUrl, ShouldEqual, "https://grafana.com/img/fav32.png")
+				So(slackNotifier.IconURL, ShouldEqual, "https://grafana.com/img/fav32.png")
 				So(slackNotifier.Mention, ShouldEqual, "@carl")
 				So(slackNotifier.Token, ShouldEqual, "xoxb-XXXXXXXX-XXXXXXXX-XXXXXXXXXX")
 			})
diff --git a/pkg/services/alerting/notifiers/teams.go b/pkg/services/alerting/notifiers/teams.go
index e19357d7b7e2..4d0c47ddad23 100644
--- a/pkg/services/alerting/notifiers/teams.go
+++ b/pkg/services/alerting/notifiers/teams.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -26,7 +26,8 @@ func init() {
 
 }
 
-func NewTeamsNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewTeamsNotifier is the constructor for Teams notifier.
+func NewTeamsNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	url := model.Settings.Get("url").MustString()
 	if url == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
@@ -34,23 +35,26 @@ func NewTeamsNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 
 	return &TeamsNotifier{
 		NotifierBase: NewNotifierBase(model),
-		Url:          url,
+		URL:          url,
 		log:          log.New("alerting.notifier.teams"),
 	}, nil
 }
 
+// TeamsNotifier is responsible for sending
+// alert notifications to Microsoft teams.
 type TeamsNotifier struct {
 	NotifierBase
-	Url string
+	URL string
 	log log.Logger
 }
 
-func (this *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Executing teams notification", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+// Notify send an alert notification to Microsoft teams.
+func (tn *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
+	tn.log.Info("Executing teams notification", "ruleId", evalContext.Rule.ID, "notification", tn.Name)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		tn.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
@@ -74,14 +78,14 @@ func (this *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
 	}
 
 	message := ""
-	if evalContext.Rule.State != m.AlertStateOK { //don't add message when going back to alert state ok.
+	if evalContext.Rule.State != models.AlertStateOK { //don't add message when going back to alert state ok.
 		message = evalContext.Rule.Message
 	}
 
 	images := make([]map[string]interface{}, 0)
-	if evalContext.ImagePublicUrl != "" {
+	if evalContext.ImagePublicURL != "" {
 		images = append(images, map[string]interface{}{
-			"image": evalContext.ImagePublicUrl,
+			"image": evalContext.ImagePublicURL,
 		})
 	}
 
@@ -108,7 +112,7 @@ func (this *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
 				"name":     "View Rule",
 				"targets": []map[string]interface{}{
 					{
-						"os": "default", "uri": ruleUrl,
+						"os": "default", "uri": ruleURL,
 					},
 				},
 			},
@@ -118,7 +122,7 @@ func (this *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
 				"name":     "View Graph",
 				"targets": []map[string]interface{}{
 					{
-						"os": "default", "uri": evalContext.ImagePublicUrl,
+						"os": "default", "uri": evalContext.ImagePublicURL,
 					},
 				},
 			},
@@ -126,10 +130,10 @@ func (this *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
 	}
 
 	data, _ := json.Marshal(&body)
-	cmd := &m.SendWebhookSync{Url: this.Url, Body: string(data)}
+	cmd := &models.SendWebhookSync{Url: tn.URL, Body: string(data)}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send teams notification", "error", err, "webhook", this.Name)
+		tn.log.Error("Failed to send teams notification", "error", err, "webhook", tn.Name)
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/teams_test.go b/pkg/services/alerting/notifiers/teams_test.go
index a96473507363..10ec7edca285 100644
--- a/pkg/services/alerting/notifiers/teams_test.go
+++ b/pkg/services/alerting/notifiers/teams_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,7 +16,7 @@ func TestTeamsNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "teams",
 					Settings: settingsJSON,
@@ -33,7 +33,7 @@ func TestTeamsNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "teams",
 					Settings: settingsJSON,
@@ -45,7 +45,7 @@ func TestTeamsNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(teamsNotifier.Name, ShouldEqual, "ops")
 				So(teamsNotifier.Type, ShouldEqual, "teams")
-				So(teamsNotifier.Url, ShouldEqual, "http://google.com")
+				So(teamsNotifier.URL, ShouldEqual, "http://google.com")
 			})
 
 			Convey("from settings with Recipient and Mention", func() {
@@ -55,7 +55,7 @@ func TestTeamsNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "teams",
 					Settings: settingsJSON,
@@ -67,9 +67,8 @@ func TestTeamsNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(teamsNotifier.Name, ShouldEqual, "ops")
 				So(teamsNotifier.Type, ShouldEqual, "teams")
-				So(teamsNotifier.Url, ShouldEqual, "http://google.com")
+				So(teamsNotifier.URL, ShouldEqual, "http://google.com")
 			})
-
 		})
 	})
 }
diff --git a/pkg/services/alerting/notifiers/telegram.go b/pkg/services/alerting/notifiers/telegram.go
index ab43f3bce356..be354bc2733e 100644
--- a/pkg/services/alerting/notifiers/telegram.go
+++ b/pkg/services/alerting/notifiers/telegram.go
@@ -8,8 +8,8 @@ import (
 	"os"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -18,7 +18,7 @@ const (
 )
 
 var (
-	telegramApiUrl = "https://api.telegram.org/bot%s/%s"
+	telegramAPIURL = "https://api.telegram.org/bot%s/%s"
 )
 
 func init() {
@@ -52,6 +52,8 @@ func init() {
 
 }
 
+// TelegramNotifier is responsible for sending
+// alert notifications to Telegram.
 type TelegramNotifier struct {
 	NotifierBase
 	BotToken    string
@@ -60,54 +62,55 @@ type TelegramNotifier struct {
 	log         log.Logger
 }
 
-func NewTelegramNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewTelegramNotifier is the constructor for the Telegram notifier
+func NewTelegramNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	if model.Settings == nil {
 		return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
 	}
 
 	botToken := model.Settings.Get("bottoken").MustString()
-	chatId := model.Settings.Get("chatid").MustString()
+	chatID := model.Settings.Get("chatid").MustString()
 	uploadImage := model.Settings.Get("uploadImage").MustBool()
 
 	if botToken == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find Bot Token in settings"}
 	}
 
-	if chatId == "" {
+	if chatID == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find Chat Id in settings"}
 	}
 
 	return &TelegramNotifier{
 		NotifierBase: NewNotifierBase(model),
 		BotToken:     botToken,
-		ChatID:       chatId,
+		ChatID:       chatID,
 		UploadImage:  uploadImage,
 		log:          log.New("alerting.notifier.telegram"),
 	}, nil
 }
 
-func (this *TelegramNotifier) buildMessage(evalContext *alerting.EvalContext, sendImageInline bool) *m.SendWebhookSync {
+func (tn *TelegramNotifier) buildMessage(evalContext *alerting.EvalContext, sendImageInline bool) *models.SendWebhookSync {
 	if sendImageInline {
-		cmd, err := this.buildMessageInlineImage(evalContext)
+		cmd, err := tn.buildMessageInlineImage(evalContext)
 		if err == nil {
 			return cmd
 		}
-		this.log.Error("Could not generate Telegram message with inline image.", "err", err)
+		tn.log.Error("Could not generate Telegram message with inline image.", "err", err)
 	}
 
-	return this.buildMessageLinkedImage(evalContext)
+	return tn.buildMessageLinkedImage(evalContext)
 }
 
-func (this *TelegramNotifier) buildMessageLinkedImage(evalContext *alerting.EvalContext) *m.SendWebhookSync {
+func (tn *TelegramNotifier) buildMessageLinkedImage(evalContext *alerting.EvalContext) *models.SendWebhookSync {
 	message := fmt.Sprintf("<b>%s</b>\nState: %s\nMessage: %s\n", evalContext.GetNotificationTitle(), evalContext.Rule.Name, evalContext.Rule.Message)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err == nil {
-		message = message + fmt.Sprintf("URL: %s\n", ruleUrl)
+		message = message + fmt.Sprintf("URL: %s\n", ruleURL)
 	}
 
-	if evalContext.ImagePublicUrl != "" {
-		message = message + fmt.Sprintf("Image: %s\n", evalContext.ImagePublicUrl)
+	if evalContext.ImagePublicURL != "" {
+		message = message + fmt.Sprintf("Image: %s\n", evalContext.ImagePublicURL)
 	}
 
 	metrics := generateMetricsMessage(evalContext)
@@ -115,14 +118,14 @@ func (this *TelegramNotifier) buildMessageLinkedImage(evalContext *alerting.Eval
 		message = message + fmt.Sprintf("\n<i>Metrics:</i>%s", metrics)
 	}
 
-	cmd := this.generateTelegramCmd(message, "text", "sendMessage", func(w *multipart.Writer) {
+	cmd := tn.generateTelegramCmd(message, "text", "sendMessage", func(w *multipart.Writer) {
 		fw, _ := w.CreateFormField("parse_mode")
 		fw.Write([]byte("html"))
 	})
 	return cmd
 }
 
-func (this *TelegramNotifier) buildMessageInlineImage(evalContext *alerting.EvalContext) (*m.SendWebhookSync, error) {
+func (tn *TelegramNotifier) buildMessageInlineImage(evalContext *alerting.EvalContext) (*models.SendWebhookSync, error) {
 	var imageFile *os.File
 	var err error
 
@@ -130,7 +133,7 @@ func (this *TelegramNotifier) buildMessageInlineImage(evalContext *alerting.Eval
 	defer func() {
 		err := imageFile.Close()
 		if err != nil {
-			this.log.Error("Could not close Telegram inline image.", "err", err)
+			tn.log.Error("Could not close Telegram inline image.", "err", err)
 		}
 	}()
 
@@ -138,27 +141,27 @@ func (this *TelegramNotifier) buildMessageInlineImage(evalContext *alerting.Eval
 		return nil, err
 	}
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
 		return nil, err
 	}
 
 	metrics := generateMetricsMessage(evalContext)
-	message := generateImageCaption(evalContext, ruleUrl, metrics)
+	message := generateImageCaption(evalContext, ruleURL, metrics)
 
-	cmd := this.generateTelegramCmd(message, "caption", "sendPhoto", func(w *multipart.Writer) {
+	cmd := tn.generateTelegramCmd(message, "caption", "sendPhoto", func(w *multipart.Writer) {
 		fw, _ := w.CreateFormFile("photo", evalContext.ImageOnDiskPath)
 		io.Copy(fw, imageFile)
 	})
 	return cmd, nil
 }
 
-func (this *TelegramNotifier) generateTelegramCmd(message string, messageField string, apiAction string, extraConf func(writer *multipart.Writer)) *m.SendWebhookSync {
+func (tn *TelegramNotifier) generateTelegramCmd(message string, messageField string, apiAction string, extraConf func(writer *multipart.Writer)) *models.SendWebhookSync {
 	var body bytes.Buffer
 	w := multipart.NewWriter(&body)
 
 	fw, _ := w.CreateFormField("chat_id")
-	fw.Write([]byte(this.ChatID))
+	fw.Write([]byte(tn.ChatID))
 
 	fw, _ = w.CreateFormField(messageField)
 	fw.Write([]byte(message))
@@ -167,10 +170,10 @@ func (this *TelegramNotifier) generateTelegramCmd(message string, messageField s
 
 	w.Close()
 
-	this.log.Info("Sending telegram notification", "chat_id", this.ChatID, "bot_token", this.BotToken, "apiAction", apiAction)
-	url := fmt.Sprintf(telegramApiUrl, this.BotToken, apiAction)
+	tn.log.Info("Sending telegram notification", "chat_id", tn.ChatID, "bot_token", tn.BotToken, "apiAction", apiAction)
+	url := fmt.Sprintf(telegramAPIURL, tn.BotToken, apiAction)
 
-	cmd := &m.SendWebhookSync{
+	cmd := &models.SendWebhookSync{
 		Url:        url,
 		Body:       body.String(),
 		HttpMethod: "POST",
@@ -193,7 +196,7 @@ func generateMetricsMessage(evalContext *alerting.EvalContext) string {
 	return metrics
 }
 
-func generateImageCaption(evalContext *alerting.EvalContext, ruleUrl string, metrics string) string {
+func generateImageCaption(evalContext *alerting.EvalContext, ruleURL string, metrics string) string {
 	message := evalContext.GetNotificationTitle()
 
 	if len(evalContext.Rule.Message) > 0 {
@@ -205,8 +208,8 @@ func generateImageCaption(evalContext *alerting.EvalContext, ruleUrl string, met
 
 	}
 
-	if len(ruleUrl) > 0 {
-		urlLine := fmt.Sprintf("\nURL: %s", ruleUrl)
+	if len(ruleURL) > 0 {
+		urlLine := fmt.Sprintf("\nURL: %s", ruleURL)
 		message = appendIfPossible(message, urlLine, captionLengthLimit)
 	}
 
@@ -226,16 +229,17 @@ func appendIfPossible(message string, extra string, sizeLimit int) string {
 	return message
 }
 
-func (this *TelegramNotifier) Notify(evalContext *alerting.EvalContext) error {
-	var cmd *m.SendWebhookSync
-	if evalContext.ImagePublicUrl == "" && this.UploadImage {
-		cmd = this.buildMessage(evalContext, true)
+// Notify send an alert notification to Telegram.
+func (tn *TelegramNotifier) Notify(evalContext *alerting.EvalContext) error {
+	var cmd *models.SendWebhookSync
+	if evalContext.ImagePublicURL == "" && tn.UploadImage {
+		cmd = tn.buildMessage(evalContext, true)
 	} else {
-		cmd = this.buildMessage(evalContext, false)
+		cmd = tn.buildMessage(evalContext, false)
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name)
+		tn.log.Error("Failed to send webhook", "error", err, "webhook", tn.Name)
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/telegram_test.go b/pkg/services/alerting/notifiers/telegram_test.go
index 9906a2ffd957..3559555439e5 100644
--- a/pkg/services/alerting/notifiers/telegram_test.go
+++ b/pkg/services/alerting/notifiers/telegram_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	. "github.com/smartystreets/goconvey/convey"
 )
@@ -18,7 +18,7 @@ func TestTelegramNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "telegram_testing",
 					Type:     "telegram",
 					Settings: settingsJSON,
@@ -36,7 +36,7 @@ func TestTelegramNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "telegram_testing",
 					Type:     "telegram",
 					Settings: settingsJSON,
@@ -57,7 +57,7 @@ func TestTelegramNotifier(t *testing.T) {
 					&alerting.Rule{
 						Name:    "This is an alarm",
 						Message: "Some kind of message.",
-						State:   m.AlertStateOK,
+						State:   models.AlertStateOK,
 					})
 
 				caption := generateImageCaption(evalContext, "http://grafa.url/abcdef", "")
@@ -74,7 +74,7 @@ func TestTelegramNotifier(t *testing.T) {
 						&alerting.Rule{
 							Name:    "This is an alarm",
 							Message: "Some kind of message.",
-							State:   m.AlertStateOK,
+							State:   models.AlertStateOK,
 						})
 
 					caption := generateImageCaption(evalContext,
@@ -92,7 +92,7 @@ func TestTelegramNotifier(t *testing.T) {
 						&alerting.Rule{
 							Name:    "This is an alarm",
 							Message: "Some kind of message that is too long for appending to our pretty little message, this line is actually exactly 197 chars long and I will get there in the end I promise I will. Yes siree that's it. But suddenly Telegram increased the length so now we need some lorem ipsum to fix this test. Here we go: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus consectetur molestie cursus. Donec suscipit egestas nisi. Proin ut efficitur ex. Mauris mi augue, volutpat a nisi vel, euismod dictum arcu. Sed quis tempor eros, sed malesuada dolor. Ut orci augue, viverra sit amet blandit quis, faucibus sit amet ex. Duis condimentum efficitur lectus, id dignissim quam tempor id. Morbi sollicitudin rhoncus diam, id tincidunt lectus scelerisque vitae. Etiam imperdiet semper sem, vel eleifend ligula mollis eget. Etiam ultrices fringilla lacus, sit amet pharetra ex blandit quis. Suspendisse in egestas neque, et posuere lectus. Vestibulum eu ex dui. Sed molestie nulla a lobortis scelerisque. Nulla ipsum ex, iaculis vitae vehicula sit amet, fermentum eu eros.",
-							State:   m.AlertStateOK,
+							State:   models.AlertStateOK,
 						})
 
 					caption := generateImageCaption(evalContext,
@@ -109,7 +109,7 @@ func TestTelegramNotifier(t *testing.T) {
 						&alerting.Rule{
 							Name:    "This is an alarm",
 							Message: "Some kind of message that is too long for appending to our pretty little message, this line is actually exactly 197 chars long and I will get there in the end I promise I will. Yes siree that's it. But suddenly Telegram increased the length so now we need some lorem ipsum to fix this test. Here we go: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus consectetur molestie cursus. Donec suscipit egestas nisi. Proin ut efficitur ex. Mauris mi augue, volutpat a nisi vel, euismod dictum arcu. Sed quis tempor eros, sed malesuada dolor. Ut orci augue, viverra sit amet blandit quis, faucibus sit amet ex. Duis condimentum efficitur lectus, id dignissim quam tempor id. Morbi sollicitudin rhoncus diam, id tincidunt lectus scelerisque vitae. Etiam imperdiet semper sem, vel eleifend ligula mollis eget. Etiam ultrices fringilla lacus, sit amet pharetra ex blandit quis. Suspendisse in egestas neque, et posuere lectus. Vestibulum eu ex dui. Sed molestie nulla a lobortis sceleri",
-							State:   m.AlertStateOK,
+							State:   models.AlertStateOK,
 						})
 
 					caption := generateImageCaption(evalContext,
diff --git a/pkg/services/alerting/notifiers/threema.go b/pkg/services/alerting/notifiers/threema.go
index 28a62fade177..560e8c12e80b 100644
--- a/pkg/services/alerting/notifiers/threema.go
+++ b/pkg/services/alerting/notifiers/threema.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -68,6 +68,8 @@ func init() {
 
 }
 
+// ThreemaNotifier is responsible for sending
+// alert notifications to Threema.
 type ThreemaNotifier struct {
 	NotifierBase
 	GatewayID   string
@@ -76,7 +78,8 @@ type ThreemaNotifier struct {
 	log         log.Logger
 }
 
-func NewThreemaNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewThreemaNotifier is the constructor for the Threema notifer
+func NewThreemaNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	if model.Settings == nil {
 		return nil, alerting.ValidationError{Reason: "No Settings Supplied"}
 	}
@@ -114,6 +117,7 @@ func NewThreemaNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 	}, nil
 }
 
+// Notify send an alert notification to Threema
 func (notifier *ThreemaNotifier) Notify(evalContext *alerting.EvalContext) error {
 	notifier.log.Info("Sending alert notification from", "threema_id", notifier.GatewayID)
 	notifier.log.Info("Sending alert notification to", "threema_id", notifier.RecipientID)
@@ -127,11 +131,11 @@ func (notifier *ThreemaNotifier) Notify(evalContext *alerting.EvalContext) error
 	// Determine emoji
 	stateEmoji := ""
 	switch evalContext.Rule.State {
-	case m.AlertStateOK:
+	case models.AlertStateOK:
 		stateEmoji = "\u2705 " // White Heavy Check Mark
-	case m.AlertStateNoData:
+	case models.AlertStateNoData:
 		stateEmoji = "\u2753 " // Black Question Mark Ornament
-	case m.AlertStateAlerting:
+	case models.AlertStateAlerting:
 		stateEmoji = "\u26A0 " // Warning sign
 	}
 
@@ -139,12 +143,12 @@ func (notifier *ThreemaNotifier) Notify(evalContext *alerting.EvalContext) error
 	message := fmt.Sprintf("%s%s\n\n*State:* %s\n*Message:* %s\n",
 		stateEmoji, evalContext.GetNotificationTitle(),
 		evalContext.Rule.Name, evalContext.Rule.Message)
-	ruleURL, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err == nil {
 		message = message + fmt.Sprintf("*URL:* %s\n", ruleURL)
 	}
-	if evalContext.ImagePublicUrl != "" {
-		message = message + fmt.Sprintf("*Image:* %s\n", evalContext.ImagePublicUrl)
+	if evalContext.ImagePublicURL != "" {
+		message = message + fmt.Sprintf("*Image:* %s\n", evalContext.ImagePublicURL)
 	}
 	data.Set("text", message)
 
@@ -154,7 +158,7 @@ func (notifier *ThreemaNotifier) Notify(evalContext *alerting.EvalContext) error
 	headers := map[string]string{
 		"Content-Type": "application/x-www-form-urlencoded",
 	}
-	cmd := &m.SendWebhookSync{
+	cmd := &models.SendWebhookSync{
 		Url:        url,
 		Body:       body,
 		HttpMethod: "POST",
diff --git a/pkg/services/alerting/notifiers/threema_test.go b/pkg/services/alerting/notifiers/threema_test.go
index 3f23730a249a..8ec77db42129 100644
--- a/pkg/services/alerting/notifiers/threema_test.go
+++ b/pkg/services/alerting/notifiers/threema_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	. "github.com/smartystreets/goconvey/convey"
 )
@@ -17,7 +17,7 @@ func TestThreemaNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "threema_testing",
 					Type:     "threema",
 					Settings: settingsJSON,
@@ -36,7 +36,7 @@ func TestThreemaNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "threema_testing",
 					Type:     "threema",
 					Settings: settingsJSON,
@@ -63,7 +63,7 @@ func TestThreemaNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "threema_testing",
 					Type:     "threema",
 					Settings: settingsJSON,
@@ -83,7 +83,7 @@ func TestThreemaNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "threema_testing",
 					Type:     "threema",
 					Settings: settingsJSON,
@@ -103,7 +103,7 @@ func TestThreemaNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "threema_testing",
 					Type:     "threema",
 					Settings: settingsJSON,
@@ -113,7 +113,6 @@ func TestThreemaNotifier(t *testing.T) {
 				So(not, ShouldBeNil)
 				So(err.(alerting.ValidationError).Reason, ShouldEqual, "Invalid Threema Recipient ID: Must be 8 characters long")
 			})
-
 		})
 	})
 }
diff --git a/pkg/services/alerting/notifiers/victorops.go b/pkg/services/alerting/notifiers/victorops.go
index f33b3f4019e0..d19ea356547b 100644
--- a/pkg/services/alerting/notifiers/victorops.go
+++ b/pkg/services/alerting/notifiers/victorops.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/setting"
@@ -14,7 +14,7 @@ import (
 // AlertStateCritical - Victorops uses "CRITICAL" string to indicate "Alerting" state
 const AlertStateCritical = "CRITICAL"
 
-const AlertStateRecovery = "RECOVERY"
+const alertStateRecovery = "RECOVERY"
 
 func init() {
 	alerting.RegisterNotifier(&alerting.NotifierPlugin{
@@ -69,17 +69,17 @@ type VictoropsNotifier struct {
 }
 
 // Notify sends notification to Victorops via POST to URL endpoint
-func (this *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Executing victorops notification", "ruleId", evalContext.Rule.Id, "notification", this.Name)
+func (vn *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error {
+	vn.log.Info("Executing victorops notification", "ruleId", evalContext.Rule.ID, "notification", vn.Name)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err != nil {
-		this.log.Error("Failed get rule link", "error", err)
+		vn.log.Error("Failed get rule link", "error", err)
 		return err
 	}
 
-	if evalContext.Rule.State == models.AlertStateOK && !this.AutoResolve {
-		this.log.Info("Not alerting VictorOps", "state", evalContext.Rule.State, "auto resolve", this.AutoResolve)
+	if evalContext.Rule.State == models.AlertStateOK && !vn.AutoResolve {
+		vn.log.Info("Not alerting VictorOps", "state", evalContext.Rule.State, "auto resolve", vn.AutoResolve)
 		return nil
 	}
 
@@ -89,10 +89,10 @@ func (this *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error {
 	}
 
 	if evalContext.Rule.State == models.AlertStateOK {
-		messageType = AlertStateRecovery
+		messageType = alertStateRecovery
 	}
 
-	fields := make(map[string]interface{}, 0)
+	fields := make(map[string]interface{})
 	fieldLimitCount := 4
 	for index, evt := range evalContext.EvalMatches {
 		fields[evt.Metric] = evt.Value
@@ -109,22 +109,22 @@ func (this *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error {
 	bodyJSON.Set("state_start_time", evalContext.StartTime.Unix())
 	bodyJSON.Set("state_message", evalContext.Rule.Message)
 	bodyJSON.Set("monitoring_tool", "Grafana v"+setting.BuildVersion)
-	bodyJSON.Set("alert_url", ruleUrl)
+	bodyJSON.Set("alert_url", ruleURL)
 	bodyJSON.Set("metrics", fields)
 
 	if evalContext.Error != nil {
 		bodyJSON.Set("error_message", evalContext.Error.Error())
 	}
 
-	if evalContext.ImagePublicUrl != "" {
-		bodyJSON.Set("image_url", evalContext.ImagePublicUrl)
+	if evalContext.ImagePublicURL != "" {
+		bodyJSON.Set("image_url", evalContext.ImagePublicURL)
 	}
 
 	data, _ := bodyJSON.MarshalJSON()
-	cmd := &models.SendWebhookSync{Url: this.URL, Body: string(data)}
+	cmd := &models.SendWebhookSync{Url: vn.URL, Body: string(data)}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send Victorops notification", "error", err, "webhook", this.Name)
+		vn.log.Error("Failed to send Victorops notification", "error", err, "webhook", vn.Name)
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/victorops_test.go b/pkg/services/alerting/notifiers/victorops_test.go
index 6ac806a82cc5..258d2900a22b 100644
--- a/pkg/services/alerting/notifiers/victorops_test.go
+++ b/pkg/services/alerting/notifiers/victorops_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,7 +16,7 @@ func TestVictoropsNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "victorops_testing",
 					Type:     "victorops",
 					Settings: settingsJSON,
@@ -33,7 +33,7 @@ func TestVictoropsNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "victorops_testing",
 					Type:     "victorops",
 					Settings: settingsJSON,
diff --git a/pkg/services/alerting/notifiers/webhook.go b/pkg/services/alerting/notifiers/webhook.go
index 4045e496af99..f5ee99245127 100644
--- a/pkg/services/alerting/notifiers/webhook.go
+++ b/pkg/services/alerting/notifiers/webhook.go
@@ -3,8 +3,8 @@ package notifiers
 import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 )
 
@@ -40,7 +40,9 @@ func init() {
 
 }
 
-func NewWebHookNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
+// NewWebHookNotifier is the constructor for
+// the WebHook notifier.
+func NewWebHookNotifier(model *models.AlertNotification) (alerting.Notifier, error) {
 	url := model.Settings.Get("url").MustString()
 	if url == "" {
 		return nil, alerting.ValidationError{Reason: "Could not find url property in settings"}
@@ -48,40 +50,44 @@ func NewWebHookNotifier(model *m.AlertNotification) (alerting.Notifier, error) {
 
 	return &WebhookNotifier{
 		NotifierBase: NewNotifierBase(model),
-		Url:          url,
+		URL:          url,
 		User:         model.Settings.Get("username").MustString(),
 		Password:     model.Settings.Get("password").MustString(),
-		HttpMethod:   model.Settings.Get("httpMethod").MustString("POST"),
+		HTTPMethod:   model.Settings.Get("httpMethod").MustString("POST"),
 		log:          log.New("alerting.notifier.webhook"),
 	}, nil
 }
 
+// WebhookNotifier is responsible for sending
+// alert notifications as webhooks.
 type WebhookNotifier struct {
 	NotifierBase
-	Url        string
+	URL        string
 	User       string
 	Password   string
-	HttpMethod string
+	HTTPMethod string
 	log        log.Logger
 }
 
-func (this *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error {
-	this.log.Info("Sending webhook")
+// Notify send alert notifications as
+// webhook as http requests.
+func (wn *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error {
+	wn.log.Info("Sending webhook")
 
 	bodyJSON := simplejson.New()
 	bodyJSON.Set("title", evalContext.GetNotificationTitle())
-	bodyJSON.Set("ruleId", evalContext.Rule.Id)
+	bodyJSON.Set("ruleId", evalContext.Rule.ID)
 	bodyJSON.Set("ruleName", evalContext.Rule.Name)
 	bodyJSON.Set("state", evalContext.Rule.State)
 	bodyJSON.Set("evalMatches", evalContext.EvalMatches)
 
-	ruleUrl, err := evalContext.GetRuleUrl()
+	ruleURL, err := evalContext.GetRuleURL()
 	if err == nil {
-		bodyJSON.Set("ruleUrl", ruleUrl)
+		bodyJSON.Set("ruleUrl", ruleURL)
 	}
 
-	if evalContext.ImagePublicUrl != "" {
-		bodyJSON.Set("imageUrl", evalContext.ImagePublicUrl)
+	if evalContext.ImagePublicURL != "" {
+		bodyJSON.Set("imageUrl", evalContext.ImagePublicURL)
 	}
 
 	if evalContext.Rule.Message != "" {
@@ -90,16 +96,16 @@ func (this *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error {
 
 	body, _ := bodyJSON.MarshalJSON()
 
-	cmd := &m.SendWebhookSync{
-		Url:        this.Url,
-		User:       this.User,
-		Password:   this.Password,
+	cmd := &models.SendWebhookSync{
+		Url:        wn.URL,
+		User:       wn.User,
+		Password:   wn.Password,
 		Body:       string(body),
-		HttpMethod: this.HttpMethod,
+		HttpMethod: wn.HTTPMethod,
 	}
 
 	if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
-		this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name)
+		wn.log.Error("Failed to send webhook", "error", err, "webhook", wn.Name)
 		return err
 	}
 
diff --git a/pkg/services/alerting/notifiers/webhook_test.go b/pkg/services/alerting/notifiers/webhook_test.go
index b2d944eb6e94..b8c001b6e60b 100644
--- a/pkg/services/alerting/notifiers/webhook_test.go
+++ b/pkg/services/alerting/notifiers/webhook_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -16,7 +16,7 @@ func TestWebhookNotifier(t *testing.T) {
 				json := `{ }`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "webhook",
 					Settings: settingsJSON,
@@ -33,7 +33,7 @@ func TestWebhookNotifier(t *testing.T) {
 				}`
 
 				settingsJSON, _ := simplejson.NewJson([]byte(json))
-				model := &m.AlertNotification{
+				model := &models.AlertNotification{
 					Name:     "ops",
 					Type:     "webhook",
 					Settings: settingsJSON,
@@ -45,7 +45,7 @@ func TestWebhookNotifier(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(webhookNotifier.Name, ShouldEqual, "ops")
 				So(webhookNotifier.Type, ShouldEqual, "webhook")
-				So(webhookNotifier.Url, ShouldEqual, "http://google.com")
+				So(webhookNotifier.URL, ShouldEqual, "http://google.com")
 			})
 		})
 	})
diff --git a/pkg/services/alerting/reader.go b/pkg/services/alerting/reader.go
index d9f20a21c8e6..c8020510ef63 100644
--- a/pkg/services/alerting/reader.go
+++ b/pkg/services/alerting/reader.go
@@ -2,45 +2,32 @@ package alerting
 
 import (
 	"sync"
-	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 )
 
-type RuleReader interface {
-	Fetch() []*Rule
+type ruleReader interface {
+	fetch() []*Rule
 }
 
-type DefaultRuleReader struct {
+type defaultRuleReader struct {
 	sync.RWMutex
-	//serverID       string
-	serverPosition int
-	clusterSize    int
-	log            log.Logger
+	log log.Logger
 }
 
-func NewRuleReader() *DefaultRuleReader {
-	ruleReader := &DefaultRuleReader{
+func newRuleReader() *defaultRuleReader {
+	ruleReader := &defaultRuleReader{
 		log: log.New("alerting.ruleReader"),
 	}
 
-	go ruleReader.initReader()
 	return ruleReader
 }
 
-func (arr *DefaultRuleReader) initReader() {
-	heartbeat := time.NewTicker(time.Second * 10)
-
-	for range heartbeat.C {
-		arr.heartbeat()
-	}
-}
-
-func (arr *DefaultRuleReader) Fetch() []*Rule {
-	cmd := &m.GetAllAlertsQuery{}
+func (arr *defaultRuleReader) fetch() []*Rule {
+	cmd := &models.GetAllAlertsQuery{}
 
 	if err := bus.Dispatch(cmd); err != nil {
 		arr.log.Error("Could not load alerts", "error", err)
@@ -59,8 +46,3 @@ func (arr *DefaultRuleReader) Fetch() []*Rule {
 	metrics.M_Alerting_Active_Alerts.Set(float64(len(res)))
 	return res
 }
-
-func (arr *DefaultRuleReader) heartbeat() {
-	arr.clusterSize = 1
-	arr.serverPosition = 1
-}
diff --git a/pkg/services/alerting/result_handler.go b/pkg/services/alerting/result_handler.go
index c8e9e2dc25c7..814a3f8a21e2 100644
--- a/pkg/services/alerting/result_handler.go
+++ b/pkg/services/alerting/result_handler.go
@@ -5,30 +5,31 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/metrics"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
+
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/rendering"
 )
 
-type ResultHandler interface {
-	Handle(evalContext *EvalContext) error
+type resultHandler interface {
+	handle(evalContext *EvalContext) error
 }
 
-type DefaultResultHandler struct {
-	notifier NotificationService
+type defaultResultHandler struct {
+	notifier *notificationService
 	log      log.Logger
 }
 
-func NewResultHandler(renderService rendering.Service) *DefaultResultHandler {
-	return &DefaultResultHandler{
+func newResultHandler(renderService rendering.Service) *defaultResultHandler {
+	return &defaultResultHandler{
 		log:      log.New("alerting.resultHandler"),
-		notifier: NewNotificationService(renderService),
+		notifier: newNotificationService(renderService),
 	}
 }
 
-func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
+func (handler *defaultResultHandler) handle(evalContext *EvalContext) error {
 	executionError := ""
 	annotationData := simplejson.New()
 
@@ -44,24 +45,24 @@ func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
 	}
 
 	metrics.M_Alerting_Result_State.WithLabelValues(string(evalContext.Rule.State)).Inc()
-	if evalContext.ShouldUpdateAlertState() {
-		handler.log.Info("New state change", "alertId", evalContext.Rule.Id, "newState", evalContext.Rule.State, "prev state", evalContext.PrevAlertState)
+	if evalContext.shouldUpdateAlertState() {
+		handler.log.Info("New state change", "alertId", evalContext.Rule.ID, "newState", evalContext.Rule.State, "prev state", evalContext.PrevAlertState)
 
-		cmd := &m.SetAlertStateCommand{
-			AlertId:  evalContext.Rule.Id,
-			OrgId:    evalContext.Rule.OrgId,
+		cmd := &models.SetAlertStateCommand{
+			AlertId:  evalContext.Rule.ID,
+			OrgId:    evalContext.Rule.OrgID,
 			State:    evalContext.Rule.State,
 			Error:    executionError,
 			EvalData: annotationData,
 		}
 
 		if err := bus.Dispatch(cmd); err != nil {
-			if err == m.ErrCannotChangeStateOnPausedAlert {
+			if err == models.ErrCannotChangeStateOnPausedAlert {
 				handler.log.Error("Cannot change state on alert that's paused", "error", err)
 				return err
 			}
 
-			if err == m.ErrRequiresNewState {
+			if err == models.ErrRequiresNewState {
 				handler.log.Info("Alert already updated")
 				return nil
 			}
@@ -80,10 +81,10 @@ func (handler *DefaultResultHandler) Handle(evalContext *EvalContext) error {
 
 		// save annotation
 		item := annotations.Item{
-			OrgId:       evalContext.Rule.OrgId,
-			DashboardId: evalContext.Rule.DashboardId,
-			PanelId:     evalContext.Rule.PanelId,
-			AlertId:     evalContext.Rule.Id,
+			OrgId:       evalContext.Rule.OrgID,
+			DashboardId: evalContext.Rule.DashboardID,
+			PanelId:     evalContext.Rule.PanelID,
+			AlertId:     evalContext.Rule.ID,
 			Text:        "",
 			NewState:    string(evalContext.Rule.State),
 			PrevState:   string(evalContext.PrevAlertState),
diff --git a/pkg/services/alerting/rule.go b/pkg/services/alerting/rule.go
index f62690a2d960..9a4065e279da 100644
--- a/pkg/services/alerting/rule.go
+++ b/pkg/services/alerting/rule.go
@@ -8,53 +8,59 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 )
 
 var (
+	// ErrFrequencyCannotBeZeroOrLess frequency cannot be below zero
 	ErrFrequencyCannotBeZeroOrLess = errors.New(`"evaluate every" cannot be zero or below`)
-	ErrFrequencyCouldNotBeParsed   = errors.New(`"evaluate every" field could not be parsed`)
+
+	// ErrFrequencyCouldNotBeParsed frequency cannot be parsed
+	ErrFrequencyCouldNotBeParsed = errors.New(`"evaluate every" field could not be parsed`)
 )
 
+// Rule is the in-memory version of an alert rule.
 type Rule struct {
-	Id                  int64
-	OrgId               int64
-	DashboardId         int64
-	PanelId             int64
+	ID                  int64
+	OrgID               int64
+	DashboardID         int64
+	PanelID             int64
 	Frequency           int64
 	Name                string
 	Message             string
 	LastStateChange     time.Time
 	For                 time.Duration
-	NoDataState         m.NoDataOption
-	ExecutionErrorState m.ExecutionErrorOption
-	State               m.AlertStateType
+	NoDataState         models.NoDataOption
+	ExecutionErrorState models.ExecutionErrorOption
+	State               models.AlertStateType
 	Conditions          []Condition
 	Notifications       []string
 
 	StateChanges int64
 }
 
+// ValidationError is a typed error with meta data
+// about the validation error.
 type ValidationError struct {
 	Reason      string
 	Err         error
-	Alertid     int64
-	DashboardId int64
-	PanelId     int64
+	AlertID     int64
+	DashboardID int64
+	PanelID     int64
 }
 
 func (e ValidationError) Error() string {
 	extraInfo := e.Reason
-	if e.Alertid != 0 {
-		extraInfo = fmt.Sprintf("%s AlertId: %v", extraInfo, e.Alertid)
+	if e.AlertID != 0 {
+		extraInfo = fmt.Sprintf("%s AlertId: %v", extraInfo, e.AlertID)
 	}
 
-	if e.PanelId != 0 {
-		extraInfo = fmt.Sprintf("%s PanelId: %v", extraInfo, e.PanelId)
+	if e.PanelID != 0 {
+		extraInfo = fmt.Sprintf("%s PanelId: %v", extraInfo, e.PanelID)
 	}
 
-	if e.DashboardId != 0 {
-		extraInfo = fmt.Sprintf("%s DashboardId: %v", extraInfo, e.DashboardId)
+	if e.DashboardID != 0 {
+		extraInfo = fmt.Sprintf("%s DashboardId: %v", extraInfo, e.DashboardID)
 	}
 
 	if e.Err != nil {
@@ -65,8 +71,8 @@ func (e ValidationError) Error() string {
 }
 
 var (
-	ValueFormatRegex = regexp.MustCompile(`^\d+`)
-	UnitFormatRegex  = regexp.MustCompile(`\w{1}$`)
+	valueFormatRegex = regexp.MustCompile(`^\d+`)
+	unitFormatRegex  = regexp.MustCompile(`\w{1}$`)
 )
 
 var unitMultiplier = map[string]int{
@@ -79,7 +85,7 @@ var unitMultiplier = map[string]int{
 func getTimeDurationStringToSeconds(str string) (int64, error) {
 	multiplier := 1
 
-	matches := ValueFormatRegex.FindAllString(str, 1)
+	matches := valueFormatRegex.FindAllString(str, 1)
 
 	if len(matches) <= 0 {
 		return 0, ErrFrequencyCouldNotBeParsed
@@ -94,7 +100,7 @@ func getTimeDurationStringToSeconds(str string) (int64, error) {
 		return 0, ErrFrequencyCannotBeZeroOrLess
 	}
 
-	unit := UnitFormatRegex.FindAllString(str, 1)[0]
+	unit := unitFormatRegex.FindAllString(str, 1)[0]
 
 	if val, ok := unitMultiplier[unit]; ok {
 		multiplier = val
@@ -103,19 +109,21 @@ func getTimeDurationStringToSeconds(str string) (int64, error) {
 	return int64(value * multiplier), nil
 }
 
-func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
+// NewRuleFromDBAlert mappes an db version of
+// alert to an in-memory version.
+func NewRuleFromDBAlert(ruleDef *models.Alert) (*Rule, error) {
 	model := &Rule{}
-	model.Id = ruleDef.Id
-	model.OrgId = ruleDef.OrgId
-	model.DashboardId = ruleDef.DashboardId
-	model.PanelId = ruleDef.PanelId
+	model.ID = ruleDef.Id
+	model.OrgID = ruleDef.OrgId
+	model.DashboardID = ruleDef.DashboardId
+	model.PanelID = ruleDef.PanelId
 	model.Name = ruleDef.Name
 	model.Message = ruleDef.Message
 	model.State = ruleDef.State
 	model.LastStateChange = ruleDef.NewStateDate
 	model.For = ruleDef.For
-	model.NoDataState = m.NoDataOption(ruleDef.Settings.Get("noDataState").MustString("no_data"))
-	model.ExecutionErrorState = m.ExecutionErrorOption(ruleDef.Settings.Get("executionErrorState").MustString("alerting"))
+	model.NoDataState = models.NoDataOption(ruleDef.Settings.Get("noDataState").MustString("no_data"))
+	model.ExecutionErrorState = models.ExecutionErrorOption(ruleDef.Settings.Get("executionErrorState").MustString("alerting"))
 	model.StateChanges = ruleDef.StateChanges
 
 	model.Frequency = ruleDef.Frequency
@@ -132,7 +140,7 @@ func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
 		} else {
 			uid, err := jsonModel.Get("uid").String()
 			if err != nil {
-				return nil, ValidationError{Reason: "Neither id nor uid is specified, " + err.Error(), DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
+				return nil, ValidationError{Reason: "Neither id nor uid is specified, " + err.Error(), DashboardID: model.DashboardID, AlertID: model.ID, PanelID: model.PanelID}
 			}
 			model.Notifications = append(model.Notifications, uid)
 		}
@@ -143,11 +151,11 @@ func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
 		conditionType := conditionModel.Get("type").MustString()
 		factory, exist := conditionFactories[conditionType]
 		if !exist {
-			return nil, ValidationError{Reason: "Unknown alert condition: " + conditionType, DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
+			return nil, ValidationError{Reason: "Unknown alert condition: " + conditionType, DashboardID: model.DashboardID, AlertID: model.ID, PanelID: model.PanelID}
 		}
 		queryCondition, err := factory(conditionModel, index)
 		if err != nil {
-			return nil, ValidationError{Err: err, DashboardId: model.DashboardId, Alertid: model.Id, PanelId: model.PanelId}
+			return nil, ValidationError{Err: err, DashboardID: model.DashboardID, AlertID: model.ID, PanelID: model.PanelID}
 		}
 		model.Conditions = append(model.Conditions, queryCondition)
 	}
@@ -159,10 +167,12 @@ func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
 	return model, nil
 }
 
+// ConditionFactory is the function signature for creating `Conditions`.
 type ConditionFactory func(model *simplejson.Json, index int) (Condition, error)
 
 var conditionFactories = make(map[string]ConditionFactory)
 
+// RegisterCondition adds support for alerting conditions.
 func RegisterCondition(typeName string, factory ConditionFactory) {
 	conditionFactories[typeName] = factory
 }
diff --git a/pkg/services/alerting/rule_test.go b/pkg/services/alerting/rule_test.go
index ca533c36210f..853fb5d17b5c 100644
--- a/pkg/services/alerting/rule_test.go
+++ b/pkg/services/alerting/rule_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	. "github.com/smartystreets/goconvey/convey"
 )
@@ -60,10 +60,10 @@ func TestAlertRuleModel(t *testing.T) {
 		})
 
 		Convey("can construct alert rule model", func() {
-			firstNotification := m.CreateAlertNotificationCommand{OrgId: 1, Name: "1"}
+			firstNotification := models.CreateAlertNotificationCommand{OrgId: 1, Name: "1"}
 			err := sqlstore.CreateAlertNotificationCommand(&firstNotification)
 			So(err, ShouldBeNil)
-			secondNotification := m.CreateAlertNotificationCommand{Uid: "notifier2", OrgId: 1, Name: "2"}
+			secondNotification := models.CreateAlertNotificationCommand{Uid: "notifier2", OrgId: 1, Name: "2"}
 			err = sqlstore.CreateAlertNotificationCommand(&secondNotification)
 			So(err, ShouldBeNil)
 
@@ -92,7 +92,7 @@ func TestAlertRuleModel(t *testing.T) {
 				alertJSON, jsonErr := simplejson.NewJson([]byte(json))
 				So(jsonErr, ShouldBeNil)
 
-				alert := &m.Alert{
+				alert := &models.Alert{
 					Id:          1,
 					OrgId:       1,
 					DashboardId: 1,
@@ -129,7 +129,7 @@ func TestAlertRuleModel(t *testing.T) {
 			alertJSON, jsonErr := simplejson.NewJson([]byte(json))
 			So(jsonErr, ShouldBeNil)
 
-			alert := &m.Alert{
+			alert := &models.Alert{
 				Id:          1,
 				OrgId:       1,
 				DashboardId: 1,
@@ -167,7 +167,7 @@ func TestAlertRuleModel(t *testing.T) {
 			alertJSON, jsonErr := simplejson.NewJson([]byte(json))
 			So(jsonErr, ShouldBeNil)
 
-			alert := &m.Alert{
+			alert := &models.Alert{
 				Id:          1,
 				OrgId:       1,
 				DashboardId: 1,
diff --git a/pkg/services/alerting/scheduler.go b/pkg/services/alerting/scheduler.go
index b7555ae8d898..b01618f40955 100644
--- a/pkg/services/alerting/scheduler.go
+++ b/pkg/services/alerting/scheduler.go
@@ -4,31 +4,31 @@ import (
 	"math"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 )
 
-type SchedulerImpl struct {
+type schedulerImpl struct {
 	jobs map[int64]*Job
 	log  log.Logger
 }
 
-func NewScheduler() Scheduler {
-	return &SchedulerImpl{
+func newScheduler() scheduler {
+	return &schedulerImpl{
 		jobs: make(map[int64]*Job),
 		log:  log.New("alerting.scheduler"),
 	}
 }
 
-func (s *SchedulerImpl) Update(rules []*Rule) {
+func (s *schedulerImpl) Update(rules []*Rule) {
 	s.log.Debug("Scheduling update", "ruleCount", len(rules))
 
 	jobs := make(map[int64]*Job)
 
 	for i, rule := range rules {
 		var job *Job
-		if s.jobs[rule.Id] != nil {
-			job = s.jobs[rule.Id]
+		if s.jobs[rule.ID] != nil {
+			job = s.jobs[rule.ID]
 		} else {
 			job = &Job{
 				Running: false,
@@ -42,13 +42,13 @@ func (s *SchedulerImpl) Update(rules []*Rule) {
 		if job.Offset == 0 { //zero offset causes division with 0 panics.
 			job.Offset = 1
 		}
-		jobs[rule.Id] = job
+		jobs[rule.ID] = job
 	}
 
 	s.jobs = jobs
 }
 
-func (s *SchedulerImpl) Tick(tickTime time.Time, execQueue chan *Job) {
+func (s *schedulerImpl) Tick(tickTime time.Time, execQueue chan *Job) {
 	now := tickTime.Unix()
 
 	for _, job := range s.jobs {
@@ -72,7 +72,7 @@ func (s *SchedulerImpl) Tick(tickTime time.Time, execQueue chan *Job) {
 	}
 }
 
-func (s *SchedulerImpl) enqueue(job *Job, execQueue chan *Job) {
-	s.log.Debug("Scheduler: Putting job on to exec queue", "name", job.Rule.Name, "id", job.Rule.Id)
+func (s *schedulerImpl) enqueue(job *Job, execQueue chan *Job) {
+	s.log.Debug("Scheduler: Putting job on to exec queue", "name", job.Rule.Name, "id", job.Rule.ID)
 	execQueue <- job
 }
diff --git a/pkg/services/alerting/test_notification.go b/pkg/services/alerting/test_notification.go
index 22f6a2118b7d..311109ed6078 100644
--- a/pkg/services/alerting/test_notification.go
+++ b/pkg/services/alerting/test_notification.go
@@ -7,12 +7,14 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 )
 
+// NotificationTestCommand initiates an test
+// execution of an alert notification.
 type NotificationTestCommand struct {
-	State    m.AlertStateType
+	State    models.AlertStateType
 	Name     string
 	Type     string
 	Settings *simplejson.Json
@@ -27,9 +29,9 @@ func init() {
 }
 
 func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
-	notifier := NewNotificationService(nil).(*notificationService)
+	notifier := newNotificationService(nil)
 
-	model := &m.AlertNotification{
+	model := &models.AlertNotification{
 		Name:     cmd.Name,
 		Type:     cmd.Type,
 		Settings: cmd.Settings,
@@ -47,16 +49,16 @@ func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
 
 func createTestEvalContext(cmd *NotificationTestCommand) *EvalContext {
 	testRule := &Rule{
-		DashboardId: 1,
-		PanelId:     1,
+		DashboardID: 1,
+		PanelID:     1,
 		Name:        "Test notification",
 		Message:     "Someone is testing the alert notification within grafana.",
-		State:       m.AlertStateAlerting,
+		State:       models.AlertStateAlerting,
 	}
 
 	ctx := NewEvalContext(context.Background(), testRule)
 	if cmd.Settings.Get("uploadImage").MustBool(true) {
-		ctx.ImagePublicUrl = "https://grafana.com/assets/img/blog/mixed_styles.png"
+		ctx.ImagePublicURL = "https://grafana.com/assets/img/blog/mixed_styles.png"
 	}
 	ctx.IsTestRun = true
 	ctx.Firing = true
diff --git a/pkg/services/alerting/test_rule.go b/pkg/services/alerting/test_rule.go
index 360ee065de0f..1575490ea324 100644
--- a/pkg/services/alerting/test_rule.go
+++ b/pkg/services/alerting/test_rule.go
@@ -6,14 +6,16 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 )
 
+// AlertTestCommand initiates an test evaluation
+// of an alert rule.
 type AlertTestCommand struct {
 	Dashboard *simplejson.Json
-	PanelId   int64
-	OrgId     int64
-	User      *m.SignedInUser
+	PanelID   int64
+	OrgID     int64
+	User      *models.SignedInUser
 
 	Result *EvalContext
 }
@@ -24,16 +26,16 @@ func init() {
 
 func handleAlertTestCommand(cmd *AlertTestCommand) error {
 
-	dash := m.NewDashboardFromJson(cmd.Dashboard)
+	dash := models.NewDashboardFromJson(cmd.Dashboard)
 
-	extractor := NewDashAlertExtractor(dash, cmd.OrgId, cmd.User)
+	extractor := NewDashAlertExtractor(dash, cmd.OrgID, cmd.User)
 	alerts, err := extractor.GetAlerts()
 	if err != nil {
 		return err
 	}
 
 	for _, alert := range alerts {
-		if alert.PanelId == cmd.PanelId {
+		if alert.PanelId == cmd.PanelID {
 			rule, err := NewRuleFromDBAlert(alert)
 			if err != nil {
 				return err
@@ -44,7 +46,7 @@ func handleAlertTestCommand(cmd *AlertTestCommand) error {
 		}
 	}
 
-	return fmt.Errorf("Could not find alert with panel id %d", cmd.PanelId)
+	return fmt.Errorf("Could not find alert with panel id %d", cmd.PanelID)
 }
 
 func testAlertRule(rule *Rule) *EvalContext {
diff --git a/pkg/services/alerting/ticker.go b/pkg/services/alerting/ticker.go
index 8cee2653ee9d..9702a2cda63a 100644
--- a/pkg/services/alerting/ticker.go
+++ b/pkg/services/alerting/ticker.go
@@ -6,7 +6,7 @@ import (
 	"github.com/benbjohnson/clock"
 )
 
-// ticker is a ticker to power the alerting scheduler. it's like a time.Ticker, except:
+// Ticker is a ticker to power the alerting scheduler. it's like a time.Ticker, except:
 // * it doesn't drop ticks for slow receivers, rather, it queues up.  so that callers are in control to instrument what's going on.
 // * it automatically ticks every second, which is the right thing in our current design
 // * it ticks on second marks or very shortly after. this provides a predictable load pattern
diff --git a/pkg/services/auth/auth_token.go b/pkg/services/auth/auth_token.go
index dc9936f2f3ff..af23d773f65c 100644
--- a/pkg/services/auth/auth_token.go
+++ b/pkg/services/auth/auth_token.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
+	"strings"
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/serverlock"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
@@ -305,6 +306,36 @@ func (s *UserAuthTokenService) RevokeAllUserTokens(ctx context.Context, userId i
 	})
 }
 
+func (s *UserAuthTokenService) BatchRevokeAllUserTokens(ctx context.Context, userIds []int64) error {
+	return s.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *sqlstore.DBSession) error {
+		if len(userIds) == 0 {
+			return nil
+		}
+
+		user_id_params := strings.Repeat(",?", len(userIds)-1)
+		sql := "DELETE from user_auth_token WHERE user_id IN (?" + user_id_params + ")"
+
+		params := []interface{}{sql}
+		for _, v := range userIds {
+			params = append(params, v)
+		}
+
+		res, err := dbSession.Exec(params...)
+		if err != nil {
+			return err
+		}
+
+		affected, err := res.RowsAffected()
+		if err != nil {
+			return err
+		}
+
+		s.log.Debug("all user tokens for given users revoked", "usersCount", len(userIds), "count", affected)
+
+		return err
+	})
+}
+
 func (s *UserAuthTokenService) GetUserToken(ctx context.Context, userId, userTokenId int64) (*models.UserToken, error) {
 
 	var result models.UserToken
diff --git a/pkg/services/auth/auth_token_test.go b/pkg/services/auth/auth_token_test.go
index b1398834bdc9..bf12d914e970 100644
--- a/pkg/services/auth/auth_token_test.go
+++ b/pkg/services/auth/auth_token_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/setting"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	. "github.com/smartystreets/goconvey/convey"
@@ -117,6 +117,26 @@ func TestUserAuthToken(t *testing.T) {
 					So(model2, ShouldBeNil)
 				})
 			})
+
+			Convey("When revoking users tokens in a batch", func() {
+				Convey("Can revoke all users tokens", func() {
+					userIds := []int64{}
+					for i := 0; i < 3; i++ {
+						userId := userID + int64(i+1)
+						userIds = append(userIds, userId)
+						userAuthTokenService.CreateToken(context.Background(), userId, "192.168.10.11:1234", "some user agent")
+					}
+
+					err := userAuthTokenService.BatchRevokeAllUserTokens(context.Background(), userIds)
+					So(err, ShouldBeNil)
+
+					for _, v := range userIds {
+						tokens, err := userAuthTokenService.GetUserTokens(context.Background(), v)
+						So(err, ShouldBeNil)
+						So(len(tokens), ShouldEqual, 0)
+					}
+				})
+			})
 		})
 
 		Convey("expires correctly", func() {
diff --git a/pkg/services/cleanup/cleanup.go b/pkg/services/cleanup/cleanup.go
index 63d829bccec1..6e07a76f8002 100644
--- a/pkg/services/cleanup/cleanup.go
+++ b/pkg/services/cleanup/cleanup.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/serverlock"
-	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/setting"
diff --git a/pkg/services/dashboards/dashboard_service.go b/pkg/services/dashboards/dashboard_service.go
index 884d993f43c6..bec718700a78 100644
--- a/pkg/services/dashboards/dashboard_service.go
+++ b/pkg/services/dashboards/dashboard_service.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/util"
diff --git a/pkg/services/guardian/guardian.go b/pkg/services/guardian/guardian.go
index 366bc90fc377..4d242722d6b1 100644
--- a/pkg/services/guardian/guardian.go
+++ b/pkg/services/guardian/guardian.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 )
diff --git a/pkg/services/ldap/hooks.go b/pkg/services/ldap/hooks.go
deleted file mode 100644
index ece98e5e73b0..000000000000
--- a/pkg/services/ldap/hooks.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package ldap
-
-var (
-	hookDial func(*Auth) error
-)
diff --git a/pkg/services/ldap/ldap.go b/pkg/services/ldap/ldap.go
index 5ff74bd7a3e9..418673be4463 100644
--- a/pkg/services/ldap/ldap.go
+++ b/pkg/services/ldap/ldap.go
@@ -8,39 +8,37 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/davecgh/go-spew/spew"
-	LDAP "gopkg.in/ldap.v3"
+	"gopkg.in/ldap.v3"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	models "github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 )
 
 // IConnection is interface for LDAP connection manipulation
 type IConnection interface {
 	Bind(username, password string) error
 	UnauthenticatedBind(username string) error
-	Search(*LDAP.SearchRequest) (*LDAP.SearchResult, error)
+	Add(*ldap.AddRequest) error
+	Del(*ldap.DelRequest) error
+	Search(*ldap.SearchRequest) (*ldap.SearchResult, error)
 	StartTLS(*tls.Config) error
 	Close()
 }
 
-// IAuth is interface for LDAP authorization
-type IAuth interface {
-	Login(query *models.LoginUserQuery) error
-	SyncUser(query *models.LoginUserQuery) error
-	GetGrafanaUserFor(
-		ctx *models.ReqContext,
-		user *UserInfo,
-	) (*models.User, error)
-	Users() ([]*UserInfo, error)
+// IServer is interface for LDAP authorization
+type IServer interface {
+	Login(*models.LoginUserQuery) (*models.ExternalUserInfo, error)
+	Users([]string) ([]*models.ExternalUserInfo, error)
+	InitialBind(string, string) error
+	Dial() error
+	Close()
 }
 
-// Auth is basic struct of LDAP authorization
-type Auth struct {
-	server            *ServerConfig
-	conn              IConnection
+// Server is basic struct of LDAP authorization
+type Server struct {
+	Config            *ServerConfig
+	Connection        IConnection
 	requireSecondBind bool
 	log               log.Logger
 }
@@ -52,28 +50,24 @@ var (
 )
 
 var dial = func(network, addr string) (IConnection, error) {
-	return LDAP.Dial(network, addr)
+	return ldap.Dial(network, addr)
 }
 
 // New creates the new LDAP auth
-func New(server *ServerConfig) IAuth {
-	return &Auth{
-		server: server,
+func New(config *ServerConfig) IServer {
+	return &Server{
+		Config: config,
 		log:    log.New("ldap"),
 	}
 }
 
 // Dial dials in the LDAP
-func (auth *Auth) Dial() error {
-	if hookDial != nil {
-		return hookDial(auth)
-	}
-
+func (server *Server) Dial() error {
 	var err error
 	var certPool *x509.CertPool
-	if auth.server.RootCACert != "" {
+	if server.Config.RootCACert != "" {
 		certPool = x509.NewCertPool()
-		for _, caCertFile := range strings.Split(auth.server.RootCACert, " ") {
+		for _, caCertFile := range strings.Split(server.Config.RootCACert, " ") {
 			pem, err := ioutil.ReadFile(caCertFile)
 			if err != nil {
 				return err
@@ -84,35 +78,35 @@ func (auth *Auth) Dial() error {
 		}
 	}
 	var clientCert tls.Certificate
-	if auth.server.ClientCert != "" && auth.server.ClientKey != "" {
-		clientCert, err = tls.LoadX509KeyPair(auth.server.ClientCert, auth.server.ClientKey)
+	if server.Config.ClientCert != "" && server.Config.ClientKey != "" {
+		clientCert, err = tls.LoadX509KeyPair(server.Config.ClientCert, server.Config.ClientKey)
 		if err != nil {
 			return err
 		}
 	}
-	for _, host := range strings.Split(auth.server.Host, " ") {
-		address := fmt.Sprintf("%s:%d", host, auth.server.Port)
-		if auth.server.UseSSL {
+	for _, host := range strings.Split(server.Config.Host, " ") {
+		address := fmt.Sprintf("%s:%d", host, server.Config.Port)
+		if server.Config.UseSSL {
 			tlsCfg := &tls.Config{
-				InsecureSkipVerify: auth.server.SkipVerifySSL,
+				InsecureSkipVerify: server.Config.SkipVerifySSL,
 				ServerName:         host,
 				RootCAs:            certPool,
 			}
 			if len(clientCert.Certificate) > 0 {
 				tlsCfg.Certificates = append(tlsCfg.Certificates, clientCert)
 			}
-			if auth.server.StartTLS {
-				auth.conn, err = dial("tcp", address)
+			if server.Config.StartTLS {
+				server.Connection, err = dial("tcp", address)
 				if err == nil {
-					if err = auth.conn.StartTLS(tlsCfg); err == nil {
+					if err = server.Connection.StartTLS(tlsCfg); err == nil {
 						return nil
 					}
 				}
 			} else {
-				auth.conn, err = LDAP.DialTLS("tcp", address, tlsCfg)
+				server.Connection, err = ldap.DialTLS("tcp", address, tlsCfg)
 			}
 		} else {
-			auth.conn, err = dial("tcp", address)
+			server.Connection, err = dial("tcp", address)
 		}
 
 		if err == nil {
@@ -122,91 +116,180 @@ func (auth *Auth) Dial() error {
 	return err
 }
 
-// Login logs in the user
-func (auth *Auth) Login(query *models.LoginUserQuery) error {
-	// connect to ldap server
-	if err := auth.Dial(); err != nil {
-		return err
-	}
-	defer auth.conn.Close()
+// Close closes the LDAP connection
+func (server *Server) Close() {
+	server.Connection.Close()
+}
 
-	// perform initial authentication
-	if err := auth.initialBind(query.Username, query.Password); err != nil {
-		return err
+// Login user by searching and serializing it
+func (server *Server) Login(query *models.LoginUserQuery) (
+	*models.ExternalUserInfo, error,
+) {
+
+	// Perform initial authentication
+	err := server.InitialBind(query.Username, query.Password)
+	if err != nil {
+		return nil, err
 	}
 
-	// find user entry & attributes
-	user, err := auth.searchForUser(query.Username)
+	// Find user entry & attributes
+	users, err := server.Users([]string{query.Username})
 	if err != nil {
-		return err
+		return nil, err
+	}
+
+	// If we couldn't find the user -
+	// we should show incorrect credentials err
+	if len(users) == 0 {
+		server.disableExternalUser(query.Username)
+		return nil, ErrInvalidCredentials
 	}
 
-	auth.log.Debug("Ldap User found", "info", spew.Sdump(user))
+	// Check if a second user bind is needed
+	user := users[0]
 
-	// check if a second user bind is needed
-	if auth.requireSecondBind {
-		err = auth.secondBind(user, query.Password)
+	if err := server.validateGrafanaUser(user); err != nil {
+		return nil, err
+	}
+
+	if server.requireSecondBind {
+		err = server.secondBind(user, query.Password)
 		if err != nil {
-			return err
+			return nil, err
+		}
+	}
+
+	return user, nil
+}
+
+// Users gets LDAP users
+func (server *Server) Users(logins []string) (
+	[]*models.ExternalUserInfo,
+	error,
+) {
+	var result *ldap.SearchResult
+	var err error
+	var Config = server.Config
+
+	for _, base := range Config.SearchBaseDNs {
+		result, err = server.Connection.Search(
+			server.getSearchRequest(base, logins),
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		if len(result.Entries) > 0 {
+			break
 		}
 	}
 
-	grafanaUser, err := auth.GetGrafanaUserFor(query.ReqContext, user)
+	serializedUsers, err := server.serializeUsers(result)
 	if err != nil {
-		return err
+		return nil, err
+	}
+
+	return serializedUsers, nil
+}
+
+// validateGrafanaUser validates user access.
+// If there are no ldap group mappings access is true
+// otherwise a single group must match
+func (server *Server) validateGrafanaUser(user *models.ExternalUserInfo) error {
+	if len(server.Config.Groups) > 0 && len(user.OrgRoles) < 1 {
+		server.log.Error(
+			"user does not belong in any of the specified LDAP groups",
+			"username", user.Login,
+			"groups", user.Groups,
+		)
+		return ErrInvalidCredentials
 	}
 
-	query.User = grafanaUser
 	return nil
 }
 
-// SyncUser syncs user with Grafana
-func (auth *Auth) SyncUser(query *models.LoginUserQuery) error {
-	// connect to ldap server
-	err := auth.Dial()
-	if err != nil {
-		return err
+// disableExternalUser marks external user as disabled in Grafana db
+func (server *Server) disableExternalUser(username string) error {
+	// Check if external user exist in Grafana
+	userQuery := &models.GetExternalUserInfoByLoginQuery{
+		LoginOrEmail: username,
 	}
-	defer auth.conn.Close()
 
-	err = auth.serverBind()
-	if err != nil {
+	if err := bus.Dispatch(userQuery); err != nil {
 		return err
 	}
 
-	// find user entry & attributes
-	user, err := auth.searchForUser(query.Username)
-	if err != nil {
-		auth.log.Error("Failed searching for user in ldap", "error", err)
-		return err
+	userInfo := userQuery.Result
+	if !userInfo.IsDisabled {
+		server.log.Debug("Disabling external user", "user", userQuery.Result.Login)
+		// Mark user as disabled in grafana db
+		disableUserCmd := &models.DisableUserCommand{
+			UserId:     userQuery.Result.UserId,
+			IsDisabled: true,
+		}
+
+		if err := bus.Dispatch(disableUserCmd); err != nil {
+			server.log.Debug("Error disabling external user", "user", userQuery.Result.Login, "message", err.Error())
+			return err
+		}
 	}
+	return nil
+}
 
-	auth.log.Debug("Ldap User found", "info", spew.Sdump(user))
+// getSearchRequest returns LDAP search request for users
+func (server *Server) getSearchRequest(
+	base string,
+	logins []string,
+) *ldap.SearchRequest {
+	attributes := []string{}
+
+	inputs := server.Config.Attr
+	attributes = appendIfNotEmpty(
+		attributes,
+		inputs.Username,
+		inputs.Surname,
+		inputs.Email,
+		inputs.Name,
+		inputs.MemberOf,
+	)
+
+	search := ""
+	for _, login := range logins {
+		query := strings.Replace(
+			server.Config.SearchFilter,
+			"%s", ldap.EscapeFilter(login),
+			-1,
+		)
 
-	grafanaUser, err := auth.GetGrafanaUserFor(query.ReqContext, user)
-	if err != nil {
-		return err
+		search = search + query
 	}
 
-	query.User = grafanaUser
-	return nil
+	filter := fmt.Sprintf("(|%s)", search)
+
+	return &ldap.SearchRequest{
+		BaseDN:       base,
+		Scope:        ldap.ScopeWholeSubtree,
+		DerefAliases: ldap.NeverDerefAliases,
+		Attributes:   attributes,
+		Filter:       filter,
+	}
 }
 
-func (auth *Auth) GetGrafanaUserFor(
-	ctx *models.ReqContext,
-	user *UserInfo,
-) (*models.User, error) {
+// buildGrafanaUser extracts info from UserInfo model to ExternalUserInfo
+func (server *Server) buildGrafanaUser(user *UserInfo) *models.ExternalUserInfo {
 	extUser := &models.ExternalUserInfo{
-		AuthModule: "ldap",
+		AuthModule: models.AuthModuleLDAP,
 		AuthId:     user.DN,
-		Name:       fmt.Sprintf("%s %s", user.FirstName, user.LastName),
-		Login:      user.Username,
-		Email:      user.Email,
-		Groups:     user.MemberOf,
-		OrgRoles:   map[int64]models.RoleType{},
+		Name: strings.TrimSpace(
+			fmt.Sprintf("%s %s", user.FirstName, user.LastName),
+		),
+		Login:    user.Username,
+		Email:    user.Email,
+		Groups:   user.MemberOf,
+		OrgRoles: map[int64]models.RoleType{},
 	}
 
-	for _, group := range auth.server.Groups {
+	for _, group := range server.Config.Groups {
 		// only use the first match for each org
 		if extUser.OrgRoles[group.OrgId] != "" {
 			continue
@@ -220,49 +303,28 @@ func (auth *Auth) GetGrafanaUserFor(
 		}
 	}
 
-	// validate that the user has access
-	// if there are no ldap group mappings access is true
-	// otherwise a single group must match
-	if len(auth.server.Groups) > 0 && len(extUser.OrgRoles) < 1 {
-		auth.log.Info(
-			"Ldap Auth: user does not belong in any of the specified ldap groups",
-			"username", user.Username,
-			"groups", user.MemberOf,
-		)
-		return nil, ErrInvalidCredentials
-	}
-
-	// add/update user in grafana
-	upsertUserCmd := &models.UpsertUserCommand{
-		ReqContext:    ctx,
-		ExternalUser:  extUser,
-		SignupAllowed: setting.LdapAllowSignup,
-	}
-
-	err := bus.Dispatch(upsertUserCmd)
-	if err != nil {
-		return nil, err
-	}
-
-	return upsertUserCmd.Result, nil
+	return extUser
 }
 
-func (auth *Auth) serverBind() error {
+func (server *Server) serverBind() error {
 	bindFn := func() error {
-		return auth.conn.Bind(auth.server.BindDN, auth.server.BindPassword)
+		return server.Connection.Bind(
+			server.Config.BindDN,
+			server.Config.BindPassword,
+		)
 	}
 
-	if auth.server.BindPassword == "" {
+	if server.Config.BindPassword == "" {
 		bindFn = func() error {
-			return auth.conn.UnauthenticatedBind(auth.server.BindDN)
+			return server.Connection.UnauthenticatedBind(server.Config.BindDN)
 		}
 	}
 
 	// bind_dn and bind_password to bind
 	if err := bindFn(); err != nil {
-		auth.log.Info("LDAP initial bind failed, %v", err)
+		server.log.Info("LDAP initial bind failed, %v", err)
 
-		if ldapErr, ok := err.(*LDAP.Error); ok {
+		if ldapErr, ok := err.(*ldap.Error); ok {
 			if ldapErr.ResultCode == 49 {
 				return ErrInvalidCredentials
 			}
@@ -273,11 +335,15 @@ func (auth *Auth) serverBind() error {
 	return nil
 }
 
-func (auth *Auth) secondBind(user *UserInfo, userPassword string) error {
-	if err := auth.conn.Bind(user.DN, userPassword); err != nil {
-		auth.log.Info("Second bind failed", "error", err)
+func (server *Server) secondBind(
+	user *models.ExternalUserInfo,
+	userPassword string,
+) error {
+	err := server.Connection.Bind(user.AuthId, userPassword)
+	if err != nil {
+		server.log.Info("Second bind failed", "error", err)
 
-		if ldapErr, ok := err.(*LDAP.Error); ok {
+		if ldapErr, ok := err.(*ldap.Error); ok {
 			if ldapErr.ResultCode == 49 {
 				return ErrInvalidCredentials
 			}
@@ -288,31 +354,32 @@ func (auth *Auth) secondBind(user *UserInfo, userPassword string) error {
 	return nil
 }
 
-func (auth *Auth) initialBind(username, userPassword string) error {
-	if auth.server.BindPassword != "" || auth.server.BindDN == "" {
-		userPassword = auth.server.BindPassword
-		auth.requireSecondBind = true
+// InitialBind intiates first bind to LDAP server
+func (server *Server) InitialBind(username, userPassword string) error {
+	if server.Config.BindPassword != "" || server.Config.BindDN == "" {
+		userPassword = server.Config.BindPassword
+		server.requireSecondBind = true
 	}
 
-	bindPath := auth.server.BindDN
+	bindPath := server.Config.BindDN
 	if strings.Contains(bindPath, "%s") {
-		bindPath = fmt.Sprintf(auth.server.BindDN, username)
+		bindPath = fmt.Sprintf(server.Config.BindDN, username)
 	}
 
 	bindFn := func() error {
-		return auth.conn.Bind(bindPath, userPassword)
+		return server.Connection.Bind(bindPath, userPassword)
 	}
 
 	if userPassword == "" {
 		bindFn = func() error {
-			return auth.conn.UnauthenticatedBind(bindPath)
+			return server.Connection.UnauthenticatedBind(bindPath)
 		}
 	}
 
 	if err := bindFn(); err != nil {
-		auth.log.Info("Initial bind failed", "error", err)
+		server.log.Info("Initial bind failed", "error", err)
 
-		if ldapErr, ok := err.(*LDAP.Error); ok {
+		if ldapErr, ok := err.(*ldap.Error); ok {
 			if ldapErr.ResultCode == 49 {
 				return ErrInvalidCredentials
 			}
@@ -323,199 +390,124 @@ func (auth *Auth) initialBind(username, userPassword string) error {
 	return nil
 }
 
-func (auth *Auth) searchForUser(username string) (*UserInfo, error) {
-	var searchResult *LDAP.SearchResult
-	var err error
-
-	for _, searchBase := range auth.server.SearchBaseDNs {
-		attributes := make([]string, 0)
-		inputs := auth.server.Attr
-		attributes = appendIfNotEmpty(attributes,
-			inputs.Username,
-			inputs.Surname,
-			inputs.Email,
-			inputs.Name,
-			inputs.MemberOf)
-
-		searchReq := LDAP.SearchRequest{
-			BaseDN:       searchBase,
-			Scope:        LDAP.ScopeWholeSubtree,
-			DerefAliases: LDAP.NeverDerefAliases,
-			Attributes:   attributes,
-			Filter: strings.Replace(
-				auth.server.SearchFilter,
-				"%s", LDAP.EscapeFilter(username),
-				-1,
-			),
-		}
-
-		auth.log.Debug("Ldap Search For User Request", "info", spew.Sdump(searchReq))
-
-		searchResult, err = auth.conn.Search(&searchReq)
-		if err != nil {
-			return nil, err
-		}
-
-		if len(searchResult.Entries) > 0 {
-			break
-		}
-	}
-
-	if len(searchResult.Entries) == 0 {
-		return nil, ErrInvalidCredentials
-	}
-
-	if len(searchResult.Entries) > 1 {
-		return nil, errors.New("Ldap search matched more than one entry, please review your filter setting")
-	}
-
+// requestMemberOf use this function when POSIX LDAP schema does not support memberOf, so it manually search the groups
+func (server *Server) requestMemberOf(searchResult *ldap.SearchResult) ([]string, error) {
 	var memberOf []string
-	if auth.server.GroupSearchFilter == "" {
-		memberOf = getLdapAttrArray(auth.server.Attr.MemberOf, searchResult)
-	} else {
-		// If we are using a POSIX LDAP schema it won't support memberOf, so we manually search the groups
-		var groupSearchResult *LDAP.SearchResult
-		for _, groupSearchBase := range auth.server.GroupSearchBaseDNs {
-			var filter_replace string
-			if auth.server.GroupSearchFilterUserAttribute == "" {
-				filter_replace = getLdapAttr(auth.server.Attr.Username, searchResult)
-			} else {
-				filter_replace = getLdapAttr(auth.server.GroupSearchFilterUserAttribute, searchResult)
-			}
 
-			filter := strings.Replace(
-				auth.server.GroupSearchFilter, "%s",
-				LDAP.EscapeFilter(filter_replace),
-				-1,
-			)
-
-			auth.log.Info("Searching for user's groups", "filter", filter)
-
-			// support old way of reading settings
-			groupIdAttribute := auth.server.Attr.MemberOf
-			// but prefer dn attribute if default settings are used
-			if groupIdAttribute == "" || groupIdAttribute == "memberOf" {
-				groupIdAttribute = "dn"
-			}
-
-			groupSearchReq := LDAP.SearchRequest{
-				BaseDN:       groupSearchBase,
-				Scope:        LDAP.ScopeWholeSubtree,
-				DerefAliases: LDAP.NeverDerefAliases,
-				Attributes:   []string{groupIdAttribute},
-				Filter:       filter,
-			}
-
-			groupSearchResult, err = auth.conn.Search(&groupSearchReq)
-			if err != nil {
-				return nil, err
-			}
-
-			if len(groupSearchResult.Entries) > 0 {
-				for i := range groupSearchResult.Entries {
-					memberOf = append(memberOf, getLdapAttrN(groupIdAttribute, groupSearchResult, i))
-				}
-				break
-			}
+	for _, groupSearchBase := range server.Config.GroupSearchBaseDNs {
+		var filterReplace string
+		if server.Config.GroupSearchFilterUserAttribute == "" {
+			filterReplace = getLDAPAttr(server.Config.Attr.Username, searchResult)
+		} else {
+			filterReplace = getLDAPAttr(server.Config.GroupSearchFilterUserAttribute, searchResult)
 		}
-	}
-
-	return &UserInfo{
-		DN:        searchResult.Entries[0].DN,
-		LastName:  getLdapAttr(auth.server.Attr.Surname, searchResult),
-		FirstName: getLdapAttr(auth.server.Attr.Name, searchResult),
-		Username:  getLdapAttr(auth.server.Attr.Username, searchResult),
-		Email:     getLdapAttr(auth.server.Attr.Email, searchResult),
-		MemberOf:  memberOf,
-	}, nil
-}
-
-func (ldap *Auth) Users() ([]*UserInfo, error) {
-	var result *LDAP.SearchResult
-	var err error
-	server := ldap.server
 
-	if err := ldap.Dial(); err != nil {
-		return nil, err
-	}
-	defer ldap.conn.Close()
-
-	for _, base := range server.SearchBaseDNs {
-		attributes := make([]string, 0)
-		inputs := server.Attr
-		attributes = appendIfNotEmpty(
-			attributes,
-			inputs.Username,
-			inputs.Surname,
-			inputs.Email,
-			inputs.Name,
-			inputs.MemberOf,
+		filter := strings.Replace(
+			server.Config.GroupSearchFilter, "%s",
+			ldap.EscapeFilter(filterReplace),
+			-1,
 		)
 
-		req := LDAP.SearchRequest{
-			BaseDN:       base,
-			Scope:        LDAP.ScopeWholeSubtree,
-			DerefAliases: LDAP.NeverDerefAliases,
-			Attributes:   attributes,
+		server.log.Info("Searching for user's groups", "filter", filter)
+
+		// support old way of reading settings
+		groupIDAttribute := server.Config.Attr.MemberOf
+		// but prefer dn attribute if default settings are used
+		if groupIDAttribute == "" || groupIDAttribute == "memberOf" {
+			groupIDAttribute = "dn"
+		}
 
-			// Doing a star here to get all the users in one go
-			Filter: strings.Replace(server.SearchFilter, "%s", "*", -1),
+		groupSearchReq := ldap.SearchRequest{
+			BaseDN:       groupSearchBase,
+			Scope:        ldap.ScopeWholeSubtree,
+			DerefAliases: ldap.NeverDerefAliases,
+			Attributes:   []string{groupIDAttribute},
+			Filter:       filter,
 		}
 
-		result, err = ldap.conn.Search(&req)
+		groupSearchResult, err := server.Connection.Search(&groupSearchReq)
 		if err != nil {
 			return nil, err
 		}
 
-		if len(result.Entries) > 0 {
+		if len(groupSearchResult.Entries) > 0 {
+			for i := range groupSearchResult.Entries {
+				memberOf = append(memberOf, getLDAPAttrN(groupIDAttribute, groupSearchResult, i))
+			}
 			break
 		}
 	}
 
-	return ldap.serializeUsers(result), nil
+	return memberOf, nil
 }
 
-func (ldap *Auth) serializeUsers(users *LDAP.SearchResult) []*UserInfo {
-	var serialized []*UserInfo
+// serializeUsers serializes the users
+// from LDAP result to ExternalInfo struct
+func (server *Server) serializeUsers(
+	users *ldap.SearchResult,
+) ([]*models.ExternalUserInfo, error) {
+	var serialized []*models.ExternalUserInfo
 
 	for index := range users.Entries {
-		serialize := &UserInfo{
-			DN: getLdapAttrN(
+		memberOf, err := server.getMemberOf(users)
+		if err != nil {
+			return nil, err
+		}
+
+		userInfo := &UserInfo{
+			DN: getLDAPAttrN(
 				"dn",
 				users,
 				index,
 			),
-			LastName: getLdapAttrN(
-				ldap.server.Attr.Surname,
-				users,
-				index,
-			),
-			FirstName: getLdapAttrN(
-				ldap.server.Attr.Name,
+			LastName: getLDAPAttrN(
+				server.Config.Attr.Surname,
 				users,
 				index,
 			),
-			Username: getLdapAttrN(
-				ldap.server.Attr.Username,
+			FirstName: getLDAPAttrN(
+				server.Config.Attr.Name,
 				users,
 				index,
 			),
-			Email: getLdapAttrN(
-				ldap.server.Attr.Email,
+			Username: getLDAPAttrN(
+				server.Config.Attr.Username,
 				users,
 				index,
 			),
-			MemberOf: getLdapAttrArrayN(
-				ldap.server.Attr.MemberOf,
+			Email: getLDAPAttrN(
+				server.Config.Attr.Email,
 				users,
 				index,
 			),
+			MemberOf: memberOf,
 		}
 
-		serialized = append(serialized, serialize)
+		serialized = append(
+			serialized,
+			server.buildGrafanaUser(userInfo),
+		)
+	}
+
+	return serialized, nil
+}
+
+// getMemberOf finds memberOf property or request it
+func (server *Server) getMemberOf(search *ldap.SearchResult) (
+	[]string, error,
+) {
+	if server.Config.GroupSearchFilter == "" {
+		memberOf := getLDAPAttrArray(server.Config.Attr.MemberOf, search)
+
+		return memberOf, nil
+	}
+
+	memberOf, err := server.requestMemberOf(search)
+	if err != nil {
+		return nil, err
 	}
 
-	return serialized
+	return memberOf, nil
 }
 
 func appendIfNotEmpty(slice []string, values ...string) []string {
@@ -527,11 +519,11 @@ func appendIfNotEmpty(slice []string, values ...string) []string {
 	return slice
 }
 
-func getLdapAttr(name string, result *LDAP.SearchResult) string {
-	return getLdapAttrN(name, result, 0)
+func getLDAPAttr(name string, result *ldap.SearchResult) string {
+	return getLDAPAttrN(name, result, 0)
 }
 
-func getLdapAttrN(name string, result *LDAP.SearchResult, n int) string {
+func getLDAPAttrN(name string, result *ldap.SearchResult, n int) string {
 	if strings.ToLower(name) == "dn" {
 		return result.Entries[n].DN
 	}
@@ -545,11 +537,11 @@ func getLdapAttrN(name string, result *LDAP.SearchResult, n int) string {
 	return ""
 }
 
-func getLdapAttrArray(name string, result *LDAP.SearchResult) []string {
-	return getLdapAttrArrayN(name, result, 0)
+func getLDAPAttrArray(name string, result *ldap.SearchResult) []string {
+	return getLDAPAttrArrayN(name, result, 0)
 }
 
-func getLdapAttrArrayN(name string, result *LDAP.SearchResult, n int) []string {
+func getLDAPAttrArrayN(name string, result *ldap.SearchResult, n int) []string {
 	for _, attr := range result.Entries[n].Attributes {
 		if attr.Name == name {
 			return attr.Values
diff --git a/pkg/services/ldap/ldap_helpers_test.go b/pkg/services/ldap/ldap_helpers_test.go
new file mode 100644
index 000000000000..48e6bce8b5ba
--- /dev/null
+++ b/pkg/services/ldap/ldap_helpers_test.go
@@ -0,0 +1,140 @@
+package ldap
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+	"gopkg.in/ldap.v3"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+)
+
+func TestLDAPHelpers(t *testing.T) {
+	Convey("serializeUsers()", t, func() {
+		Convey("simple case", func() {
+			server := &Server{
+				Config: &ServerConfig{
+					Attr: AttributeMap{
+						Username: "username",
+						Name:     "name",
+						MemberOf: "memberof",
+						Email:    "email",
+					},
+					SearchBaseDNs: []string{"BaseDNHere"},
+				},
+				Connection: &MockConnection{},
+				log:        log.New("test-logger"),
+			}
+
+			entry := ldap.Entry{
+				DN: "dn", Attributes: []*ldap.EntryAttribute{
+					{Name: "username", Values: []string{"roelgerrits"}},
+					{Name: "surname", Values: []string{"Gerrits"}},
+					{Name: "email", Values: []string{"roel@test.com"}},
+					{Name: "name", Values: []string{"Roel"}},
+					{Name: "memberof", Values: []string{"admins"}},
+				}}
+			users := &ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
+
+			result, err := server.serializeUsers(users)
+
+			So(err, ShouldBeNil)
+			So(result[0].Login, ShouldEqual, "roelgerrits")
+			So(result[0].Email, ShouldEqual, "roel@test.com")
+			So(result[0].Groups, ShouldContain, "admins")
+		})
+
+		Convey("without lastname", func() {
+			server := &Server{
+				Config: &ServerConfig{
+					Attr: AttributeMap{
+						Username: "username",
+						Name:     "name",
+						MemberOf: "memberof",
+						Email:    "email",
+					},
+					SearchBaseDNs: []string{"BaseDNHere"},
+				},
+				Connection: &MockConnection{},
+				log:        log.New("test-logger"),
+			}
+
+			entry := ldap.Entry{
+				DN: "dn", Attributes: []*ldap.EntryAttribute{
+					{Name: "username", Values: []string{"roelgerrits"}},
+					{Name: "email", Values: []string{"roel@test.com"}},
+					{Name: "name", Values: []string{"Roel"}},
+					{Name: "memberof", Values: []string{"admins"}},
+				}}
+			users := &ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
+
+			result, err := server.serializeUsers(users)
+
+			So(err, ShouldBeNil)
+			So(result[0].Name, ShouldEqual, "Roel")
+		})
+	})
+
+	Convey("serverBind()", t, func() {
+		Convey("Given bind dn and password configured", func() {
+			connection := &MockConnection{}
+			var actualUsername, actualPassword string
+			connection.bindProvider = func(username, password string) error {
+				actualUsername = username
+				actualPassword = password
+				return nil
+			}
+			server := &Server{
+				Connection: connection,
+				Config: &ServerConfig{
+					BindDN:       "o=users,dc=grafana,dc=org",
+					BindPassword: "bindpwd",
+				},
+			}
+			err := server.serverBind()
+			So(err, ShouldBeNil)
+			So(actualUsername, ShouldEqual, "o=users,dc=grafana,dc=org")
+			So(actualPassword, ShouldEqual, "bindpwd")
+		})
+
+		Convey("Given bind dn configured", func() {
+			connection := &MockConnection{}
+			unauthenticatedBindWasCalled := false
+			var actualUsername string
+			connection.unauthenticatedBindProvider = func(username string) error {
+				unauthenticatedBindWasCalled = true
+				actualUsername = username
+				return nil
+			}
+			server := &Server{
+				Connection: connection,
+				Config: &ServerConfig{
+					BindDN: "o=users,dc=grafana,dc=org",
+				},
+			}
+			err := server.serverBind()
+			So(err, ShouldBeNil)
+			So(unauthenticatedBindWasCalled, ShouldBeTrue)
+			So(actualUsername, ShouldEqual, "o=users,dc=grafana,dc=org")
+		})
+
+		Convey("Given empty bind dn and password", func() {
+			connection := &MockConnection{}
+			unauthenticatedBindWasCalled := false
+			var actualUsername string
+			connection.unauthenticatedBindProvider = func(username string) error {
+				unauthenticatedBindWasCalled = true
+				actualUsername = username
+				return nil
+			}
+			server := &Server{
+				Connection: connection,
+				Config:     &ServerConfig{},
+			}
+			err := server.serverBind()
+			So(err, ShouldBeNil)
+			So(unauthenticatedBindWasCalled, ShouldBeTrue)
+			So(actualUsername, ShouldBeEmpty)
+		})
+	})
+}
diff --git a/pkg/services/ldap/ldap_login_test.go b/pkg/services/ldap/ldap_login_test.go
index 5afed5462463..573a9a560e84 100644
--- a/pkg/services/ldap/ldap_login_test.go
+++ b/pkg/services/ldap/ldap_login_test.go
@@ -6,24 +6,95 @@ import (
 	. "github.com/smartystreets/goconvey/convey"
 	"gopkg.in/ldap.v3"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/user"
 )
 
-func TestLdapLogin(t *testing.T) {
-	Convey("Login using ldap", t, func() {
-		AuthScenario("When login with invalid credentials", func(scenario *scenarioContext) {
-			conn := &mockLdapConn{}
+func TestLDAPLogin(t *testing.T) {
+	Convey("Login()", t, func() {
+		serverScenario("When user is log in and updated", func(sc *scenarioContext) {
+			// arrange
+			mockConnection := &MockConnection{}
+
+			server := &Server{
+				Config: &ServerConfig{
+					Host:       "",
+					RootCACert: "",
+					Groups: []*GroupToOrgRole{
+						{GroupDN: "*", OrgRole: "Admin"},
+					},
+					Attr: AttributeMap{
+						Username: "username",
+						Surname:  "surname",
+						Email:    "email",
+						Name:     "name",
+						MemberOf: "memberof",
+					},
+					SearchBaseDNs: []string{"BaseDNHere"},
+				},
+				Connection: mockConnection,
+				log:        log.New("test-logger"),
+			}
+
+			entry := ldap.Entry{
+				DN: "dn", Attributes: []*ldap.EntryAttribute{
+					{Name: "username", Values: []string{"roelgerrits"}},
+					{Name: "surname", Values: []string{"Gerrits"}},
+					{Name: "email", Values: []string{"roel@test.com"}},
+					{Name: "name", Values: []string{"Roel"}},
+					{Name: "memberof", Values: []string{"admins"}},
+				}}
+			result := ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
+			mockConnection.setSearchResult(&result)
+
+			query := &models.LoginUserQuery{
+				Username: "roelgerrits",
+			}
+
+			sc.userQueryReturns(&models.User{
+				Id:    1,
+				Email: "roel@test.net",
+				Name:  "Roel Gerrits",
+				Login: "roelgerrits",
+			})
+			sc.userOrgsQueryReturns([]*models.UserOrgDTO{})
+
+			// act
+			extUser, _ := server.Login(query)
+			userInfo, err := user.Upsert(&user.UpsertArgs{
+				SignupAllowed: true,
+				ExternalUser:  extUser,
+			})
+
+			// assert
+
+			// Check absence of the error
+			So(err, ShouldBeNil)
+
+			// User should be searched in ldap
+			So(mockConnection.SearchCalled, ShouldBeTrue)
+
+			// Info should be updated (email differs)
+			So(userInfo.Email, ShouldEqual, "roel@test.com")
+
+			// User should have admin privileges
+			So(sc.addOrgUserCmd.Role, ShouldEqual, "Admin")
+		})
+
+		serverScenario("When login with invalid credentials", func(scenario *scenarioContext) {
+			connection := &MockConnection{}
 			entry := ldap.Entry{}
 			result := ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
-			conn.setSearchResult(&result)
+			connection.setSearchResult(&result)
 
-			conn.bindProvider = func(username, password string) error {
+			connection.bindProvider = func(username, password string) error {
 				return &ldap.Error{
 					ResultCode: 49,
 				}
 			}
-			auth := &Auth{
-				server: &ServerConfig{
+			server := &Server{
+				Config: &ServerConfig{
 					Attr: AttributeMap{
 						Username: "username",
 						Name:     "name",
@@ -31,19 +102,19 @@ func TestLdapLogin(t *testing.T) {
 					},
 					SearchBaseDNs: []string{"BaseDNHere"},
 				},
-				conn: conn,
-				log:  log.New("test-logger"),
+				Connection: connection,
+				log:        log.New("test-logger"),
 			}
 
-			err := auth.Login(scenario.loginUserQuery)
+			_, err := server.Login(scenario.loginUserQuery)
 
 			Convey("it should return invalid credentials error", func() {
 				So(err, ShouldEqual, ErrInvalidCredentials)
 			})
 		})
 
-		AuthScenario("When login with valid credentials", func(scenario *scenarioContext) {
-			conn := &mockLdapConn{}
+		serverScenario("When login with valid credentials", func(scenario *scenarioContext) {
+			connection := &MockConnection{}
 			entry := ldap.Entry{
 				DN: "dn", Attributes: []*ldap.EntryAttribute{
 					{Name: "username", Values: []string{"markelog"}},
@@ -54,13 +125,13 @@ func TestLdapLogin(t *testing.T) {
 				},
 			}
 			result := ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
-			conn.setSearchResult(&result)
+			connection.setSearchResult(&result)
 
-			conn.bindProvider = func(username, password string) error {
+			connection.bindProvider = func(username, password string) error {
 				return nil
 			}
-			auth := &Auth{
-				server: &ServerConfig{
+			server := &Server{
+				Config: &ServerConfig{
 					Attr: AttributeMap{
 						Username: "username",
 						Name:     "name",
@@ -68,18 +139,110 @@ func TestLdapLogin(t *testing.T) {
 					},
 					SearchBaseDNs: []string{"BaseDNHere"},
 				},
-				conn: conn,
-				log:  log.New("test-logger"),
+				Connection: connection,
+				log:        log.New("test-logger"),
 			}
 
-			err := auth.Login(scenario.loginUserQuery)
+			resp, err := server.Login(scenario.loginUserQuery)
 
-			Convey("it should not return error", func() {
-				So(err, ShouldBeNil)
+			So(err, ShouldBeNil)
+			So(resp.Login, ShouldEqual, "markelog")
+		})
+
+		serverScenario("When user not found in LDAP, but exist in Grafana", func(scenario *scenarioContext) {
+			connection := &MockConnection{}
+			result := ldap.SearchResult{Entries: []*ldap.Entry{}}
+			connection.setSearchResult(&result)
+
+			externalUser := &models.ExternalUserInfo{UserId: 42, IsDisabled: false}
+			scenario.getExternalUserInfoByLoginQueryReturns(externalUser)
+
+			connection.bindProvider = func(username, password string) error {
+				return nil
+			}
+			server := &Server{
+				Config: &ServerConfig{
+					SearchBaseDNs: []string{"BaseDNHere"},
+				},
+				Connection: connection,
+				log:        log.New("test-logger"),
+			}
+
+			_, err := server.Login(scenario.loginUserQuery)
+
+			Convey("it should disable user", func() {
+				So(scenario.disableExternalUserCalled, ShouldBeTrue)
+				So(scenario.disableUserCmd.IsDisabled, ShouldBeTrue)
+				So(scenario.disableUserCmd.UserId, ShouldEqual, 42)
+			})
+
+			Convey("it should return invalid credentials error", func() {
+				So(err, ShouldEqual, ErrInvalidCredentials)
+			})
+		})
+
+		serverScenario("When user not found in LDAP, and disabled in Grafana already", func(scenario *scenarioContext) {
+			connection := &MockConnection{}
+			result := ldap.SearchResult{Entries: []*ldap.Entry{}}
+			connection.setSearchResult(&result)
+
+			externalUser := &models.ExternalUserInfo{UserId: 42, IsDisabled: true}
+			scenario.getExternalUserInfoByLoginQueryReturns(externalUser)
+
+			connection.bindProvider = func(username, password string) error {
+				return nil
+			}
+			server := &Server{
+				Config: &ServerConfig{
+					SearchBaseDNs: []string{"BaseDNHere"},
+				},
+				Connection: connection,
+				log:        log.New("test-logger"),
+			}
+
+			_, err := server.Login(scenario.loginUserQuery)
+
+			Convey("it should't call disable function", func() {
+				So(scenario.disableExternalUserCalled, ShouldBeFalse)
+			})
+
+			Convey("it should return invalid credentials error", func() {
+				So(err, ShouldEqual, ErrInvalidCredentials)
 			})
+		})
+
+		serverScenario("When user found in LDAP, and disabled in Grafana", func(scenario *scenarioContext) {
+			connection := &MockConnection{}
+			entry := ldap.Entry{}
+			result := ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
+			connection.setSearchResult(&result)
+			scenario.userQueryReturns(&models.User{Id: 42, IsDisabled: true})
 
-			Convey("it should get user", func() {
-				So(scenario.loginUserQuery.User.Login, ShouldEqual, "markelog")
+			connection.bindProvider = func(username, password string) error {
+				return nil
+			}
+			server := &Server{
+				Config: &ServerConfig{
+					SearchBaseDNs: []string{"BaseDNHere"},
+				},
+				Connection: connection,
+				log:        log.New("test-logger"),
+			}
+
+			extUser, _ := server.Login(scenario.loginUserQuery)
+			_, err := user.Upsert(&user.UpsertArgs{
+				SignupAllowed: true,
+				ExternalUser:  extUser,
+			})
+
+			Convey("it should re-enable user", func() {
+				So(scenario.disableExternalUserCalled, ShouldBeTrue)
+				So(scenario.disableUserCmd.IsDisabled, ShouldBeFalse)
+				So(scenario.disableUserCmd.UserId, ShouldEqual, 42)
+			})
+
+			Convey("it should not return error", func() {
+				So(err, ShouldBeNil)
 			})
 		})
 	})
diff --git a/pkg/services/ldap/ldap_test.go b/pkg/services/ldap/ldap_test.go
index c5232a54e2bd..98b15ec44576 100644
--- a/pkg/services/ldap/ldap_test.go
+++ b/pkg/services/ldap/ldap_test.go
@@ -1,496 +1,118 @@
 package ldap
 
 import (
-	"context"
 	"testing"
 
 	. "github.com/smartystreets/goconvey/convey"
-	"gopkg.in/ldap.v3"
+	ldap "gopkg.in/ldap.v3"
 
-	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
 )
 
-func TestAuth(t *testing.T) {
-	Convey("initialBind", t, func() {
-		Convey("Given bind dn and password configured", func() {
-			conn := &mockLdapConn{}
-			var actualUsername, actualPassword string
-			conn.bindProvider = func(username, password string) error {
-				actualUsername = username
-				actualPassword = password
-				return nil
+func TestPublicAPI(t *testing.T) {
+	Convey("Users()", t, func() {
+		Convey("find one user", func() {
+			MockConnection := &MockConnection{}
+			entry := ldap.Entry{
+				DN: "dn", Attributes: []*ldap.EntryAttribute{
+					{Name: "username", Values: []string{"roelgerrits"}},
+					{Name: "surname", Values: []string{"Gerrits"}},
+					{Name: "email", Values: []string{"roel@test.com"}},
+					{Name: "name", Values: []string{"Roel"}},
+					{Name: "memberof", Values: []string{"admins"}},
+				}}
+			result := ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
+			MockConnection.setSearchResult(&result)
+
+			// Set up attribute map without surname and email
+			server := &Server{
+				Config: &ServerConfig{
+					Attr: AttributeMap{
+						Username: "username",
+						Name:     "name",
+						MemberOf: "memberof",
+					},
+					SearchBaseDNs: []string{"BaseDNHere"},
+				},
+				Connection: MockConnection,
+				log:        log.New("test-logger"),
 			}
-			Auth := &Auth{
-				conn: conn,
-				server: &ServerConfig{
-					BindDN:       "cn=%s,o=users,dc=grafana,dc=org",
-					BindPassword: "bindpwd",
-				},
-			}
-			err := Auth.initialBind("user", "pwd")
-			So(err, ShouldBeNil)
-			So(Auth.requireSecondBind, ShouldBeTrue)
-			So(actualUsername, ShouldEqual, "cn=user,o=users,dc=grafana,dc=org")
-			So(actualPassword, ShouldEqual, "bindpwd")
-		})
 
-		Convey("Given bind dn configured", func() {
-			conn := &mockLdapConn{}
-			var actualUsername, actualPassword string
-			conn.bindProvider = func(username, password string) error {
-				actualUsername = username
-				actualPassword = password
-				return nil
-			}
-			Auth := &Auth{
-				conn: conn,
-				server: &ServerConfig{
-					BindDN: "cn=%s,o=users,dc=grafana,dc=org",
-				},
-			}
-			err := Auth.initialBind("user", "pwd")
-			So(err, ShouldBeNil)
-			So(Auth.requireSecondBind, ShouldBeFalse)
-			So(actualUsername, ShouldEqual, "cn=user,o=users,dc=grafana,dc=org")
-			So(actualPassword, ShouldEqual, "pwd")
-		})
+			searchResult, err := server.Users([]string{"roelgerrits"})
 
-		Convey("Given empty bind dn and password", func() {
-			conn := &mockLdapConn{}
-			unauthenticatedBindWasCalled := false
-			var actualUsername string
-			conn.unauthenticatedBindProvider = func(username string) error {
-				unauthenticatedBindWasCalled = true
-				actualUsername = username
-				return nil
-			}
-			Auth := &Auth{
-				conn:   conn,
-				server: &ServerConfig{},
-			}
-			err := Auth.initialBind("user", "pwd")
 			So(err, ShouldBeNil)
-			So(Auth.requireSecondBind, ShouldBeTrue)
-			So(unauthenticatedBindWasCalled, ShouldBeTrue)
-			So(actualUsername, ShouldBeEmpty)
+			So(searchResult, ShouldNotBeNil)
+
+			// User should be searched in ldap
+			So(MockConnection.SearchCalled, ShouldBeTrue)
+
+			// No empty attributes should be added to the search request
+			So(len(MockConnection.SearchAttributes), ShouldEqual, 3)
 		})
 	})
 
-	Convey("serverBind", t, func() {
+	Convey("InitialBind", t, func() {
 		Convey("Given bind dn and password configured", func() {
-			conn := &mockLdapConn{}
+			connection := &MockConnection{}
 			var actualUsername, actualPassword string
-			conn.bindProvider = func(username, password string) error {
+			connection.bindProvider = func(username, password string) error {
 				actualUsername = username
 				actualPassword = password
 				return nil
 			}
-			Auth := &Auth{
-				conn: conn,
-				server: &ServerConfig{
-					BindDN:       "o=users,dc=grafana,dc=org",
+			server := &Server{
+				Connection: connection,
+				Config: &ServerConfig{
+					BindDN:       "cn=%s,o=users,dc=grafana,dc=org",
 					BindPassword: "bindpwd",
 				},
 			}
-			err := Auth.serverBind()
+			err := server.InitialBind("user", "pwd")
 			So(err, ShouldBeNil)
-			So(actualUsername, ShouldEqual, "o=users,dc=grafana,dc=org")
+			So(server.requireSecondBind, ShouldBeTrue)
+			So(actualUsername, ShouldEqual, "cn=user,o=users,dc=grafana,dc=org")
 			So(actualPassword, ShouldEqual, "bindpwd")
 		})
 
 		Convey("Given bind dn configured", func() {
-			conn := &mockLdapConn{}
-			unauthenticatedBindWasCalled := false
-			var actualUsername string
-			conn.unauthenticatedBindProvider = func(username string) error {
-				unauthenticatedBindWasCalled = true
+			connection := &MockConnection{}
+			var actualUsername, actualPassword string
+			connection.bindProvider = func(username, password string) error {
 				actualUsername = username
+				actualPassword = password
 				return nil
 			}
-			Auth := &Auth{
-				conn: conn,
-				server: &ServerConfig{
-					BindDN: "o=users,dc=grafana,dc=org",
+			server := &Server{
+				Connection: connection,
+				Config: &ServerConfig{
+					BindDN: "cn=%s,o=users,dc=grafana,dc=org",
 				},
 			}
-			err := Auth.serverBind()
+			err := server.InitialBind("user", "pwd")
 			So(err, ShouldBeNil)
-			So(unauthenticatedBindWasCalled, ShouldBeTrue)
-			So(actualUsername, ShouldEqual, "o=users,dc=grafana,dc=org")
+			So(server.requireSecondBind, ShouldBeFalse)
+			So(actualUsername, ShouldEqual, "cn=user,o=users,dc=grafana,dc=org")
+			So(actualPassword, ShouldEqual, "pwd")
 		})
 
 		Convey("Given empty bind dn and password", func() {
-			conn := &mockLdapConn{}
+			connection := &MockConnection{}
 			unauthenticatedBindWasCalled := false
 			var actualUsername string
-			conn.unauthenticatedBindProvider = func(username string) error {
+			connection.unauthenticatedBindProvider = func(username string) error {
 				unauthenticatedBindWasCalled = true
 				actualUsername = username
 				return nil
 			}
-			Auth := &Auth{
-				conn:   conn,
-				server: &ServerConfig{},
+			server := &Server{
+				Connection: connection,
+				Config:     &ServerConfig{},
 			}
-			err := Auth.serverBind()
+			err := server.InitialBind("user", "pwd")
 			So(err, ShouldBeNil)
+			So(server.requireSecondBind, ShouldBeTrue)
 			So(unauthenticatedBindWasCalled, ShouldBeTrue)
 			So(actualUsername, ShouldBeEmpty)
 		})
 	})
-
-	Convey("When translating ldap user to grafana user", t, func() {
-
-		var user1 = &m.User{}
-
-		bus.AddHandlerCtx("test", func(ctx context.Context, cmd *m.UpsertUserCommand) error {
-			cmd.Result = user1
-			cmd.Result.Login = "torkelo"
-			return nil
-		})
-
-		Convey("Given no ldap group map match", func() {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{{}},
-			})
-			_, err := Auth.GetGrafanaUserFor(nil, &UserInfo{})
-
-			So(err, ShouldEqual, ErrInvalidCredentials)
-		})
-
-		AuthScenario("Given wildcard group match", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "*", OrgRole: "Admin"},
-				},
-			})
-
-			sc.userQueryReturns(user1)
-
-			result, err := Auth.GetGrafanaUserFor(nil, &UserInfo{})
-			So(err, ShouldBeNil)
-			So(result, ShouldEqual, user1)
-		})
-
-		AuthScenario("Given exact group match", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=users", OrgRole: "Admin"},
-				},
-			})
-
-			sc.userQueryReturns(user1)
-
-			result, err := Auth.GetGrafanaUserFor(nil, &UserInfo{MemberOf: []string{"cn=users"}})
-			So(err, ShouldBeNil)
-			So(result, ShouldEqual, user1)
-		})
-
-		AuthScenario("Given group match with different case", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=users", OrgRole: "Admin"},
-				},
-			})
-
-			sc.userQueryReturns(user1)
-
-			result, err := Auth.GetGrafanaUserFor(nil, &UserInfo{MemberOf: []string{"CN=users"}})
-			So(err, ShouldBeNil)
-			So(result, ShouldEqual, user1)
-		})
-
-		AuthScenario("Given no existing grafana user", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=admin", OrgRole: "Admin"},
-					{GroupDN: "cn=editor", OrgRole: "Editor"},
-					{GroupDN: "*", OrgRole: "Viewer"},
-				},
-			})
-
-			sc.userQueryReturns(nil)
-
-			result, err := Auth.GetGrafanaUserFor(nil, &UserInfo{
-				DN:       "torkelo",
-				Username: "torkelo",
-				Email:    "my@email.com",
-				MemberOf: []string{"cn=editor"},
-			})
-
-			So(err, ShouldBeNil)
-
-			Convey("Should return new user", func() {
-				So(result.Login, ShouldEqual, "torkelo")
-			})
-
-			Convey("Should set isGrafanaAdmin to false by default", func() {
-				So(result.IsAdmin, ShouldBeFalse)
-			})
-
-		})
-
-	})
-
-	Convey("When syncing ldap groups to grafana org roles", t, func() {
-		AuthScenario("given no current user orgs", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=users", OrgRole: "Admin"},
-				},
-			})
-
-			sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
-			_, err := Auth.GetGrafanaUserFor(nil, &UserInfo{
-				MemberOf: []string{"cn=users"},
-			})
-
-			Convey("Should create new org user", func() {
-				So(err, ShouldBeNil)
-				So(sc.addOrgUserCmd, ShouldNotBeNil)
-				So(sc.addOrgUserCmd.Role, ShouldEqual, m.ROLE_ADMIN)
-			})
-		})
-
-		AuthScenario("given different current org role", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=users", OrgId: 1, OrgRole: "Admin"},
-				},
-			})
-
-			sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_EDITOR}})
-			_, err := Auth.GetGrafanaUserFor(nil, &UserInfo{
-				MemberOf: []string{"cn=users"},
-			})
-
-			Convey("Should update org role", func() {
-				So(err, ShouldBeNil)
-				So(sc.updateOrgUserCmd, ShouldNotBeNil)
-				So(sc.updateOrgUserCmd.Role, ShouldEqual, m.ROLE_ADMIN)
-				So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 1)
-			})
-		})
-
-		AuthScenario("given current org role is removed in ldap", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=users", OrgId: 2, OrgRole: "Admin"},
-				},
-			})
-
-			sc.userOrgsQueryReturns([]*m.UserOrgDTO{
-				{OrgId: 1, Role: m.ROLE_EDITOR},
-				{OrgId: 2, Role: m.ROLE_EDITOR},
-			})
-			_, err := Auth.GetGrafanaUserFor(nil, &UserInfo{
-				MemberOf: []string{"cn=users"},
-			})
-
-			Convey("Should remove org role", func() {
-				So(err, ShouldBeNil)
-				So(sc.removeOrgUserCmd, ShouldNotBeNil)
-				So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 2)
-			})
-		})
-
-		AuthScenario("given org role is updated in config", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=admin", OrgId: 1, OrgRole: "Admin"},
-					{GroupDN: "cn=users", OrgId: 1, OrgRole: "Viewer"},
-				},
-			})
-
-			sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_EDITOR}})
-			_, err := Auth.GetGrafanaUserFor(nil, &UserInfo{
-				MemberOf: []string{"cn=users"},
-			})
-
-			Convey("Should update org role", func() {
-				So(err, ShouldBeNil)
-				So(sc.removeOrgUserCmd, ShouldBeNil)
-				So(sc.updateOrgUserCmd, ShouldNotBeNil)
-				So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 1)
-			})
-		})
-
-		AuthScenario("given multiple matching ldap groups", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=admins", OrgId: 1, OrgRole: "Admin"},
-					{GroupDN: "*", OrgId: 1, OrgRole: "Viewer"},
-				},
-			})
-
-			sc.userOrgsQueryReturns([]*m.UserOrgDTO{{OrgId: 1, Role: m.ROLE_ADMIN}})
-			_, err := Auth.GetGrafanaUserFor(nil, &UserInfo{
-				MemberOf: []string{"cn=admins"},
-			})
-
-			Convey("Should take first match, and ignore subsequent matches", func() {
-				So(err, ShouldBeNil)
-				So(sc.updateOrgUserCmd, ShouldBeNil)
-				So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 1)
-			})
-		})
-
-		AuthScenario("given multiple matching ldap groups and no existing groups", func(sc *scenarioContext) {
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=admins", OrgId: 1, OrgRole: "Admin"},
-					{GroupDN: "*", OrgId: 1, OrgRole: "Viewer"},
-				},
-			})
-
-			sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
-			_, err := Auth.GetGrafanaUserFor(nil, &UserInfo{
-				MemberOf: []string{"cn=admins"},
-			})
-
-			Convey("Should take first match, and ignore subsequent matches", func() {
-				So(err, ShouldBeNil)
-				So(sc.addOrgUserCmd.Role, ShouldEqual, m.ROLE_ADMIN)
-				So(sc.setUsingOrgCmd.OrgId, ShouldEqual, 1)
-			})
-
-			Convey("Should not update permissions unless specified", func() {
-				So(err, ShouldBeNil)
-				So(sc.updateUserPermissionsCmd, ShouldBeNil)
-			})
-		})
-
-		AuthScenario("given ldap groups with grafana_admin=true", func(sc *scenarioContext) {
-			trueVal := true
-
-			Auth := New(&ServerConfig{
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "cn=admins", OrgId: 1, OrgRole: "Admin", IsGrafanaAdmin: &trueVal},
-				},
-			})
-
-			sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
-			_, err := Auth.GetGrafanaUserFor(nil, &UserInfo{
-				MemberOf: []string{"cn=admins"},
-			})
-
-			Convey("Should create user with admin set to true", func() {
-				So(err, ShouldBeNil)
-				So(sc.updateUserPermissionsCmd.IsGrafanaAdmin, ShouldBeTrue)
-			})
-		})
-	})
-
-	Convey("When calling SyncUser", t, func() {
-		mockLdapConnection := &mockLdapConn{}
-
-		auth := &Auth{
-			server: &ServerConfig{
-				Host:       "",
-				RootCACert: "",
-				Groups: []*GroupToOrgRole{
-					{GroupDN: "*", OrgRole: "Admin"},
-				},
-				Attr: AttributeMap{
-					Username: "username",
-					Surname:  "surname",
-					Email:    "email",
-					Name:     "name",
-					MemberOf: "memberof",
-				},
-				SearchBaseDNs: []string{"BaseDNHere"},
-			},
-			conn: mockLdapConnection,
-			log:  log.New("test-logger"),
-		}
-
-		dialCalled := false
-		dial = func(network, addr string) (IConnection, error) {
-			dialCalled = true
-			return mockLdapConnection, nil
-		}
-
-		entry := ldap.Entry{
-			DN: "dn", Attributes: []*ldap.EntryAttribute{
-				{Name: "username", Values: []string{"roelgerrits"}},
-				{Name: "surname", Values: []string{"Gerrits"}},
-				{Name: "email", Values: []string{"roel@test.com"}},
-				{Name: "name", Values: []string{"Roel"}},
-				{Name: "memberof", Values: []string{"admins"}},
-			}}
-		result := ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
-		mockLdapConnection.setSearchResult(&result)
-
-		AuthScenario("When ldapUser found call syncInfo and orgRoles", func(sc *scenarioContext) {
-			// arrange
-			query := &m.LoginUserQuery{
-				Username: "roelgerrits",
-			}
-
-			hookDial = nil
-
-			sc.userQueryReturns(&m.User{
-				Id:    1,
-				Email: "roel@test.net",
-				Name:  "Roel Gerrits",
-				Login: "roelgerrits",
-			})
-			sc.userOrgsQueryReturns([]*m.UserOrgDTO{})
-
-			// act
-			syncErrResult := auth.SyncUser(query)
-
-			// assert
-			So(dialCalled, ShouldBeTrue)
-			So(syncErrResult, ShouldBeNil)
-			// User should be searched in ldap
-			So(mockLdapConnection.searchCalled, ShouldBeTrue)
-			// Info should be updated (email differs)
-			So(sc.updateUserCmd.Email, ShouldEqual, "roel@test.com")
-			// User should have admin privileges
-			So(sc.addOrgUserCmd.UserId, ShouldEqual, 1)
-			So(sc.addOrgUserCmd.Role, ShouldEqual, "Admin")
-		})
-	})
-
-	Convey("When searching for a user and not all five attributes are mapped", t, func() {
-		mockLdapConnection := &mockLdapConn{}
-		entry := ldap.Entry{
-			DN: "dn", Attributes: []*ldap.EntryAttribute{
-				{Name: "username", Values: []string{"roelgerrits"}},
-				{Name: "surname", Values: []string{"Gerrits"}},
-				{Name: "email", Values: []string{"roel@test.com"}},
-				{Name: "name", Values: []string{"Roel"}},
-				{Name: "memberof", Values: []string{"admins"}},
-			}}
-		result := ldap.SearchResult{Entries: []*ldap.Entry{&entry}}
-		mockLdapConnection.setSearchResult(&result)
-
-		// Set up attribute map without surname and email
-		Auth := &Auth{
-			server: &ServerConfig{
-				Attr: AttributeMap{
-					Username: "username",
-					Name:     "name",
-					MemberOf: "memberof",
-				},
-				SearchBaseDNs: []string{"BaseDNHere"},
-			},
-			conn: mockLdapConnection,
-			log:  log.New("test-logger"),
-		}
-
-		searchResult, err := Auth.searchForUser("roelgerrits")
-
-		So(err, ShouldBeNil)
-		So(searchResult, ShouldNotBeNil)
-
-		// User should be searched in ldap
-		So(mockLdapConnection.searchCalled, ShouldBeTrue)
-
-		// No empty attributes should be added to the search request
-		So(len(mockLdapConnection.searchAttributes), ShouldEqual, 3)
-	})
 }
diff --git a/pkg/services/ldap/settings.go b/pkg/services/ldap/settings.go
index 633920d0a194..df63f10a6fa6 100644
--- a/pkg/services/ldap/settings.go
+++ b/pkg/services/ldap/settings.go
@@ -5,18 +5,20 @@ import (
 	"sync"
 
 	"github.com/BurntSushi/toml"
-	"github.com/grafana/grafana/pkg/util/errutil"
 	"golang.org/x/xerrors"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
+// Config holds list of connections to LDAP
 type Config struct {
 	Servers []*ServerConfig `toml:"servers"`
 }
 
+// ServerConfig holds connection data to LDAP
 type ServerConfig struct {
 	Host          string       `toml:"host"`
 	Port          int          `toml:"port"`
@@ -63,26 +65,27 @@ var loadingMutex = &sync.Mutex{}
 
 // IsEnabled checks if ldap is enabled
 func IsEnabled() bool {
-	return setting.LdapEnabled
+	return setting.LDAPEnabled
 }
 
 // ReloadConfig reads the config from the disc and caches it.
 func ReloadConfig() error {
-	if IsEnabled() == false {
+	if !IsEnabled() {
 		return nil
 	}
+
 	loadingMutex.Lock()
 	defer loadingMutex.Unlock()
 
 	var err error
-	config, err = readConfig(setting.LdapConfigFile)
+	config, err = readConfig(setting.LDAPConfigFile)
 	return err
 }
 
 // GetConfig returns the LDAP config if LDAP is enabled otherwise it returns nil. It returns either cached value of
 // the config or it reads it and caches it first.
 func GetConfig() (*Config, error) {
-	if IsEnabled() == false {
+	if !IsEnabled() {
 		return nil, nil
 	}
 
@@ -95,7 +98,7 @@ func GetConfig() (*Config, error) {
 	defer loadingMutex.Unlock()
 
 	var err error
-	config, err = readConfig(setting.LdapConfigFile)
+	config, err = readConfig(setting.LDAPConfigFile)
 
 	return config, err
 }
@@ -103,15 +106,15 @@ func GetConfig() (*Config, error) {
 func readConfig(configFile string) (*Config, error) {
 	result := &Config{}
 
-	logger.Info("Ldap enabled, reading config file", "file", configFile)
+	logger.Info("LDAP enabled, reading config file", "file", configFile)
 
 	_, err := toml.DecodeFile(configFile, result)
 	if err != nil {
-		return nil, errutil.Wrap("Failed to load ldap config file", err)
+		return nil, errutil.Wrap("Failed to load LDAP config file", err)
 	}
 
 	if len(result.Servers) == 0 {
-		return nil, xerrors.New("ldap enabled but no ldap servers defined in config file")
+		return nil, xerrors.New("LDAP enabled but no LDAP servers defined in config file")
 	}
 
 	// set default org id
diff --git a/pkg/services/ldap/test.go b/pkg/services/ldap/test.go
index 98d169b9a1ad..6319cddd2807 100644
--- a/pkg/services/ldap/test.go
+++ b/pkg/services/ldap/test.go
@@ -12,15 +12,24 @@ import (
 	"github.com/grafana/grafana/pkg/services/login"
 )
 
-type mockLdapConn struct {
-	result                      *ldap.SearchResult
-	searchCalled                bool
-	searchAttributes            []string
+// MockConnection struct for testing
+type MockConnection struct {
+	SearchResult     *ldap.SearchResult
+	SearchCalled     bool
+	SearchAttributes []string
+
+	AddParams *ldap.AddRequest
+	AddCalled bool
+
+	DelParams *ldap.DelRequest
+	DelCalled bool
+
 	bindProvider                func(username, password string) error
 	unauthenticatedBindProvider func(username string) error
 }
 
-func (c *mockLdapConn) Bind(username, password string) error {
+// Bind mocks Bind connection function
+func (c *MockConnection) Bind(username, password string) error {
 	if c.bindProvider != nil {
 		return c.bindProvider(username, password)
 	}
@@ -28,7 +37,8 @@ func (c *mockLdapConn) Bind(username, password string) error {
 	return nil
 }
 
-func (c *mockLdapConn) UnauthenticatedBind(username string) error {
+// UnauthenticatedBind mocks UnauthenticatedBind connection function
+func (c *MockConnection) UnauthenticatedBind(username string) error {
 	if c.unauthenticatedBindProvider != nil {
 		return c.unauthenticatedBindProvider(username)
 	}
@@ -36,23 +46,40 @@ func (c *mockLdapConn) UnauthenticatedBind(username string) error {
 	return nil
 }
 
-func (c *mockLdapConn) Close() {}
+// Close mocks Close connection function
+func (c *MockConnection) Close() {}
+
+func (c *MockConnection) setSearchResult(result *ldap.SearchResult) {
+	c.SearchResult = result
+}
+
+// Search mocks Search connection function
+func (c *MockConnection) Search(sr *ldap.SearchRequest) (*ldap.SearchResult, error) {
+	c.SearchCalled = true
+	c.SearchAttributes = sr.Attributes
+	return c.SearchResult, nil
+}
 
-func (c *mockLdapConn) setSearchResult(result *ldap.SearchResult) {
-	c.result = result
+// Add mocks Add connection function
+func (c *MockConnection) Add(request *ldap.AddRequest) error {
+	c.AddCalled = true
+	c.AddParams = request
+	return nil
 }
 
-func (c *mockLdapConn) Search(sr *ldap.SearchRequest) (*ldap.SearchResult, error) {
-	c.searchCalled = true
-	c.searchAttributes = sr.Attributes
-	return c.result, nil
+// Del mocks Del connection function
+func (c *MockConnection) Del(request *ldap.DelRequest) error {
+	c.DelCalled = true
+	c.DelParams = request
+	return nil
 }
 
-func (c *mockLdapConn) StartTLS(*tls.Config) error {
+// StartTLS mocks StartTLS connection function
+func (c *MockConnection) StartTLS(*tls.Config) error {
 	return nil
 }
 
-func AuthScenario(desc string, fn scenarioFunc) {
+func serverScenario(desc string, fn scenarioFunc) {
 	Convey(desc, func() {
 		defer bus.ClearBusHandlers()
 
@@ -64,10 +91,6 @@ func AuthScenario(desc string, fn scenarioFunc) {
 			},
 		}
 
-		hookDial = func(auth *Auth) error {
-			return nil
-		}
-
 		loginService := &login.LoginService{
 			Bus: bus.GetBus(),
 		}
@@ -100,6 +123,18 @@ func AuthScenario(desc string, fn scenarioFunc) {
 			return nil
 		})
 
+		bus.AddHandler("test", func(cmd *models.GetExternalUserInfoByLoginQuery) error {
+			sc.getExternalUserInfoByLoginQuery = cmd
+			sc.getExternalUserInfoByLoginQuery.Result = &models.ExternalUserInfo{UserId: 42, IsDisabled: false}
+			return nil
+		})
+
+		bus.AddHandler("test", func(cmd *models.DisableUserCommand) error {
+			sc.disableExternalUserCalled = true
+			sc.disableUserCmd = cmd
+			return nil
+		})
+
 		bus.AddHandler("test", func(cmd *models.AddOrgUserCommand) error {
 			sc.addOrgUserCmd = cmd
 			return nil
@@ -130,16 +165,19 @@ func AuthScenario(desc string, fn scenarioFunc) {
 }
 
 type scenarioContext struct {
-	loginUserQuery           *models.LoginUserQuery
-	getUserByAuthInfoQuery   *models.GetUserByAuthInfoQuery
-	getUserOrgListQuery      *models.GetUserOrgListQuery
-	createUserCmd            *models.CreateUserCommand
-	addOrgUserCmd            *models.AddOrgUserCommand
-	updateOrgUserCmd         *models.UpdateOrgUserCommand
-	removeOrgUserCmd         *models.RemoveOrgUserCommand
-	updateUserCmd            *models.UpdateUserCommand
-	setUsingOrgCmd           *models.SetUsingOrgCommand
-	updateUserPermissionsCmd *models.UpdateUserPermissionsCommand
+	loginUserQuery                  *models.LoginUserQuery
+	getUserByAuthInfoQuery          *models.GetUserByAuthInfoQuery
+	getExternalUserInfoByLoginQuery *models.GetExternalUserInfoByLoginQuery
+	getUserOrgListQuery             *models.GetUserOrgListQuery
+	createUserCmd                   *models.CreateUserCommand
+	disableUserCmd                  *models.DisableUserCommand
+	addOrgUserCmd                   *models.AddOrgUserCommand
+	updateOrgUserCmd                *models.UpdateOrgUserCommand
+	removeOrgUserCmd                *models.RemoveOrgUserCommand
+	updateUserCmd                   *models.UpdateUserCommand
+	setUsingOrgCmd                  *models.SetUsingOrgCommand
+	updateUserPermissionsCmd        *models.UpdateUserPermissionsCommand
+	disableExternalUserCalled       bool
 }
 
 func (sc *scenarioContext) userQueryReturns(user *models.User) {
@@ -162,4 +200,15 @@ func (sc *scenarioContext) userOrgsQueryReturns(orgs []*models.UserOrgDTO) {
 	})
 }
 
+func (sc *scenarioContext) getExternalUserInfoByLoginQueryReturns(externalUser *models.ExternalUserInfo) {
+	bus.AddHandler("test", func(cmd *models.GetExternalUserInfoByLoginQuery) error {
+		sc.getExternalUserInfoByLoginQuery = cmd
+		sc.getExternalUserInfoByLoginQuery.Result = &models.ExternalUserInfo{
+			UserId:     externalUser.UserId,
+			IsDisabled: externalUser.IsDisabled,
+		}
+		return nil
+	})
+}
+
 type scenarioFunc func(c *scenarioContext)
diff --git a/pkg/services/login/errors.go b/pkg/services/login/errors.go
index 0889b4613a6b..dbf15ea76cd4 100644
--- a/pkg/services/login/errors.go
+++ b/pkg/services/login/errors.go
@@ -9,7 +9,7 @@ var (
 	ErrProviderDeniedRequest = errors.New("Login provider denied login request")
 	ErrSignUpNotAllowed      = errors.New("Signup is not allowed for this adapter")
 	ErrTooManyLoginAttempts  = errors.New("Too many consecutive incorrect login attempts for user. Login for user temporarily blocked")
-	ErrPasswordEmpty         = errors.New("No password provided.")
+	ErrPasswordEmpty         = errors.New("No password provided")
 	ErrUsersQuotaReached     = errors.New("Users quota reached")
 	ErrGettingUserQuota      = errors.New("Error getting user quota")
 )
diff --git a/pkg/services/login/login.go b/pkg/services/login/login.go
index 9b2a258dea02..cf7b8dd92c55 100644
--- a/pkg/services/login/login.go
+++ b/pkg/services/login/login.go
@@ -2,8 +2,8 @@ package login
 
 import (
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/quota"
 )
@@ -27,10 +27,10 @@ func (ls *LoginService) Init() error {
 	return nil
 }
 
-func (ls *LoginService) UpsertUser(cmd *m.UpsertUserCommand) error {
+func (ls *LoginService) UpsertUser(cmd *models.UpsertUserCommand) error {
 	extUser := cmd.ExternalUser
 
-	userQuery := &m.GetUserByAuthInfoQuery{
+	userQuery := &models.GetUserByAuthInfoQuery{
 		AuthModule: extUser.AuthModule,
 		AuthId:     extUser.AuthId,
 		UserId:     extUser.UserId,
@@ -39,7 +39,7 @@ func (ls *LoginService) UpsertUser(cmd *m.UpsertUserCommand) error {
 	}
 
 	err := bus.Dispatch(userQuery)
-	if err != m.ErrUserNotFound && err != nil {
+	if err != models.ErrUserNotFound && err != nil {
 		return err
 	}
 
@@ -64,7 +64,7 @@ func (ls *LoginService) UpsertUser(cmd *m.UpsertUserCommand) error {
 		}
 
 		if extUser.AuthModule != "" {
-			cmd2 := &m.SetAuthInfoCommand{
+			cmd2 := &models.SetAuthInfoCommand{
 				UserId:     cmd.Result.Id,
 				AuthModule: extUser.AuthModule,
 				AuthId:     extUser.AuthId,
@@ -90,6 +90,13 @@ func (ls *LoginService) UpsertUser(cmd *m.UpsertUserCommand) error {
 				return err
 			}
 		}
+
+		if extUser.AuthModule == models.AuthModuleLDAP && userQuery.Result.IsDisabled {
+			// Re-enable user when it found in LDAP
+			if err := ls.Bus.Dispatch(&models.DisableUserCommand{UserId: cmd.Result.Id, IsDisabled: false}); err != nil {
+				return err
+			}
+		}
 	}
 
 	err = syncOrgRoles(cmd.Result, extUser)
@@ -100,12 +107,12 @@ func (ls *LoginService) UpsertUser(cmd *m.UpsertUserCommand) error {
 
 	// Sync isGrafanaAdmin permission
 	if extUser.IsGrafanaAdmin != nil && *extUser.IsGrafanaAdmin != cmd.Result.IsAdmin {
-		if err := ls.Bus.Dispatch(&m.UpdateUserPermissionsCommand{UserId: cmd.Result.Id, IsGrafanaAdmin: *extUser.IsGrafanaAdmin}); err != nil {
+		if err := ls.Bus.Dispatch(&models.UpdateUserPermissionsCommand{UserId: cmd.Result.Id, IsGrafanaAdmin: *extUser.IsGrafanaAdmin}); err != nil {
 			return err
 		}
 	}
 
-	err = ls.Bus.Dispatch(&m.SyncTeamsCommand{
+	err = ls.Bus.Dispatch(&models.SyncTeamsCommand{
 		User:         cmd.Result,
 		ExternalUser: extUser,
 	})
@@ -117,8 +124,8 @@ func (ls *LoginService) UpsertUser(cmd *m.UpsertUserCommand) error {
 	return err
 }
 
-func createUser(extUser *m.ExternalUserInfo) (*m.User, error) {
-	cmd := &m.CreateUserCommand{
+func createUser(extUser *models.ExternalUserInfo) (*models.User, error) {
+	cmd := &models.CreateUserCommand{
 		Login:        extUser.Login,
 		Email:        extUser.Email,
 		Name:         extUser.Name,
@@ -132,9 +139,9 @@ func createUser(extUser *m.ExternalUserInfo) (*m.User, error) {
 	return &cmd.Result, nil
 }
 
-func updateUser(user *m.User, extUser *m.ExternalUserInfo) error {
+func updateUser(user *models.User, extUser *models.ExternalUserInfo) error {
 	// sync user info
-	updateCmd := &m.UpdateUserCommand{
+	updateCmd := &models.UpdateUserCommand{
 		UserId: user.Id,
 	}
 
@@ -165,8 +172,8 @@ func updateUser(user *m.User, extUser *m.ExternalUserInfo) error {
 	return bus.Dispatch(updateCmd)
 }
 
-func updateUserAuth(user *m.User, extUser *m.ExternalUserInfo) error {
-	updateCmd := &m.UpdateAuthInfoCommand{
+func updateUserAuth(user *models.User, extUser *models.ExternalUserInfo) error {
+	updateCmd := &models.UpdateAuthInfoCommand{
 		AuthModule: extUser.AuthModule,
 		AuthId:     extUser.AuthId,
 		UserId:     user.Id,
@@ -177,13 +184,13 @@ func updateUserAuth(user *m.User, extUser *m.ExternalUserInfo) error {
 	return bus.Dispatch(updateCmd)
 }
 
-func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
+func syncOrgRoles(user *models.User, extUser *models.ExternalUserInfo) error {
 	// don't sync org roles if none are specified
 	if len(extUser.OrgRoles) == 0 {
 		return nil
 	}
 
-	orgsQuery := &m.GetUserOrgListQuery{UserId: user.Id}
+	orgsQuery := &models.GetUserOrgListQuery{UserId: user.Id}
 	if err := bus.Dispatch(orgsQuery); err != nil {
 		return err
 	}
@@ -199,7 +206,7 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
 			deleteOrgIds = append(deleteOrgIds, org.OrgId)
 		} else if extUser.OrgRoles[org.OrgId] != org.Role {
 			// update role
-			cmd := &m.UpdateOrgUserCommand{OrgId: org.OrgId, UserId: user.Id, Role: extUser.OrgRoles[org.OrgId]}
+			cmd := &models.UpdateOrgUserCommand{OrgId: org.OrgId, UserId: user.Id, Role: extUser.OrgRoles[org.OrgId]}
 			if err := bus.Dispatch(cmd); err != nil {
 				return err
 			}
@@ -213,16 +220,16 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
 		}
 
 		// add role
-		cmd := &m.AddOrgUserCommand{UserId: user.Id, Role: orgRole, OrgId: orgId}
+		cmd := &models.AddOrgUserCommand{UserId: user.Id, Role: orgRole, OrgId: orgId}
 		err := bus.Dispatch(cmd)
-		if err != nil && err != m.ErrOrgNotFound {
+		if err != nil && err != models.ErrOrgNotFound {
 			return err
 		}
 	}
 
 	// delete any removed org roles
 	for _, orgId := range deleteOrgIds {
-		cmd := &m.RemoveOrgUserCommand{OrgId: orgId, UserId: user.Id}
+		cmd := &models.RemoveOrgUserCommand{OrgId: orgId, UserId: user.Id}
 		if err := bus.Dispatch(cmd); err != nil {
 			return err
 		}
@@ -235,7 +242,7 @@ func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
 			break
 		}
 
-		return bus.Dispatch(&m.SetUsingOrgCommand{
+		return bus.Dispatch(&models.SetUsingOrgCommand{
 			UserId: user.Id,
 			OrgId:  user.OrgId,
 		})
diff --git a/pkg/services/multildap/multildap.go b/pkg/services/multildap/multildap.go
new file mode 100644
index 000000000000..6c2baf1671af
--- /dev/null
+++ b/pkg/services/multildap/multildap.go
@@ -0,0 +1,152 @@
+package multildap
+
+import (
+	"errors"
+
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/ldap"
+)
+
+// GetConfig gets LDAP config
+var GetConfig = ldap.GetConfig
+
+// IsEnabled checks if LDAP is enabled
+var IsEnabled = ldap.IsEnabled
+
+// ErrInvalidCredentials is returned if username and password do not match
+var ErrInvalidCredentials = ldap.ErrInvalidCredentials
+
+// ErrNoLDAPServers is returned when there is no LDAP servers specified
+var ErrNoLDAPServers = errors.New("No LDAP servers are configured")
+
+// ErrDidNotFindUser if request for user is unsuccessful
+var ErrDidNotFindUser = errors.New("Did not find a user")
+
+// IMultiLDAP is interface for MultiLDAP
+type IMultiLDAP interface {
+	Login(query *models.LoginUserQuery) (
+		*models.ExternalUserInfo, error,
+	)
+
+	Users(logins []string) (
+		[]*models.ExternalUserInfo, error,
+	)
+
+	User(login string) (
+		*models.ExternalUserInfo, error,
+	)
+}
+
+// MultiLDAP is basic struct of LDAP authorization
+type MultiLDAP struct {
+	configs []*ldap.ServerConfig
+}
+
+// New creates the new LDAP auth
+func New(configs []*ldap.ServerConfig) IMultiLDAP {
+	return &MultiLDAP{
+		configs: configs,
+	}
+}
+
+// Login tries to log in the user in multiples LDAP
+func (multiples *MultiLDAP) Login(query *models.LoginUserQuery) (
+	*models.ExternalUserInfo, error,
+) {
+	if len(multiples.configs) == 0 {
+		return nil, ErrNoLDAPServers
+	}
+
+	for _, config := range multiples.configs {
+		server := ldap.New(config)
+
+		if err := server.Dial(); err != nil {
+			return nil, err
+		}
+
+		defer server.Close()
+
+		user, err := server.Login(query)
+
+		if user != nil {
+			return user, nil
+		}
+
+		// Continue if we couldn't find the user
+		if err == ErrInvalidCredentials {
+			continue
+		}
+
+		if err != nil {
+			return nil, err
+		}
+
+		return user, nil
+	}
+
+	// Return invalid credentials if we couldn't find the user anywhere
+	return nil, ErrInvalidCredentials
+}
+
+// User gets a user by login
+func (multiples *MultiLDAP) User(login string) (
+	*models.ExternalUserInfo,
+	error,
+) {
+
+	if len(multiples.configs) == 0 {
+		return nil, ErrNoLDAPServers
+	}
+
+	search := []string{login}
+	for _, config := range multiples.configs {
+		server := ldap.New(config)
+
+		if err := server.Dial(); err != nil {
+			return nil, err
+		}
+
+		defer server.Close()
+
+		users, err := server.Users(search)
+		if err != nil {
+			return nil, err
+		}
+
+		if len(users) != 0 {
+			return users[0], nil
+		}
+	}
+
+	return nil, ErrDidNotFindUser
+}
+
+// Users gets users from multiple LDAP servers
+func (multiples *MultiLDAP) Users(logins []string) (
+	[]*models.ExternalUserInfo,
+	error,
+) {
+	var result []*models.ExternalUserInfo
+
+	if len(multiples.configs) == 0 {
+		return nil, ErrNoLDAPServers
+	}
+
+	for _, config := range multiples.configs {
+		server := ldap.New(config)
+
+		if err := server.Dial(); err != nil {
+			return nil, err
+		}
+
+		defer server.Close()
+
+		users, err := server.Users(logins)
+		if err != nil {
+			return nil, err
+		}
+		result = append(result, users...)
+	}
+
+	return result, nil
+}
diff --git a/pkg/services/notifications/codes.go b/pkg/services/notifications/codes.go
index 6382b609036b..b2bc9439549f 100644
--- a/pkg/services/notifications/codes.go
+++ b/pkg/services/notifications/codes.go
@@ -1,7 +1,7 @@
 package notifications
 
 import (
-	"crypto/sha1"
+	"crypto/sha1" // #nosec
 	"encoding/hex"
 	"fmt"
 	"time"
diff --git a/pkg/services/notifications/mailer.go b/pkg/services/notifications/mailer.go
index f88deb2bf960..584914f5ff71 100644
--- a/pkg/services/notifications/mailer.go
+++ b/pkg/services/notifications/mailer.go
@@ -12,9 +12,9 @@ import (
 	"net"
 	"strconv"
 
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/pkg/errors"
+	"github.com/grafana/grafana/pkg/util/errutil"
 	gomail "gopkg.in/mail.v2"
 )
 
@@ -38,11 +38,11 @@ func (ns *NotificationService) send(msg *Message) (int, error) {
 
 		e := dialer.DialAndSend(m)
 		if e != nil {
-			err = errors.Wrapf(e, "Failed to send notification to email address: %s", address)
+			err = errutil.Wrapf(e, "Failed to send notification to email address: %s", address)
 			continue
 		}
 
-		num += 1
+		num++
 	}
 
 	return num, err
@@ -83,9 +83,9 @@ func (ns *NotificationService) createDialer() (*gomail.Dialer, error) {
 	return d, nil
 }
 
-func (ns *NotificationService) buildEmailMessage(cmd *m.SendEmailCommand) (*Message, error) {
+func (ns *NotificationService) buildEmailMessage(cmd *models.SendEmailCommand) (*Message, error) {
 	if !ns.Cfg.Smtp.Enabled {
-		return nil, m.ErrSmtpNotEnabled
+		return nil, models.ErrSmtpNotEnabled
 	}
 
 	var buffer bytes.Buffer
diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go
index 769fdd06fd04..3168fdcd5e95 100644
--- a/pkg/services/notifications/notifications.go
+++ b/pkg/services/notifications/notifications.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/events"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/setting"
diff --git a/pkg/services/provisioning/dashboards/config_reader.go b/pkg/services/provisioning/dashboards/config_reader.go
index 50cedc079e33..d004221a3525 100644
--- a/pkg/services/provisioning/dashboards/config_reader.go
+++ b/pkg/services/provisioning/dashboards/config_reader.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	yaml "gopkg.in/yaml.v2"
 )
 
diff --git a/pkg/services/provisioning/dashboards/config_reader_test.go b/pkg/services/provisioning/dashboards/config_reader_test.go
index 18d8022d62d0..03aa19af11e8 100644
--- a/pkg/services/provisioning/dashboards/config_reader_test.go
+++ b/pkg/services/provisioning/dashboards/config_reader_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
diff --git a/pkg/services/provisioning/dashboards/dashboard.go b/pkg/services/provisioning/dashboards/dashboard.go
index fd3a824420c6..108b1b126c91 100644
--- a/pkg/services/provisioning/dashboards/dashboard.go
+++ b/pkg/services/provisioning/dashboards/dashboard.go
@@ -3,8 +3,10 @@ package dashboards
 import (
 	"context"
 	"fmt"
-	"github.com/grafana/grafana/pkg/log"
-	"github.com/pkg/errors"
+	"os"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
 type DashboardProvisionerImpl struct {
@@ -18,13 +20,13 @@ func NewDashboardProvisionerImpl(configDirectory string) (*DashboardProvisionerI
 	configs, err := cfgReader.readConfig()
 
 	if err != nil {
-		return nil, errors.Wrap(err, "Failed to read dashboards config")
+		return nil, errutil.Wrap("Failed to read dashboards config", err)
 	}
 
 	fileReaders, err := getFileReaders(configs, logger)
 
 	if err != nil {
-		return nil, errors.Wrap(err, "Failed to initialize file readers")
+		return nil, errutil.Wrap("Failed to initialize file readers", err)
 	}
 
 	d := &DashboardProvisionerImpl{
@@ -37,9 +39,14 @@ func NewDashboardProvisionerImpl(configDirectory string) (*DashboardProvisionerI
 
 func (provider *DashboardProvisionerImpl) Provision() error {
 	for _, reader := range provider.fileReaders {
-		err := reader.startWalkingDisk()
-		if err != nil {
-			return errors.Wrapf(err, "Failed to provision config %v", reader.Cfg.Name)
+		if err := reader.startWalkingDisk(); err != nil {
+			if os.IsNotExist(err) {
+				// don't stop the provisioning service in case the folder is missing. The folder can appear after the startup
+				provider.log.Warn("Failed to provision config", "name", reader.Cfg.Name, "error", err)
+				return nil
+			}
+
+			return errutil.Wrapf(err, "Failed to provision config %v", reader.Cfg.Name)
 		}
 	}
 
@@ -73,7 +80,7 @@ func getFileReaders(configs []*DashboardsAsConfig, logger log.Logger) ([]*fileRe
 		case "file":
 			fileReader, err := NewDashboardFileReader(config, logger.New("type", config.Type, "name", config.Name))
 			if err != nil {
-				return nil, errors.Wrapf(err, "Failed to create file reader for config %v", config.Name)
+				return nil, errutil.Wrapf(err, "Failed to create file reader for config %v", config.Name)
 			}
 			readers = append(readers, fileReader)
 		default:
diff --git a/pkg/services/provisioning/dashboards/dashboard_mock.go b/pkg/services/provisioning/dashboards/dashboard_mock.go
index 303338106e63..2ad13744b295 100644
--- a/pkg/services/provisioning/dashboards/dashboard_mock.go
+++ b/pkg/services/provisioning/dashboards/dashboard_mock.go
@@ -25,9 +25,8 @@ func (dpm *DashboardProvisionerMock) Provision() error {
 	dpm.Calls.Provision = append(dpm.Calls.Provision, nil)
 	if dpm.ProvisionFunc != nil {
 		return dpm.ProvisionFunc()
-	} else {
-		return nil
 	}
+	return nil
 }
 
 func (dpm *DashboardProvisionerMock) PollChanges(ctx context.Context) {
@@ -41,7 +40,6 @@ func (dpm *DashboardProvisionerMock) GetProvisionerResolvedPath(name string) str
 	dpm.Calls.PollChanges = append(dpm.Calls.GetProvisionerResolvedPath, name)
 	if dpm.GetProvisionerResolvedPathFunc != nil {
 		return dpm.GetProvisionerResolvedPathFunc(name)
-	} else {
-		return ""
 	}
+	return ""
 }
diff --git a/pkg/services/provisioning/dashboards/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go
index 96da9c8f6dfb..3b47e5014c13 100644
--- a/pkg/services/provisioning/dashboards/file_reader.go
+++ b/pkg/services/provisioning/dashboards/file_reader.go
@@ -16,7 +16,7 @@ import (
 	"github.com/grafana/grafana/pkg/bus"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 )
 
@@ -72,9 +72,7 @@ func (fr *fileReader) startWalkingDisk() error {
 	fr.log.Debug("Start walking disk", "path", fr.Path)
 	resolvedPath := fr.resolvedPath()
 	if _, err := os.Stat(resolvedPath); err != nil {
-		if os.IsNotExist(err) {
-			return err
-		}
+		return err
 	}
 
 	folderId, err := getOrCreateFolderId(fr.Cfg, fr.dashboardProvisioningService)
diff --git a/pkg/services/provisioning/dashboards/file_reader_linux_test.go b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
index d62a59a4f4c7..4adeeafe49b4 100644
--- a/pkg/services/provisioning/dashboards/file_reader_linux_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_linux_test.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 )
 
 var (
diff --git a/pkg/services/provisioning/dashboards/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go
index efc6052cbe79..668608d79eca 100644
--- a/pkg/services/provisioning/dashboards/file_reader_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
diff --git a/pkg/services/provisioning/datasources/config_reader.go b/pkg/services/provisioning/datasources/config_reader.go
index 334ce879e5ad..60794e3b4b03 100644
--- a/pkg/services/provisioning/datasources/config_reader.go
+++ b/pkg/services/provisioning/datasources/config_reader.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"gopkg.in/yaml.v2"
 )
 
diff --git a/pkg/services/provisioning/datasources/config_reader_test.go b/pkg/services/provisioning/datasources/config_reader_test.go
index 6aba82622141..6bf60b30fc1b 100644
--- a/pkg/services/provisioning/datasources/config_reader_test.go
+++ b/pkg/services/provisioning/datasources/config_reader_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 
 	. "github.com/smartystreets/goconvey/convey"
diff --git a/pkg/services/provisioning/datasources/datasources.go b/pkg/services/provisioning/datasources/datasources.go
index de6c876baada..f25d717b915f 100644
--- a/pkg/services/provisioning/datasources/datasources.go
+++ b/pkg/services/provisioning/datasources/datasources.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/bus"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 
 	"github.com/grafana/grafana/pkg/models"
 )
diff --git a/pkg/services/provisioning/datasources/types.go b/pkg/services/provisioning/datasources/types.go
index bbd072052dd7..d1a76246c9db 100644
--- a/pkg/services/provisioning/datasources/types.go
+++ b/pkg/services/provisioning/datasources/types.go
@@ -2,7 +2,7 @@ package datasources
 
 import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/provisioning/values"
 )
diff --git a/pkg/services/provisioning/notifiers/alert_notifications.go b/pkg/services/provisioning/notifiers/alert_notifications.go
index 3659a73832ee..865e215e38bf 100644
--- a/pkg/services/provisioning/notifiers/alert_notifications.go
+++ b/pkg/services/provisioning/notifiers/alert_notifications.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 )
 
diff --git a/pkg/services/provisioning/notifiers/config_reader.go b/pkg/services/provisioning/notifiers/config_reader.go
index 896d5105cedb..5dbb3d87b786 100644
--- a/pkg/services/provisioning/notifiers/config_reader.go
+++ b/pkg/services/provisioning/notifiers/config_reader.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"gopkg.in/yaml.v2"
diff --git a/pkg/services/provisioning/notifiers/config_reader_test.go b/pkg/services/provisioning/notifiers/config_reader_test.go
index d705bd0d93d9..e09531774252 100644
--- a/pkg/services/provisioning/notifiers/config_reader_test.go
+++ b/pkg/services/provisioning/notifiers/config_reader_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/alerting/notifiers"
@@ -66,6 +66,8 @@ func TestNotificationAsConfig(t *testing.T) {
 			So(nt.Settings, ShouldResemble, map[string]interface{}{
 				"recipient": "XXX", "token": "xoxb", "uploadImage": true, "url": "https://slack.com",
 			})
+			So(nt.SendReminder, ShouldBeTrue)
+			So(nt.Frequency, ShouldEqual, "1h")
 
 			nt = nts[1]
 			So(nt.Name, ShouldEqual, "another-not-default-notification")
diff --git a/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml b/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml
index 1d846f64473b..5c71e0229335 100644
--- a/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml
+++ b/pkg/services/provisioning/notifiers/testdata/test-configs/correct-properties/correct-properties.yaml
@@ -3,8 +3,9 @@ notifiers:
     type: slack
     uid: notifier1
     org_id: 2
-    uid: "notifier1"
     is_default: true
+    send_reminder: true
+    frequency: 1h
     settings:
       recipient: "XXX"
       token: "xoxb"
diff --git a/pkg/services/provisioning/provisioning.go b/pkg/services/provisioning/provisioning.go
index 29f2d1391643..025b5fe311d1 100644
--- a/pkg/services/provisioning/provisioning.go
+++ b/pkg/services/provisioning/provisioning.go
@@ -5,8 +5,8 @@ import (
 	"path"
 	"sync"
 
-	"github.com/grafana/grafana/pkg/log"
-	"github.com/pkg/errors"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/util/errutil"
 
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/provisioning/dashboards"
@@ -103,20 +103,20 @@ func (ps *provisioningServiceImpl) Run(ctx context.Context) error {
 func (ps *provisioningServiceImpl) ProvisionDatasources() error {
 	datasourcePath := path.Join(ps.Cfg.ProvisioningPath, "datasources")
 	err := ps.provisionDatasources(datasourcePath)
-	return errors.Wrap(err, "Datasource provisioning error")
+	return errutil.Wrap("Datasource provisioning error", err)
 }
 
 func (ps *provisioningServiceImpl) ProvisionNotifications() error {
 	alertNotificationsPath := path.Join(ps.Cfg.ProvisioningPath, "notifiers")
 	err := ps.provisionNotifiers(alertNotificationsPath)
-	return errors.Wrap(err, "Alert notification provisioning error")
+	return errutil.Wrap("Alert notification provisioning error", err)
 }
 
 func (ps *provisioningServiceImpl) ProvisionDashboards() error {
 	dashboardPath := path.Join(ps.Cfg.ProvisioningPath, "dashboards")
 	dashProvisioner, err := ps.newDashboardProvisioner(dashboardPath)
 	if err != nil {
-		return errors.Wrap(err, "Failed to create provisioner")
+		return errutil.Wrap("Failed to create provisioner", err)
 	}
 
 	ps.mutex.Lock()
@@ -127,7 +127,7 @@ func (ps *provisioningServiceImpl) ProvisionDashboards() error {
 	if err := dashProvisioner.Provision(); err != nil {
 		// If we fail to provision with the new provisioner, mutex will unlock and the polling we restart with the
 		// old provisioner as we did not switch them yet.
-		return errors.Wrap(err, "Failed to provision dashboards")
+		return errutil.Wrap("Failed to provision dashboards", err)
 	}
 	ps.dashboardProvisioner = dashProvisioner
 	return nil
diff --git a/pkg/services/provisioning/provisioning_mock.go b/pkg/services/provisioning/provisioning_mock.go
index 7977e59b2e47..dc487f566465 100644
--- a/pkg/services/provisioning/provisioning_mock.go
+++ b/pkg/services/provisioning/provisioning_mock.go
@@ -25,34 +25,30 @@ func (mock *ProvisioningServiceMock) ProvisionDatasources() error {
 	mock.Calls.ProvisionDatasources = append(mock.Calls.ProvisionDatasources, nil)
 	if mock.ProvisionDatasourcesFunc != nil {
 		return mock.ProvisionDatasourcesFunc()
-	} else {
-		return nil
 	}
+	return nil
 }
 
 func (mock *ProvisioningServiceMock) ProvisionNotifications() error {
 	mock.Calls.ProvisionNotifications = append(mock.Calls.ProvisionNotifications, nil)
 	if mock.ProvisionNotificationsFunc != nil {
 		return mock.ProvisionNotificationsFunc()
-	} else {
-		return nil
 	}
+	return nil
 }
 
 func (mock *ProvisioningServiceMock) ProvisionDashboards() error {
 	mock.Calls.ProvisionDashboards = append(mock.Calls.ProvisionDashboards, nil)
 	if mock.ProvisionDashboardsFunc != nil {
 		return mock.ProvisionDashboardsFunc()
-	} else {
-		return nil
 	}
+	return nil
 }
 
 func (mock *ProvisioningServiceMock) GetDashboardProvisionerResolvedPath(name string) string {
 	mock.Calls.GetDashboardProvisionerResolvedPath = append(mock.Calls.GetDashboardProvisionerResolvedPath, name)
 	if mock.GetDashboardProvisionerResolvedPathFunc != nil {
 		return mock.GetDashboardProvisionerResolvedPathFunc(name)
-	} else {
-		return ""
 	}
+	return ""
 }
diff --git a/pkg/services/provisioning/values/values.go b/pkg/services/provisioning/values/values.go
index 48c7cd6444e6..63da76a9338d 100644
--- a/pkg/services/provisioning/values/values.go
+++ b/pkg/services/provisioning/values/values.go
@@ -1,4 +1,4 @@
-// A set of value types to use in provisioning. They add custom unmarshaling logic that puts the string values
+// Package values is a set of value types to use in provisioning. They add custom unmarshaling logic that puts the string values
 // through os.ExpandEnv.
 // Usage:
 // type Data struct {
@@ -11,10 +11,11 @@
 package values
 
 import (
-	"github.com/pkg/errors"
 	"os"
 	"reflect"
 	"strconv"
+
+	"github.com/grafana/grafana/pkg/util/errutil"
 )
 
 type IntValue struct {
@@ -33,7 +34,7 @@ func (val *IntValue) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	}
 	val.Raw = interpolated.raw
 	val.value, err = strconv.Atoi(interpolated.value)
-	return errors.Wrap(err, "cannot convert value int")
+	return errutil.Wrap("cannot convert value int", err)
 }
 
 func (val *IntValue) Value() int {
diff --git a/pkg/services/rendering/phantomjs.go b/pkg/services/rendering/phantomjs.go
index 35389fe7918e..a67d43c3c239 100644
--- a/pkg/services/rendering/phantomjs.go
+++ b/pkg/services/rendering/phantomjs.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/middleware"
 )
 
diff --git a/pkg/services/rendering/rendering.go b/pkg/services/rendering/rendering.go
index 06db73771b26..259b5db2d7af 100644
--- a/pkg/services/rendering/rendering.go
+++ b/pkg/services/rendering/rendering.go
@@ -10,7 +10,7 @@ import (
 	plugin "github.com/hashicorp/go-plugin"
 
 	pluginModel "github.com/grafana/grafana-plugin-model/go/renderer"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/middleware"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
diff --git a/pkg/services/sqlstore/logger.go b/pkg/services/sqlstore/logger.go
index 9b0b068c9184..498c2b58c17d 100644
--- a/pkg/services/sqlstore/logger.go
+++ b/pkg/services/sqlstore/logger.go
@@ -3,7 +3,7 @@ package sqlstore
 import (
 	"fmt"
 
-	glog "github.com/grafana/grafana/pkg/log"
+	glog "github.com/grafana/grafana/pkg/infra/log"
 
 	"github.com/go-xorm/core"
 )
diff --git a/pkg/services/sqlstore/login_attempt.go b/pkg/services/sqlstore/login_attempt.go
index fe77dd7e9146..a9adbca5bfed 100644
--- a/pkg/services/sqlstore/login_attempt.go
+++ b/pkg/services/sqlstore/login_attempt.go
@@ -43,7 +43,7 @@ func DeleteOldLoginAttempts(cmd *m.DeleteOldLoginAttemptsCommand) error {
 		if err != nil {
 			return err
 		}
-
+		// nolint: gosimple
 		if result == nil || len(result) == 0 || result[0] == nil {
 			return nil
 		}
diff --git a/pkg/services/sqlstore/migrations/user_mig.go b/pkg/services/sqlstore/migrations/user_mig.go
index e273cb7d5424..8202dfc1cbbc 100644
--- a/pkg/services/sqlstore/migrations/user_mig.go
+++ b/pkg/services/sqlstore/migrations/user_mig.go
@@ -116,6 +116,12 @@ func addUserMigrations(mg *Migrator) {
 
 	// Adds salt & rands for old users who used ldap or oauth
 	mg.AddMigration("Add missing user data", &AddMissingUserSaltAndRandsMigration{})
+
+	// is_disabled indicates whether user disabled or not. Disabled user should not be able to log in.
+	// This field used in couple with LDAP auth to disable users removed from LDAP rather than delete it immediately.
+	mg.AddMigration("Add is_disabled column to user", NewAddColumnMigration(userV2, &Column{
+		Name: "is_disabled", Type: DB_Bool, Nullable: false, Default: "0",
+	}))
 }
 
 type AddMissingUserSaltAndRandsMigration struct {
diff --git a/pkg/services/sqlstore/migrator/migrator.go b/pkg/services/sqlstore/migrator/migrator.go
index ce0b2663def4..68820c7feb6a 100644
--- a/pkg/services/sqlstore/migrator/migrator.go
+++ b/pkg/services/sqlstore/migrator/migrator.go
@@ -5,7 +5,7 @@ import (
 
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/xorm"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
 )
diff --git a/pkg/services/sqlstore/session.go b/pkg/services/sqlstore/session.go
index 29d7392678fe..a705af39da3b 100644
--- a/pkg/services/sqlstore/session.go
+++ b/pkg/services/sqlstore/session.go
@@ -18,6 +18,11 @@ func (sess *DBSession) publishAfterCommit(msg interface{}) {
 	sess.events = append(sess.events, msg)
 }
 
+// NewSession returns a new DBSession
+func (ss *SqlStore) NewSession() *DBSession {
+	return &DBSession{Session: ss.engine.NewSession()}
+}
+
 func newSession() *DBSession {
 	return &DBSession{Session: x.NewSession()}
 }
@@ -41,6 +46,16 @@ func startSession(ctx context.Context, engine *xorm.Engine, beginTran bool) (*DB
 	return newSess, nil
 }
 
+// WithDbSession calls the callback with an session attached to the context.
+func (ss *SqlStore) WithDbSession(ctx context.Context, callback dbTransactionFunc) error {
+	sess, err := startSession(ctx, ss.engine, false)
+	if err != nil {
+		return err
+	}
+
+	return callback(sess)
+}
+
 func withDbSession(ctx context.Context, callback dbTransactionFunc) error {
 	sess, err := startSession(ctx, x, false)
 	if err != nil {
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
index 116c246cbe34..675af5f02bb3 100644
--- a/pkg/services/sqlstore/sqlstore.go
+++ b/pkg/services/sqlstore/sqlstore.go
@@ -8,13 +8,12 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
-	"testing"
 	"time"
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/xorm"
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/registry"
 	"github.com/grafana/grafana/pkg/services/annotations"
@@ -26,7 +25,6 @@ import (
 	_ "github.com/grafana/grafana/pkg/tsdb/mssql"
 	"github.com/grafana/grafana/pkg/util"
 	_ "github.com/lib/pq"
-	sqlite3 "github.com/mattn/go-sqlite3"
 )
 
 var (
@@ -39,6 +37,11 @@ var (
 const ContextSessionName = "db-session"
 
 func init() {
+	// This change will make xorm use an empty default schema for postgres and
+	// by that mimic the functionality of how it was functioning before
+	// xorm's changes above.
+	xorm.DefaultPostgresSchema = ""
+
 	registry.Register(&registry.Descriptor{
 		Name:         "SqlStore",
 		Instance:     &SqlStore{},
@@ -58,64 +61,6 @@ type SqlStore struct {
 	skipEnsureAdmin bool
 }
 
-// NewSession returns a new DBSession
-func (ss *SqlStore) NewSession() *DBSession {
-	return &DBSession{Session: ss.engine.NewSession()}
-}
-
-// WithDbSession calls the callback with an session attached to the context.
-func (ss *SqlStore) WithDbSession(ctx context.Context, callback dbTransactionFunc) error {
-	sess, err := startSession(ctx, ss.engine, false)
-	if err != nil {
-		return err
-	}
-
-	return callback(sess)
-}
-
-// WithTransactionalDbSession calls the callback with an session within a transaction
-func (ss *SqlStore) WithTransactionalDbSession(ctx context.Context, callback dbTransactionFunc) error {
-	return ss.inTransactionWithRetryCtx(ctx, callback, 0)
-}
-
-func (ss *SqlStore) inTransactionWithRetryCtx(ctx context.Context, callback dbTransactionFunc, retry int) error {
-	sess, err := startSession(ctx, ss.engine, true)
-	if err != nil {
-		return err
-	}
-
-	defer sess.Close()
-
-	err = callback(sess)
-
-	// special handling of database locked errors for sqlite, then we can retry 3 times
-	if sqlError, ok := err.(sqlite3.Error); ok && retry < 5 {
-		if sqlError.Code == sqlite3.ErrLocked {
-			sess.Rollback()
-			time.Sleep(time.Millisecond * time.Duration(10))
-			sqlog.Info("Database table locked, sleeping then retrying", "retry", retry)
-			return ss.inTransactionWithRetryCtx(ctx, callback, retry+1)
-		}
-	}
-
-	if err != nil {
-		sess.Rollback()
-		return err
-	} else if err = sess.Commit(); err != nil {
-		return err
-	}
-
-	if len(sess.events) > 0 {
-		for _, e := range sess.events {
-			if err = bus.Publish(e); err != nil {
-				log.Error(3, "Failed to publish event after commit. error: %v", err)
-			}
-		}
-	}
-
-	return nil
-}
-
 func (ss *SqlStore) Init() error {
 	ss.log = log.New("sqlstore")
 	ss.readConfig()
@@ -230,7 +175,7 @@ func (ss *SqlStore) buildConnectionString() (string, error) {
 			ss.dbCfg.User, ss.dbCfg.Pwd, protocol, ss.dbCfg.Host, ss.dbCfg.Name)
 
 		if ss.dbCfg.SslMode == "true" || ss.dbCfg.SslMode == "skip-verify" {
-			tlsCert, err := makeCert("custom", ss.dbCfg)
+			tlsCert, err := makeCert(ss.dbCfg)
 			if err != nil {
 				return "", err
 			}
@@ -339,7 +284,14 @@ func (ss *SqlStore) readConfig() {
 	ss.dbCfg.CacheMode = sec.Key("cache_mode").MustString("private")
 }
 
-func InitTestDB(t *testing.T) *SqlStore {
+// Interface of arguments for testing db
+type ITestDB interface {
+	Helper()
+	Fatalf(format string, args ...interface{})
+}
+
+// InitTestDB initiliaze test DB
+func InitTestDB(t ITestDB) *SqlStore {
 	t.Helper()
 	sqlstore := &SqlStore{}
 	sqlstore.skipEnsureAdmin = true
diff --git a/pkg/services/sqlstore/tls_mysql.go b/pkg/services/sqlstore/tls_mysql.go
index 3697135c717e..0ba3d6da8d52 100644
--- a/pkg/services/sqlstore/tls_mysql.go
+++ b/pkg/services/sqlstore/tls_mysql.go
@@ -5,9 +5,13 @@ import (
 	"crypto/x509"
 	"fmt"
 	"io/ioutil"
+
+	"github.com/grafana/grafana/pkg/infra/log"
 )
 
-func makeCert(tlsPoolName string, config DatabaseConfig) (*tls.Config, error) {
+var tlslog = log.New("tls_mysql")
+
+func makeCert(config DatabaseConfig) (*tls.Config, error) {
 	rootCertPool := x509.NewCertPool()
 	pem, err := ioutil.ReadFile(config.CaCertPath)
 	if err != nil {
@@ -16,18 +20,16 @@ func makeCert(tlsPoolName string, config DatabaseConfig) (*tls.Config, error) {
 	if ok := rootCertPool.AppendCertsFromPEM(pem); !ok {
 		return nil, err
 	}
-	clientCert := make([]tls.Certificate, 0, 1)
-	if config.ClientCertPath != "" && config.ClientKeyPath != "" {
 
-		certs, err := tls.LoadX509KeyPair(config.ClientCertPath, config.ClientKeyPath)
-		if err != nil {
-			return nil, err
-		}
-		clientCert = append(clientCert, certs)
-	}
 	tlsConfig := &tls.Config{
-		RootCAs:      rootCertPool,
-		Certificates: clientCert,
+		RootCAs: rootCertPool,
+	}
+	if config.ClientCertPath != "" && config.ClientKeyPath != "" {
+		tlsConfig.GetClientCertificate = func(*tls.CertificateRequestInfo) (*tls.Certificate, error) {
+			tlslog.Debug("Loading client certificate")
+			cert, err := tls.LoadX509KeyPair(config.ClientCertPath, config.ClientKeyPath)
+			return &cert, err
+		}
 	}
 	tlsConfig.ServerName = config.ServerCertName
 	if config.SslMode == "skip-verify" {
diff --git a/pkg/services/sqlstore/transactions.go b/pkg/services/sqlstore/transactions.go
index edf29fffb8f3..9b744fd32884 100644
--- a/pkg/services/sqlstore/transactions.go
+++ b/pkg/services/sqlstore/transactions.go
@@ -4,63 +4,34 @@ import (
 	"context"
 	"time"
 
+	"github.com/go-xorm/xorm"
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	sqlite3 "github.com/mattn/go-sqlite3"
 )
 
+// WithTransactionalDbSession calls the callback with an session within a transaction
+func (ss *SqlStore) WithTransactionalDbSession(ctx context.Context, callback dbTransactionFunc) error {
+	return inTransactionWithRetryCtx(ctx, ss.engine, callback, 0)
+}
+
 func (ss *SqlStore) InTransaction(ctx context.Context, fn func(ctx context.Context) error) error {
 	return ss.inTransactionWithRetry(ctx, fn, 0)
 }
 
 func (ss *SqlStore) inTransactionWithRetry(ctx context.Context, fn func(ctx context.Context) error, retry int) error {
-	sess, err := startSession(ctx, ss.engine, true)
-	if err != nil {
-		return err
-	}
-
-	defer sess.Close()
-
-	withValue := context.WithValue(ctx, ContextSessionName, sess)
-
-	err = fn(withValue)
-
-	// special handling of database locked errors for sqlite, then we can retry 3 times
-	if sqlError, ok := err.(sqlite3.Error); ok && retry < 5 {
-		if sqlError.Code == sqlite3.ErrLocked {
-			sess.Rollback()
-			time.Sleep(time.Millisecond * time.Duration(10))
-			ss.log.Info("Database table locked, sleeping then retrying", "retry", retry)
-			return ss.inTransactionWithRetry(ctx, fn, retry+1)
-		}
-	}
-
-	if err != nil {
-		sess.Rollback()
-		return err
-	}
-
-	if err = sess.Commit(); err != nil {
-		return err
-	}
-
-	if len(sess.events) > 0 {
-		for _, e := range sess.events {
-			if err = bus.Publish(e); err != nil {
-				ss.log.Error("Failed to publish event after commit", err)
-			}
-		}
-	}
-
-	return nil
+	return inTransactionWithRetryCtx(ctx, ss.engine, func(sess *DBSession) error {
+		withValue := context.WithValue(ctx, ContextSessionName, sess)
+		return fn(withValue)
+	}, retry)
 }
 
 func inTransactionWithRetry(callback dbTransactionFunc, retry int) error {
-	return inTransactionWithRetryCtx(context.Background(), callback, retry)
+	return inTransactionWithRetryCtx(context.Background(), x, callback, retry)
 }
 
-func inTransactionWithRetryCtx(ctx context.Context, callback dbTransactionFunc, retry int) error {
-	sess, err := startSession(ctx, x, true)
+func inTransactionWithRetryCtx(ctx context.Context, engine *xorm.Engine, callback dbTransactionFunc, retry int) error {
+	sess, err := startSession(ctx, engine, true)
 	if err != nil {
 		return err
 	}
@@ -69,12 +40,12 @@ func inTransactionWithRetryCtx(ctx context.Context, callback dbTransactionFunc,
 
 	err = callback(sess)
 
-	// special handling of database locked errors for sqlite, then we can retry 3 times
+	// special handling of database locked errors for sqlite, then we can retry 5 times
 	if sqlError, ok := err.(sqlite3.Error); ok && retry < 5 {
-		if sqlError.Code == sqlite3.ErrLocked {
+		if sqlError.Code == sqlite3.ErrLocked || sqlError.Code == sqlite3.ErrBusy {
 			sess.Rollback()
 			time.Sleep(time.Millisecond * time.Duration(10))
-			sqlog.Info("Database table locked, sleeping then retrying", "retry", retry)
+			sqlog.Info("Database locked, sleeping then retrying", "error", err, "retry", retry)
 			return inTransactionWithRetry(callback, retry+1)
 		}
 	}
@@ -102,5 +73,5 @@ func inTransaction(callback dbTransactionFunc) error {
 }
 
 func inTransactionCtx(ctx context.Context, callback dbTransactionFunc) error {
-	return inTransactionWithRetryCtx(ctx, callback, 0)
+	return inTransactionWithRetryCtx(ctx, x, callback, 0)
 }
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 311081af4f8e..641fc5f1344f 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -27,6 +27,8 @@ func (ss *SqlStore) addUserQueryAndCommandHandlers() {
 	bus.AddHandler("sql", GetUserProfile)
 	bus.AddHandler("sql", SearchUsers)
 	bus.AddHandler("sql", GetUserOrgList)
+	bus.AddHandler("sql", DisableUser)
+	bus.AddHandler("sql", BatchDisableUsers)
 	bus.AddHandler("sql", DeleteUser)
 	bus.AddHandler("sql", UpdateUserPermissions)
 	bus.AddHandler("sql", SetUserHelpFlag)
@@ -326,6 +328,7 @@ func GetUserProfile(query *m.GetUserProfileQuery) error {
 		Login:          user.Login,
 		Theme:          user.Theme,
 		IsGrafanaAdmin: user.IsAdmin,
+		IsDisabled:     user.IsDisabled,
 		OrgId:          user.OrgId,
 	}
 
@@ -450,7 +453,7 @@ func SearchUsers(query *m.SearchUsersQuery) error {
 
 	offset := query.Limit * (query.Page - 1)
 	sess.Limit(query.Limit, offset)
-	sess.Cols("id", "email", "name", "login", "is_admin", "last_seen_at")
+	sess.Cols("id", "email", "name", "login", "is_admin", "is_disabled", "last_seen_at")
 	if err := sess.Find(&query.Result.Users); err != nil {
 		return err
 	}
@@ -473,6 +476,43 @@ func SearchUsers(query *m.SearchUsersQuery) error {
 	return err
 }
 
+func DisableUser(cmd *m.DisableUserCommand) error {
+	user := m.User{}
+	sess := x.Table("user")
+	sess.ID(cmd.UserId).Get(&user)
+
+	user.IsDisabled = cmd.IsDisabled
+	sess.UseBool("is_disabled")
+
+	_, err := sess.ID(cmd.UserId).Update(&user)
+	return err
+}
+
+func BatchDisableUsers(cmd *m.BatchDisableUsersCommand) error {
+	return inTransaction(func(sess *DBSession) error {
+		userIds := cmd.UserIds
+
+		if len(userIds) == 0 {
+			return nil
+		}
+
+		user_id_params := strings.Repeat(",?", len(userIds)-1)
+		disableSQL := "UPDATE " + dialect.Quote("user") + " SET is_disabled=? WHERE Id IN (?" + user_id_params + ")"
+
+		disableParams := []interface{}{disableSQL, cmd.IsDisabled}
+		for _, v := range userIds {
+			disableParams = append(disableParams, v)
+		}
+
+		_, err := sess.Exec(disableParams...)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+}
+
 func DeleteUser(cmd *m.DeleteUserCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		return deleteUserInTransaction(sess, cmd)
diff --git a/pkg/services/sqlstore/user_auth.go b/pkg/services/sqlstore/user_auth.go
index fd8ec3d057f6..19287b8a8668 100644
--- a/pkg/services/sqlstore/user_auth.go
+++ b/pkg/services/sqlstore/user_auth.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/bus"
-	m "github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -14,17 +14,18 @@ var getTime = time.Now
 
 func init() {
 	bus.AddHandler("sql", GetUserByAuthInfo)
+	bus.AddHandler("sql", GetExternalUserInfoByLogin)
 	bus.AddHandler("sql", GetAuthInfo)
 	bus.AddHandler("sql", SetAuthInfo)
 	bus.AddHandler("sql", UpdateAuthInfo)
 	bus.AddHandler("sql", DeleteAuthInfo)
 }
 
-func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
-	user := &m.User{}
+func GetUserByAuthInfo(query *models.GetUserByAuthInfoQuery) error {
+	user := &models.User{}
 	has := false
 	var err error
-	authQuery := &m.GetAuthInfoQuery{}
+	authQuery := &models.GetAuthInfoQuery{}
 
 	// Try to find the user by auth module and id first
 	if query.AuthModule != "" && query.AuthId != "" {
@@ -32,14 +33,14 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
 		authQuery.AuthId = query.AuthId
 
 		err = GetAuthInfo(authQuery)
-		if err != m.ErrUserNotFound {
+		if err != models.ErrUserNotFound {
 			if err != nil {
 				return err
 			}
 
 			// if user id was specified and doesn't match the user_auth entry, remove it
 			if query.UserId != 0 && query.UserId != authQuery.Result.UserId {
-				err = DeleteAuthInfo(&m.DeleteAuthInfoCommand{
+				err = DeleteAuthInfo(&models.DeleteAuthInfoCommand{
 					UserAuth: authQuery.Result,
 				})
 				if err != nil {
@@ -55,7 +56,7 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
 
 				if !has {
 					// if the user has been deleted then remove the entry
-					err = DeleteAuthInfo(&m.DeleteAuthInfoCommand{
+					err = DeleteAuthInfo(&models.DeleteAuthInfoCommand{
 						UserAuth: authQuery.Result,
 					})
 					if err != nil {
@@ -78,7 +79,7 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
 
 	// If not found, try to find the user by email address
 	if !has && query.Email != "" {
-		user = &m.User{Email: query.Email}
+		user = &models.User{Email: query.Email}
 		has, err = x.Get(user)
 		if err != nil {
 			return err
@@ -87,7 +88,7 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
 
 	// If not found, try to find the user by login
 	if !has && query.Login != "" {
-		user = &m.User{Login: query.Login}
+		user = &models.User{Login: query.Login}
 		has, err = x.Get(user)
 		if err != nil {
 			return err
@@ -96,12 +97,12 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
 
 	// No user found
 	if !has {
-		return m.ErrUserNotFound
+		return models.ErrUserNotFound
 	}
 
 	// create authInfo record to link accounts
 	if authQuery.Result == nil && query.AuthModule != "" {
-		cmd2 := &m.SetAuthInfoCommand{
+		cmd2 := &models.SetAuthInfoCommand{
 			UserId:     user.Id,
 			AuthModule: query.AuthModule,
 			AuthId:     query.AuthId,
@@ -115,8 +116,32 @@ func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
 	return nil
 }
 
-func GetAuthInfo(query *m.GetAuthInfoQuery) error {
-	userAuth := &m.UserAuth{
+func GetExternalUserInfoByLogin(query *models.GetExternalUserInfoByLoginQuery) error {
+	userQuery := models.GetUserByLoginQuery{LoginOrEmail: query.LoginOrEmail}
+	err := bus.Dispatch(&userQuery)
+	if err != nil {
+		return err
+	}
+
+	authInfoQuery := &models.GetAuthInfoQuery{UserId: userQuery.Result.Id}
+	if err := bus.Dispatch(authInfoQuery); err != nil {
+		return err
+	}
+
+	query.Result = &models.ExternalUserInfo{
+		UserId:     userQuery.Result.Id,
+		Login:      userQuery.Result.Login,
+		Email:      userQuery.Result.Email,
+		Name:       userQuery.Result.Name,
+		IsDisabled: userQuery.Result.IsDisabled,
+		AuthModule: authInfoQuery.Result.AuthModule,
+		AuthId:     authInfoQuery.Result.AuthId,
+	}
+	return nil
+}
+
+func GetAuthInfo(query *models.GetAuthInfoQuery) error {
+	userAuth := &models.UserAuth{
 		UserId:     query.UserId,
 		AuthModule: query.AuthModule,
 		AuthId:     query.AuthId,
@@ -126,7 +151,7 @@ func GetAuthInfo(query *m.GetAuthInfoQuery) error {
 		return err
 	}
 	if !has {
-		return m.ErrUserNotFound
+		return models.ErrUserNotFound
 	}
 
 	secretAccessToken, err := decodeAndDecrypt(userAuth.OAuthAccessToken)
@@ -149,9 +174,9 @@ func GetAuthInfo(query *m.GetAuthInfoQuery) error {
 	return nil
 }
 
-func SetAuthInfo(cmd *m.SetAuthInfoCommand) error {
+func SetAuthInfo(cmd *models.SetAuthInfoCommand) error {
 	return inTransaction(func(sess *DBSession) error {
-		authUser := &m.UserAuth{
+		authUser := &models.UserAuth{
 			UserId:     cmd.UserId,
 			AuthModule: cmd.AuthModule,
 			AuthId:     cmd.AuthId,
@@ -183,9 +208,9 @@ func SetAuthInfo(cmd *m.SetAuthInfoCommand) error {
 	})
 }
 
-func UpdateAuthInfo(cmd *m.UpdateAuthInfoCommand) error {
+func UpdateAuthInfo(cmd *models.UpdateAuthInfoCommand) error {
 	return inTransaction(func(sess *DBSession) error {
-		authUser := &m.UserAuth{
+		authUser := &models.UserAuth{
 			UserId:     cmd.UserId,
 			AuthModule: cmd.AuthModule,
 			AuthId:     cmd.AuthId,
@@ -212,7 +237,7 @@ func UpdateAuthInfo(cmd *m.UpdateAuthInfoCommand) error {
 			authUser.OAuthExpiry = cmd.OAuthToken.Expiry
 		}
 
-		cond := &m.UserAuth{
+		cond := &models.UserAuth{
 			UserId:     cmd.UserId,
 			AuthModule: cmd.AuthModule,
 		}
@@ -222,7 +247,7 @@ func UpdateAuthInfo(cmd *m.UpdateAuthInfoCommand) error {
 	})
 }
 
-func DeleteAuthInfo(cmd *m.DeleteAuthInfoCommand) error {
+func DeleteAuthInfo(cmd *models.DeleteAuthInfoCommand) error {
 	return inTransaction(func(sess *DBSession) error {
 		_, err := sess.Delete(cmd.UserAuth)
 		return err
diff --git a/pkg/services/sqlstore/user_test.go b/pkg/services/sqlstore/user_test.go
index 84640687ed9f..e5807ea7bf57 100644
--- a/pkg/services/sqlstore/user_test.go
+++ b/pkg/services/sqlstore/user_test.go
@@ -175,6 +175,40 @@ func TestUserDataAccess(t *testing.T) {
 					So(found, ShouldBeTrue)
 				})
 			})
+
+			Convey("When batch disabling users", func() {
+				userIdsToDisable := []int64{}
+				for i := 0; i < 3; i++ {
+					userIdsToDisable = append(userIdsToDisable, users[i].Id)
+				}
+				disableCmd := m.BatchDisableUsersCommand{UserIds: userIdsToDisable, IsDisabled: true}
+
+				err = BatchDisableUsers(&disableCmd)
+				So(err, ShouldBeNil)
+
+				Convey("Should disable all provided users", func() {
+					query := m.SearchUsersQuery{}
+					err = SearchUsers(&query)
+
+					So(query.Result.TotalCount, ShouldEqual, 5)
+					for _, user := range query.Result.Users {
+						shouldBeDisabled := false
+
+						// Check if user id is in the userIdsToDisable list
+						for _, disabledUserId := range userIdsToDisable {
+							if user.Id == disabledUserId {
+								So(user.IsDisabled, ShouldBeTrue)
+								shouldBeDisabled = true
+							}
+						}
+
+						// Otherwise user shouldn't be disabled
+						if !shouldBeDisabled {
+							So(user.IsDisabled, ShouldBeFalse)
+						}
+					}
+				})
+			})
 		})
 
 		Convey("Given one grafana admin user", func() {
diff --git a/pkg/services/user/user.go b/pkg/services/user/user.go
new file mode 100644
index 000000000000..94762c811b08
--- /dev/null
+++ b/pkg/services/user/user.go
@@ -0,0 +1,39 @@
+package user
+
+import (
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/models"
+)
+
+// UpsertArgs are object for Upsert method
+type UpsertArgs struct {
+	ReqContext    *models.ReqContext
+	ExternalUser  *models.ExternalUserInfo
+	SignupAllowed bool
+}
+
+// Upsert add/update grafana user
+func Upsert(args *UpsertArgs) (*models.User, error) {
+	query := &models.UpsertUserCommand{
+		ReqContext:    args.ReqContext,
+		ExternalUser:  args.ExternalUser,
+		SignupAllowed: args.SignupAllowed,
+	}
+	err := bus.Dispatch(query)
+	if err != nil {
+		return nil, err
+	}
+
+	return query.Result, nil
+}
+
+// Get the users
+func Get(
+	query *models.SearchUsersQuery,
+) ([]*models.UserSearchHitDTO, error) {
+	if err := bus.Dispatch(query); err != nil {
+		return nil, err
+	}
+
+	return query.Result.Users, nil
+}
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 788ea7677c99..eef813a3afe5 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -20,7 +20,7 @@ import (
 	"github.com/go-macaron/session"
 	ini "gopkg.in/ini.v1"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -47,10 +47,11 @@ var (
 
 var (
 	// App settings.
-	Env          = DEV
-	AppUrl       string
-	AppSubUrl    string
-	InstanceName string
+	Env              = DEV
+	AppUrl           string
+	AppSubUrl        string
+	ServeFromSubPath bool
+	InstanceName     string
 
 	// build
 	BuildVersion    string
@@ -138,7 +139,7 @@ var (
 	AuthProxyHeaderName     string
 	AuthProxyHeaderProperty string
 	AuthProxyAutoSignUp     bool
-	AuthProxyLdapSyncTtl    int
+	AuthProxyLDAPSyncTtl    int
 	AuthProxyWhitelist      string
 	AuthProxyHeaders        map[string]string
 
@@ -165,11 +166,11 @@ var (
 	GoogleTagManagerId string
 
 	// LDAP
-	LdapEnabled           bool
-	LdapConfigFile        string
-	LdapSyncCron          string
-	LdapAllowSignup       bool
-	LdapActiveSyncEnabled bool
+	LDAPEnabled           bool
+	LDAPConfigFile        string
+	LDAPSyncCron          string
+	LDAPAllowSignup       bool
+	LDAPActiveSyncEnabled bool
 
 	// QUOTA
 	Quota QuotaSettings
@@ -205,8 +206,9 @@ type Cfg struct {
 	Logger log.Logger
 
 	// HTTP Server Settings
-	AppUrl    string
-	AppSubUrl string
+	AppUrl           string
+	AppSubUrl        string
+	ServeFromSubPath bool
 
 	// Paths
 	ProvisioningPath string
@@ -486,9 +488,9 @@ func (cfg *Cfg) loadConfiguration(args *CommandLineArgs) (*ini.File, error) {
 	// load specified config file
 	err = loadSpecifedConfigFile(args.Config, parsedFile)
 	if err != nil {
-		err = cfg.initLogging(parsedFile)
-		if err != nil {
-			return nil, err
+		err2 := cfg.initLogging(parsedFile)
+		if err2 != nil {
+			return nil, err2
 		}
 		log.Fatal(3, err.Error())
 	}
@@ -610,8 +612,11 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 	if err != nil {
 		return err
 	}
+	ServeFromSubPath = server.Key("serve_from_sub_path").MustBool(false)
+
 	cfg.AppUrl = AppUrl
 	cfg.AppSubUrl = AppSubUrl
+	cfg.ServeFromSubPath = ServeFromSubPath
 
 	Protocol = HTTP
 	protocolStr, err := valueAsString(server, "protocol", "http")
@@ -805,6 +810,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 	// auth proxy
 	authProxy := iniFile.Section("auth.proxy")
 	AuthProxyEnabled = authProxy.Key("enabled").MustBool(false)
+
 	AuthProxyHeaderName, err = valueAsString(authProxy, "header_name", "")
 	if err != nil {
 		return err
@@ -814,7 +820,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 		return err
 	}
 	AuthProxyAutoSignUp = authProxy.Key("auto_sign_up").MustBool(true)
-	AuthProxyLdapSyncTtl = authProxy.Key("ldap_sync_ttl").MustInt()
+	AuthProxyLDAPSyncTtl = authProxy.Key("ldap_sync_ttl").MustInt()
 	AuthProxyWhitelist, err = valueAsString(authProxy, "whitelist", "")
 	if err != nil {
 		return err
@@ -977,11 +983,11 @@ type RemoteCacheOptions struct {
 
 func (cfg *Cfg) readLDAPConfig() {
 	ldapSec := cfg.Raw.Section("auth.ldap")
-	LdapConfigFile = ldapSec.Key("config_file").String()
-	LdapSyncCron = ldapSec.Key("sync_cron").String()
-	LdapEnabled = ldapSec.Key("enabled").MustBool(false)
-	LdapActiveSyncEnabled = ldapSec.Key("active_sync_enabled").MustBool(false)
-	LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
+	LDAPConfigFile = ldapSec.Key("config_file").String()
+	LDAPSyncCron = ldapSec.Key("sync_cron").String()
+	LDAPEnabled = ldapSec.Key("enabled").MustBool(false)
+	LDAPActiveSyncEnabled = ldapSec.Key("active_sync_enabled").MustBool(false)
+	LDAPAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
 }
 
 func (cfg *Cfg) readSessionConfig() {
diff --git a/pkg/setting/setting_session_test.go b/pkg/setting/setting_session_test.go
index 7bf31123473e..0a73b47a91d8 100644
--- a/pkg/setting/setting_session_test.go
+++ b/pkg/setting/setting_session_test.go
@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
diff --git a/pkg/tsdb/azuremonitor/azuremonitor-datasource.go b/pkg/tsdb/azuremonitor/azuremonitor-datasource.go
index cae8d8bfb73b..abbf6fd69b53 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor-datasource.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor-datasource.go
@@ -85,14 +85,17 @@ func (e *AzureMonitorDatasource) buildQueries(queries []*tsdb.Query, timeRange *
 		azlog.Debug("AzureMonitor", "target", azureMonitorTarget)
 
 		urlComponents := map[string]string{}
+		urlComponents["subscription"] = fmt.Sprintf("%v", query.Model.Get("subscription").MustString())
 		urlComponents["resourceGroup"] = fmt.Sprintf("%v", azureMonitorTarget["resourceGroup"])
 		urlComponents["metricDefinition"] = fmt.Sprintf("%v", azureMonitorTarget["metricDefinition"])
 		urlComponents["resourceName"] = fmt.Sprintf("%v", azureMonitorTarget["resourceName"])
 
 		ub := urlBuilder{
-			ResourceGroup:    urlComponents["resourceGroup"],
-			MetricDefinition: urlComponents["metricDefinition"],
-			ResourceName:     urlComponents["resourceName"],
+			DefaultSubscription: query.DataSource.JsonData.Get("subscriptionId").MustString(),
+			Subscription:        urlComponents["subscription"],
+			ResourceGroup:       urlComponents["resourceGroup"],
+			MetricDefinition:    urlComponents["metricDefinition"],
+			ResourceName:        urlComponents["resourceName"],
 		}
 		azureURL := ub.Build()
 
@@ -199,8 +202,7 @@ func (e *AzureMonitorDatasource) createRequest(ctx context.Context, dsInfo *mode
 	}
 
 	cloudName := dsInfo.JsonData.Get("cloudName").MustString("azuremonitor")
-	subscriptionID := dsInfo.JsonData.Get("subscriptionId").MustString()
-	proxyPass := fmt.Sprintf("%s/subscriptions/%s", cloudName, subscriptionID)
+	proxyPass := fmt.Sprintf("%s/subscriptions", cloudName)
 
 	u, _ := url.Parse(dsInfo.Url)
 	u.Path = path.Join(u.Path, "render")
diff --git a/pkg/tsdb/azuremonitor/azuremonitor-datasource_test.go b/pkg/tsdb/azuremonitor/azuremonitor-datasource_test.go
index 39cfe3f76713..94c2aef6c03a 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor-datasource_test.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor-datasource_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 
 	. "github.com/smartystreets/goconvey/convey"
@@ -27,7 +28,13 @@ func TestAzureMonitorDatasource(t *testing.T) {
 				},
 				Queries: []*tsdb.Query{
 					{
+						DataSource: &models.DataSource{
+							JsonData: simplejson.NewFromAny(map[string]interface{}{
+								"subscriptionId": "default-subscription",
+							}),
+						},
 						Model: simplejson.NewFromAny(map[string]interface{}{
+							"subscription": "12345678-aaaa-bbbb-cccc-123456789abc",
 							"azureMonitor": map[string]interface{}{
 								"timeGrain":        "PT1M",
 								"aggregation":      "Average",
@@ -49,7 +56,7 @@ func TestAzureMonitorDatasource(t *testing.T) {
 
 				So(len(queries), ShouldEqual, 1)
 				So(queries[0].RefID, ShouldEqual, "A")
-				So(queries[0].URL, ShouldEqual, "resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics")
+				So(queries[0].URL, ShouldEqual, "12345678-aaaa-bbbb-cccc-123456789abc/resourceGroups/grafanastaging/providers/Microsoft.Compute/virtualMachines/grafana/providers/microsoft.insights/metrics")
 				So(queries[0].Target, ShouldEqual, "aggregation=Average&api-version=2018-01-01&interval=PT1M&metricnames=Percentage+CPU&timespan=2018-03-15T13%3A00%3A00Z%2F2018-03-15T13%3A34%3A00Z")
 				So(len(queries[0].Params), ShouldEqual, 5)
 				So(queries[0].Params["timespan"][0], ShouldEqual, "2018-03-15T13:00:00Z/2018-03-15T13:34:00Z")
diff --git a/pkg/tsdb/azuremonitor/azuremonitor.go b/pkg/tsdb/azuremonitor/azuremonitor.go
index 31a42d21a12f..39014bf38dae 100644
--- a/pkg/tsdb/azuremonitor/azuremonitor.go
+++ b/pkg/tsdb/azuremonitor/azuremonitor.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
diff --git a/pkg/tsdb/azuremonitor/url-builder.go b/pkg/tsdb/azuremonitor/url-builder.go
index c252048f5172..445f815e0cd6 100644
--- a/pkg/tsdb/azuremonitor/url-builder.go
+++ b/pkg/tsdb/azuremonitor/url-builder.go
@@ -7,22 +7,30 @@ import (
 
 // urlBuilder builds the URL for calling the Azure Monitor API
 type urlBuilder struct {
-	ResourceGroup    string
-	MetricDefinition string
-	ResourceName     string
+	DefaultSubscription string
+	Subscription        string
+	ResourceGroup       string
+	MetricDefinition    string
+	ResourceName        string
 }
 
 // Build checks the metric definition property to see which form of the url
 // should be returned
 func (ub *urlBuilder) Build() string {
 
+	subscription := ub.Subscription
+
+	if ub.Subscription == "" {
+		subscription = ub.DefaultSubscription
+	}
+
 	if strings.Count(ub.MetricDefinition, "/") > 1 {
 		rn := strings.Split(ub.ResourceName, "/")
 		lastIndex := strings.LastIndex(ub.MetricDefinition, "/")
 		service := ub.MetricDefinition[lastIndex+1:]
 		md := ub.MetricDefinition[0:lastIndex]
-		return fmt.Sprintf("resourceGroups/%s/providers/%s/%s/%s/%s/providers/microsoft.insights/metrics", ub.ResourceGroup, md, rn[0], service, rn[1])
+		return fmt.Sprintf("%s/resourceGroups/%s/providers/%s/%s/%s/%s/providers/microsoft.insights/metrics", subscription, ub.ResourceGroup, md, rn[0], service, rn[1])
 	}
 
-	return fmt.Sprintf("resourceGroups/%s/providers/%s/%s/providers/microsoft.insights/metrics", ub.ResourceGroup, ub.MetricDefinition, ub.ResourceName)
+	return fmt.Sprintf("%s/resourceGroups/%s/providers/%s/%s/providers/microsoft.insights/metrics", subscription, ub.ResourceGroup, ub.MetricDefinition, ub.ResourceName)
 }
diff --git a/pkg/tsdb/azuremonitor/url-builder_test.go b/pkg/tsdb/azuremonitor/url-builder_test.go
index 85c4f81bc835..2af784a7554a 100644
--- a/pkg/tsdb/azuremonitor/url-builder_test.go
+++ b/pkg/tsdb/azuremonitor/url-builder_test.go
@@ -11,35 +11,51 @@ func TestURLBuilder(t *testing.T) {
 
 		Convey("when metric definition is in the short form", func() {
 			ub := &urlBuilder{
-				ResourceGroup:    "rg",
-				MetricDefinition: "Microsoft.Compute/virtualMachines",
-				ResourceName:     "rn",
+				DefaultSubscription: "default-sub",
+				ResourceGroup:       "rg",
+				MetricDefinition:    "Microsoft.Compute/virtualMachines",
+				ResourceName:        "rn",
 			}
 
 			url := ub.Build()
-			So(url, ShouldEqual, "resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/rn/providers/microsoft.insights/metrics")
+			So(url, ShouldEqual, "default-sub/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/rn/providers/microsoft.insights/metrics")
+		})
+
+		Convey("when metric definition is in the short form and a subscription is defined", func() {
+			ub := &urlBuilder{
+				DefaultSubscription: "default-sub",
+				Subscription:        "specified-sub",
+				ResourceGroup:       "rg",
+				MetricDefinition:    "Microsoft.Compute/virtualMachines",
+				ResourceName:        "rn",
+			}
+
+			url := ub.Build()
+			So(url, ShouldEqual, "specified-sub/resourceGroups/rg/providers/Microsoft.Compute/virtualMachines/rn/providers/microsoft.insights/metrics")
 		})
 
 		Convey("when metric definition is Microsoft.Storage/storageAccounts/blobServices", func() {
 			ub := &urlBuilder{
-				ResourceGroup:    "rg",
-				MetricDefinition: "Microsoft.Storage/storageAccounts/blobServices",
-				ResourceName:     "rn1/default",
+				DefaultSubscription: "default-sub",
+				ResourceGroup:       "rg",
+				MetricDefinition:    "Microsoft.Storage/storageAccounts/blobServices",
+				ResourceName:        "rn1/default",
 			}
 
 			url := ub.Build()
-			So(url, ShouldEqual, "resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/blobServices/default/providers/microsoft.insights/metrics")
+			So(url, ShouldEqual, "default-sub/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/blobServices/default/providers/microsoft.insights/metrics")
 		})
 
 		Convey("when metric definition is Microsoft.Storage/storageAccounts/fileServices", func() {
 			ub := &urlBuilder{
-				ResourceGroup:    "rg",
-				MetricDefinition: "Microsoft.Storage/storageAccounts/fileServices",
-				ResourceName:     "rn1/default",
+				DefaultSubscription: "default-sub",
+				ResourceGroup:       "rg",
+				MetricDefinition:    "Microsoft.Storage/storageAccounts/fileServices",
+				ResourceName:        "rn1/default",
 			}
 
 			url := ub.Build()
-			So(url, ShouldEqual, "resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/fileServices/default/providers/microsoft.insights/metrics")
+			So(url, ShouldEqual, "default-sub/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/fileServices/default/providers/microsoft.insights/metrics")
 		})
 	})
 }
diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 56e9bd30e98b..34d57f4d71fc 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -10,7 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 	"golang.org/x/sync/errgroup"
diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go
index b25e6b105356..844adfadccfd 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query.go
@@ -56,6 +56,7 @@ func init() {
 		"AWS/Connect":           {"CallBackNotDialableNumber", "CallRecordingUploadError", "CallsBreachingConcurrencyQuota", "CallsPerInterval", "ConcurrentCalls", "ConcurrentCallsPercentage", "ContactFlowErrors", "ContactFlowFatalErrors", "LongestQueueWaitTime", "MisconfiguredPhoneNumbers", "MissedCalls", "PublicSigningKeyUsage", "QueueCapacityExceededError", "QueueSize", "ThrottledCalls", "ToInstancePacketLossRate"},
 		"AWS/DDoSProtection":    {"AllowedRequests", "BlockedRequests", "CountedRequests", "DDoSAttackBitsPerSecond", "DDoSAttackPacketsPerSecond", "DDoSAttackRequestsPerSecond", "DDoSDetected", "PassedRequests"},
 		"AWS/DMS":               {"CDCChangesDiskSource", "CDCChangesDiskTarget", "CDCChangesMemorySource", "CDCChangesMemoryTarget", "CDCIncomingChanges", "CDCLatencySource", "CDCLatencyTarget", "CDCThroughputBandwidthSource", "CDCThroughputBandwidthTarget", "CDCThroughputRowsSource", "CDCThroughputRowsTarget", "CPUUtilization", "FreeStorageSpace", "FreeableMemory", "FullLoadThroughputBandwidthSource", "FullLoadThroughputBandwidthTarget", "FullLoadThroughputRowsSource", "FullLoadThroughputRowsTarget", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "ReadIOPS", "ReadLatency", "ReadThroughput", "SwapUsage", "WriteIOPS", "WriteLatency", "WriteThroughput"},
+		"AWS/DocDB":             {"BackupRetentionPeriodStorageUsed", "BufferCacheHitRatio", "CPUUtilization", "DatabaseConnections", "DBInstanceReplicaLag", "DBClusterReplicaLagMaximum", "DBClusterReplicaLagMinimum", "DiskQueueDepth", "EngineUptime", "FreeableMemory", "FreeLocalStorage", "NetworkReceiveThroughput", "NetworkThroughput", "NetworkTransmitThroughput", "ReadIOPS", "ReadLatency", "ReadThroughput", "SnapshotStorageUsed", "SwapUsage", "TotalBackupStorageBilled", "VolumeBytesUsed", "VolumeReadIOPs", "VolumeWriteIOPs", "WriteIOPS", "WriteLatency", "WriteThroughput"},
 		"AWS/DX":                {"ConnectionBpsEgress", "ConnectionBpsIngress", "ConnectionCRCErrorCount", "ConnectionLightLevelRx", "ConnectionLightLevelTx", "ConnectionPpsEgress", "ConnectionPpsIngress", "ConnectionState"},
 		"AWS/DynamoDB":          {"ConditionalCheckFailedRequests", "ConsumedReadCapacityUnits", "ConsumedWriteCapacityUnits", "OnlineIndexConsumedWriteCapacity", "OnlineIndexPercentageProgress", "OnlineIndexThrottleEvents", "PendingReplicationCount", "ProvisionedReadCapacityUnits", "ProvisionedWriteCapacityUnits", "ReadThrottleEvents", "ReplicationLatency", "ReturnedBytes", "ReturnedItemCount", "ReturnedRecordsCount", "SuccessfulRequestLatency", "SystemErrors", "ThrottledRequests", "TimeToLiveDeletedItemCount", "UserErrors", "WriteThrottleEvents"},
 		"AWS/EBS":               {"BurstBalance", "VolumeConsumedReadWriteOps", "VolumeIdleTime", "VolumeQueueLength", "VolumeReadBytes", "VolumeReadOps", "VolumeThroughputPercentage", "VolumeTotalReadTime", "VolumeTotalWriteTime", "VolumeWriteBytes", "VolumeWriteOps"},
@@ -135,6 +136,7 @@ func init() {
 		"AWS/Connect":           {"InstanceId", "MetricGroup", "Participant", "QueueName", "Stream Type", "Type of Connection"},
 		"AWS/DDoSProtection":    {"Region", "Rule", "RuleGroup", "WebACL"},
 		"AWS/DMS":               {"ReplicationInstanceIdentifier", "ReplicationTaskIdentifier"},
+		"AWS/DocDB":             {"DBClusterIdentifier"},
 		"AWS/DX":                {"ConnectionId"},
 		"AWS/DynamoDB":          {"GlobalSecondaryIndexName", "Operation", "ReceivingRegion", "StreamLabel", "TableName"},
 		"AWS/EBS":               {"VolumeId"},
diff --git a/pkg/tsdb/elasticsearch/client/client.go b/pkg/tsdb/elasticsearch/client/client.go
index 131bcdc97844..48f9cce0a5a2 100644
--- a/pkg/tsdb/elasticsearch/client/client.go
+++ b/pkg/tsdb/elasticsearch/client/client.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb"
 
 	"github.com/grafana/grafana/pkg/models"
diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go
index 857b847f0f93..01c9194877c9 100644
--- a/pkg/tsdb/elasticsearch/elasticsearch.go
+++ b/pkg/tsdb/elasticsearch/elasticsearch.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 	"github.com/grafana/grafana/pkg/tsdb/elasticsearch/client"
diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go
index 9a5de205a23a..b74112c3001e 100644
--- a/pkg/tsdb/graphite/graphite.go
+++ b/pkg/tsdb/graphite/graphite.go
@@ -13,7 +13,7 @@ import (
 
 	"golang.org/x/net/context/ctxhttp"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb"
diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go
index 6bff961f981f..3b8f365211a5 100644
--- a/pkg/tsdb/influxdb/influxdb.go
+++ b/pkg/tsdb/influxdb/influxdb.go
@@ -10,7 +10,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb"
diff --git a/pkg/tsdb/mssql/macros.go b/pkg/tsdb/mssql/macros.go
index ec3f103a4ef2..c0794863efe5 100644
--- a/pkg/tsdb/mssql/macros.go
+++ b/pkg/tsdb/mssql/macros.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/grafana/grafana/pkg/components/gtime"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
 
@@ -74,7 +75,7 @@ func (m *msSqlMacroEngine) evaluateMacro(name string, args []string) (string, er
 		if len(args) < 2 {
 			return "", fmt.Errorf("macro %v needs time column and interval", name)
 		}
-		interval, err := time.ParseDuration(strings.Trim(args[1], `'"`))
+		interval, err := gtime.ParseInterval(strings.Trim(args[1], `'"`))
 		if err != nil {
 			return "", fmt.Errorf("error parsing interval %v", args[1])
 		}
@@ -109,7 +110,7 @@ func (m *msSqlMacroEngine) evaluateMacro(name string, args []string) (string, er
 		if len(args) < 2 {
 			return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name)
 		}
-		interval, err := time.ParseDuration(strings.Trim(args[1], `'`))
+		interval, err := gtime.ParseInterval(strings.Trim(args[1], `'`))
 		if err != nil {
 			return "", fmt.Errorf("error parsing interval %v", args[1])
 		}
diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go
index 6503632aea3a..81a7e159a868 100644
--- a/pkg/tsdb/mssql/mssql.go
+++ b/pkg/tsdb/mssql/mssql.go
@@ -8,7 +8,7 @@ import (
 
 	_ "github.com/denisenkom/go-mssqldb"
 	"github.com/go-xorm/core"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 	"github.com/grafana/grafana/pkg/util"
diff --git a/pkg/tsdb/mysql/macros.go b/pkg/tsdb/mysql/macros.go
index bbd928b05631..8cd83d2f9991 100644
--- a/pkg/tsdb/mysql/macros.go
+++ b/pkg/tsdb/mysql/macros.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"regexp"
 	"strings"
-	"time"
 
+	"github.com/grafana/grafana/pkg/components/gtime"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
 
@@ -69,7 +69,7 @@ func (m *mySqlMacroEngine) evaluateMacro(name string, args []string) (string, er
 		if len(args) < 2 {
 			return "", fmt.Errorf("macro %v needs time column and interval", name)
 		}
-		interval, err := time.ParseDuration(strings.Trim(args[1], `'"`))
+		interval, err := gtime.ParseInterval(strings.Trim(args[1], `'"`))
 		if err != nil {
 			return "", fmt.Errorf("error parsing interval %v", args[1])
 		}
@@ -104,7 +104,7 @@ func (m *mySqlMacroEngine) evaluateMacro(name string, args []string) (string, er
 		if len(args) < 2 {
 			return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name)
 		}
-		interval, err := time.ParseDuration(strings.Trim(args[1], `'`))
+		interval, err := gtime.ParseInterval(strings.Trim(args[1], `'`))
 		if err != nil {
 			return "", fmt.Errorf("error parsing interval %v", args[1])
 		}
diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go
index 95a9e02598f0..1f569f215db9 100644
--- a/pkg/tsdb/mysql/mysql.go
+++ b/pkg/tsdb/mysql/mysql.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/core"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
diff --git a/pkg/tsdb/opentsdb/opentsdb.go b/pkg/tsdb/opentsdb/opentsdb.go
index d0f61e052335..372f0ef67849 100644
--- a/pkg/tsdb/opentsdb/opentsdb.go
+++ b/pkg/tsdb/opentsdb/opentsdb.go
@@ -15,7 +15,7 @@ import (
 	"net/url"
 
 	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb"
diff --git a/pkg/tsdb/postgres/macros.go b/pkg/tsdb/postgres/macros.go
index 2efba13d31ac..f7a194e63cd1 100644
--- a/pkg/tsdb/postgres/macros.go
+++ b/pkg/tsdb/postgres/macros.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/grafana/grafana/pkg/components/gtime"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
 
@@ -95,7 +96,7 @@ func (m *postgresMacroEngine) evaluateMacro(name string, args []string) (string,
 		if len(args) < 2 {
 			return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name)
 		}
-		interval, err := time.ParseDuration(strings.Trim(args[1], `'`))
+		interval, err := gtime.ParseInterval(strings.Trim(args[1], `'`))
 		if err != nil {
 			return "", fmt.Errorf("error parsing interval %v", args[1])
 		}
@@ -139,7 +140,7 @@ func (m *postgresMacroEngine) evaluateMacro(name string, args []string) (string,
 		if len(args) < 2 {
 			return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name)
 		}
-		interval, err := time.ParseDuration(strings.Trim(args[1], `'`))
+		interval, err := gtime.ParseInterval(strings.Trim(args[1], `'`))
 		if err != nil {
 			return "", fmt.Errorf("error parsing interval %v", args[1])
 		}
diff --git a/pkg/tsdb/postgres/postgres.go b/pkg/tsdb/postgres/postgres.go
index 7840a47fb187..dc3a006123b3 100644
--- a/pkg/tsdb/postgres/postgres.go
+++ b/pkg/tsdb/postgres/postgres.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/go-xorm/core"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index bb343aea26e7..04fef37c2cf2 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -12,7 +12,7 @@ import (
 	"net/http"
 
 	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 	api "github.com/prometheus/client_golang/api"
diff --git a/pkg/tsdb/sql_engine.go b/pkg/tsdb/sql_engine.go
index ab7230e9b029..b4ceead85678 100644
--- a/pkg/tsdb/sql_engine.go
+++ b/pkg/tsdb/sql_engine.go
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 
 	"github.com/grafana/grafana/pkg/components/null"
 
diff --git a/pkg/tsdb/stackdriver/stackdriver.go b/pkg/tsdb/stackdriver/stackdriver.go
index 76b346553ad2..e811e70c775d 100644
--- a/pkg/tsdb/stackdriver/stackdriver.go
+++ b/pkg/tsdb/stackdriver/stackdriver.go
@@ -21,7 +21,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/pluginproxy"
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/setting"
diff --git a/pkg/tsdb/testdata/scenarios.go b/pkg/tsdb/testdata/scenarios.go
index 964e6f586f33..3e7aa0541a8a 100644
--- a/pkg/tsdb/testdata/scenarios.go
+++ b/pkg/tsdb/testdata/scenarios.go
@@ -2,6 +2,7 @@ package testdata
 
 import (
 	"encoding/json"
+	"fmt"
 	"math"
 	"math/rand"
 	"strconv"
@@ -9,7 +10,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/null"
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
 
@@ -261,6 +262,84 @@ func init() {
 			return queryRes
 		},
 	})
+
+	registerScenario(&Scenario{
+		Id:   "logs",
+		Name: "Logs",
+
+		Handler: func(query *tsdb.Query, context *tsdb.TsdbQuery) *tsdb.QueryResult {
+			from := context.TimeRange.GetFromAsMsEpoch()
+			to := context.TimeRange.GetToAsMsEpoch()
+			lines := query.Model.Get("lines").MustInt64(10)
+			includeLevelColumn := query.Model.Get("levelColumn").MustBool(false)
+
+			logLevelGenerator := newRandomStringProvider([]string{
+				"emerg",
+				"alert",
+				"crit",
+				"critical",
+				"warn",
+				"warning",
+				"err",
+				"eror",
+				"error",
+				"info",
+				"notice",
+				"dbug",
+				"debug",
+				"trace",
+				"",
+			})
+			containerIDGenerator := newRandomStringProvider([]string{
+				"f36a9eaa6d34310686f2b851655212023a216de955cbcc764210cefa71179b1a",
+				"5a354a630364f3742c602f315132e16def594fe68b1e4a195b2fce628e24c97a",
+			})
+			hostnameGenerator := newRandomStringProvider([]string{
+				"srv-001",
+				"srv-002",
+			})
+
+			table := tsdb.Table{
+				Columns: []tsdb.TableColumn{
+					{Text: "time"},
+					{Text: "message"},
+					{Text: "container_id"},
+					{Text: "hostname"},
+				},
+				Rows: []tsdb.RowValues{},
+			}
+
+			if includeLevelColumn {
+				table.Columns = append(table.Columns, tsdb.TableColumn{Text: "level"})
+			}
+
+			for i := int64(0); i < lines && to > from; i++ {
+				row := tsdb.RowValues{float64(to)}
+
+				logLevel := logLevelGenerator.Next()
+				timeFormatted := time.Unix(to/1000, 0).Format(time.RFC3339)
+				lvlString := ""
+				if !includeLevelColumn {
+					lvlString = fmt.Sprintf("lvl=%s ", logLevel)
+				}
+
+				row = append(row, fmt.Sprintf("t=%s %smsg=\"Request Completed\" logger=context userId=1 orgId=1 uname=admin method=GET path=/api/datasources/proxy/152/api/prom/label status=502 remote_addr=[::1] time_ms=1 size=0 referer=\"http://localhost:3000/explore?left=%%5B%%22now-6h%%22,%%22now%%22,%%22Prometheus%%202.x%%22,%%7B%%7D,%%7B%%22ui%%22:%%5Btrue,true,true,%%22none%%22%%5D%%7D%%5D\"", timeFormatted, lvlString))
+				row = append(row, containerIDGenerator.Next())
+				row = append(row, hostnameGenerator.Next())
+
+				if includeLevelColumn {
+					row = append(row, logLevel)
+				}
+
+				table.Rows = append(table.Rows, row)
+				to -= query.IntervalMs
+			}
+
+			queryRes := tsdb.NewQueryResult()
+			queryRes.Tables = append(queryRes.Tables, &table)
+			return queryRes
+		},
+	})
 }
 
 func getRandomWalk(query *tsdb.Query, tsdbQuery *tsdb.TsdbQuery) *tsdb.QueryResult {
diff --git a/pkg/tsdb/testdata/testdata.go b/pkg/tsdb/testdata/testdata.go
index c2c2ea3f696c..11b25c73542f 100644
--- a/pkg/tsdb/testdata/testdata.go
+++ b/pkg/tsdb/testdata/testdata.go
@@ -3,7 +3,7 @@ package testdata
 import (
 	"context"
 
-	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
diff --git a/pkg/tsdb/testdata/utils.go b/pkg/tsdb/testdata/utils.go
new file mode 100644
index 000000000000..85c02e8a296d
--- /dev/null
+++ b/pkg/tsdb/testdata/utils.go
@@ -0,0 +1,22 @@
+package testdata
+
+import (
+	"math/rand"
+	"time"
+)
+
+type randomStringProvider struct {
+	r    *rand.Rand
+	data []string
+}
+
+func newRandomStringProvider(data []string) *randomStringProvider {
+	return &randomStringProvider{
+		r:    rand.New(rand.NewSource(time.Now().UnixNano())),
+		data: data,
+	}
+}
+
+func (p *randomStringProvider) Next() string {
+	return p.data[p.r.Int31n(int32(len(p.data)))]
+}
diff --git a/pkg/util/errutil/errors.go b/pkg/util/errutil/errors.go
index 37f26ff9564c..65edd11779b9 100644
--- a/pkg/util/errutil/errors.go
+++ b/pkg/util/errutil/errors.go
@@ -1,11 +1,29 @@
 package errutil
 
-import "golang.org/x/xerrors"
+import (
+	"fmt"
+
+	"golang.org/x/xerrors"
+)
 
 // Wrap is a simple wrapper around Errorf that is doing error wrapping. You can read how that works in
 // https://godoc.org/golang.org/x/xerrors#Errorf but its API is very implicit which is a reason for this wrapper.
 // There is also a discussion (https://github.com/golang/go/issues/29934) where many comments make arguments for such
 // wrapper so hopefully it will be added in the standard lib later.
 func Wrap(message string, err error) error {
+	if err == nil {
+		return nil
+	}
+
 	return xerrors.Errorf("%v: %w", message, err)
 }
+
+// Wrapf is a simple wrapper around Errorf that is doing error wrapping
+// Wrapf allows you to send a format and args instead of just a message.
+func Wrapf(err error, message string, a ...interface{}) error {
+	if err == nil {
+		return nil
+	}
+
+	return Wrap(fmt.Sprintf(message, a...), err)
+}
diff --git a/pkg/util/strings.go b/pkg/util/strings.go
index 9eaa141edbfb..9ce5d03e126c 100644
--- a/pkg/util/strings.go
+++ b/pkg/util/strings.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math"
 	"regexp"
+	"strings"
 	"time"
 )
 
@@ -66,3 +67,19 @@ func GetAgeString(t time.Time) string {
 
 	return "< 1m"
 }
+
+// ToCamelCase changes kebab case, snake case or mixed strings to camel case. See unit test for examples.
+func ToCamelCase(str string) string {
+	var finalParts []string
+	parts := strings.Split(str, "_")
+
+	for _, part := range parts {
+		finalParts = append(finalParts, strings.Split(part, "-")...)
+	}
+
+	for index, part := range finalParts[1:] {
+		finalParts[index+1] = strings.Title(part)
+	}
+
+	return strings.Join(finalParts, "")
+}
diff --git a/pkg/util/strings_test.go b/pkg/util/strings_test.go
index 0cc1905baff8..4bc52ee75217 100644
--- a/pkg/util/strings_test.go
+++ b/pkg/util/strings_test.go
@@ -37,3 +37,12 @@ func TestDateAge(t *testing.T) {
 		So(GetAgeString(time.Now().Add(-time.Hour*24*409)), ShouldEqual, "1y")
 	})
 }
+
+func TestToCamelCase(t *testing.T) {
+	Convey("ToCamelCase", t, func() {
+		So(ToCamelCase("kebab-case-string"), ShouldEqual, "kebabCaseString")
+		So(ToCamelCase("snake_case_string"), ShouldEqual, "snakeCaseString")
+		So(ToCamelCase("mixed-case_string"), ShouldEqual, "mixedCaseString")
+		So(ToCamelCase("alreadyCamelCase"), ShouldEqual, "alreadyCamelCase")
+	})
+}
diff --git a/public/app/core/actions/application.ts b/public/app/core/actions/application.ts
new file mode 100644
index 000000000000..9bde989e8ca6
--- /dev/null
+++ b/public/app/core/actions/application.ts
@@ -0,0 +1,3 @@
+import { noPayloadActionCreatorFactory } from 'app/core/redux';
+
+export const toggleLogActions = noPayloadActionCreatorFactory('TOGGLE_LOG_ACTIONS').create();
diff --git a/public/app/core/actions/location.ts b/public/app/core/actions/location.ts
index 34ab43da7d22..567934e12cbe 100644
--- a/public/app/core/actions/location.ts
+++ b/public/app/core/actions/location.ts
@@ -1,4 +1,4 @@
-import { LocationUpdate } from 'app/types';
+import { LocationUpdate } from '@grafana/runtime';
 import { actionCreatorFactory } from 'app/core/redux';
 
 export const updateLocation = actionCreatorFactory<LocationUpdate>('UPDATE_LOCATION').create();
diff --git a/public/app/core/angular_wrappers.ts b/public/app/core/angular_wrappers.ts
index 6da0ca1a44df..30163be0edf5 100644
--- a/public/app/core/angular_wrappers.ts
+++ b/public/app/core/angular_wrappers.ts
@@ -4,7 +4,6 @@ import { AnnotationQueryEditor as StackdriverAnnotationQueryEditor } from 'app/p
 import { PasswordStrength } from './components/PasswordStrength';
 import PageHeader from './components/PageHeader/PageHeader';
 import EmptyListCTA from './components/EmptyListCTA/EmptyListCTA';
-import { SearchResult } from './components/search/SearchResult';
 import { TagFilter } from './components/TagFilter/TagFilter';
 import { SideMenu } from './components/sidemenu/SideMenu';
 import { MetricSelect } from './components/Select/MetricSelect';
@@ -20,7 +19,6 @@ export function registerAngularDirectives() {
   react2AngularDirective('appNotificationsList', AppNotificationList, []);
   react2AngularDirective('pageHeader', PageHeader, ['model', 'noTabs']);
   react2AngularDirective('emptyListCta', EmptyListCTA, ['model']);
-  react2AngularDirective('searchResult', SearchResult, []);
   react2AngularDirective('searchField', SearchField, [
     'query',
     'autoFocus',
diff --git a/public/app/core/components/AppNotifications/AppNotificationItem.tsx b/public/app/core/components/AppNotifications/AppNotificationItem.tsx
index d1fc506d54cd..f1617a0a6351 100644
--- a/public/app/core/components/AppNotifications/AppNotificationItem.tsx
+++ b/public/app/core/components/AppNotifications/AppNotificationItem.tsx
@@ -4,11 +4,11 @@ import { AlertBox } from '../AlertBox/AlertBox';
 
 interface Props {
   appNotification: AppNotification;
-  onClearNotification: (id) => void;
+  onClearNotification: (id: number) => void;
 }
 
 export default class AppNotificationItem extends Component<Props> {
-  shouldComponentUpdate(nextProps) {
+  shouldComponentUpdate(nextProps: Props) {
     return this.props.appNotification.id !== nextProps.appNotification.id;
   }
 
diff --git a/public/app/core/components/AppNotifications/AppNotificationList.tsx b/public/app/core/components/AppNotifications/AppNotificationList.tsx
index c91f8372384f..991ac37eda6c 100644
--- a/public/app/core/components/AppNotifications/AppNotificationList.tsx
+++ b/public/app/core/components/AppNotifications/AppNotificationList.tsx
@@ -20,12 +20,12 @@ export class AppNotificationList extends PureComponent<Props> {
   componentDidMount() {
     const { notifyApp } = this.props;
 
-    appEvents.on('alert-warning', options => notifyApp(createWarningNotification(options[0], options[1])));
-    appEvents.on('alert-success', options => notifyApp(createSuccessNotification(options[0], options[1])));
-    appEvents.on('alert-error', options => notifyApp(createErrorNotification(options[0], options[1])));
+    appEvents.on('alert-warning', (options: string[]) => notifyApp(createWarningNotification(options[0], options[1])));
+    appEvents.on('alert-success', (options: string[]) => notifyApp(createSuccessNotification(options[0], options[1])));
+    appEvents.on('alert-error', (options: string[]) => notifyApp(createErrorNotification(options[0], options[1])));
   }
 
-  onClearAppNotification = id => {
+  onClearAppNotification = (id: number) => {
     this.props.clearAppNotification(id);
   };
 
diff --git a/public/app/core/components/OrgActionBar/OrgActionBar.tsx b/public/app/core/components/OrgActionBar/OrgActionBar.tsx
index f83d5c957f74..016c47776686 100644
--- a/public/app/core/components/OrgActionBar/OrgActionBar.tsx
+++ b/public/app/core/components/OrgActionBar/OrgActionBar.tsx
@@ -14,10 +14,10 @@ export interface Props {
 export default class OrgActionBar extends PureComponent<Props> {
   render() {
     const { searchQuery, layoutMode, onSetLayoutMode, linkButton, setSearchQuery, target } = this.props;
-    const linkProps = { href: linkButton.href, target: undefined };
+    const linkProps = { href: linkButton.href };
 
     if (target) {
-      linkProps.target = target;
+      (linkProps as any).target = target;
     }
 
     return (
diff --git a/public/app/core/components/PageHeader/PageHeader.test.tsx b/public/app/core/components/PageHeader/PageHeader.test.tsx
index a9ba8d008a3a..1999831a6d55 100644
--- a/public/app/core/components/PageHeader/PageHeader.test.tsx
+++ b/public/app/core/components/PageHeader/PageHeader.test.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import PageHeader from './PageHeader';
-import { shallow } from 'enzyme';
+import { shallow, ShallowWrapper } from 'enzyme';
 
 describe('PageHeader', () => {
-  let wrapper;
+  let wrapper: ShallowWrapper<PageHeader>;
 
   describe('when the nav tree has a node with a title', () => {
     beforeAll(() => {
diff --git a/public/app/core/components/PasswordStrength.tsx b/public/app/core/components/PasswordStrength.tsx
index 1d676a00a375..6c6bb697f653 100644
--- a/public/app/core/components/PasswordStrength.tsx
+++ b/public/app/core/components/PasswordStrength.tsx
@@ -5,7 +5,7 @@ export interface Props {
 }
 
 export class PasswordStrength extends React.Component<Props, any> {
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
   }
 
diff --git a/public/app/core/components/PermissionList/AddPermission.tsx b/public/app/core/components/PermissionList/AddPermission.tsx
index d55ec3511ea0..b668229939ff 100644
--- a/public/app/core/components/PermissionList/AddPermission.tsx
+++ b/public/app/core/components/PermissionList/AddPermission.tsx
@@ -22,7 +22,7 @@ class AddPermissions extends Component<Props, NewDashboardAclItem> {
     showPermissionLevels: true,
   };
 
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
     this.state = this.getCleanState();
   }
@@ -36,7 +36,7 @@ class AddPermissions extends Component<Props, NewDashboardAclItem> {
     };
   }
 
-  onTypeChanged = evt => {
+  onTypeChanged = (evt: any) => {
     const type = evt.target.value as AclTarget;
 
     switch (type) {
@@ -65,7 +65,7 @@ class AddPermissions extends Component<Props, NewDashboardAclItem> {
     this.setState({ permission: permission.value });
   };
 
-  onSubmit = async evt => {
+  onSubmit = async (evt: React.SyntheticEvent) => {
     evt.preventDefault();
     await this.props.onAddPermission(this.state);
     this.setState(this.getCleanState());
diff --git a/public/app/core/components/PermissionList/PermissionListItem.tsx b/public/app/core/components/PermissionList/PermissionListItem.tsx
index b949209d6a38..f590f5fd8ae3 100644
--- a/public/app/core/components/PermissionList/PermissionListItem.tsx
+++ b/public/app/core/components/PermissionList/PermissionListItem.tsx
@@ -1,13 +1,13 @@
 import React, { PureComponent } from 'react';
-import { Select } from '@grafana/ui';
+import { Select, SelectOptionItem } from '@grafana/ui';
 import { dashboardPermissionLevels, DashboardAcl, PermissionLevel } from 'app/types/acl';
 import { FolderInfo } from 'app/types';
 
-const setClassNameHelper = inherited => {
+const setClassNameHelper = (inherited: boolean) => {
   return inherited ? 'gf-form-disabled' : '';
 };
 
-function ItemAvatar({ item }) {
+function ItemAvatar({ item }: { item: DashboardAcl }) {
   if (item.userAvatarUrl) {
     return <img className="filter-table__avatar" src={item.userAvatarUrl} />;
   }
@@ -21,7 +21,7 @@ function ItemAvatar({ item }) {
   return <i style={{ width: '25px', height: '25px' }} className="gicon gicon-viewer" />;
 }
 
-function ItemDescription({ item }) {
+function ItemDescription({ item }: { item: DashboardAcl }) {
   if (item.userId) {
     return <span className="filter-table__weak-italic">(User)</span>;
   }
@@ -39,8 +39,8 @@ interface Props {
 }
 
 export default class PermissionsListItem extends PureComponent<Props> {
-  onPermissionChanged = option => {
-    this.props.onPermissionChanged(this.props.item, option.value as PermissionLevel);
+  onPermissionChanged = (option: SelectOptionItem<PermissionLevel>) => {
+    this.props.onPermissionChanged(this.props.item, option.value);
   };
 
   onRemoveItem = () => {
diff --git a/public/app/core/components/PluginHelp/PluginHelp.tsx b/public/app/core/components/PluginHelp/PluginHelp.tsx
index c37498afc459..40aed4a6c0c8 100644
--- a/public/app/core/components/PluginHelp/PluginHelp.tsx
+++ b/public/app/core/components/PluginHelp/PluginHelp.tsx
@@ -1,6 +1,7 @@
 import React, { PureComponent } from 'react';
+// @ts-ignore
 import Remarkable from 'remarkable';
-import { getBackendSrv } from '../../services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 
 interface Props {
   plugin: {
@@ -37,7 +38,7 @@ export class PluginHelp extends PureComponent<Props, State> {
 
     getBackendSrv()
       .get(`/api/plugins/${plugin.id}/markdown/${type}`)
-      .then(response => {
+      .then((response: string) => {
         const markdown = new Remarkable();
         const helpHtml = markdown.render(response);
 
diff --git a/public/app/core/components/Select/MetricSelect.tsx b/public/app/core/components/Select/MetricSelect.tsx
index e4b6cfb8abd9..aa0ea5d40c45 100644
--- a/public/app/core/components/Select/MetricSelect.tsx
+++ b/public/app/core/components/Select/MetricSelect.tsx
@@ -19,13 +19,13 @@ interface State {
 }
 
 export class MetricSelect extends React.Component<Props, State> {
-  static defaultProps = {
+  static defaultProps: Partial<Props> = {
     variables: [],
     options: [],
     isSearchable: true,
   };
 
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
     this.state = { options: [] };
   }
@@ -45,7 +45,7 @@ export class MetricSelect extends React.Component<Props, State> {
     return nextProps.value !== this.props.value || !_.isEqual(nextOptions, this.state.options);
   }
 
-  buildOptions({ variables = [], options }) {
+  buildOptions({ variables = [], options }: Props) {
     return variables.length > 0 ? [this.getVariablesGroup(), ...options] : options;
   }
 
diff --git a/public/app/core/components/Select/TeamPicker.test.tsx b/public/app/core/components/Select/TeamPicker.test.tsx
index 3db9f7bb4eb4..8ee09461c7fa 100644
--- a/public/app/core/components/Select/TeamPicker.test.tsx
+++ b/public/app/core/components/Select/TeamPicker.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+// @ts-ignore
 import renderer from 'react-test-renderer';
 import { TeamPicker } from './TeamPicker';
 
diff --git a/public/app/core/components/Select/TeamPicker.tsx b/public/app/core/components/Select/TeamPicker.tsx
index 8d9e1d48d810..16df350ad67f 100644
--- a/public/app/core/components/Select/TeamPicker.tsx
+++ b/public/app/core/components/Select/TeamPicker.tsx
@@ -23,7 +23,7 @@ export interface State {
 export class TeamPicker extends Component<Props, State> {
   debouncedSearch: any;
 
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
     this.state = { isLoading: false };
     this.search = this.search.bind(this);
@@ -42,8 +42,8 @@ export class TeamPicker extends Component<Props, State> {
       query = '';
     }
 
-    return backendSrv.get(`/api/teams/search?perpage=10&page=1&query=${query}`).then(result => {
-      const teams = result.teams.map(team => {
+    return backendSrv.get(`/api/teams/search?perpage=10&page=1&query=${query}`).then((result: any) => {
+      const teams = result.teams.map((team: any) => {
         return {
           id: team.id,
           value: team.id,
diff --git a/public/app/core/components/Select/UserPicker.test.tsx b/public/app/core/components/Select/UserPicker.test.tsx
index 054ca643700e..b1dddb48cff0 100644
--- a/public/app/core/components/Select/UserPicker.test.tsx
+++ b/public/app/core/components/Select/UserPicker.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+// @ts-ignore
 import renderer from 'react-test-renderer';
 import { UserPicker } from './UserPicker';
 
diff --git a/public/app/core/components/Select/UserPicker.tsx b/public/app/core/components/Select/UserPicker.tsx
index ff4ae32f0683..ba054a20620c 100644
--- a/public/app/core/components/Select/UserPicker.tsx
+++ b/public/app/core/components/Select/UserPicker.tsx
@@ -24,7 +24,7 @@ export interface State {
 export class UserPicker extends Component<Props, State> {
   debouncedSearch: any;
 
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
     this.state = { isLoading: false };
     this.search = this.search.bind(this);
@@ -45,8 +45,8 @@ export class UserPicker extends Component<Props, State> {
 
     return backendSrv
       .get(`/api/org/users?query=${query}&limit=10`)
-      .then(result => {
-        return result.map(user => ({
+      .then((result: any) => {
+        return result.map((user: any) => ({
           id: user.userId,
           value: user.userId,
           label: user.login === user.email ? user.login : `${user.login} - ${user.email}`,
diff --git a/public/app/core/components/SharedPreferences/SharedPreferences.tsx b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
index a39eefcec4b3..b6d19f1f8af2 100644
--- a/public/app/core/components/SharedPreferences/SharedPreferences.tsx
+++ b/public/app/core/components/SharedPreferences/SharedPreferences.tsx
@@ -1,9 +1,9 @@
 import React, { PureComponent } from 'react';
 
 import { FormLabel, Select } from '@grafana/ui';
-import { getBackendSrv, BackendSrv } from 'app/core/services/backend_srv';
 
 import { DashboardSearchHit, DashboardSearchHitType } from 'app/types';
+import { getBackendSrv } from 'app/core/services/backend_srv';
 
 export interface Props {
   resourceUri: string;
@@ -25,9 +25,9 @@ const timezones = [
 ];
 
 export class SharedPreferences extends PureComponent<Props, State> {
-  backendSrv: BackendSrv = getBackendSrv();
+  backendSrv = getBackendSrv();
 
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
 
     this.state = {
@@ -72,7 +72,7 @@ export class SharedPreferences extends PureComponent<Props, State> {
     });
   }
 
-  onSubmitForm = async event => {
+  onSubmitForm = async (event: React.SyntheticEvent) => {
     event.preventDefault();
 
     const { homeDashboardId, theme, timezone } = this.state;
diff --git a/public/app/core/components/TagFilter/TagBadge.tsx b/public/app/core/components/TagFilter/TagBadge.tsx
index b00b95b70cba..d7a0c8977958 100644
--- a/public/app/core/components/TagFilter/TagBadge.tsx
+++ b/public/app/core/components/TagFilter/TagBadge.tsx
@@ -9,7 +9,7 @@ export interface Props {
 }
 
 export class TagBadge extends React.Component<Props, any> {
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
   }
 
diff --git a/public/app/core/components/TagFilter/TagFilter.tsx b/public/app/core/components/TagFilter/TagFilter.tsx
index 967792a9f7b2..89d3e8469b6b 100644
--- a/public/app/core/components/TagFilter/TagFilter.tsx
+++ b/public/app/core/components/TagFilter/TagFilter.tsx
@@ -1,10 +1,14 @@
+// Libraries
 import React from 'react';
-import { NoOptionsMessage, IndicatorsContainer, resetSelectStyles } from '@grafana/ui';
+// @ts-ignore
+import { components } from '@torkelo/react-select';
+// @ts-ignore
 import AsyncSelect from '@torkelo/react-select/lib/Async';
 
+// Components
 import { TagOption } from './TagOption';
 import { TagBadge } from './TagBadge';
-import { components } from '@torkelo/react-select';
+import { NoOptionsMessage, IndicatorsContainer, resetSelectStyles } from '@grafana/ui';
 import { escapeStringForRegex } from '../FilterInput/FilterInput';
 
 export interface Props {
@@ -16,12 +20,12 @@ export interface Props {
 export class TagFilter extends React.Component<Props, any> {
   inlineTags: boolean;
 
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
   }
 
-  onLoadOptions = query => {
-    return this.props.tagOptions().then(options => {
+  onLoadOptions = (query: string) => {
+    return this.props.tagOptions().then((options: any[]) => {
       return options.map(option => ({
         value: option.term,
         label: option.term,
@@ -47,11 +51,11 @@ export class TagFilter extends React.Component<Props, any> {
       placeholder: 'Tags',
       loadingMessage: () => 'Loading...',
       noOptionsMessage: () => 'No tags found',
-      getOptionValue: i => i.value,
-      getOptionLabel: i => i.label,
+      getOptionValue: (i: any) => i.value,
+      getOptionLabel: (i: any) => i.label,
       value: tags,
       styles: resetSelectStyles(),
-      filterOption: (option, searchQuery) => {
+      filterOption: (option: any, searchQuery: string) => {
         const regex = RegExp(escapeStringForRegex(searchQuery), 'i');
         return regex.test(option.value);
       },
@@ -59,10 +63,10 @@ export class TagFilter extends React.Component<Props, any> {
         Option: TagOption,
         IndicatorsContainer,
         NoOptionsMessage,
-        MultiValueLabel: () => {
+        MultiValueLabel: (): any => {
           return null; // We want the whole tag to be clickable so we use MultiValueRemove instead
         },
-        MultiValueRemove: props => {
+        MultiValueRemove: (props: any) => {
           const { data } = props;
 
           return (
diff --git a/public/app/core/components/TagFilter/TagOption.tsx b/public/app/core/components/TagFilter/TagOption.tsx
index 9db15aaca0b3..4da6202bf3e8 100644
--- a/public/app/core/components/TagFilter/TagOption.tsx
+++ b/public/app/core/components/TagFilter/TagOption.tsx
@@ -1,4 +1,6 @@
+// Libraries
 import React from 'react';
+// @ts-ignore
 import { components } from '@torkelo/react-select';
 import { OptionProps } from 'react-select/lib/components/Option';
 import { TagBadge } from './TagBadge';
diff --git a/public/app/core/components/TagFilter/TagValue.tsx b/public/app/core/components/TagFilter/TagValue.tsx
index 43e41c7fdc29..0406ead16a62 100644
--- a/public/app/core/components/TagFilter/TagValue.tsx
+++ b/public/app/core/components/TagFilter/TagValue.tsx
@@ -9,18 +9,17 @@ export interface Props {
 }
 
 export class TagValue extends React.Component<Props, any> {
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
     this.onClick = this.onClick.bind(this);
   }
 
-  onClick(event) {
+  onClick(event: React.SyntheticEvent) {
     this.props.onRemove(this.props.value, event);
   }
 
   render() {
     const { value } = this.props;
-
     return <TagBadge label={value.label} removeIcon={false} count={0} onClick={this.onClick} />;
   }
 }
diff --git a/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx b/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx
index e550afc20c3f..07a39cfd1094 100644
--- a/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx
+++ b/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx
@@ -21,7 +21,7 @@ export default class ToggleButtonGroup extends PureComponent<ToggleButtonGroupPr
 }
 
 interface ToggleButtonProps {
-  onChange?: (value) => void;
+  onChange?: (value: any) => void;
   selected?: boolean;
   value: any;
   className?: string;
@@ -37,9 +37,9 @@ export const ToggleButton: FC<ToggleButtonProps> = ({
   tooltip,
   onChange,
 }) => {
-  const onClick = event => {
+  const onClick = (event: React.SyntheticEvent) => {
     event.stopPropagation();
-    if (onChange) {
+    if (!selected && onChange) {
       onChange(value);
     }
   };
diff --git a/public/app/core/components/code_editor/code_editor.ts b/public/app/core/components/code_editor/code_editor.ts
index ca9023e86570..542454988bd6 100644
--- a/public/app/core/components/code_editor/code_editor.ts
+++ b/public/app/core/components/code_editor/code_editor.ts
@@ -55,7 +55,7 @@ const DEFAULT_SNIPPETS = true;
 
 const editorTemplate = `<div></div>`;
 
-function link(scope, elem, attrs) {
+function link(scope: any, elem: any, attrs: any) {
   // Options
   const langMode = attrs.mode || DEFAULT_MODE;
   const maxLines = attrs.maxLines || DEFAULT_MAX_LINES;
@@ -116,7 +116,7 @@ function link(scope, elem, attrs) {
   });
 
   // Sync with outer scope - update editor content if model has been changed from outside of directive.
-  scope.$watch('content', (newValue, oldValue) => {
+  scope.$watch('content', (newValue: any, oldValue: any) => {
     const editorValue = codeEditor.getValue();
     if (newValue !== editorValue && newValue !== oldValue) {
       scope.$$postDigest(() => {
@@ -142,7 +142,7 @@ function link(scope, elem, attrs) {
     },
   });
 
-  function setLangMode(lang) {
+  function setLangMode(lang: string) {
     ace.acequire('ace/ext/language_tools');
     codeEditor.setOptions({
       enableBasicAutocompletion: true,
@@ -170,7 +170,7 @@ function link(scope, elem, attrs) {
     codeEditor.setTheme(theme);
   }
 
-  function setEditorContent(value) {
+  function setEditorContent(value: string) {
     codeEditor.setValue(value);
     codeEditor.clearSelection();
   }
diff --git a/public/app/core/components/colorpicker/spectrum_picker.ts b/public/app/core/components/colorpicker/spectrum_picker.ts
index 4576648df835..d9831aa96440 100644
--- a/public/app/core/components/colorpicker/spectrum_picker.ts
+++ b/public/app/core/components/colorpicker/spectrum_picker.ts
@@ -13,9 +13,9 @@ export function spectrumPicker() {
     scope: true,
     replace: true,
     template: '<color-picker color="ngModel.$viewValue" onChange="onColorChange"></color-picker>',
-    link: (scope, element, attrs, ngModel) => {
+    link: (scope: any, element: any, attrs: any, ngModel: any) => {
       scope.ngModel = ngModel;
-      scope.onColorChange = color => {
+      scope.onColorChange = (color: string) => {
         ngModel.$setViewValue(color);
       };
     },
diff --git a/public/app/core/components/dashboard_selector.ts b/public/app/core/components/dashboard_selector.ts
index e1809f3d42cd..f312c77f6a85 100644
--- a/public/app/core/components/dashboard_selector.ts
+++ b/public/app/core/components/dashboard_selector.ts
@@ -1,4 +1,5 @@
 import coreModule from 'app/core/core_module';
+import { BackendSrv } from '../services/backend_srv';
 
 const template = `
 <select class="gf-form-input" ng-model="ctrl.model" ng-options="f.value as f.text for f in ctrl.options"></select>
@@ -9,7 +10,7 @@ export class DashboardSelectorCtrl {
   options: any;
 
   /** @ngInject */
-  constructor(private backendSrv) {}
+  constructor(private backendSrv: BackendSrv) {}
 
   $onInit() {
     this.options = [{ value: 0, text: 'Default' }];
diff --git a/public/app/core/components/help/help.ts b/public/app/core/components/help/help.ts
index 7ef54339f497..63be172a5deb 100644
--- a/public/app/core/components/help/help.ts
+++ b/public/app/core/components/help/help.ts
@@ -13,8 +13,6 @@ export class HelpCtrl {
         { keys: ['g', 'h'], description: 'Go to Home Dashboard' },
         { keys: ['g', 'p'], description: 'Go to Profile' },
         { keys: ['s', 'o'], description: 'Open search' },
-        { keys: ['s', 's'], description: 'Open search with starred filter' },
-        { keys: ['s', 't'], description: 'Open search in tags view' },
         { keys: ['esc'], description: 'Exit edit/setting views' },
       ],
       Dashboard: [
diff --git a/public/app/core/components/info_popover.ts b/public/app/core/components/info_popover.ts
index 2ada91b09f1b..704514659303 100644
--- a/public/app/core/components/info_popover.ts
+++ b/public/app/core/components/info_popover.ts
@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import coreModule from 'app/core/core_module';
+// @ts-ignore
 import Drop from 'tether-drop';
 
 export function infoPopover() {
@@ -7,7 +8,7 @@ export function infoPopover() {
     restrict: 'E',
     template: '<i class="fa fa-info-circle"></i>',
     transclude: true,
-    link: (scope, elem, attrs, ctrl, transclude) => {
+    link: (scope: any, elem: any, attrs: any, ctrl: any, transclude: any) => {
       const offset = attrs.offset || '0 -10px';
       const position = attrs.position || 'right middle';
       let classes = 'drop-help drop-hide-out-of-bounds';
@@ -23,7 +24,7 @@ export function infoPopover() {
         elem.addClass('gf-form-help-icon--' + attrs.mode);
       }
 
-      transclude((clone, newScope) => {
+      transclude((clone: any, newScope: any) => {
         const content = document.createElement('div');
         content.className = 'markdown-html';
 
diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html
deleted file mode 100644
index 6d611692efc9..000000000000
--- a/public/app/core/components/navbar/navbar.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="page-nav">
-  <div class="page-breadcrumbs">
-    <a class="breadcrumb-item active" href="/">
-      <i class="fa fa-home"></i>
-    </a>
-    <a class="breadcrumb-item" ng-href="{{::item.url}}" ng-repeat="item in ctrl.model.breadcrumbs">
-      {{::item.text}}
-    </a>
-  </div>
-</div>
-
-<dashboard-search></dashboard-search>
diff --git a/public/app/core/components/navbar/navbar.ts b/public/app/core/components/navbar/navbar.ts
deleted file mode 100644
index f4de87451728..000000000000
--- a/public/app/core/components/navbar/navbar.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import coreModule from '../../core_module';
-import appEvents from 'app/core/app_events';
-import { NavModel } from '@grafana/ui';
-
-export class NavbarCtrl {
-  model: NavModel;
-
-  /** @ngInject */
-  constructor() {}
-
-  showSearch() {
-    appEvents.emit('show-dash-search');
-  }
-
-  navItemClicked(navItem, evt) {
-    if (navItem.clickHandler) {
-      navItem.clickHandler();
-      evt.preventDefault();
-    }
-  }
-}
-
-export function navbarDirective() {
-  return {
-    restrict: 'E',
-    templateUrl: 'public/app/core/components/navbar/navbar.html',
-    controller: NavbarCtrl,
-    bindToController: true,
-    controllerAs: 'ctrl',
-    scope: {
-      model: '=',
-    },
-    link: (scope, elem) => {},
-  };
-}
-
-export function pageH1() {
-  return {
-    restrict: 'E',
-    template: `
-    <h1 class="page-header__title">
-      <i class="page-header__icon {{::model.header.icon}}" ng-if="::model.header.icon"></i>
-      <img class="page-header__img" ng-src="{{::model.header.img}}" ng-if="::model.header.img"></i>
-      {{model.header.text}}
-    </h1>
-    `,
-    scope: {
-      model: '=',
-    },
-  };
-}
-
-coreModule.directive('pageH1', pageH1);
-coreModule.directive('navbar', navbarDirective);
diff --git a/public/app/core/components/org_switcher.ts b/public/app/core/components/org_switcher.ts
index dc8f00f0fdb4..0e25482e190a 100644
--- a/public/app/core/components/org_switcher.ts
+++ b/public/app/core/components/org_switcher.ts
@@ -1,6 +1,7 @@
 import coreModule from 'app/core/core_module';
 import { contextSrv } from 'app/core/services/context_srv';
 import config from 'app/core/config';
+import { BackendSrv } from '../services/backend_srv';
 
 const template = `
 <div class="modal-body">
@@ -47,18 +48,18 @@ export class OrgSwitchCtrl {
   currentOrgId: any;
 
   /** @ngInject */
-  constructor(private backendSrv) {
+  constructor(private backendSrv: BackendSrv) {
     this.currentOrgId = contextSrv.user.orgId;
     this.getUserOrgs();
   }
 
   getUserOrgs() {
-    this.backendSrv.get('/api/user/orgs').then(orgs => {
+    this.backendSrv.get('/api/user/orgs').then((orgs: any) => {
       this.orgs = orgs;
     });
   }
 
-  setUsingOrg(org) {
+  setUsingOrg(org: any) {
     return this.backendSrv.post('/api/user/using/' + org.orgId).then(() => {
       this.setWindowLocation(config.appSubUrl + (config.appSubUrl.endsWith('/') ? '' : '/') + '?orgId=' + org.orgId);
     });
diff --git a/public/app/core/components/query_part/query_part.ts b/public/app/core/components/query_part/query_part.ts
index 10ac878f4b56..b2466977c229 100644
--- a/public/app/core/components/query_part/query_part.ts
+++ b/public/app/core/components/query_part/query_part.ts
@@ -40,7 +40,7 @@ export class QueryPart {
     return this.def.renderer(this, innerExpr);
   }
 
-  hasMultipleParamsInString(strValue, index) {
+  hasMultipleParamsInString(strValue: string, index: number) {
     if (strValue.indexOf(',') === -1) {
       return false;
     }
@@ -48,7 +48,7 @@ export class QueryPart {
     return this.def.params[index + 1] && this.def.params[index + 1].optional;
   }
 
-  updateParam(strValue, index) {
+  updateParam(strValue: string, index: number) {
     // handle optional parameters
     // if string contains ',' and next param is optional, split and update both
     if (this.hasMultipleParamsInString(strValue, index)) {
@@ -81,7 +81,7 @@ export class QueryPart {
   }
 }
 
-export function functionRenderer(part, innerExpr) {
+export function functionRenderer(part: any, innerExpr: string) {
   const str = part.def.type + '(';
   const parameters = _.map(part.params, (value, index) => {
     const paramType = part.def.params[index];
@@ -105,14 +105,14 @@ export function functionRenderer(part, innerExpr) {
   return str + parameters.join(', ') + ')';
 }
 
-export function suffixRenderer(part, innerExpr) {
+export function suffixRenderer(part: QueryPartDef, innerExpr: string) {
   return innerExpr + ' ' + part.params[0];
 }
 
-export function identityRenderer(part, innerExpr) {
+export function identityRenderer(part: QueryPartDef, innerExpr: string) {
   return part.params[0];
 }
 
-export function quotedIdentityRenderer(part, innerExpr) {
+export function quotedIdentityRenderer(part: QueryPartDef, innerExpr: string) {
   return '"' + part.params[0] + '"';
 }
diff --git a/public/app/core/components/query_part/query_part_editor.ts b/public/app/core/components/query_part/query_part_editor.ts
index 4e6b82e151be..4e7221749aa1 100644
--- a/public/app/core/components/query_part/query_part_editor.ts
+++ b/public/app/core/components/query_part/query_part_editor.ts
@@ -14,7 +14,7 @@ const template = `
 `;
 
 /** @ngInject */
-export function queryPartEditorDirective($compile, templateSrv) {
+export function queryPartEditorDirective(templateSrv: any) {
   const paramTemplate = '<input type="text" class="hide input-mini tight-form-func-param"></input>';
 
   return {
@@ -25,7 +25,7 @@ export function queryPartEditorDirective($compile, templateSrv) {
       handleEvent: '&',
       debounce: '@',
     },
-    link: function postLink($scope, elem) {
+    link: function postLink($scope: any, elem: any) {
       const part = $scope.part;
       const partDef = part.def;
       const $paramsContainer = elem.find('.query-part-parameters');
@@ -33,7 +33,7 @@ export function queryPartEditorDirective($compile, templateSrv) {
 
       $scope.partActions = [];
 
-      function clickFuncParam(this: any, paramIndex) {
+      function clickFuncParam(this: any, paramIndex: number) {
         /*jshint validthis:true */
         const $link = $(this);
         const $input = $link.next();
@@ -53,7 +53,7 @@ export function queryPartEditorDirective($compile, templateSrv) {
         }
       }
 
-      function inputBlur(this: any, paramIndex) {
+      function inputBlur(this: any, paramIndex: number) {
         /*jshint validthis:true */
         const $input = $(this);
         const $link = $input.prev();
@@ -72,7 +72,7 @@ export function queryPartEditorDirective($compile, templateSrv) {
         $link.show();
       }
 
-      function inputKeyPress(this: any, paramIndex, e) {
+      function inputKeyPress(this: any, paramIndex: number, e: any) {
         /*jshint validthis:true */
         if (e.which === 13) {
           inputBlur.call(this, paramIndex);
@@ -84,12 +84,12 @@ export function queryPartEditorDirective($compile, templateSrv) {
         this.style.width = (3 + this.value.length) * 8 + 'px';
       }
 
-      function addTypeahead($input, param, paramIndex) {
+      function addTypeahead($input: JQuery, param: any, paramIndex: number) {
         if (!param.options && !param.dynamicLookup) {
           return;
         }
 
-        const typeaheadSource = (query, callback) => {
+        const typeaheadSource = (query: string, callback: any) => {
           if (param.options) {
             let options = param.options;
             if (param.type === 'int') {
@@ -101,7 +101,7 @@ export function queryPartEditorDirective($compile, templateSrv) {
           }
 
           $scope.$apply(() => {
-            $scope.handleEvent({ $event: { name: 'get-param-options' } }).then(result => {
+            $scope.handleEvent({ $event: { name: 'get-param-options' } }).then((result: any) => {
               const dynamicOptions = _.map(result, op => {
                 return _.escape(op.value);
               });
@@ -116,7 +116,7 @@ export function queryPartEditorDirective($compile, templateSrv) {
           source: typeaheadSource,
           minLength: 0,
           items: 1000,
-          updater: value => {
+          updater: (value: string) => {
             value = _.unescape(value);
             setTimeout(() => {
               inputBlur.call($input[0], paramIndex);
@@ -138,12 +138,12 @@ export function queryPartEditorDirective($compile, templateSrv) {
       }
 
       $scope.showActionsMenu = () => {
-        $scope.handleEvent({ $event: { name: 'get-part-actions' } }).then(res => {
+        $scope.handleEvent({ $event: { name: 'get-part-actions' } }).then((res: any) => {
           $scope.partActions = res;
         });
       };
 
-      $scope.triggerPartAction = action => {
+      $scope.triggerPartAction = (action: string) => {
         $scope.handleEvent({ $event: { name: 'action', action: action } });
       };
 
diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts
index 49931ecaac45..fe7e729bb190 100644
--- a/public/app/core/components/scroll/scroll.ts
+++ b/public/app/core/components/scroll/scroll.ts
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+// @ts-ignore
 import baron from 'baron';
 import coreModule from 'app/core/core_module';
 
@@ -14,7 +15,7 @@ const scrollerClass = 'baron__scroller';
 export function geminiScrollbar() {
   return {
     restrict: 'A',
-    link: (scope, elem, attrs) => {
+    link: (scope: any, elem: any, attrs: any) => {
       let scrollRoot = elem.parent();
       const scroller = elem;
 
diff --git a/public/app/core/components/search/SearchField.tsx b/public/app/core/components/search/SearchField.tsx
index 5b6dd03165f5..a72782e21c75 100644
--- a/public/app/core/components/search/SearchField.tsx
+++ b/public/app/core/components/search/SearchField.tsx
@@ -1,4 +1,5 @@
 import React, { useContext } from 'react';
+// @ts-ignore
 import tinycolor from 'tinycolor2';
 import { SearchQuery } from './search';
 import { css, cx } from 'emotion';
diff --git a/public/app/core/components/search/SearchResult.tsx b/public/app/core/components/search/SearchResult.tsx
deleted file mode 100644
index 13333c168f91..000000000000
--- a/public/app/core/components/search/SearchResult.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-
-export class SearchResult extends React.Component<any, any> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      search: '',
-    };
-  }
-
-  render() {
-    return this.state.search.sections.map(section => {
-      return <SearchResultSection section={section} key={section.id} />;
-    });
-  }
-}
-
-export interface SectionProps {
-  section: any;
-}
-
-export class SearchResultSection extends React.Component<SectionProps, any> {
-  constructor(props) {
-    super(props);
-  }
-
-  renderItem(item) {
-    return (
-      <a className="search-item" href={item.url} key={item.id}>
-        <span className="search-item__icon">
-          <i className="fa fa-th-large" />
-        </span>
-        <span className="search-item__body">
-          <div className="search-item__body-title">{item.title}</div>
-        </span>
-      </a>
-    );
-  }
-
-  toggleSection = () => {
-    this.props.section.toggle();
-  };
-
-  render() {
-    const collapseClassNames = classNames({
-      fa: true,
-      'fa-plus': !this.props.section.expanded,
-      'fa-minus': this.props.section.expanded,
-      'search-section__header__toggle': true,
-    });
-
-    return (
-      <div className="search-section" key={this.props.section.id}>
-        <div className="search-section__header">
-          <i className={classNames('search-section__header__icon', this.props.section.icon)} />
-          <span className="search-section__header__text">{this.props.section.title}</span>
-          <i className={collapseClassNames} onClick={this.toggleSection} />
-        </div>
-        {this.props.section.expanded && (
-          <div className="search-section__items">{this.props.section.items.map(this.renderItem)}</div>
-        )}
-      </div>
-    );
-  }
-}
diff --git a/public/app/core/components/search/search.ts b/public/app/core/components/search/search.ts
index 9cf8e9cd8c12..fbeb90922986 100644
--- a/public/app/core/components/search/search.ts
+++ b/public/app/core/components/search/search.ts
@@ -6,6 +6,7 @@ import { contextSrv } from 'app/core/services/context_srv';
 import appEvents from 'app/core/app_events';
 import { parse, SearchParserOptions, SearchParserResult } from 'search-query-parser';
 import { getDashboardSrv } from 'app/features/dashboard/services/DashboardSrv';
+
 export interface SearchQuery {
   query: string;
   parsedQuery: SearchParserResult;
@@ -32,6 +33,15 @@ class SearchQueryParser {
   }
 }
 
+interface SelectedIndicies {
+  dashboardIndex?: number;
+  folderIndex?: number;
+}
+
+interface OpenSearchParams {
+  query?: string;
+}
+
 export class SearchCtrl {
   isOpen: boolean;
   query: SearchQuery;
@@ -49,7 +59,7 @@ export class SearchCtrl {
   queryParser: SearchQueryParser;
 
   /** @ngInject */
-  constructor($scope, private $location, private $timeout, private searchSrv: SearchSrv) {
+  constructor($scope: any, private $location: any, private $timeout: any, private searchSrv: SearchSrv) {
     appEvents.on('show-dash-search', this.openSearch.bind(this), $scope);
     appEvents.on('hide-dash-search', this.closeSearch.bind(this), $scope);
     appEvents.on('search-query', debounce(this.search.bind(this), 500), $scope);
@@ -88,7 +98,7 @@ export class SearchCtrl {
     appEvents.emit('search-query');
   }
 
-  openSearch(evt, payload) {
+  openSearch(payload: OpenSearchParams = {}) {
     if (this.isOpen) {
       this.closeSearch();
       return;
@@ -99,19 +109,16 @@ export class SearchCtrl {
     this.selectedIndex = -1;
     this.results = [];
     this.query = {
-      query: evt ? `${evt.query} ` : '',
-      parsedQuery: this.queryParser.parse(evt && evt.query),
+      query: payload.query ? `${payload.query} ` : '',
+      parsedQuery: this.queryParser.parse(payload.query),
       tags: [],
       starred: false,
     };
+
     this.currentSearchId = 0;
     this.ignoreClose = true;
     this.isLoading = true;
 
-    if (payload && payload.starred) {
-      this.query.starred = true;
-    }
-
     this.$timeout(() => {
       this.ignoreClose = false;
       this.giveSearchFocus = true;
@@ -166,7 +173,7 @@ export class SearchCtrl {
     }, 100);
   }
 
-  moveSelection(direction) {
+  moveSelection(direction: number) {
     if (this.results.length === 0) {
       return;
     }
@@ -252,14 +259,14 @@ export class SearchCtrl {
     return query.query === '' && query.starred === false && query.tags.length === 0;
   }
 
-  filterByTag(tag) {
+  filterByTag(tag: string) {
     if (_.indexOf(this.query.tags, tag) === -1) {
       this.query.tags.push(tag);
       this.search();
     }
   }
 
-  removeTag(tag, evt) {
+  removeTag(tag: string, evt: any) {
     this.query.tags = _.without(this.query.tags, tag);
     this.search();
     this.giveSearchFocus = true;
@@ -298,14 +305,11 @@ export class SearchCtrl {
     this.moveSelection(0);
   }
 
-  private getFlattenedResultForNavigation(): Array<{
-    folderIndex: number;
-    dashboardIndex: number;
-  }> {
+  private getFlattenedResultForNavigation(): SelectedIndicies[] {
     let folderIndex = 0;
 
-    return _.flatMap(this.results, s => {
-      let result = [];
+    return _.flatMap(this.results, (s: any) => {
+      let result: SelectedIndicies[] = [];
 
       result.push({
         folderIndex: folderIndex,
diff --git a/public/app/core/components/search/search_results.ts b/public/app/core/components/search/search_results.ts
index 35ee1365e222..20cd49d3443e 100644
--- a/public/app/core/components/search/search_results.ts
+++ b/public/app/core/components/search/search_results.ts
@@ -10,15 +10,15 @@ export class SearchResultsCtrl {
   editable: boolean;
 
   /** @ngInject */
-  constructor(private $location) {}
+  constructor(private $location: any) {}
 
-  toggleFolderExpand(section) {
+  toggleFolderExpand(section: any) {
     if (section.toggle) {
       if (!section.expanded && this.onFolderExpanding) {
         this.onFolderExpanding();
       }
 
-      section.toggle(section).then(f => {
+      section.toggle(section).then((f: any) => {
         if (this.editable && f.expanded) {
           if (f.items) {
             _.each(f.items, i => {
@@ -34,7 +34,7 @@ export class SearchResultsCtrl {
     }
   }
 
-  navigateToFolder(section, evt) {
+  navigateToFolder(section: any, evt: any) {
     this.$location.path(section.url);
 
     if (evt) {
@@ -43,7 +43,7 @@ export class SearchResultsCtrl {
     }
   }
 
-  toggleSelection(item, evt) {
+  toggleSelection(item: any, evt: any) {
     item.checked = !item.checked;
 
     if (item.items) {
@@ -62,14 +62,14 @@ export class SearchResultsCtrl {
     }
   }
 
-  onItemClick(item) {
+  onItemClick(item: any) {
     //Check if one string can be found in the other
     if (this.$location.path().indexOf(item.url) > -1 || item.url.indexOf(this.$location.path()) > -1) {
       appEvents.emit('hide-dash-search');
     }
   }
 
-  selectTag(tag, evt) {
+  selectTag(tag: any, evt: any) {
     if (this.onTagSelected) {
       this.onTagSelected({ $tag: tag });
     }
diff --git a/public/app/core/components/sidemenu/BottomNavLinks.test.tsx b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
index 5ba4503da139..d59973fe02d6 100644
--- a/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
+++ b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
@@ -10,7 +10,9 @@ jest.mock('../../app_events', () => ({
 const setup = (propOverrides?: object) => {
   const props = Object.assign(
     {
-      link: {},
+      link: {
+        text: 'Hello',
+      },
       user: {
         id: 1,
         isGrafanaAdmin: false,
@@ -87,9 +89,9 @@ describe('Functions', () => {
     const wrapper = setup();
     const mockEvent = { preventDefault: jest.fn() };
     it('should emit show modal event if url matches shortcut', () => {
-      const child = { url: '/shortcuts' };
+      const child = { url: '/shortcuts', text: 'hello' };
       const instance = wrapper.instance() as BottomNavLinks;
-      instance.itemClicked(mockEvent, child);
+      instance.itemClicked(mockEvent as any, child);
 
       expect(appEvents.emit).toHaveBeenCalledWith('show-modal', { templateHtml: '<help-modal></help-modal>' });
     });
diff --git a/public/app/core/components/sidemenu/BottomNavLinks.tsx b/public/app/core/components/sidemenu/BottomNavLinks.tsx
index e1665c9ebc5a..fee58bad15fc 100644
--- a/public/app/core/components/sidemenu/BottomNavLinks.tsx
+++ b/public/app/core/components/sidemenu/BottomNavLinks.tsx
@@ -1,14 +1,15 @@
 import React, { PureComponent } from 'react';
 import appEvents from '../../app_events';
 import { User } from '../../services/context_srv';
+import { NavModelItem } from '@grafana/ui';
 
 export interface Props {
-  link: any;
+  link: NavModelItem;
   user: User;
 }
 
 class BottomNavLinks extends PureComponent<Props> {
-  itemClicked = (event, child) => {
+  itemClicked = (event: React.SyntheticEvent, child: NavModelItem) => {
     if (child.url === '/shortcuts') {
       event.preventDefault();
       appEvents.emit('show-modal', {
@@ -57,7 +58,7 @@ class BottomNavLinks extends PureComponent<Props> {
             link.children.map((child, index) => {
               if (!child.hideFromMenu) {
                 return (
-                  <li className={child.divider} key={`${child.text}-${index}`}>
+                  <li key={`${child.text}-${index}`}>
                     <a href={child.url} target={child.target} onClick={event => this.itemClicked(event, child)}>
                       {child.icon && <i className={child.icon} />}
                       {child.text}
diff --git a/public/app/core/components/sidemenu/BottomSection.tsx b/public/app/core/components/sidemenu/BottomSection.tsx
index 85754a910fa0..f0668eaf4dd7 100644
--- a/public/app/core/components/sidemenu/BottomSection.tsx
+++ b/public/app/core/components/sidemenu/BottomSection.tsx
@@ -4,10 +4,11 @@ import SignIn from './SignIn';
 import BottomNavLinks from './BottomNavLinks';
 import { contextSrv } from 'app/core/services/context_srv';
 import config from '../../config';
+import { NavModelItem } from '@grafana/ui';
 
 export default function BottomSection() {
-  const navTree: any = _.cloneDeep(config.bootData.navTree);
-  const bottomNav: any = _.filter(navTree, item => item.hideFromMenu);
+  const navTree: NavModelItem[] = _.cloneDeep(config.bootData.navTree);
+  const bottomNav: NavModelItem[] = _.filter(navTree, item => item.hideFromMenu);
   const isSignedIn = contextSrv.isSignedIn;
   const user = contextSrv.user;
 
diff --git a/public/app/core/components/sidemenu/SideMenuDropDown.tsx b/public/app/core/components/sidemenu/SideMenuDropDown.tsx
index db2172039c6f..b3959d55d4a7 100644
--- a/public/app/core/components/sidemenu/SideMenuDropDown.tsx
+++ b/public/app/core/components/sidemenu/SideMenuDropDown.tsx
@@ -1,8 +1,9 @@
 import React, { FC } from 'react';
 import DropDownChild from './DropDownChild';
+import { NavModelItem } from '@grafana/ui';
 
 interface Props {
-  link: any;
+  link: NavModelItem;
 }
 
 const SideMenuDropDown: FC<Props> = props => {
diff --git a/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
index ae8c9c753aa2..8b15bb0ae361 100644
--- a/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
+++ b/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
@@ -67,7 +67,9 @@ exports[`Render should render component 1`] = `
     >
       <span
         className="sidemenu-item-text"
-      />
+      >
+        Hello
+      </span>
     </li>
   </ul>
 </div>
diff --git a/public/app/core/components/sql_part/sql_part.ts b/public/app/core/components/sql_part/sql_part.ts
index a9b76b1ed2dc..543d9eaf761b 100644
--- a/public/app/core/components/sql_part/sql_part.ts
+++ b/public/app/core/components/sql_part/sql_part.ts
@@ -61,7 +61,7 @@ export class SqlPart {
     this.params = part.params;
   }
 
-  updateParam(strValue, index) {
+  updateParam(strValue: string, index: number) {
     // handle optional parameters
     if (strValue === '' && this.def.params[index].optional) {
       this.params.splice(index, 1);
diff --git a/public/app/core/components/sql_part/sql_part_editor.ts b/public/app/core/components/sql_part/sql_part_editor.ts
index b095f5fefed7..7799537b0fc2 100644
--- a/public/app/core/components/sql_part/sql_part_editor.ts
+++ b/public/app/core/components/sql_part/sql_part_editor.ts
@@ -14,7 +14,7 @@ const template = `
 `;
 
 /** @ngInject */
-export function sqlPartEditorDirective($compile, templateSrv) {
+export function sqlPartEditorDirective(templateSrv: any) {
   const paramTemplate = '<input type="text" class="hide input-mini"></input>';
 
   return {
@@ -25,16 +25,16 @@ export function sqlPartEditorDirective($compile, templateSrv) {
       handleEvent: '&',
       debounce: '@',
     },
-    link: function postLink($scope, elem) {
+    link: function postLink($scope: any, elem: any) {
       const part = $scope.part;
       const partDef = part.def;
       const $paramsContainer = elem.find('.query-part-parameters');
       const debounceLookup = $scope.debounce;
-      let cancelBlur = null;
+      let cancelBlur: any = null;
 
       $scope.partActions = [];
 
-      function clickFuncParam(this: any, paramIndex) {
+      function clickFuncParam(this: any, paramIndex: number) {
         /*jshint validthis:true */
         const $link = $(this);
         const $input = $link.next();
@@ -54,13 +54,13 @@ export function sqlPartEditorDirective($compile, templateSrv) {
         }
       }
 
-      function inputBlur($input, paramIndex) {
+      function inputBlur($input: JQuery, paramIndex: number) {
         cancelBlur = setTimeout(() => {
           switchToLink($input, paramIndex);
         }, 200);
       }
 
-      function switchToLink($input, paramIndex) {
+      function switchToLink($input: JQuery, paramIndex: number) {
         /*jshint validthis:true */
         const $link = $input.prev();
         const newValue = $input.val();
@@ -78,7 +78,7 @@ export function sqlPartEditorDirective($compile, templateSrv) {
         $link.show();
       }
 
-      function inputKeyPress(this: any, paramIndex, e) {
+      function inputKeyPress(this: any, paramIndex: number, e: any) {
         /*jshint validthis:true */
         if (e.which === 13) {
           switchToLink($(this), paramIndex);
@@ -90,12 +90,12 @@ export function sqlPartEditorDirective($compile, templateSrv) {
         this.style.width = (3 + this.value.length) * 8 + 'px';
       }
 
-      function addTypeahead($input, param, paramIndex) {
+      function addTypeahead($input: JQuery, param: any, paramIndex: number) {
         if (!param.options && !param.dynamicLookup) {
           return;
         }
 
-        const typeaheadSource = (query, callback) => {
+        const typeaheadSource = (query: string, callback: any) => {
           if (param.options) {
             let options = param.options;
             if (param.type === 'int') {
@@ -107,7 +107,7 @@ export function sqlPartEditorDirective($compile, templateSrv) {
           }
 
           $scope.$apply(() => {
-            $scope.handleEvent({ $event: { name: 'get-param-options', param: param } }).then(result => {
+            $scope.handleEvent({ $event: { name: 'get-param-options', param: param } }).then((result: any) => {
               const dynamicOptions = _.map(result, op => {
                 return _.escape(op.value);
               });
@@ -128,7 +128,7 @@ export function sqlPartEditorDirective($compile, templateSrv) {
           source: typeaheadSource,
           minLength: 0,
           items: 1000,
-          updater: value => {
+          updater: (value: string) => {
             value = _.unescape(value);
             if (value === part.params[paramIndex]) {
               clearTimeout(cancelBlur);
@@ -152,12 +152,12 @@ export function sqlPartEditorDirective($compile, templateSrv) {
       }
 
       $scope.showActionsMenu = () => {
-        $scope.handleEvent({ $event: { name: 'get-part-actions' } }).then(res => {
+        $scope.handleEvent({ $event: { name: 'get-part-actions' } }).then((res: any) => {
           $scope.partActions = res;
         });
       };
 
-      $scope.triggerPartAction = action => {
+      $scope.triggerPartAction = (action: string) => {
         $scope.handleEvent({ $event: { name: 'action', action: action } });
       };
 
diff --git a/public/app/core/components/switch.ts b/public/app/core/components/switch.ts
index 4a1d3ff804fe..d6a66a1a362f 100644
--- a/public/app/core/components/switch.ts
+++ b/public/app/core/components/switch.ts
@@ -38,7 +38,7 @@ export class SwitchCtrl {
   label: string;
 
   /** @ngInject */
-  constructor($scope, private $timeout) {
+  constructor($scope: any, private $timeout: any) {
     this.show = true;
     this.id = $scope.$id;
   }
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index c7f03781710c..ba4230cfe451 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -20,7 +20,6 @@ import { colors } from '@grafana/ui/';
 
 import { searchDirective } from './components/search/search';
 import { infoPopover } from './components/info_popover';
-import { navbarDirective } from './components/navbar/navbar';
 import { arrayJoin } from './directives/array_join';
 import { liveSrv } from './live/live_srv';
 import { Emitter } from './utils/emitter';
@@ -56,7 +55,6 @@ export {
   registerAngularDirectives,
   arrayJoin,
   coreModule,
-  navbarDirective,
   searchDirective,
   liveSrv,
   layoutSelector,
diff --git a/public/app/core/jquery_extended.ts b/public/app/core/jquery_extended.ts
index fa9b1aeb8234..11c67be9656c 100644
--- a/public/app/core/jquery_extended.ts
+++ b/public/app/core/jquery_extended.ts
@@ -9,7 +9,7 @@ $.fn.place_tt = (() => {
     offset: 5,
   };
 
-  return function(this: any, x, y, opts) {
+  return function(this: any, x: number, y: number, opts: any) {
     opts = $.extend(true, {}, defaults, opts);
 
     return this.each(() => {
diff --git a/public/app/core/logs_model.ts b/public/app/core/logs_model.ts
index 2ba60ce428e9..5fe95a182d07 100644
--- a/public/app/core/logs_model.ts
+++ b/public/app/core/logs_model.ts
@@ -13,6 +13,14 @@ import {
   toLegacyResponseData,
   FieldCache,
   FieldType,
+  getLogLevelFromKey,
+  LogRowModel,
+  LogsModel,
+  LogsMetaItem,
+  LogsMetaKind,
+  LogsParser,
+  LogLabelStatsModel,
+  LogsDedupStrategy,
 } from '@grafana/ui';
 import { getThemeColor } from 'app/core/utils/colors';
 import { hasAnsiCodes } from 'app/core/utils/text';
@@ -28,102 +36,19 @@ export const LogLevelColor = {
   [LogLevel.unknown]: getThemeColor('#8e8e8e', '#dde4ed'),
 };
 
-export interface LogSearchMatch {
-  start: number;
-  length: number;
-  text: string;
-}
-
-export interface LogRowModel {
-  duplicates?: number;
-  entry: string;
-  hasAnsi: boolean;
-  labels: Labels;
-  logLevel: LogLevel;
-  raw: string;
-  searchWords?: string[];
-  timestamp: string; // ISO with nanosec precision
-  timeFromNow: string;
-  timeEpochMs: number;
-  timeLocal: string;
-  uniqueLabels?: Labels;
-}
-
-export interface LogLabelStatsModel {
-  active?: boolean;
-  count: number;
-  proportion: number;
-  value: string;
-}
-
-export enum LogsMetaKind {
-  Number,
-  String,
-  LabelsMap,
-}
-
-export interface LogsMetaItem {
-  label: string;
-  value: string | number | Labels;
-  kind: LogsMetaKind;
-}
-
-export interface LogsModel {
-  hasUniqueLabels: boolean;
-  meta?: LogsMetaItem[];
-  rows: LogRowModel[];
-  series?: TimeSeries[];
-}
-
 export enum LogsDedupDescription {
   none = 'No de-duplication',
   exact = 'De-duplication of successive lines that are identical, ignoring ISO datetimes.',
   numbers = 'De-duplication of successive lines that are identical when ignoring numbers, e.g., IP addresses, latencies.',
   signature = 'De-duplication of successive lines that have identical punctuation and whitespace.',
 }
-
-export enum LogsDedupStrategy {
-  none = 'none',
-  exact = 'exact',
-  numbers = 'numbers',
-  signature = 'signature',
-}
-
-export interface LogsParser {
-  /**
-   * Value-agnostic matcher for a field label.
-   * Used to filter rows, and first capture group contains the value.
-   */
-  buildMatcher: (label: string) => RegExp;
-
-  /**
-   * Returns all parsable substrings from a line, used for highlighting
-   */
-  getFields: (line: string) => string[];
-
-  /**
-   * Gets the label name from a parsable substring of a line
-   */
-  getLabelFromField: (field: string) => string;
-
-  /**
-   * Gets the label value from a parsable substring of a line
-   */
-  getValueFromField: (field: string) => string;
-  /**
-   * Function to verify if this is a valid parser for the given line.
-   * The parser accepts the line unless it returns undefined.
-   */
-  test: (line: string) => any;
-}
-
 const LOGFMT_REGEXP = /(?:^|\s)(\w+)=("[^"]*"|\S+)/;
 
 export const LogsParsers: { [name: string]: LogsParser } = {
   JSON: {
     buildMatcher: label => new RegExp(`(?:{|,)\\s*"${label}"\\s*:\\s*"?([\\d\\.]+|[^"]*)"?`),
     getFields: line => {
-      const fields = [];
+      const fields: string[] = [];
       try {
         const parsed = JSON.parse(line);
         _.map(parsed, (value, key) => {
@@ -149,7 +74,7 @@ export const LogsParsers: { [name: string]: LogsParser } = {
   logfmt: {
     buildMatcher: label => new RegExp(`(?:^|\\s)${label}=("[^"]*"|\\S+)`),
     getFields: line => {
-      const fields = [];
+      const fields: string[] = [];
       line.replace(new RegExp(LOGFMT_REGEXP, 'g'), substring => {
         fields.push(substring.trim());
         return '';
@@ -273,9 +198,9 @@ export function makeSeriesForLogs(rows: LogRowModel[], intervalMs: number): Time
   // intervalMs = intervalMs * 10;
 
   // Graph time series by log level
-  const seriesByLevel = {};
+  const seriesByLevel: any = {};
   const bucketSize = intervalMs * 10;
-  const seriesList = [];
+  const seriesList: any[] = [];
 
   for (const row of rows) {
     let series = seriesByLevel[row.logLevel];
@@ -312,7 +237,7 @@ export function makeSeriesForLogs(rows: LogRowModel[], intervalMs: number): Time
   }
 
   return seriesList.map(series => {
-    series.datapoints.sort((a, b) => {
+    series.datapoints.sort((a: number[], b: number[]) => {
       return a[1] - b[1];
     });
 
@@ -444,9 +369,19 @@ export function processLogSeriesRow(
   const timeEpochMs = time.valueOf();
   const timeFromNow = time.fromNow();
   const timeLocal = time.format('YYYY-MM-DD HH:mm:ss');
-  const logLevel = getLogLevel(message);
+
+  let logLevel = LogLevel.unknown;
+  const logLevelField = fieldCache.getFieldByName('level');
+
+  if (logLevelField) {
+    logLevel = getLogLevelFromKey(row[logLevelField.index]);
+  } else if (series.labels && Object.keys(series.labels).indexOf('level') !== -1) {
+    logLevel = getLogLevelFromKey(series.labels['level']);
+  } else {
+    logLevel = getLogLevel(message);
+  }
   const hasAnsi = hasAnsiCodes(message);
-  const search = series.meta && series.meta.search ? series.meta.search : '';
+  const searchWords = series.meta && series.meta.searchWords ? series.meta.searchWords : [];
 
   return {
     logLevel,
@@ -455,10 +390,10 @@ export function processLogSeriesRow(
     timeLocal,
     uniqueLabels,
     hasAnsi,
+    searchWords,
     entry: hasAnsi ? ansicolor.strip(message) : message,
     raw: message,
     labels: series.labels,
-    searchWords: search ? [search] : [],
     timestamp: ts,
   };
 }
diff --git a/public/app/core/middlewares/application.ts b/public/app/core/middlewares/application.ts
new file mode 100644
index 000000000000..3ca9768d626f
--- /dev/null
+++ b/public/app/core/middlewares/application.ts
@@ -0,0 +1,27 @@
+import { Store, Dispatch } from 'redux';
+import { StoreState } from 'app/types/store';
+import { ActionOf } from '../redux/actionCreatorFactory';
+import { toggleLogActions } from '../actions/application';
+
+export const toggleLogActionsMiddleware = (store: Store<StoreState>) => (next: Dispatch) => (action: ActionOf<any>) => {
+  const isLogActionsAction = action.type === toggleLogActions.type;
+  if (isLogActionsAction) {
+    return next(action);
+  }
+
+  const logActionsTrue =
+    window && window.location && window.location.search && window.location.search.indexOf('logActions=true') !== -1;
+  const logActionsFalse =
+    window && window.location && window.location.search && window.location.search.indexOf('logActions=false') !== -1;
+  const logActions = store.getState().application.logActions;
+
+  if (logActionsTrue && !logActions) {
+    store.dispatch(toggleLogActions());
+  }
+
+  if (logActionsFalse && logActions) {
+    store.dispatch(toggleLogActions());
+  }
+
+  return next(action);
+};
diff --git a/public/app/core/nav_model_srv.ts b/public/app/core/nav_model_srv.ts
index bf31c2169c5d..598db4a53f2b 100644
--- a/public/app/core/nav_model_srv.ts
+++ b/public/app/core/nav_model_srv.ts
@@ -15,7 +15,7 @@ export class NavModelSrv {
     return _.find(this.navItems, { id: 'cfg' });
   }
 
-  getNav(...args) {
+  getNav(...args: string[]) {
     let children = this.navItems;
     const nav = {
       breadcrumbs: [],
diff --git a/public/app/core/partials.ts b/public/app/core/partials.ts
index 864a3dcfa8a3..32203a18f42e 100644
--- a/public/app/core/partials.ts
+++ b/public/app/core/partials.ts
@@ -1,4 +1,4 @@
 let templates = (require as any).context('../', true, /\.html$/);
-templates.keys().forEach(key => {
+templates.keys().forEach((key: string) => {
   templates(key);
 });
diff --git a/public/app/core/profiler.ts b/public/app/core/profiler.ts
index 2284401803c6..02f58b92d221 100644
--- a/public/app/core/profiler.ts
+++ b/public/app/core/profiler.ts
@@ -4,7 +4,7 @@ export class Profiler {
   $rootScope: any;
   window: any;
 
-  init(config, $rootScope) {
+  init(config: any, $rootScope: any) {
     this.$rootScope = $rootScope;
     this.window = window;
 
@@ -13,7 +13,7 @@ export class Profiler {
     }
   }
 
-  renderingCompleted(panelId) {
+  renderingCompleted() {
     // add render counter to root scope
     // used by phantomjs render.js to know when panel has rendered
     this.panelsRendered = (this.panelsRendered || 0) + 1;
diff --git a/public/app/core/reducers/application.ts b/public/app/core/reducers/application.ts
new file mode 100644
index 000000000000..458f49316191
--- /dev/null
+++ b/public/app/core/reducers/application.ts
@@ -0,0 +1,17 @@
+import { ApplicationState } from 'app/types/application';
+import { reducerFactory } from 'app/core/redux';
+import { toggleLogActions } from '../actions/application';
+
+export const initialState: ApplicationState = {
+  logActions: false,
+};
+
+export const applicationReducer = reducerFactory<ApplicationState>(initialState)
+  .addMapper({
+    filter: toggleLogActions,
+    mapper: (state): ApplicationState => ({
+      ...state,
+      logActions: !state.logActions,
+    }),
+  })
+  .create();
diff --git a/public/app/core/reducers/index.ts b/public/app/core/reducers/index.ts
index 1c8670ed0d6c..cc0c950ec4a0 100644
--- a/public/app/core/reducers/index.ts
+++ b/public/app/core/reducers/index.ts
@@ -1,9 +1,11 @@
 import { navIndexReducer as navIndex } from './navModel';
 import { locationReducer as location } from './location';
 import { appNotificationsReducer as appNotifications } from './appNotification';
+import { applicationReducer as application } from './application';
 
 export default {
   navIndex,
   location,
   appNotifications,
+  application,
 };
diff --git a/public/app/core/services/AngularLoader.ts b/public/app/core/services/AngularLoader.ts
index 817e9c9f3985..cd5506a94584 100644
--- a/public/app/core/services/AngularLoader.ts
+++ b/public/app/core/services/AngularLoader.ts
@@ -2,13 +2,13 @@ import angular from 'angular';
 import coreModule from 'app/core/core_module';
 import _ from 'lodash';
 
-export interface AngularComponent {
-  destroy(): void;
-  digest(): void;
-  getScope(): any;
-}
+import {
+  AngularComponent,
+  AngularLoader as AngularLoaderInterface,
+  setAngularLoader as setAngularLoaderInterface,
+} from '@grafana/runtime';
 
-export class AngularLoader {
+export class AngularLoader implements AngularLoaderInterface {
   /** @ngInject */
   constructor(private $compile: any, private $rootScope: any) {}
 
@@ -38,15 +38,8 @@ export class AngularLoader {
   }
 }
 
-coreModule.service('angularLoader', AngularLoader);
-
-let angularLoaderInstance: AngularLoader;
-
-export function setAngularLoader(pl: AngularLoader) {
-  angularLoaderInstance = pl;
+export function setAngularLoader(v: AngularLoader) {
+  setAngularLoaderInterface(v);
 }
 
-// away to access it from react
-export function getAngularLoader(): AngularLoader {
-  return angularLoaderInstance;
-}
+coreModule.service('angularLoader', AngularLoader);
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index 96e7a2cc258e..0f099c93d767 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -7,8 +7,9 @@ import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { DashboardSearchHit } from 'app/types/search';
 import { ContextSrv } from './context_srv';
 import { FolderInfo, DashboardDTO } from 'app/types';
+import { BackendSrv as BackendService, getBackendSrv as getBackendService, BackendSrvRequest } from '@grafana/runtime';
 
-export class BackendSrv {
+export class BackendSrv implements BackendService {
   private inFlightRequests: { [key: string]: Array<angular.IDeferred<any>> } = {};
   private HTTP_REQUEST_CANCELED = -1;
   private noBackendCache: boolean;
@@ -29,7 +30,7 @@ export class BackendSrv {
     return this.request({ method: 'DELETE', url });
   }
 
-  post(url: string, data: any) {
+  post(url: string, data?: any) {
     return this.request({ method: 'POST', url, data });
   }
 
@@ -83,7 +84,7 @@ export class BackendSrv {
     throw data;
   }
 
-  request(options: any) {
+  request(options: BackendSrvRequest) {
     options.retry = options.retry || 0;
     const requestIsLocal = !options.url.match(/^http/);
     const firstAttempt = options.retry === 0;
@@ -385,16 +386,7 @@ export class BackendSrv {
 
 coreModule.service('backendSrv', BackendSrv);
 
-//
-// Code below is to expore the service to react components
-//
-
-let singletonInstance: BackendSrv;
-
-export function setBackendSrv(instance: BackendSrv) {
-  singletonInstance = instance;
-}
-
+// Used for testing and things that really need BackendSrv
 export function getBackendSrv(): BackendSrv {
-  return singletonInstance;
+  return getBackendService() as BackendSrv;
 }
diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts
index 6fb50dd4ec29..0a4bd1c028ca 100644
--- a/public/app/core/services/keybindingSrv.ts
+++ b/public/app/core/services/keybindingSrv.ts
@@ -43,21 +43,11 @@ export class KeybindingSrv {
     this.bind('g h', this.goToHome);
     this.bind('g a', this.openAlerting);
     this.bind('g p', this.goToProfile);
-    this.bind('s s', this.openSearchStarred);
     this.bind('s o', this.openSearch);
-    this.bind('s t', this.openSearchTags);
     this.bind('f', this.openSearch);
     this.bindGlobal('esc', this.exit);
   }
 
-  openSearchStarred() {
-    appEvents.emit('show-dash-search', { starred: true });
-  }
-
-  openSearchTags() {
-    appEvents.emit('show-dash-search', { tagsMode: true });
-  }
-
   openSearch() {
     appEvents.emit('show-dash-search');
   }
diff --git a/public/app/core/services/segment_srv.ts b/public/app/core/services/segment_srv.ts
index e7653ec5cf73..d093a5570d6a 100644
--- a/public/app/core/services/segment_srv.ts
+++ b/public/app/core/services/segment_srv.ts
@@ -2,39 +2,51 @@ import _ from 'lodash';
 import coreModule from '../core_module';
 
 /** @ngInject */
-export function uiSegmentSrv(this: any, $sce, templateSrv) {
+export function uiSegmentSrv(this: any, $sce: any, templateSrv: any) {
   const self = this;
 
-  function MetricSegment(this: any, options) {
-    if (options === '*' || options.value === '*') {
-      this.value = '*';
-      this.html = $sce.trustAsHtml('<i class="fa fa-asterisk"><i>');
-      this.type = options.type;
-      this.expandable = true;
-      return;
-    }
+  class MetricSegment {
+    value: string;
+    html: any;
+    type: any;
+    expandable: boolean;
+    text: string;
+    cssClass: string;
+    fake: boolean;
+    custom: boolean;
+    selectMode: any;
+
+    constructor(options: any) {
+      if (options === '*' || options.value === '*') {
+        this.value = '*';
+        this.html = $sce.trustAsHtml('<i class="fa fa-asterisk"><i>');
+        this.type = options.type;
+        this.expandable = true;
+        return;
+      }
 
-    if (_.isString(options)) {
-      this.value = options;
-      this.html = $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
-      return;
-    }
+      if (_.isString(options)) {
+        this.value = options;
+        this.html = $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
+        return;
+      }
 
-    // temp hack to work around legacy inconsistency in segment model
-    this.text = options.value;
-
-    this.cssClass = options.cssClass;
-    this.custom = options.custom;
-    this.type = options.type;
-    this.fake = options.fake;
-    this.value = options.value;
-    this.selectMode = options.selectMode;
-    this.type = options.type;
-    this.expandable = options.expandable;
-    this.html = options.html || $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
+      // temp hack to work around legacy inconsistency in segment model
+      this.text = options.value;
+
+      this.cssClass = options.cssClass;
+      this.custom = options.custom;
+      this.type = options.type;
+      this.fake = options.fake;
+      this.value = options.value;
+      this.selectMode = options.selectMode;
+      this.type = options.type;
+      this.expandable = options.expandable;
+      this.html = options.html || $sce.trustAsHtml(templateSrv.highlightVariablesAsHtml(this.value));
+    }
   }
 
-  this.getSegmentForValue = function(value, fallbackText) {
+  this.getSegmentForValue = function(value: string, fallbackText: string) {
     if (value) {
       return this.newSegment(value);
     } else {
@@ -46,38 +58,38 @@ export function uiSegmentSrv(this: any, $sce, templateSrv) {
     return new MetricSegment({ value: 'select measurement', fake: true });
   };
 
-  this.newFake = (text, type, cssClass) => {
+  this.newFake = (text: string, type: string, cssClass: string) => {
     return new MetricSegment({ value: text, fake: true, type: type, cssClass: cssClass });
   };
 
-  this.newSegment = options => {
+  this.newSegment = (options: any) => {
     return new MetricSegment(options);
   };
 
-  this.newKey = key => {
+  this.newKey = (key: string) => {
     return new MetricSegment({ value: key, type: 'key', cssClass: 'query-segment-key' });
   };
 
-  this.newKeyValue = value => {
+  this.newKeyValue = (value: string) => {
     return new MetricSegment({ value: value, type: 'value', cssClass: 'query-segment-value' });
   };
 
-  this.newCondition = condition => {
+  this.newCondition = (condition: string) => {
     return new MetricSegment({ value: condition, type: 'condition', cssClass: 'query-keyword' });
   };
 
-  this.newOperator = op => {
+  this.newOperator = (op: string) => {
     return new MetricSegment({ value: op, type: 'operator', cssClass: 'query-segment-operator' });
   };
 
-  this.newOperators = ops => {
+  this.newOperators = (ops: string[]) => {
     return _.map(ops, op => {
       return new MetricSegment({ value: op, type: 'operator', cssClass: 'query-segment-operator' });
     });
   };
 
-  this.transformToSegments = (addTemplateVars, variableTypeFilter) => {
-    return results => {
+  this.transformToSegments = (addTemplateVars: boolean, variableTypeFilter: string) => {
+    return (results: any[]) => {
       const segments = _.map(results, segment => {
         return self.newSegment({ value: segment.text, expandable: segment.expandable });
       });
diff --git a/public/app/core/specs/file_export.test.ts b/public/app/core/specs/file_export.test.ts
index 9e2ff0a7ce16..ab254a94f2b4 100644
--- a/public/app/core/specs/file_export.test.ts
+++ b/public/app/core/specs/file_export.test.ts
@@ -92,6 +92,7 @@ describe('file_export', () => {
           [0x123, 'some string with \n in the middle', 10.01, false],
           [0b1011, 'some string with ; in the middle', -12.34, true],
           [123, 'some string with ;; in the middle', -12.34, true],
+          [1234, '=a bogus formula  ', '-and another', '+another', '@ref'],
         ],
       };
 
@@ -108,7 +109,8 @@ describe('file_export', () => {
         '501;"some string with "" at the end""";0.01;false\r\n' +
         '291;"some string with \n in the middle";10.01;false\r\n' +
         '11;"some string with ; in the middle";-12.34;true\r\n' +
-        '123;"some string with ;; in the middle";-12.34;true';
+        '123;"some string with ;; in the middle";-12.34;true\r\n' +
+        '1234;"\'=a bogus formula";"\'-and another";"\'+another";"\'@ref"';
 
       expect(returnedText).toBe(expectedText);
     });
diff --git a/public/app/core/specs/logs_model.test.ts b/public/app/core/specs/logs_model.test.ts
index c30a3ebfa391..c83f0ce6c1c0 100644
--- a/public/app/core/specs/logs_model.test.ts
+++ b/public/app/core/specs/logs_model.test.ts
@@ -1,15 +1,12 @@
+import { SeriesData, FieldType, LogsModel, LogsMetaKind, LogsDedupStrategy, LogLevel } from '@grafana/ui';
 import {
+  dedupLogRows,
   calculateFieldStats,
   calculateLogsLabelStats,
-  dedupLogRows,
   getParser,
-  LogsDedupStrategy,
-  LogsModel,
   LogsParsers,
   seriesDataToLogsModel,
-  LogsMetaKind,
 } from '../logs_model';
-import { SeriesData, FieldType } from '@grafana/ui';
 
 describe('dedupLogRows()', () => {
   test('should return rows as is when dedup is set to none', () => {
@@ -463,8 +460,12 @@ describe('seriesDataToLogsModel', () => {
             name: 'message',
             type: FieldType.string,
           },
+          {
+            name: 'level',
+            type: FieldType.string,
+          },
         ],
-        rows: [['1970-01-01T00:00:01Z', 'WARN boooo']],
+        rows: [['1970-01-01T00:00:01Z', 'WARN boooo', 'dbug']],
       },
     ];
     const logsModel = seriesDataToLogsModel(series, 0);
@@ -473,7 +474,7 @@ describe('seriesDataToLogsModel', () => {
       {
         entry: 'WARN boooo',
         labels: undefined,
-        logLevel: 'warning',
+        logLevel: LogLevel.debug,
         uniqueLabels: {},
       },
     ]);
@@ -485,6 +486,7 @@ describe('seriesDataToLogsModel', () => {
         labels: {
           foo: 'bar',
           baz: '1',
+          level: 'dbug',
         },
         fields: [
           {
@@ -503,6 +505,7 @@ describe('seriesDataToLogsModel', () => {
         labels: {
           foo: 'bar',
           baz: '2',
+          level: 'err',
         },
         fields: [
           {
@@ -524,19 +527,19 @@ describe('seriesDataToLogsModel', () => {
       {
         entry: 'INFO 2',
         labels: { foo: 'bar', baz: '2' },
-        logLevel: 'info',
+        logLevel: LogLevel.error,
         uniqueLabels: { baz: '2' },
       },
       {
         entry: 'WARN boooo',
         labels: { foo: 'bar', baz: '1' },
-        logLevel: 'warning',
+        logLevel: LogLevel.debug,
         uniqueLabels: { baz: '1' },
       },
       {
         entry: 'INFO 1',
         labels: { foo: 'bar', baz: '2' },
-        logLevel: 'info',
+        logLevel: LogLevel.error,
         uniqueLabels: { baz: '2' },
       },
     ]);
diff --git a/public/app/core/table_model.ts b/public/app/core/table_model.ts
index ffd1e54dcbc6..d193e7fcbe74 100644
--- a/public/app/core/table_model.ts
+++ b/public/app/core/table_model.ts
@@ -26,15 +26,19 @@ export default class TableModel implements TableData {
 
     if (table) {
       if (table.columns) {
-        table.columns.forEach(col => this.addColumn(col));
+        for (const col of table.columns) {
+          this.addColumn(col);
+        }
       }
       if (table.rows) {
-        table.rows.forEach(row => this.addRow(row));
+        for (const row of table.rows) {
+          this.addRow(row);
+        }
       }
     }
   }
 
-  sort(options) {
+  sort(options: { col: number; desc: boolean }) {
     if (options.col === null || this.columns.length <= options.col) {
       return;
     }
@@ -54,21 +58,21 @@ export default class TableModel implements TableData {
     this.columns[options.col].desc = options.desc;
   }
 
-  addColumn(col) {
+  addColumn(col: Column) {
     if (!this.columnMap[col.text]) {
       this.columns.push(col);
       this.columnMap[col.text] = col;
     }
   }
 
-  addRow(row) {
+  addRow(row: any[]) {
     this.rows.push(row);
   }
 }
 
 // Returns true if both rows have matching non-empty fields as well as matching
 // indexes where one field is empty and the other is not
-function areRowsMatching(columns, row, otherRow) {
+function areRowsMatching(columns: Column[], row: any[], otherRow: any[]) {
   let foundFieldToMatch = false;
   for (let columnIndex = 0; columnIndex < columns.length; columnIndex++) {
     if (row[columnIndex] !== undefined && otherRow[columnIndex] !== undefined) {
@@ -96,7 +100,7 @@ export function mergeTablesIntoModel(dst?: TableModel, ...tables: TableModel[]):
   }
 
   // Track column indexes of union: name -> index
-  const columnNames = {};
+  const columnNames: { [key: string]: any } = {};
 
   // Union of all non-value columns
   const columnsUnion = tables.slice().reduce((acc, series) => {
@@ -119,7 +123,7 @@ export function mergeTablesIntoModel(dst?: TableModel, ...tables: TableModel[]):
   const flattenedRows = tables.reduce((acc, series, seriesIndex) => {
     const mapper = columnIndexMapper[seriesIndex];
     series.rows.forEach(row => {
-      const alteredRow = [];
+      const alteredRow: any[] = [];
       // Shifting entries according to index mapper
       mapper.forEach((to, from) => {
         alteredRow[to] = row[from];
@@ -130,7 +134,8 @@ export function mergeTablesIntoModel(dst?: TableModel, ...tables: TableModel[]):
   }, []);
 
   // Merge rows that have same values for columns
-  const mergedRows = {};
+  const mergedRows: { [key: string]: any } = {};
+
   const compactedRows = flattenedRows.reduce((acc, row, rowIndex) => {
     if (!mergedRows[rowIndex]) {
       // Look from current row onwards
diff --git a/public/app/core/time_series2.ts b/public/app/core/time_series2.ts
index 10c91c148d79..d7a57b77afc9 100644
--- a/public/app/core/time_series2.ts
+++ b/public/app/core/time_series2.ts
@@ -1,8 +1,8 @@
 import { getFlotTickDecimals } from 'app/core/utils/ticks';
 import _ from 'lodash';
-import { getValueFormat, stringToJsRegex } from '@grafana/ui';
+import { getValueFormat, stringToJsRegex, ValueFormatter, DecimalCount } from '@grafana/ui';
 
-function matchSeriesOverride(aliasOrRegex, seriesAlias) {
+function matchSeriesOverride(aliasOrRegex: string, seriesAlias: string) {
   if (!aliasOrRegex) {
     return false;
   }
@@ -15,7 +15,7 @@ function matchSeriesOverride(aliasOrRegex, seriesAlias) {
   return aliasOrRegex === seriesAlias;
 }
 
-function translateFillOption(fill) {
+function translateFillOption(fill: number) {
   return fill === 0 ? 0.001 : fill / 10;
 }
 
@@ -25,7 +25,7 @@ function translateFillOption(fill) {
  * @param panel
  * @param height
  */
-export function updateLegendValues(data: TimeSeries[], panel, height) {
+export function updateLegendValues(data: TimeSeries[], panel: any, height: number) {
   for (let i = 0; i < data.length; i++) {
     const series = data[i];
     const yaxes = panel.yaxes;
@@ -97,7 +97,7 @@ export default class TimeSeries {
   flotpairs: any;
   unit: any;
 
-  constructor(opts) {
+  constructor(opts: any) {
     this.datapoints = opts.datapoints;
     this.label = opts.alias;
     this.id = opts.alias;
@@ -112,7 +112,7 @@ export default class TimeSeries {
     this.hasMsResolution = this.isMsResolutionNeeded();
   }
 
-  applySeriesOverrides(overrides) {
+  applySeriesOverrides(overrides: any[]) {
     this.lines = {};
     this.dashes = {
       dashLength: [],
@@ -192,7 +192,7 @@ export default class TimeSeries {
     }
   }
 
-  getFlotPairs(fillStyle) {
+  getFlotPairs(fillStyle: string) {
     const result = [];
 
     this.stats.total = 0;
@@ -314,13 +314,13 @@ export default class TimeSeries {
     return result;
   }
 
-  updateLegendValues(formater, decimals, scaledDecimals) {
+  updateLegendValues(formater: ValueFormatter, decimals: DecimalCount, scaledDecimals: DecimalCount) {
     this.valueFormater = formater;
     this.decimals = decimals;
     this.scaledDecimals = scaledDecimals;
   }
 
-  formatValue(value) {
+  formatValue(value: number) {
     if (!_.isFinite(value)) {
       value = null; // Prevent NaN formatting
     }
@@ -329,7 +329,7 @@ export default class TimeSeries {
 
   isMsResolutionNeeded() {
     for (let i = 0; i < this.datapoints.length; i++) {
-      if (this.datapoints[i][1] !== null) {
+      if (this.datapoints[i][1] !== null && this.datapoints[i][1] !== undefined) {
         const timestamp = this.datapoints[i][1].toString();
         if (timestamp.length === 13 && timestamp % 1000 !== 0) {
           return true;
@@ -339,7 +339,7 @@ export default class TimeSeries {
     return false;
   }
 
-  hideFromLegend(options) {
+  hideFromLegend(options: any) {
     if (options.hideEmpty && this.allIsNull) {
       return true;
     }
diff --git a/public/app/core/utils/connectWithReduxStore.tsx b/public/app/core/utils/connectWithReduxStore.tsx
index be91958f8cd1..19493681c0d7 100644
--- a/public/app/core/utils/connectWithReduxStore.tsx
+++ b/public/app/core/utils/connectWithReduxStore.tsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { store } from '../../store/store';
 
 export function connectWithStore(WrappedComponent, ...args) {
-  const ConnectedWrappedComponent = connect(...args)(WrappedComponent);
+  const ConnectedWrappedComponent = (connect as any)(...args)(WrappedComponent);
 
   return props => {
     return <ConnectedWrappedComponent {...props} store={store} />;
diff --git a/public/app/core/utils/explore.test.ts b/public/app/core/utils/explore.test.ts
index 3a0752d2a5ed..344de3803202 100644
--- a/public/app/core/utils/explore.test.ts
+++ b/public/app/core/utils/explore.test.ts
@@ -12,8 +12,7 @@ import {
 } from './explore';
 import { ExploreUrlState } from 'app/types/explore';
 import store from 'app/core/store';
-import { LogsDedupStrategy } from 'app/core/logs_model';
-import { DataQueryError } from '@grafana/ui';
+import { DataQueryError, LogsDedupStrategy } from '@grafana/ui';
 
 const DEFAULT_EXPLORE_STATE: ExploreUrlState = {
   datasource: null,
@@ -182,11 +181,11 @@ describe('updateHistory()', () => {
 
 describe('hasNonEmptyQuery', () => {
   test('should return true if one query is non-empty', () => {
-    expect(hasNonEmptyQuery([{ refId: '1', key: '2', expr: 'foo' }])).toBeTruthy();
+    expect(hasNonEmptyQuery([{ refId: '1', key: '2', context: 'explore', expr: 'foo' }])).toBeTruthy();
   });
 
   test('should return false if query is empty', () => {
-    expect(hasNonEmptyQuery([{ refId: '1', key: '2' }])).toBeFalsy();
+    expect(hasNonEmptyQuery([{ refId: '1', key: '2', context: 'panel' }])).toBeFalsy();
   });
 
   test('should return false if no queries exist', () => {
diff --git a/public/app/core/utils/explore.ts b/public/app/core/utils/explore.ts
index 7a19fd5a822d..811950a9251f 100644
--- a/public/app/core/utils/explore.ts
+++ b/public/app/core/utils/explore.ts
@@ -1,40 +1,35 @@
 // Libraries
 import _ from 'lodash';
+import { from } from 'rxjs';
+import { toUtc } from '@grafana/ui/src/utils/moment_wrapper';
+import { isLive } from '@grafana/ui/src/components/RefreshPicker/RefreshPicker';
 
 // Services & Utils
 import * as dateMath from '@grafana/ui/src/utils/datemath';
 import { renderUrl } from 'app/core/utils/url';
 import kbn from 'app/core/utils/kbn';
 import store from 'app/core/store';
-import TableModel, { mergeTablesIntoModel } from 'app/core/table_model';
 import { getNextRefIdChar } from './query';
 
 // Types
 import {
-  colors,
   TimeRange,
   RawTimeRange,
   TimeZone,
   IntervalValues,
   DataQuery,
   DataSourceApi,
-  toSeriesData,
-  guessFieldTypes,
   TimeFragment,
   DataQueryError,
+  LogRowModel,
+  LogsModel,
+  LogsDedupStrategy,
+  DataSourceJsonData,
+  DataQueryRequest,
+  DataStreamObserver,
 } from '@grafana/ui';
-import TimeSeries from 'app/core/time_series2';
-import {
-  ExploreUrlState,
-  HistoryItem,
-  QueryTransaction,
-  ResultType,
-  QueryIntervals,
-  QueryOptions,
-  ResultGetter,
-} from 'app/types/explore';
-import { LogsDedupStrategy, seriesDataToLogsModel } from 'app/core/logs_model';
-import { toUtc } from '@grafana/ui/src/utils/moment_wrapper';
+import { ExploreUrlState, HistoryItem, QueryTransaction, QueryIntervals, QueryOptions } from 'app/types/explore';
+import { config } from '../config';
 
 export const DEFAULT_RANGE = {
   from: 'now-6h',
@@ -112,7 +107,6 @@ export async function getExploreUrl(
 
 export function buildQueryTransaction(
   queries: DataQuery[],
-  resultType: ResultType,
   queryOptions: QueryOptions,
   range: TimeRange,
   queryIntervals: QueryIntervals,
@@ -133,7 +127,7 @@ export function buildQueryTransaction(
   // Using `format` here because it relates to the view panel that the request is for.
   // However, some datasources don't use `panelId + query.refId`, but only `panelId`.
   // Therefore panel id has to be unique.
-  const panelId = `${queryOptions.format}-${key}`;
+  const panelId = `${key}`;
 
   const options = {
     interval,
@@ -152,7 +146,6 @@ export function buildQueryTransaction(
   return {
     queries,
     options,
-    resultType,
     scanning,
     id: generateKey(), // reusing for unique ID
     done: false,
@@ -310,42 +303,22 @@ export function ensureQueries(queries?: DataQuery[]): DataQuery[] {
 }
 
 /**
- * A target is non-empty when it has keys (with non-empty values) other than refId and key.
+ * A target is non-empty when it has keys (with non-empty values) other than refId, key and context.
  */
+const validKeys = ['refId', 'key', 'context'];
 export function hasNonEmptyQuery<TQuery extends DataQuery = any>(queries: TQuery[]): boolean {
   return (
     queries &&
-    queries.some(
-      query =>
-        Object.keys(query)
-          .map(k => query[k])
-          .filter(v => v).length > 2
-    )
+    queries.some(query => {
+      const keys = Object.keys(query)
+        .filter(key => validKeys.indexOf(key) === -1)
+        .map(k => query[k])
+        .filter(v => v);
+      return keys.length > 0;
+    })
   );
 }
 
-export function calculateResultsFromQueryTransactions(result: any, resultType: ResultType, graphInterval: number) {
-  const flattenedResult: any[] = _.flatten(result);
-  const graphResult = resultType === 'Graph' && result ? result : null;
-  const tableResult =
-    resultType === 'Table' && result
-      ? mergeTablesIntoModel(
-          new TableModel(),
-          ...flattenedResult.filter((r: any) => r.columns && r.rows).map((r: any) => r as TableModel)
-        )
-      : mergeTablesIntoModel(new TableModel());
-  const logsResult =
-    resultType === 'Logs' && result
-      ? seriesDataToLogsModel(flattenedResult.map(r => guessFieldTypes(toSeriesData(r))), graphInterval)
-      : null;
-
-  return {
-    graphResult,
-    tableResult,
-    logsResult,
-  };
-}
-
 export function getIntervals(range: TimeRange, lowLimit: string, resolution: number): IntervalValues {
   if (!resolution) {
     return { interval: '1s', intervalMs: 1000 };
@@ -354,37 +327,6 @@ export function getIntervals(range: TimeRange, lowLimit: string, resolution: num
   return kbn.calculateInterval(range, resolution, lowLimit);
 }
 
-export const makeTimeSeriesList: ResultGetter = (dataList, transaction, allTransactions) => {
-  // Prevent multiple Graph transactions to have the same colors
-  let colorIndexOffset = 0;
-  for (const other of allTransactions) {
-    // Only need to consider transactions that came before the current one
-    if (other === transaction) {
-      break;
-    }
-    // Count timeseries of previous query results
-    if (other.resultType === 'Graph' && other.done) {
-      colorIndexOffset += other.result.length;
-    }
-  }
-
-  return dataList.map((seriesData, index: number) => {
-    const datapoints = seriesData.datapoints || [];
-    const alias = seriesData.target;
-    const colorIndex = (colorIndexOffset + index) % colors.length;
-    const color = colors[colorIndex];
-
-    const series = new TimeSeries({
-      datapoints,
-      alias,
-      color,
-      unit: seriesData.unit,
-    });
-
-    return series;
-  });
-};
-
 /**
  * Update the query history. Side-effect: store history in local storage
  */
@@ -529,3 +471,53 @@ export const getRefIds = (value: any): string[] => {
 
   return _.uniq(_.flatten(refIds));
 };
+
+const sortInAscendingOrder = (a: LogRowModel, b: LogRowModel) => {
+  if (a.timeEpochMs < b.timeEpochMs) {
+    return -1;
+  }
+
+  if (a.timeEpochMs > b.timeEpochMs) {
+    return 1;
+  }
+
+  return 0;
+};
+
+const sortInDescendingOrder = (a: LogRowModel, b: LogRowModel) => {
+  if (a.timeEpochMs > b.timeEpochMs) {
+    return -1;
+  }
+
+  if (a.timeEpochMs < b.timeEpochMs) {
+    return 1;
+  }
+
+  return 0;
+};
+
+export const sortLogsResult = (logsResult: LogsModel, refreshInterval: string) => {
+  const rows = logsResult ? logsResult.rows : [];
+  const live = isLive(refreshInterval);
+  live ? rows.sort(sortInAscendingOrder) : rows.sort(sortInDescendingOrder);
+  const result: LogsModel = logsResult ? { ...logsResult, rows } : { hasUniqueLabels: false, rows };
+
+  return result;
+};
+
+export const convertToWebSocketUrl = (url: string) => {
+  const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
+  let backend = `${protocol}${window.location.host}${config.appSubUrl}`;
+  if (backend.endsWith('/')) {
+    backend = backend.slice(0, backend.length - 1);
+  }
+  return `${backend}${url}`;
+};
+
+export const getQueryResponse = (
+  datasourceInstance: DataSourceApi<DataQuery, DataSourceJsonData>,
+  options: DataQueryRequest<DataQuery>,
+  observer?: DataStreamObserver
+) => {
+  return from(datasourceInstance.query(options, observer));
+};
diff --git a/public/app/core/utils/file_export.ts b/public/app/core/utils/file_export.ts
index 6d341b5582e2..ae8d0ad06dea 100644
--- a/public/app/core/utils/file_export.ts
+++ b/public/app/core/utils/file_export.ts
@@ -17,7 +17,11 @@ function csvEscaped(text) {
     return text;
   }
 
-  return text.split(QUOTE).join(QUOTE + QUOTE);
+  return text
+    .split(QUOTE)
+    .join(QUOTE + QUOTE)
+    .replace(/^([-+=@])/, "'$1")
+    .replace(/\s+$/, '');
 }
 
 const domParser = new DOMParser();
diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts
index d747fa37f579..1a1cf6f56ba1 100644
--- a/public/app/core/utils/kbn.ts
+++ b/public/app/core/utils/kbn.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { has } from 'lodash';
 import { getValueFormat, getValueFormatterIndex, getValueFormats, stringToJsRegex } from '@grafana/ui';
 import deprecationWarning from '@grafana/ui/src/utils/deprecationWarning';
 
@@ -133,7 +133,7 @@ kbn.secondsToHms = seconds => {
 };
 
 kbn.secondsToHhmmss = seconds => {
-  const strings = [];
+  const strings: string[] = [];
   const numhours = Math.floor(seconds / 3600);
   const numminutes = Math.floor((seconds % 3600) / 60);
   const numseconds = Math.floor((seconds % 3600) % 60);
@@ -193,7 +193,7 @@ kbn.calculateInterval = (range, resolution, lowLimitInterval) => {
 
 kbn.describe_interval = str => {
   const matches = str.match(kbn.interval_regex);
-  if (!matches || !_.has(kbn.intervals_in_seconds, matches[2])) {
+  if (!matches || !has(kbn.intervals_in_seconds, matches[2])) {
     throw new Error('Invalid interval string, expecting a number followed by one of "Mwdhmsy"');
   } else {
     return {
diff --git a/public/app/core/utils/text.ts b/public/app/core/utils/text.ts
index faf801b45be8..6db844e736ef 100644
--- a/public/app/core/utils/text.ts
+++ b/public/app/core/utils/text.ts
@@ -6,7 +6,7 @@ import xss from 'xss';
  * See https://github.com/bvaughn/react-highlight-words#props
  */
 export function findHighlightChunksInText({ searchWords, textToHighlight }) {
-  return findMatchesInText(textToHighlight, searchWords.join(' '));
+  return searchWords.reduce((acc, term) => [...acc, ...findMatchesInText(textToHighlight, term)], []);
 }
 
 const cleanNeedle = (needle: string): string => {
diff --git a/public/app/core/utils/url.ts b/public/app/core/utils/url.ts
index b0994eb01034..878904bc7a64 100644
--- a/public/app/core/utils/url.ts
+++ b/public/app/core/utils/url.ts
@@ -2,7 +2,7 @@
  * @preserve jquery-param (c) 2015 KNOWLEDGECODE | MIT
  */
 
-import { UrlQueryMap } from 'app/types';
+import { UrlQueryMap } from '@grafana/runtime';
 
 export function renderUrl(path: string, query: UrlQueryMap | undefined): string {
   if (query && Object.keys(query).length > 0) {
@@ -11,7 +11,7 @@ export function renderUrl(path: string, query: UrlQueryMap | undefined): string
   return path;
 }
 
-export function encodeURIComponentAsAngularJS(val, pctEncodeSpaces) {
+export function encodeURIComponentAsAngularJS(val: string, pctEncodeSpaces?: boolean) {
   return encodeURIComponent(val)
     .replace(/%40/gi, '@')
     .replace(/%3A/gi, ':')
@@ -21,15 +21,15 @@ export function encodeURIComponentAsAngularJS(val, pctEncodeSpaces) {
     .replace(/%20/g, pctEncodeSpaces ? '%20' : '+');
 }
 
-export function toUrlParams(a) {
+export function toUrlParams(a: any) {
   const s = [];
   const rbracket = /\[\]$/;
 
-  const isArray = obj => {
+  const isArray = (obj: any) => {
     return Object.prototype.toString.call(obj) === '[object Array]';
   };
 
-  const add = (k, v) => {
+  const add = (k: string, v: any) => {
     v = typeof v === 'function' ? v() : v === null ? '' : v === undefined ? '' : v;
     if (typeof v !== 'boolean') {
       s[s.length] = encodeURIComponentAsAngularJS(k, true) + '=' + encodeURIComponentAsAngularJS(v, true);
@@ -38,7 +38,7 @@ export function toUrlParams(a) {
     }
   };
 
-  const buildParams = (prefix, obj) => {
+  const buildParams = (prefix: string, obj: any) => {
     let i, len, key;
 
     if (prefix) {
diff --git a/public/app/features/admin/AdminEditOrgCtrl.ts b/public/app/features/admin/AdminEditOrgCtrl.ts
index 4ce0e2366f63..a10067b3dbab 100644
--- a/public/app/features/admin/AdminEditOrgCtrl.ts
+++ b/public/app/features/admin/AdminEditOrgCtrl.ts
@@ -1,8 +1,11 @@
+import { BackendSrv } from 'app/core/services/backend_srv';
+import { NavModelSrv } from 'app/core/core';
+
 export default class AdminEditOrgCtrl {
   /** @ngInject */
-  constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
+  constructor($scope: any, $routeParams: any, backendSrv: BackendSrv, $location: any, navModelSrv: NavModelSrv) {
     $scope.init = () => {
-      $scope.navModel = navModelSrv.getNav('admin', 'global-orgs', 0);
+      $scope.navModel = navModelSrv.getNav('admin', 'global-orgs');
 
       if ($routeParams.id) {
         $scope.getOrg($routeParams.id);
@@ -10,14 +13,14 @@ export default class AdminEditOrgCtrl {
       }
     };
 
-    $scope.getOrg = id => {
-      backendSrv.get('/api/orgs/' + id).then(org => {
+    $scope.getOrg = (id: number) => {
+      backendSrv.get('/api/orgs/' + id).then((org: any) => {
         $scope.org = org;
       });
     };
 
-    $scope.getOrgUsers = id => {
-      backendSrv.get('/api/orgs/' + id + '/users').then(orgUsers => {
+    $scope.getOrgUsers = (id: number) => {
+      backendSrv.get('/api/orgs/' + id + '/users').then((orgUsers: any) => {
         $scope.orgUsers = orgUsers;
       });
     };
@@ -32,11 +35,11 @@ export default class AdminEditOrgCtrl {
       });
     };
 
-    $scope.updateOrgUser = orgUser => {
+    $scope.updateOrgUser = (orgUser: any) => {
       backendSrv.patch('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId, orgUser);
     };
 
-    $scope.removeOrgUser = orgUser => {
+    $scope.removeOrgUser = (orgUser: any) => {
       backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId).then(() => {
         $scope.getOrgUsers($scope.org.id);
       });
diff --git a/public/app/features/admin/AdminEditUserCtrl.ts b/public/app/features/admin/AdminEditUserCtrl.ts
index 4b7dc9d21e59..f64f5005dfa2 100644
--- a/public/app/features/admin/AdminEditUserCtrl.ts
+++ b/public/app/features/admin/AdminEditUserCtrl.ts
@@ -1,12 +1,15 @@
 import _ from 'lodash';
+import { BackendSrv } from 'app/core/services/backend_srv';
+import { NavModelSrv } from 'app/core/core';
+import { User } from 'app/core/services/context_srv';
 
 export default class AdminEditUserCtrl {
   /** @ngInject */
-  constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
+  constructor($scope: any, $routeParams: any, backendSrv: BackendSrv, $location: any, navModelSrv: NavModelSrv) {
     $scope.user = {};
     $scope.newOrg = { name: '', role: 'Editor' };
     $scope.permissions = {};
-    $scope.navModel = navModelSrv.getNav('admin', 'global-users', 0);
+    $scope.navModel = navModelSrv.getNav('admin', 'global-users');
 
     $scope.init = () => {
       if ($routeParams.id) {
@@ -15,8 +18,8 @@ export default class AdminEditUserCtrl {
       }
     };
 
-    $scope.getUser = id => {
-      backendSrv.get('/api/users/' + id).then(user => {
+    $scope.getUser = (id: number) => {
+      backendSrv.get('/api/users/' + id).then((user: User) => {
         $scope.user = user;
         $scope.user_id = id;
         $scope.permissions.isGrafanaAdmin = user.isGrafanaAdmin;
@@ -52,8 +55,8 @@ export default class AdminEditUserCtrl {
       });
     };
 
-    $scope.getUserOrgs = id => {
-      backendSrv.get('/api/users/' + id + '/orgs').then(orgs => {
+    $scope.getUserOrgs = (id: number) => {
+      backendSrv.get('/api/users/' + id + '/orgs').then((orgs: any) => {
         $scope.orgs = orgs;
       });
     };
@@ -68,11 +71,11 @@ export default class AdminEditUserCtrl {
       });
     };
 
-    $scope.updateOrgUser = orgUser => {
+    $scope.updateOrgUser = (orgUser: { orgId: string }) => {
       backendSrv.patch('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id, orgUser).then(() => {});
     };
 
-    $scope.removeOrgUser = orgUser => {
+    $scope.removeOrgUser = (orgUser: { orgId: string }) => {
       backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id).then(() => {
         $scope.getUser($scope.user_id);
         $scope.getUserOrgs($scope.user_id);
@@ -81,13 +84,13 @@ export default class AdminEditUserCtrl {
 
     $scope.orgsSearchCache = [];
 
-    $scope.searchOrgs = (queryStr, callback) => {
+    $scope.searchOrgs = (queryStr: any, callback: any) => {
       if ($scope.orgsSearchCache.length > 0) {
         callback(_.map($scope.orgsSearchCache, 'name'));
         return;
       }
 
-      backendSrv.get('/api/orgs', { query: '' }).then(result => {
+      backendSrv.get('/api/orgs', { query: '' }).then((result: any) => {
         $scope.orgsSearchCache = result;
         callback(_.map(result, 'name'));
       });
@@ -101,6 +104,7 @@ export default class AdminEditUserCtrl {
       const orgInfo: any = _.find($scope.orgsSearchCache, {
         name: $scope.newOrg.name,
       });
+
       if (!orgInfo) {
         return;
       }
diff --git a/public/app/features/admin/AdminListOrgsCtrl.ts b/public/app/features/admin/AdminListOrgsCtrl.ts
index d6ee4b33dbbe..439811edbf28 100644
--- a/public/app/features/admin/AdminListOrgsCtrl.ts
+++ b/public/app/features/admin/AdminListOrgsCtrl.ts
@@ -1,18 +1,21 @@
+import { BackendSrv } from 'app/core/services/backend_srv';
+import { NavModelSrv } from 'app/core/core';
+
 export default class AdminListOrgsCtrl {
   /** @ngInject */
-  constructor($scope, backendSrv, navModelSrv) {
+  constructor($scope: any, backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
     $scope.init = () => {
-      $scope.navModel = navModelSrv.getNav('admin', 'global-orgs', 0);
+      $scope.navModel = navModelSrv.getNav('admin', 'global-orgs');
       $scope.getOrgs();
     };
 
     $scope.getOrgs = () => {
-      backendSrv.get('/api/orgs').then(orgs => {
+      backendSrv.get('/api/orgs').then((orgs: any) => {
         $scope.orgs = orgs;
       });
     };
 
-    $scope.deleteOrg = org => {
+    $scope.deleteOrg = (org: any) => {
       $scope.appEvent('confirm-modal', {
         title: 'Delete',
         text: 'Do you want to delete organization ' + org.name + '?',
diff --git a/public/app/features/admin/AdminListUsersCtrl.ts b/public/app/features/admin/AdminListUsersCtrl.ts
index 5b5321d13cea..33a43adf0598 100644
--- a/public/app/features/admin/AdminListUsersCtrl.ts
+++ b/public/app/features/admin/AdminListUsersCtrl.ts
@@ -1,6 +1,9 @@
+import { BackendSrv } from 'app/core/services/backend_srv';
+import { NavModelSrv } from 'app/core/core';
+
 export default class AdminListUsersCtrl {
   users: any;
-  pages = [];
+  pages: any[] = [];
   perPage = 50;
   page = 1;
   totalPages: number;
@@ -9,8 +12,8 @@ export default class AdminListUsersCtrl {
   navModel: any;
 
   /** @ngInject */
-  constructor(private $scope, private backendSrv, navModelSrv) {
-    this.navModel = navModelSrv.getNav('admin', 'global-users', 0);
+  constructor(private $scope: any, private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
+    this.navModel = navModelSrv.getNav('admin', 'global-users');
     this.query = '';
     this.getUsers();
   }
@@ -18,7 +21,7 @@ export default class AdminListUsersCtrl {
   getUsers() {
     this.backendSrv
       .get(`/api/users/search?perpage=${this.perPage}&page=${this.page}&query=${this.query}`)
-      .then(result => {
+      .then((result: any) => {
         this.users = result.users;
         this.page = result.page;
         this.perPage = result.perPage;
@@ -32,12 +35,12 @@ export default class AdminListUsersCtrl {
       });
   }
 
-  navigateToPage(page) {
+  navigateToPage(page: any) {
     this.page = page.page;
     this.getUsers();
   }
 
-  deleteUser(user) {
+  deleteUser(user: any) {
     this.$scope.appEvent('confirm-modal', {
       title: 'Delete',
       text: 'Do you want to delete ' + user.login + '?',
diff --git a/public/app/features/admin/ServerStats.test.tsx b/public/app/features/admin/ServerStats.test.tsx
index cbcc580f6120..c33a5f4fbb21 100644
--- a/public/app/features/admin/ServerStats.test.tsx
+++ b/public/app/features/admin/ServerStats.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+// @ts-ignore
 import renderer from 'react-test-renderer';
 import { ServerStats } from './ServerStats';
 import { createNavModel } from 'test/mocks/common';
diff --git a/public/app/features/admin/StyleGuideCtrl.ts b/public/app/features/admin/StyleGuideCtrl.ts
index 6548aa091989..44ef3c487760 100644
--- a/public/app/features/admin/StyleGuideCtrl.ts
+++ b/public/app/features/admin/StyleGuideCtrl.ts
@@ -1,4 +1,6 @@
 import config from 'app/core/config';
+import { BackendSrv } from 'app/core/services/backend_srv';
+import { NavModelSrv } from 'app/core/core';
 
 export default class StyleGuideCtrl {
   theme: string;
@@ -8,8 +10,8 @@ export default class StyleGuideCtrl {
   navModel: any;
 
   /** @ngInject */
-  constructor(private $routeParams, private backendSrv, navModelSrv) {
-    this.navModel = navModelSrv.getNav('admin', 'styleguide', 0);
+  constructor(private $routeParams: any, private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
+    this.navModel = navModelSrv.getNav('admin', 'styleguide');
     this.theme = config.bootData.user.lightTheme ? 'light' : 'dark';
   }
 
diff --git a/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap b/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap
index 23d4d714559d..bb1ba9c9388f 100644
--- a/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap
+++ b/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap
@@ -212,7 +212,7 @@ exports[`ServerStats Should render table with stats 1`] = `
       </div>
     </div>
     <div
-      className="css-17l4171 track-horizontal"
+      className="css-52gpmd track-horizontal"
       style={
         Object {
           "display": "none",
@@ -233,7 +233,7 @@ exports[`ServerStats Should render table with stats 1`] = `
       />
     </div>
     <div
-      className="css-17l4171 track-vertical"
+      className="css-52gpmd track-vertical"
       style={
         Object {
           "display": "none",
diff --git a/public/app/features/admin/index.ts b/public/app/features/admin/index.ts
index fecc04bc4106..17c3204cda20 100644
--- a/public/app/features/admin/index.ts
+++ b/public/app/features/admin/index.ts
@@ -5,15 +5,17 @@ import AdminEditOrgCtrl from './AdminEditOrgCtrl';
 import StyleGuideCtrl from './StyleGuideCtrl';
 
 import coreModule from 'app/core/core_module';
+import { BackendSrv } from 'app/core/services/backend_srv';
+import { NavModelSrv } from 'app/core/core';
 
 class AdminSettingsCtrl {
   navModel: any;
 
   /** @ngInject */
-  constructor($scope, backendSrv, navModelSrv) {
-    this.navModel = navModelSrv.getNav('admin', 'server-settings', 0);
+  constructor($scope: any, backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
+    this.navModel = navModelSrv.getNav('admin', 'server-settings');
 
-    backendSrv.get('/api/admin/settings').then(settings => {
+    backendSrv.get('/api/admin/settings').then((settings: any) => {
       $scope.settings = settings;
     });
   }
@@ -23,8 +25,8 @@ class AdminHomeCtrl {
   navModel: any;
 
   /** @ngInject */
-  constructor(navModelSrv) {
-    this.navModel = navModelSrv.getNav('admin', 0);
+  constructor(navModelSrv: NavModelSrv) {
+    this.navModel = navModelSrv.getNav('admin');
   }
 }
 
diff --git a/public/app/features/admin/state/apis.ts b/public/app/features/admin/state/apis.ts
index 05321c6e7148..1166fa4dc011 100644
--- a/public/app/features/admin/state/apis.ts
+++ b/public/app/features/admin/state/apis.ts
@@ -1,4 +1,4 @@
-import { getBackendSrv } from 'app/core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 
 export interface ServerStat {
   name: string;
diff --git a/public/app/features/alerting/AlertRuleItem.test.tsx b/public/app/features/alerting/AlertRuleItem.test.tsx
index bd37e127c398..680cd69dc31a 100644
--- a/public/app/features/alerting/AlertRuleItem.test.tsx
+++ b/public/app/features/alerting/AlertRuleItem.test.tsx
@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import AlertRuleItem, { Props } from './AlertRuleItem';
 
 jest.mock('react-redux', () => ({
-  connect: () => params => params,
+  connect: () => (params: any) => params,
 }));
 
 const setup = (propOverrides?: object) => {
diff --git a/public/app/features/alerting/AlertRuleItem.tsx b/public/app/features/alerting/AlertRuleItem.tsx
index ad9e7337db78..e630b921237e 100644
--- a/public/app/features/alerting/AlertRuleItem.tsx
+++ b/public/app/features/alerting/AlertRuleItem.tsx
@@ -1,4 +1,5 @@
 import React, { PureComponent } from 'react';
+// @ts-ignore
 import Highlighter from 'react-highlight-words';
 import classNames from 'classnames';
 import { AlertRule } from '../../types';
diff --git a/public/app/features/alerting/AlertTab.tsx b/public/app/features/alerting/AlertTab.tsx
index c7d1a8e058d9..2f293010b907 100644
--- a/public/app/features/alerting/AlertTab.tsx
+++ b/public/app/features/alerting/AlertTab.tsx
@@ -2,7 +2,7 @@
 import React, { PureComponent } from 'react';
 
 // Services & Utils
-import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
+import { AngularComponent, getAngularLoader } from '@grafana/runtime';
 import appEvents from 'app/core/app_events';
 
 // Components
diff --git a/public/app/features/alerting/AlertTabCtrl.ts b/public/app/features/alerting/AlertTabCtrl.ts
index 7820d938433e..0b9e5d639b75 100644
--- a/public/app/features/alerting/AlertTabCtrl.ts
+++ b/public/app/features/alerting/AlertTabCtrl.ts
@@ -5,9 +5,14 @@ import { QueryPart } from 'app/core/components/query_part/query_part';
 import alertDef from './state/alertDef';
 import config from 'app/core/config';
 import appEvents from 'app/core/app_events';
+import { BackendSrv } from 'app/core/services/backend_srv';
+import { DashboardSrv } from '../dashboard/services/DashboardSrv';
+import DatasourceSrv from '../plugins/datasource_srv';
+import { DataQuery } from '@grafana/ui/src/types/datasource';
+import { PanelModel } from 'app/features/dashboard/state';
 
 export class AlertTabCtrl {
-  panel: any;
+  panel: PanelModel;
   panelCtrl: any;
   subTabIndex: number;
   conditionTypes: any;
@@ -17,21 +22,21 @@ export class AlertTabCtrl {
   evalOperators: any;
   noDataModes: any;
   executionErrorModes: any;
-  addNotificationSegment;
-  notifications;
-  alertNotifications;
+  addNotificationSegment: any;
+  notifications: any;
+  alertNotifications: any;
   error: string;
   appSubUrl: string;
   alertHistory: any;
 
   /** @ngInject */
   constructor(
-    private $scope,
-    private backendSrv,
-    private dashboardSrv,
-    private uiSegmentSrv,
-    private $q,
-    private datasourceSrv
+    private $scope: any,
+    private backendSrv: BackendSrv,
+    private dashboardSrv: DashboardSrv,
+    private uiSegmentSrv: any,
+    private $q: any,
+    private datasourceSrv: DatasourceSrv
   ) {
     this.panelCtrl = $scope.ctrl;
     this.panel = this.panelCtrl.panel;
@@ -65,7 +70,7 @@ export class AlertTabCtrl {
     this.alertNotifications = [];
     this.alertHistory = [];
 
-    return this.backendSrv.get('/api/alert-notifications').then(res => {
+    return this.backendSrv.get('/api/alert-notifications').then((res: any) => {
       this.notifications = res;
 
       this.initModel();
@@ -76,7 +81,7 @@ export class AlertTabCtrl {
   getAlertHistory() {
     this.backendSrv
       .get(`/api/annotations?dashboardId=${this.panelCtrl.dashboard.id}&panelId=${this.panel.id}&limit=50&type=alert`)
-      .then(res => {
+      .then((res: any) => {
         this.alertHistory = _.map(res, ah => {
           ah.time = this.dashboardSrv.getCurrent().formatDate(ah.time, 'MMM D, YYYY HH:mm:ss');
           ah.stateModel = alertDef.getStateDisplayModel(ah.newState);
@@ -86,7 +91,7 @@ export class AlertTabCtrl {
       });
   }
 
-  getNotificationIcon(type): string {
+  getNotificationIcon(type: string): string {
     switch (type) {
       case 'email':
         return 'fa fa-envelope';
@@ -114,20 +119,12 @@ export class AlertTabCtrl {
 
   getNotifications() {
     return this.$q.when(
-      this.notifications.map(item => {
+      this.notifications.map((item: any) => {
         return this.uiSegmentSrv.newSegment(item.name);
       })
     );
   }
 
-  changeTabIndex(newTabIndex) {
-    this.subTabIndex = newTabIndex;
-
-    if (this.subTabIndex === 2) {
-      this.getAlertHistory();
-    }
-  }
-
   notificationAdded() {
     const model: any = _.find(this.notifications, {
       name: this.addNotificationSegment.value,
@@ -154,7 +151,7 @@ export class AlertTabCtrl {
     this.addNotificationSegment.fake = true;
   }
 
-  removeNotification(an) {
+  removeNotification(an: any) {
     // remove notifiers refeered to by id and uid to support notifiers added
     // before and after we added support for uid
     _.remove(this.alert.notifications, (n: any) => n.uid === an.uid || n.id === an.id);
@@ -220,7 +217,7 @@ export class AlertTabCtrl {
     this.panelCtrl.render();
   }
 
-  graphThresholdChanged(evt) {
+  graphThresholdChanged(evt: any) {
     for (const condition of this.alert.conditions) {
       if (condition.type === 'query') {
         condition.evaluator.params[evt.handleIndex] = evt.threshold.value;
@@ -234,8 +231,8 @@ export class AlertTabCtrl {
     return {
       type: 'query',
       query: { params: ['A', '5m', 'now'] },
-      reducer: { type: 'avg', params: [] },
-      evaluator: { type: 'gt', params: [null] },
+      reducer: { type: 'avg', params: [] as any[] },
+      evaluator: { type: 'gt', params: [null] as any[] },
       operator: { type: 'and' },
     };
   }
@@ -246,7 +243,7 @@ export class AlertTabCtrl {
     }
 
     let firstTarget;
-    let foundTarget = null;
+    let foundTarget: DataQuery = null;
 
     for (const condition of this.alert.conditions) {
       if (condition.type !== 'query') {
@@ -285,7 +282,7 @@ export class AlertTabCtrl {
     }
   }
 
-  buildConditionModel(source) {
+  buildConditionModel(source: any) {
     const cm: any = { source: source, type: source.type };
 
     cm.queryPart = new QueryPart(source.query, alertDef.alertQueryDef);
@@ -296,7 +293,7 @@ export class AlertTabCtrl {
     return cm;
   }
 
-  handleQueryPartEvent(conditionModel, evt) {
+  handleQueryPartEvent(conditionModel: any, evt: any) {
     switch (evt.name) {
       case 'action-remove-part': {
         break;
@@ -317,7 +314,7 @@ export class AlertTabCtrl {
     }
   }
 
-  handleReducerPartEvent(conditionModel, evt) {
+  handleReducerPartEvent(conditionModel: any, evt: any) {
     switch (evt.name) {
       case 'action': {
         conditionModel.source.reducer.type = evt.action.value;
@@ -336,7 +333,7 @@ export class AlertTabCtrl {
     }
   }
 
-  addCondition(type) {
+  addCondition(type: string) {
     const condition = this.buildDefaultCondition();
     // add to persited model
     this.alert.conditions.push(condition);
@@ -344,7 +341,7 @@ export class AlertTabCtrl {
     this.conditionModels.push(this.buildConditionModel(condition));
   }
 
-  removeCondition(index) {
+  removeCondition(index: number) {
     this.alert.conditions.splice(index, 1);
     this.conditionModels.splice(index, 1);
   }
@@ -378,7 +375,7 @@ export class AlertTabCtrl {
     this.panelCtrl.render();
   }
 
-  evaluatorTypeChanged(evaluator) {
+  evaluatorTypeChanged(evaluator: any) {
     // ensure params array is correct length
     switch (evaluator.type) {
       case 'lt':
@@ -411,7 +408,7 @@ export class AlertTabCtrl {
             dashboardId: this.panelCtrl.dashboard.id,
             panelId: this.panel.id,
           })
-          .then(res => {
+          .then(() => {
             this.alertHistory = [];
             this.panelCtrl.refresh();
           });
diff --git a/public/app/features/alerting/NotificationsEditCtrl.ts b/public/app/features/alerting/NotificationsEditCtrl.ts
index 2607121bb0e7..eb6d48405cd4 100644
--- a/public/app/features/alerting/NotificationsEditCtrl.ts
+++ b/public/app/features/alerting/NotificationsEditCtrl.ts
@@ -1,5 +1,6 @@
 import _ from 'lodash';
-import { appEvents, coreModule } from 'app/core/core';
+import { appEvents, coreModule, NavModelSrv } from 'app/core/core';
+import { BackendSrv } from 'app/core/services/backend_srv';
 
 export class AlertNotificationEditCtrl {
   theForm: any;
@@ -24,8 +25,14 @@ export class AlertNotificationEditCtrl {
   getFrequencySuggestion: any;
 
   /** @ngInject */
-  constructor(private $routeParams, private backendSrv, private $location, private $templateCache, navModelSrv) {
-    this.navModel = navModelSrv.getNav('alerting', 'channels', 0);
+  constructor(
+    private $routeParams: any,
+    private backendSrv: BackendSrv,
+    private $location: any,
+    private $templateCache: any,
+    navModelSrv: NavModelSrv
+  ) {
+    this.navModel = navModelSrv.getNav('alerting', 'channels');
     this.isNew = !this.$routeParams.id;
 
     this.getFrequencySuggestion = () => {
@@ -34,7 +41,7 @@ export class AlertNotificationEditCtrl {
 
     this.backendSrv
       .get(`/api/alert-notifiers`)
-      .then(notifiers => {
+      .then((notifiers: any) => {
         this.notifiers = notifiers;
 
         // add option templates
@@ -48,14 +55,14 @@ export class AlertNotificationEditCtrl {
           return _.defaults(this.model, this.defaults);
         }
 
-        return this.backendSrv.get(`/api/alert-notifications/${this.$routeParams.id}`).then(result => {
+        return this.backendSrv.get(`/api/alert-notifications/${this.$routeParams.id}`).then((result: any) => {
           this.navModel.breadcrumbs.push({ text: result.name });
           this.navModel.node = { text: result.name };
           result.settings = _.defaults(result.settings, this.defaults.settings);
           return result;
         });
       })
-      .then(model => {
+      .then((model: any) => {
         this.model = model;
         this.notifierTemplateId = this.getNotifierTemplateId(this.model.type);
       });
@@ -69,11 +76,11 @@ export class AlertNotificationEditCtrl {
     if (this.model.id) {
       this.backendSrv
         .put(`/api/alert-notifications/${this.model.id}`, this.model)
-        .then(res => {
+        .then((res: any) => {
           this.model = res;
           appEvents.emit('alert-success', ['Notification updated', '']);
         })
-        .catch(err => {
+        .catch((err: any) => {
           if (err.data && err.data.error) {
             appEvents.emit('alert-error', [err.data.error]);
           }
@@ -81,11 +88,11 @@ export class AlertNotificationEditCtrl {
     } else {
       this.backendSrv
         .post(`/api/alert-notifications`, this.model)
-        .then(res => {
+        .then((res: any) => {
           appEvents.emit('alert-success', ['Notification created', '']);
           this.$location.path('alerting/notifications');
         })
-        .catch(err => {
+        .catch((err: any) => {
           if (err.data && err.data.error) {
             appEvents.emit('alert-error', [err.data.error]);
           }
@@ -93,7 +100,7 @@ export class AlertNotificationEditCtrl {
     }
   }
 
-  getNotifierTemplateId(type) {
+  getNotifierTemplateId(type: string) {
     return `notifier-options-${type}`;
   }
 
@@ -114,7 +121,7 @@ export class AlertNotificationEditCtrl {
       settings: this.model.settings,
     };
 
-    this.backendSrv.post(`/api/alert-notifications/test`, payload).then(res => {
+    this.backendSrv.post(`/api/alert-notifications/test`, payload).then((res: any) => {
       appEvents.emit('alert-success', ['Test notification sent', '']);
     });
   }
diff --git a/public/app/features/alerting/NotificationsListCtrl.ts b/public/app/features/alerting/NotificationsListCtrl.ts
index 1113ebd7ceb3..4db2978b08dd 100644
--- a/public/app/features/alerting/NotificationsListCtrl.ts
+++ b/public/app/features/alerting/NotificationsListCtrl.ts
@@ -1,24 +1,25 @@
-import { coreModule } from 'app/core/core';
+import { coreModule, NavModelSrv } from 'app/core/core';
+import { BackendSrv } from 'app/core/services/backend_srv';
 
 export class AlertNotificationsListCtrl {
   notifications: any;
   navModel: any;
 
   /** @ngInject */
-  constructor(private backendSrv, navModelSrv) {
+  constructor(private backendSrv: BackendSrv, navModelSrv: NavModelSrv) {
     this.loadNotifications();
-    this.navModel = navModelSrv.getNav('alerting', 'channels', 0);
+    this.navModel = navModelSrv.getNav('alerting', 'channels');
   }
 
   loadNotifications() {
-    this.backendSrv.get(`/api/alert-notifications`).then(result => {
+    this.backendSrv.get(`/api/alert-notifications`).then((result: any) => {
       this.notifications = result;
     });
   }
 
-  deleteNotification(id) {
+  deleteNotification(id: number) {
     this.backendSrv.delete(`/api/alert-notifications/${id}`).then(() => {
-      this.notifications = this.notifications.filter(notification => {
+      this.notifications = this.notifications.filter((notification: any) => {
         return notification.id !== id;
       });
     });
diff --git a/public/app/features/alerting/StateHistory.tsx b/public/app/features/alerting/StateHistory.tsx
index 3d092e7435a2..2a114ec00d10 100644
--- a/public/app/features/alerting/StateHistory.tsx
+++ b/public/app/features/alerting/StateHistory.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import alertDef from './state/alertDef';
-import { getBackendSrv } from 'app/core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 import { DashboardModel } from '../dashboard/state/DashboardModel';
 import appEvents from '../../core/app_events';
 
@@ -15,7 +15,7 @@ interface State {
 }
 
 class StateHistory extends PureComponent<Props, State> {
-  state = {
+  state: State = {
     stateHistoryItems: [],
   };
 
@@ -24,8 +24,8 @@ class StateHistory extends PureComponent<Props, State> {
 
     getBackendSrv()
       .get(`/api/annotations?dashboardId=${dashboard.id}&panelId=${panelId}&limit=50&type=alert`)
-      .then(res => {
-        const items = res.map(item => {
+      .then((res: any[]) => {
+        const items = res.map((item: any) => {
           return {
             stateModel: alertDef.getStateDisplayModel(item.newState),
             time: dashboard.formatDate(item.time, 'MMM D, YYYY HH:mm:ss'),
diff --git a/public/app/features/alerting/TestRuleResult.tsx b/public/app/features/alerting/TestRuleResult.tsx
index e8f0551d7073..509ea1721cbd 100644
--- a/public/app/features/alerting/TestRuleResult.tsx
+++ b/public/app/features/alerting/TestRuleResult.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import { JSONFormatter } from 'app/core/components/JSONFormatter/JSONFormatter';
-import { getBackendSrv } from 'app/core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 import { DashboardModel } from '../dashboard/state/DashboardModel';
 import { LoadingPlaceholder } from '@grafana/ui/src';
 
diff --git a/public/app/features/alerting/state/ThresholdMapper.ts b/public/app/features/alerting/state/ThresholdMapper.ts
index 995add42ef01..0ab5777c5e8d 100644
--- a/public/app/features/alerting/state/ThresholdMapper.ts
+++ b/public/app/features/alerting/state/ThresholdMapper.ts
@@ -1,5 +1,7 @@
+import { PanelModel } from 'app/features/dashboard/state';
+
 export class ThresholdMapper {
-  static alertToGraphThresholds(panel) {
+  static alertToGraphThresholds(panel: PanelModel) {
     for (let i = 0; i < panel.alert.conditions.length; i++) {
       const condition = panel.alert.conditions[i];
       if (condition.type !== 'query') {
@@ -7,7 +9,7 @@ export class ThresholdMapper {
       }
 
       const evaluator = condition.evaluator;
-      const thresholds = (panel.thresholds = []);
+      const thresholds: any[] = (panel.thresholds = []);
 
       switch (evaluator.type) {
         case 'gt': {
diff --git a/public/app/features/alerting/state/actions.ts b/public/app/features/alerting/state/actions.ts
index 5ec84fe051d4..3ca51d521344 100644
--- a/public/app/features/alerting/state/actions.ts
+++ b/public/app/features/alerting/state/actions.ts
@@ -1,4 +1,4 @@
-import { getBackendSrv } from 'app/core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 import { AlertRuleDTO, StoreState } from 'app/types';
 import { ThunkAction } from 'redux-thunk';
 
diff --git a/public/app/features/alerting/state/alertDef.ts b/public/app/features/alerting/state/alertDef.ts
index 8e50697d33c5..882e83b21be0 100644
--- a/public/app/features/alerting/state/alertDef.ts
+++ b/public/app/features/alerting/state/alertDef.ts
@@ -57,12 +57,12 @@ const noDataModes = [
 
 const executionErrorModes = [{ text: 'Alerting', value: 'alerting' }, { text: 'Keep Last State', value: 'keep_state' }];
 
-function createReducerPart(model) {
+function createReducerPart(model: any) {
   const def = new QueryPartDef({ type: model.type, defaultParams: [] });
   return new QueryPart(model, def);
 }
 
-function getStateDisplayModel(state) {
+function getStateDisplayModel(state: string) {
   switch (state) {
     case 'ok': {
       return {
@@ -111,7 +111,7 @@ function getStateDisplayModel(state) {
   throw { message: 'Unknown alert state' };
 }
 
-function joinEvalMatches(matches, separator: string) {
+function joinEvalMatches(matches: any, separator: string) {
   return _.reduce(
     matches,
     (res, ev) => {
@@ -130,7 +130,7 @@ function joinEvalMatches(matches, separator: string) {
   ).join(separator);
 }
 
-function getAlertAnnotationInfo(ah) {
+function getAlertAnnotationInfo(ah: any) {
   // backward compatibility, can be removed in grafana 5.x
   // old way stored evalMatches in data property directly,
   // new way stores it in evalMatches property on new data object
diff --git a/public/app/features/alerting/state/reducers.test.ts b/public/app/features/alerting/state/reducers.test.ts
index a176acc66d2a..d66ec1884f33 100644
--- a/public/app/features/alerting/state/reducers.test.ts
+++ b/public/app/features/alerting/state/reducers.test.ts
@@ -85,7 +85,7 @@ describe('Alert rules', () => {
     };
 
     const result = alertRulesReducer(initialState, action);
-
-    expect(result.items).toEqual(payload);
+    expect(result.items.length).toEqual(payload.length);
+    expect(result.items[0].stateClass).toEqual('alert-state-critical');
   });
 });
diff --git a/public/app/features/alerting/state/reducers.ts b/public/app/features/alerting/state/reducers.ts
index 240076009386..966819231029 100644
--- a/public/app/features/alerting/state/reducers.ts
+++ b/public/app/features/alerting/state/reducers.ts
@@ -5,14 +5,18 @@ import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
 
 export const initialState: AlertRulesState = { items: [], searchQuery: '', isLoading: false };
 
-function convertToAlertRule(rule, state): AlertRule {
+function convertToAlertRule(dto: AlertRuleDTO, state: string): AlertRule {
   const stateModel = alertDef.getStateDisplayModel(state);
-  rule.stateText = stateModel.text;
-  rule.stateIcon = stateModel.iconClass;
-  rule.stateClass = stateModel.stateClass;
-  rule.stateAge = dateTime(rule.newStateDate)
-    .fromNow()
-    .replace(' ago', '');
+
+  const rule: AlertRule = {
+    ...dto,
+    stateText: stateModel.text,
+    stateIcon: stateModel.iconClass,
+    stateClass: stateModel.stateClass,
+    stateAge: dateTime(dto.newStateDate)
+      .fromNow()
+      .replace(' ago', ''),
+  };
 
   if (rule.state !== 'paused') {
     if (rule.executionError) {
diff --git a/public/app/features/alerting/state/selectors.test.ts b/public/app/features/alerting/state/selectors.test.ts
index e853b146c033..8ee3f01a167d 100644
--- a/public/app/features/alerting/state/selectors.test.ts
+++ b/public/app/features/alerting/state/selectors.test.ts
@@ -3,7 +3,7 @@ import { getSearchQuery, getAlertRuleItems } from './selectors';
 describe('Get search query', () => {
   it('should get search query', () => {
     const state = { searchQuery: 'dashboard' };
-    const result = getSearchQuery(state);
+    const result = getSearchQuery(state as any);
 
     expect(result).toEqual(state.searchQuery);
   });
@@ -29,7 +29,7 @@ describe('Get alert rule items', () => {
       searchQuery: '',
     };
 
-    const result = getAlertRuleItems(state);
+    const result = getAlertRuleItems(state as any);
     expect(result.length).toEqual(1);
   });
 
@@ -88,7 +88,7 @@ describe('Get alert rule items', () => {
       searchQuery: 'dashboard',
     };
 
-    const result = getAlertRuleItems(state);
+    const result = getAlertRuleItems(state as any);
     expect(result.length).toEqual(3);
   });
 });
diff --git a/public/app/features/alerting/state/selectors.ts b/public/app/features/alerting/state/selectors.ts
index 7c72520d7739..0b03076b5733 100644
--- a/public/app/features/alerting/state/selectors.ts
+++ b/public/app/features/alerting/state/selectors.ts
@@ -1,6 +1,8 @@
-export const getSearchQuery = state => state.searchQuery;
+import { AlertRulesState } from 'app/types';
 
-export const getAlertRuleItems = state => {
+export const getSearchQuery = (state: AlertRulesState) => state.searchQuery;
+
+export const getAlertRuleItems = (state: AlertRulesState) => {
   const regex = new RegExp(state.searchQuery, 'i');
 
   return state.items.filter(item => {
diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
index a4a1adffc7d8..c6764ffd9ef9 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
@@ -14,7 +14,7 @@ import { updateLocation } from 'app/core/actions';
 import { PanelModel } from '../../state';
 import { DashboardModel } from '../../state';
 import { LS_PANEL_COPY_KEY } from 'app/core/constants';
-import { LocationUpdate } from 'app/types';
+import { LocationUpdate } from '@grafana/runtime';
 
 export interface Props {
   panel: PanelModel;
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index d366c5f18317..8db88e9ba55e 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 
 // Utils & Services
-import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
+import { AngularComponent, getAngularLoader } from '@grafana/runtime';
 import { appEvents } from 'app/core/app_events';
 import { PlaylistSrv } from 'app/features/playlist/playlist_srv';
 
@@ -60,17 +60,14 @@ export class DashNav extends PureComponent<Props> {
     }
   }
 
-  onOpenSearch = () => {
-    const { dashboard } = this.props;
-    const haveFolder = dashboard.meta.folderId > 0;
-    appEvents.emit(
-      'show-dash-search',
-      haveFolder
-        ? {
-            query: 'folder:current',
-          }
-        : null
-    );
+  onDahboardNameClick = () => {
+    appEvents.emit('show-dash-search');
+  };
+
+  onFolderNameClick = () => {
+    appEvents.emit('show-dash-search', {
+      query: 'folder:current',
+    });
   };
 
   onClose = () => {
@@ -148,11 +145,20 @@ export class DashNav extends PureComponent<Props> {
     return (
       <>
         <div>
-          <a className="navbar-page-btn" onClick={this.onOpenSearch}>
+          <div className="navbar-page-btn">
             {!this.isInFullscreenOrSettings && <i className="gicon gicon-dashboard" />}
-            {haveFolder && <span className="navbar-page-btn--folder">{folderTitle} / </span>}
-            {dashboard.title} <i className="fa fa-caret-down" />
-          </a>
+            {haveFolder && (
+              <>
+                <a className="navbar-page-btn__folder" onClick={this.onFolderNameClick}>
+                  {folderTitle}
+                </a>
+                <i className="fa fa-chevron-right navbar-page-btn__folder-icon" />
+              </>
+            )}
+            <a onClick={this.onDahboardNameClick}>
+              {dashboard.title} <i className="fa fa-caret-down navbar-page-btn__search" />
+            </a>
+          </div>
         </div>
         {this.isSettings && <span className="navbar-settings-title">&nbsp;/ Settings</span>}
         <div className="navbar__spacer" />
diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
index a043bc3e0daf..b724b89d9425 100644
--- a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
@@ -2,7 +2,7 @@
 import React, { PureComponent } from 'react';
 
 // Utils & Services
-import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
+import { AngularComponent, getAngularLoader } from '@grafana/runtime';
 
 // Types
 import { DashboardModel } from '../../state/DashboardModel';
diff --git a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
index bb18481d51a7..6f2a60f624ef 100644
--- a/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
+++ b/public/app/features/dashboard/components/SubMenu/SubMenu.tsx
@@ -2,7 +2,7 @@
 import React, { PureComponent } from 'react';
 
 // Utils & Services
-import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
+import { AngularComponent, getAngularLoader } from '@grafana/runtime';
 
 // Types
 import { DashboardModel } from '../../state/DashboardModel';
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index d05e4e9e0521..94c074dc8eac 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -61,6 +61,7 @@ export interface State {
   isFullscreen: boolean;
   fullscreenPanel: PanelModel | null;
   scrollTop: number;
+  updateScrollTop: number;
   rememberScrollTop: number;
   showLoadingState: boolean;
 }
@@ -73,6 +74,7 @@ export class DashboardPage extends PureComponent<Props, State> {
     showLoadingState: false,
     fullscreenPanel: null,
     scrollTop: 0,
+    updateScrollTop: null,
     rememberScrollTop: 0,
   };
 
@@ -168,7 +170,7 @@ export class DashboardPage extends PureComponent<Props, State> {
         isEditing: false,
         isFullscreen: false,
         fullscreenPanel: null,
-        scrollTop: this.state.rememberScrollTop,
+        updateScrollTop: this.state.rememberScrollTop,
       },
       this.triggerPanelsRendering.bind(this)
     );
@@ -204,7 +206,7 @@ export class DashboardPage extends PureComponent<Props, State> {
 
   setScrollTop = (e: MouseEvent<HTMLElement>): void => {
     const target = e.target as HTMLElement;
-    this.setState({ scrollTop: target.scrollTop });
+    this.setState({ scrollTop: target.scrollTop, updateScrollTop: null });
   };
 
   onAddPanel = () => {
@@ -251,7 +253,7 @@ export class DashboardPage extends PureComponent<Props, State> {
 
   render() {
     const { dashboard, editview, $injector, isInitSlow, initError } = this.props;
-    const { isSettingsOpening, isEditing, isFullscreen, scrollTop } = this.state;
+    const { isSettingsOpening, isEditing, isFullscreen, scrollTop, updateScrollTop } = this.state;
 
     if (!dashboard) {
       if (isInitSlow) {
@@ -285,9 +287,9 @@ export class DashboardPage extends PureComponent<Props, State> {
         />
         <div className="scroll-canvas scroll-canvas--dashboard">
           <CustomScrollbar
-            autoHeightMin={'100%'}
+            autoHeightMin="100%"
             setScrollTop={this.setScrollTop}
-            scrollTop={scrollTop}
+            scrollTop={updateScrollTop}
             updateAfterMountMs={500}
             className="custom-scrollbar--page"
           >
diff --git a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
index 20fc00cafc01..d6be7658841b 100644
--- a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
+++ b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
@@ -111,7 +111,7 @@ exports[`DashboardPage Dashboard init completed  Should render dashboard grid 1`
       autoHideTimeout={200}
       className="custom-scrollbar--page"
       hideTracksWhenNotNeeded={false}
-      scrollTop={0}
+      scrollTop={null}
       setScrollTop={[Function]}
       updateAfterMountMs={500}
     >
@@ -349,7 +349,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti
       autoHideTimeout={200}
       className="custom-scrollbar--page"
       hideTracksWhenNotNeeded={false}
-      scrollTop={0}
+      scrollTop={null}
       setScrollTop={[Function]}
       updateAfterMountMs={500}
     >
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
new file mode 100644
index 000000000000..28845d4f463e
--- /dev/null
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { shallow, ShallowWrapper } from 'enzyme';
+import { DashboardGrid, Props } from './DashboardGrid';
+import { DashboardModel } from '../state';
+
+interface ScenarioContext {
+  props: Props;
+  wrapper?: ShallowWrapper<Props, any, DashboardGrid>;
+  setup?: (fn: () => void) => void;
+  setProps: (props: Partial<Props>) => void;
+}
+
+function getTestDashboard(overrides?: any, metaOverrides?: any): DashboardModel {
+  const data = Object.assign(
+    {
+      title: 'My dashboard',
+      panels: [
+        {
+          id: 1,
+          type: 'graph',
+          title: 'My graph',
+          gridPos: { x: 0, y: 0, w: 24, h: 10 },
+        },
+        {
+          id: 2,
+          type: 'graph2',
+          title: 'My graph2',
+          gridPos: { x: 0, y: 10, w: 25, h: 10 },
+        },
+        {
+          id: 3,
+          type: 'graph3',
+          title: 'My graph3',
+          gridPos: { x: 0, y: 20, w: 25, h: 100 },
+        },
+        {
+          id: 4,
+          type: 'graph4',
+          title: 'My graph4',
+          gridPos: { x: 0, y: 120, w: 25, h: 10 },
+        },
+      ],
+    },
+    overrides
+  );
+
+  const meta = Object.assign({ canSave: true, canEdit: true }, metaOverrides);
+  return new DashboardModel(data, meta);
+}
+
+function dashboardGridScenario(description, scenarioFn: (ctx: ScenarioContext) => void) {
+  describe(description, () => {
+    let setupFn: () => void;
+
+    const ctx: ScenarioContext = {
+      setup: fn => {
+        setupFn = fn;
+      },
+      props: {
+        isEditing: false,
+        isFullscreen: false,
+        scrollTop: null,
+        dashboard: getTestDashboard(),
+      },
+      setProps: (props: Partial<Props>) => {
+        Object.assign(ctx.props, props);
+        if (ctx.wrapper) {
+          ctx.wrapper.setProps(ctx.props);
+        }
+      },
+    };
+
+    beforeEach(() => {
+      setupFn();
+      ctx.wrapper = shallow(<DashboardGrid {...ctx.props} />);
+    });
+
+    scenarioFn(ctx);
+  });
+}
+
+describe('DashboardGrid', () => {
+  dashboardGridScenario('Can render dashboard grid', ctx => {
+    ctx.setup(() => {});
+
+    it('Should render', () => {
+      expect(ctx.wrapper).toMatchSnapshot();
+    });
+  });
+});
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
index 5651b99f4cfd..6f57f6f42e39 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
@@ -205,7 +205,7 @@ export class DashboardGrid extends PureComponent<Props> {
       return false;
     }
 
-    const top = parseInt(elem.style.top.replace('px', ''), 10);
+    const top = elem.offsetTop;
     const height = panel.gridPos.h * GRID_CELL_HEIGHT + 40;
     const bottom = top + height;
 
diff --git a/public/app/features/dashboard/dashgrid/DashboardGridDirective.ts b/public/app/features/dashboard/dashgrid/DashboardGridDirective.ts
deleted file mode 100644
index bb81c936b3ea..000000000000
--- a/public/app/features/dashboard/dashgrid/DashboardGridDirective.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { react2AngularDirective } from 'app/core/utils/react2angular';
-import DashboardGrid from './DashboardGrid';
-
-react2AngularDirective('dashboardGrid', DashboardGrid, [['dashboard', { watchDepth: 'reference' }]]);
diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
index e076ee5093cd..72977e7ebc15 100644
--- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 import classNames from 'classnames';
 
 // Utils & Services
-import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
+import { getAngularLoader, AngularComponent } from '@grafana/runtime';
 import { importPanelPlugin } from 'app/features/plugins/plugin_loader';
 
 // Components
diff --git a/public/app/features/dashboard/dashgrid/PanelChrome.tsx b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
index 38291d787c36..485c409220c6 100644
--- a/public/app/features/dashboard/dashgrid/PanelChrome.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelChrome.tsx
@@ -234,7 +234,7 @@ export class PanelChrome extends PureComponent<Props, State> {
     // image rendering (phantomjs/headless chrome) to know when to capture image
     const loading = data.state;
     if (loading === LoadingState.Done) {
-      profiler.renderingCompleted(panel.id);
+      profiler.renderingCompleted();
     }
 
     // do not render component until we have first data
@@ -253,7 +253,8 @@ export class PanelChrome extends PureComponent<Props, State> {
             id={panel.id}
             data={data}
             timeRange={data.request ? data.request.range : this.timeSrv.timeRange()}
-            options={panel.getOptions(plugin.defaults)}
+            options={panel.getOptions()}
+            transparent={panel.transparent}
             width={width - theme.panelPadding * 2}
             height={innerPanelHeight}
             renderCounter={renderCounter}
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
index 12f3b95ca21f..9d057d5338ea 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
@@ -48,7 +48,7 @@ export class PanelHeaderCorner extends Component<Props> {
     const remarkableInterpolatedMarkdown = new Remarkable().render(interpolatedMarkdown);
 
     return (
-      <div className="markdown-html">
+      <div className="panel-info-content markdown-html">
         <div dangerouslySetInnerHTML={{ __html: remarkableInterpolatedMarkdown }} />
         {panel.links && panel.links.length > 0 && (
           <ul className="text-left">
@@ -71,7 +71,7 @@ export class PanelHeaderCorner extends Component<Props> {
   renderCornerType(infoMode: InfoMode, content: string | JSX.Element) {
     const theme = infoMode === InfoMode.Error ? 'error' : 'info';
     return (
-      <Tooltip content={content} placement="bottom-start" theme={theme}>
+      <Tooltip content={content} placement="top-start" theme={theme}>
         <div className={`panel-info-corner panel-info-corner--${infoMode.toLowerCase()}`}>
           <i className="fa" />
           <span className="panel-info-corner-inner" />
@@ -91,7 +91,7 @@ export class PanelHeaderCorner extends Component<Props> {
       return this.renderCornerType(infoMode, this.props.error);
     }
 
-    if (infoMode === InfoMode.Info) {
+    if (infoMode === InfoMode.Info || infoMode === InfoMode.Links) {
       return this.renderCornerType(infoMode, this.getInfoContent());
     }
 
diff --git a/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap b/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap
new file mode 100644
index 000000000000..38172a3044f5
--- /dev/null
+++ b/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap
@@ -0,0 +1,996 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DashboardGrid Can render dashboard grid Should render 1`] = `
+<SizeMe(GridWrapper)
+  className="layout"
+  isDraggable={true}
+  isFullscreen={false}
+  isResizable={true}
+  layout={
+    Array [
+      Object {
+        "h": 10,
+        "i": "1",
+        "w": 24,
+        "x": 0,
+        "y": 0,
+      },
+      Object {
+        "h": 10,
+        "i": "2",
+        "w": 25,
+        "x": 0,
+        "y": 10,
+      },
+      Object {
+        "h": 100,
+        "i": "3",
+        "w": 25,
+        "x": 0,
+        "y": 20,
+      },
+      Object {
+        "h": 10,
+        "i": "4",
+        "w": 25,
+        "x": 0,
+        "y": 120,
+      },
+    ]
+  }
+  onDragStop={[Function]}
+  onLayoutChange={[Function]}
+  onResize={[Function]}
+  onResizeStop={[Function]}
+  onWidthChange={[Function]}
+>
+  <div
+    className=""
+    id="panel-1"
+    key="1"
+  >
+    <DashboardPanel
+      dashboard={
+        DashboardModel {
+          "annotations": Object {
+            "list": Array [
+              Object {
+                "builtIn": 1,
+                "datasource": "-- Grafana --",
+                "enable": true,
+                "hide": true,
+                "iconColor": "rgba(0, 211, 255, 1)",
+                "name": "Annotations & Alerts",
+                "type": "dashboard",
+              },
+            ],
+          },
+          "autoUpdate": undefined,
+          "description": undefined,
+          "editable": true,
+          "events": Emitter {
+            "emitter": EventEmitter {
+              "_events": Object {
+                "panel-added": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "panel-removed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "repeats-processed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "row-collapsed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "row-expanded": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "view-mode-changed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+              },
+              "_eventsCount": 6,
+            },
+          },
+          "gnetId": null,
+          "graphTooltip": 0,
+          "id": null,
+          "links": Array [],
+          "meta": Object {
+            "canEdit": true,
+            "canMakeEditable": false,
+            "canSave": true,
+            "canShare": true,
+            "canStar": true,
+            "fullscreen": false,
+            "isEditing": false,
+            "showSettings": true,
+          },
+          "originalTemplating": Array [],
+          "originalTime": Object {
+            "from": "now-6h",
+            "to": "now",
+          },
+          "panels": Array [
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 24,
+                "x": 0,
+                "y": 0,
+              },
+              "id": 1,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph",
+              "transparent": false,
+              "type": "graph",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 25,
+                "x": 0,
+                "y": 10,
+              },
+              "id": 2,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph2",
+              "transparent": false,
+              "type": "graph2",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 100,
+                "w": 25,
+                "x": 0,
+                "y": 20,
+              },
+              "id": 3,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph3",
+              "transparent": false,
+              "type": "graph3",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 25,
+                "x": 0,
+                "y": 120,
+              },
+              "id": 4,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph4",
+              "transparent": false,
+              "type": "graph4",
+            },
+          ],
+          "refresh": undefined,
+          "revision": undefined,
+          "schemaVersion": 18,
+          "snapshot": undefined,
+          "style": "dark",
+          "tags": Array [],
+          "templating": Object {
+            "list": Array [],
+          },
+          "time": Object {
+            "from": "now-6h",
+            "to": "now",
+          },
+          "timepicker": Object {},
+          "timezone": "",
+          "title": "My dashboard",
+          "uid": null,
+          "version": 0,
+        }
+      }
+      isInView={false}
+      panel={
+        PanelModel {
+          "cachedPluginOptions": Object {},
+          "datasource": null,
+          "events": Emitter {
+            "emitter": EventEmitter {
+              "_events": Object {},
+              "_eventsCount": 0,
+            },
+          },
+          "gridPos": Object {
+            "h": 10,
+            "w": 24,
+            "x": 0,
+            "y": 0,
+          },
+          "id": 1,
+          "isInView": false,
+          "targets": Array [
+            Object {
+              "refId": "A",
+            },
+          ],
+          "title": "My graph",
+          "transparent": false,
+          "type": "graph",
+        }
+      }
+    />
+  </div>
+  <div
+    className=""
+    id="panel-2"
+    key="2"
+  >
+    <DashboardPanel
+      dashboard={
+        DashboardModel {
+          "annotations": Object {
+            "list": Array [
+              Object {
+                "builtIn": 1,
+                "datasource": "-- Grafana --",
+                "enable": true,
+                "hide": true,
+                "iconColor": "rgba(0, 211, 255, 1)",
+                "name": "Annotations & Alerts",
+                "type": "dashboard",
+              },
+            ],
+          },
+          "autoUpdate": undefined,
+          "description": undefined,
+          "editable": true,
+          "events": Emitter {
+            "emitter": EventEmitter {
+              "_events": Object {
+                "panel-added": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "panel-removed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "repeats-processed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "row-collapsed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "row-expanded": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "view-mode-changed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+              },
+              "_eventsCount": 6,
+            },
+          },
+          "gnetId": null,
+          "graphTooltip": 0,
+          "id": null,
+          "links": Array [],
+          "meta": Object {
+            "canEdit": true,
+            "canMakeEditable": false,
+            "canSave": true,
+            "canShare": true,
+            "canStar": true,
+            "fullscreen": false,
+            "isEditing": false,
+            "showSettings": true,
+          },
+          "originalTemplating": Array [],
+          "originalTime": Object {
+            "from": "now-6h",
+            "to": "now",
+          },
+          "panels": Array [
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 24,
+                "x": 0,
+                "y": 0,
+              },
+              "id": 1,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph",
+              "transparent": false,
+              "type": "graph",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 25,
+                "x": 0,
+                "y": 10,
+              },
+              "id": 2,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph2",
+              "transparent": false,
+              "type": "graph2",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 100,
+                "w": 25,
+                "x": 0,
+                "y": 20,
+              },
+              "id": 3,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph3",
+              "transparent": false,
+              "type": "graph3",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 25,
+                "x": 0,
+                "y": 120,
+              },
+              "id": 4,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph4",
+              "transparent": false,
+              "type": "graph4",
+            },
+          ],
+          "refresh": undefined,
+          "revision": undefined,
+          "schemaVersion": 18,
+          "snapshot": undefined,
+          "style": "dark",
+          "tags": Array [],
+          "templating": Object {
+            "list": Array [],
+          },
+          "time": Object {
+            "from": "now-6h",
+            "to": "now",
+          },
+          "timepicker": Object {},
+          "timezone": "",
+          "title": "My dashboard",
+          "uid": null,
+          "version": 0,
+        }
+      }
+      isInView={false}
+      panel={
+        PanelModel {
+          "cachedPluginOptions": Object {},
+          "datasource": null,
+          "events": Emitter {
+            "emitter": EventEmitter {
+              "_events": Object {},
+              "_eventsCount": 0,
+            },
+          },
+          "gridPos": Object {
+            "h": 10,
+            "w": 25,
+            "x": 0,
+            "y": 10,
+          },
+          "id": 2,
+          "isInView": false,
+          "targets": Array [
+            Object {
+              "refId": "A",
+            },
+          ],
+          "title": "My graph2",
+          "transparent": false,
+          "type": "graph2",
+        }
+      }
+    />
+  </div>
+  <div
+    className=""
+    id="panel-3"
+    key="3"
+  >
+    <DashboardPanel
+      dashboard={
+        DashboardModel {
+          "annotations": Object {
+            "list": Array [
+              Object {
+                "builtIn": 1,
+                "datasource": "-- Grafana --",
+                "enable": true,
+                "hide": true,
+                "iconColor": "rgba(0, 211, 255, 1)",
+                "name": "Annotations & Alerts",
+                "type": "dashboard",
+              },
+            ],
+          },
+          "autoUpdate": undefined,
+          "description": undefined,
+          "editable": true,
+          "events": Emitter {
+            "emitter": EventEmitter {
+              "_events": Object {
+                "panel-added": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "panel-removed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "repeats-processed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "row-collapsed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "row-expanded": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "view-mode-changed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+              },
+              "_eventsCount": 6,
+            },
+          },
+          "gnetId": null,
+          "graphTooltip": 0,
+          "id": null,
+          "links": Array [],
+          "meta": Object {
+            "canEdit": true,
+            "canMakeEditable": false,
+            "canSave": true,
+            "canShare": true,
+            "canStar": true,
+            "fullscreen": false,
+            "isEditing": false,
+            "showSettings": true,
+          },
+          "originalTemplating": Array [],
+          "originalTime": Object {
+            "from": "now-6h",
+            "to": "now",
+          },
+          "panels": Array [
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 24,
+                "x": 0,
+                "y": 0,
+              },
+              "id": 1,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph",
+              "transparent": false,
+              "type": "graph",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 25,
+                "x": 0,
+                "y": 10,
+              },
+              "id": 2,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph2",
+              "transparent": false,
+              "type": "graph2",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 100,
+                "w": 25,
+                "x": 0,
+                "y": 20,
+              },
+              "id": 3,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph3",
+              "transparent": false,
+              "type": "graph3",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 25,
+                "x": 0,
+                "y": 120,
+              },
+              "id": 4,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph4",
+              "transparent": false,
+              "type": "graph4",
+            },
+          ],
+          "refresh": undefined,
+          "revision": undefined,
+          "schemaVersion": 18,
+          "snapshot": undefined,
+          "style": "dark",
+          "tags": Array [],
+          "templating": Object {
+            "list": Array [],
+          },
+          "time": Object {
+            "from": "now-6h",
+            "to": "now",
+          },
+          "timepicker": Object {},
+          "timezone": "",
+          "title": "My dashboard",
+          "uid": null,
+          "version": 0,
+        }
+      }
+      isInView={false}
+      panel={
+        PanelModel {
+          "cachedPluginOptions": Object {},
+          "datasource": null,
+          "events": Emitter {
+            "emitter": EventEmitter {
+              "_events": Object {},
+              "_eventsCount": 0,
+            },
+          },
+          "gridPos": Object {
+            "h": 100,
+            "w": 25,
+            "x": 0,
+            "y": 20,
+          },
+          "id": 3,
+          "isInView": false,
+          "targets": Array [
+            Object {
+              "refId": "A",
+            },
+          ],
+          "title": "My graph3",
+          "transparent": false,
+          "type": "graph3",
+        }
+      }
+    />
+  </div>
+  <div
+    className=""
+    id="panel-4"
+    key="4"
+  >
+    <DashboardPanel
+      dashboard={
+        DashboardModel {
+          "annotations": Object {
+            "list": Array [
+              Object {
+                "builtIn": 1,
+                "datasource": "-- Grafana --",
+                "enable": true,
+                "hide": true,
+                "iconColor": "rgba(0, 211, 255, 1)",
+                "name": "Annotations & Alerts",
+                "type": "dashboard",
+              },
+            ],
+          },
+          "autoUpdate": undefined,
+          "description": undefined,
+          "editable": true,
+          "events": Emitter {
+            "emitter": EventEmitter {
+              "_events": Object {
+                "panel-added": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "panel-removed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "repeats-processed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "row-collapsed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "row-expanded": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+                "view-mode-changed": EE {
+                  "context": [Circular],
+                  "fn": [Function],
+                  "once": false,
+                },
+              },
+              "_eventsCount": 6,
+            },
+          },
+          "gnetId": null,
+          "graphTooltip": 0,
+          "id": null,
+          "links": Array [],
+          "meta": Object {
+            "canEdit": true,
+            "canMakeEditable": false,
+            "canSave": true,
+            "canShare": true,
+            "canStar": true,
+            "fullscreen": false,
+            "isEditing": false,
+            "showSettings": true,
+          },
+          "originalTemplating": Array [],
+          "originalTime": Object {
+            "from": "now-6h",
+            "to": "now",
+          },
+          "panels": Array [
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 24,
+                "x": 0,
+                "y": 0,
+              },
+              "id": 1,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph",
+              "transparent": false,
+              "type": "graph",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 25,
+                "x": 0,
+                "y": 10,
+              },
+              "id": 2,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph2",
+              "transparent": false,
+              "type": "graph2",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 100,
+                "w": 25,
+                "x": 0,
+                "y": 20,
+              },
+              "id": 3,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph3",
+              "transparent": false,
+              "type": "graph3",
+            },
+            PanelModel {
+              "cachedPluginOptions": Object {},
+              "datasource": null,
+              "events": Emitter {
+                "emitter": EventEmitter {
+                  "_events": Object {},
+                  "_eventsCount": 0,
+                },
+              },
+              "gridPos": Object {
+                "h": 10,
+                "w": 25,
+                "x": 0,
+                "y": 120,
+              },
+              "id": 4,
+              "isInView": false,
+              "targets": Array [
+                Object {
+                  "refId": "A",
+                },
+              ],
+              "title": "My graph4",
+              "transparent": false,
+              "type": "graph4",
+            },
+          ],
+          "refresh": undefined,
+          "revision": undefined,
+          "schemaVersion": 18,
+          "snapshot": undefined,
+          "style": "dark",
+          "tags": Array [],
+          "templating": Object {
+            "list": Array [],
+          },
+          "time": Object {
+            "from": "now-6h",
+            "to": "now",
+          },
+          "timepicker": Object {},
+          "timezone": "",
+          "title": "My dashboard",
+          "uid": null,
+          "version": 0,
+        }
+      }
+      isInView={false}
+      panel={
+        PanelModel {
+          "cachedPluginOptions": Object {},
+          "datasource": null,
+          "events": Emitter {
+            "emitter": EventEmitter {
+              "_events": Object {},
+              "_eventsCount": 0,
+            },
+          },
+          "gridPos": Object {
+            "h": 10,
+            "w": 25,
+            "x": 0,
+            "y": 120,
+          },
+          "id": 4,
+          "isInView": false,
+          "targets": Array [
+            Object {
+              "refId": "A",
+            },
+          ],
+          "title": "My graph4",
+          "transparent": false,
+          "type": "graph4",
+        }
+      }
+    />
+  </div>
+</SizeMe(GridWrapper)>
+`;
diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts
index 5e31a49f40f8..1a326d73bd9e 100644
--- a/public/app/features/dashboard/index.ts
+++ b/public/app/features/dashboard/index.ts
@@ -1,5 +1,3 @@
-import './dashgrid/DashboardGridDirective';
-
 // Services
 import './services/UnsavedChangesSrv';
 import './services/DashboardLoaderSrv';
diff --git a/public/app/features/dashboard/panel_editor/GeneralTab.tsx b/public/app/features/dashboard/panel_editor/GeneralTab.tsx
index 01a6e39cedba..ddbbb0d88798 100644
--- a/public/app/features/dashboard/panel_editor/GeneralTab.tsx
+++ b/public/app/features/dashboard/panel_editor/GeneralTab.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 
-import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
+import { getAngularLoader, AngularComponent } from '@grafana/runtime';
 import { EditorTabBody } from './EditorTabBody';
 
 import { PanelModel } from '../state/PanelModel';
diff --git a/public/app/features/dashboard/panel_editor/PanelEditor.tsx b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
index 722b211e4ef1..dde5f8440c17 100644
--- a/public/app/features/dashboard/panel_editor/PanelEditor.tsx
+++ b/public/app/features/dashboard/panel_editor/PanelEditor.tsx
@@ -9,7 +9,7 @@ import { AlertTab } from '../../alerting/AlertTab';
 import config from 'app/core/config';
 import { store } from 'app/store/store';
 import { updateLocation } from 'app/core/actions';
-import { AngularComponent } from 'app/core/services/AngularLoader';
+import { AngularComponent } from '@grafana/runtime';
 
 import { PanelModel } from '../state/PanelModel';
 import { DashboardModel } from '../state/DashboardModel';
diff --git a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
index 8b5f6b964f24..ca66d84ad784 100644
--- a/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
+++ b/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
@@ -5,7 +5,7 @@ import _ from 'lodash';
 
 // Utils & Services
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
-import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
+import { AngularComponent, getAngularLoader } from '@grafana/runtime';
 import { Emitter } from 'app/core/utils/emitter';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
diff --git a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
index eb7bad652424..f67532dd3980 100644
--- a/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
+++ b/public/app/features/dashboard/panel_editor/VisualizationTab.tsx
@@ -2,7 +2,7 @@
 import React, { PureComponent } from 'react';
 
 // Utils & Services
-import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
+import { AngularComponent, getAngularLoader } from '@grafana/runtime';
 import { connectWithStore } from 'app/core/utils/connectWithReduxStore';
 import { StoreState } from 'app/types';
 import { updateLocation } from 'app/core/actions';
@@ -53,8 +53,8 @@ export class VisualizationTab extends PureComponent<Props, State> {
   }
 
   getReactPanelOptions = () => {
-    const { panel, plugin } = this.props;
-    return panel.getOptions(plugin.defaults);
+    const { panel } = this.props;
+    return panel.getOptions();
   };
 
   renderPanelOptions() {
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index d5301e98cea2..88e92cd09df9 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -13,8 +13,9 @@ import sortByKeys from 'app/core/utils/sort_by_keys';
 // Types
 import { PanelModel, GridPos } from './PanelModel';
 import { DashboardMigrator } from './DashboardMigrator';
-import { TimeRange } from '@grafana/ui/src';
-import { UrlQueryValue, KIOSK_MODE_TV, DashboardMeta } from 'app/types';
+import { TimeRange } from '@grafana/ui';
+import { UrlQueryValue } from '@grafana/runtime';
+import { KIOSK_MODE_TV, DashboardMeta } from 'app/types';
 import { toUtc, DateTimeInput, dateTime, isDateTime } from '@grafana/ui/src/utils/moment_wrapper';
 
 export interface CloneOptions {
diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts
index f4d9e8d1a667..3dcb5f5cb066 100644
--- a/public/app/features/dashboard/state/PanelModel.test.ts
+++ b/public/app/features/dashboard/state/PanelModel.test.ts
@@ -7,45 +7,70 @@ describe('PanelModel', () => {
   describe('when creating new panel model', () => {
     let model;
     let modelJson;
+    let persistedOptionsMock;
+    const defaultOptionsMock = {
+      fieldOptions: {
+        thresholds: [
+          {
+            color: '#F2495C',
+            index: 1,
+            value: 50,
+          },
+          {
+            color: '#73BF69',
+            index: 0,
+            value: null,
+          },
+        ],
+      },
+      showThresholds: true,
+    };
 
     beforeEach(() => {
+      persistedOptionsMock = {
+        fieldOptions: {
+          thresholds: [
+            {
+              color: '#F2495C',
+              index: 1,
+              value: 50,
+            },
+            {
+              color: '#73BF69',
+              index: 0,
+              value: null,
+            },
+          ],
+        },
+      };
+
       modelJson = {
         type: 'table',
         showColumns: true,
         targets: [{ refId: 'A' }, { noRefId: true }],
-        options: {
-          fieldOptions: {
-            thresholds: [
-              {
-                color: '#F2495C',
-                index: 1,
-                value: 50,
-              },
-              {
-                color: '#73BF69',
-                index: 0,
-                value: null,
-              },
-            ],
-          },
-        },
+        options: persistedOptionsMock,
       };
+
       model = new PanelModel(modelJson);
-      model.pluginLoaded(
-        getPanelPlugin(
-          {
-            id: 'table',
-          },
-          null, // react
-          TablePanelCtrl // angular
-        )
+      const panelPlugin = getPanelPlugin(
+        {
+          id: 'table',
+        },
+        null, // react
+        TablePanelCtrl // angular
       );
+      panelPlugin.setDefaults(defaultOptionsMock);
+      model.pluginLoaded(panelPlugin);
     });
 
     it('should apply defaults', () => {
       expect(model.gridPos.h).toBe(3);
     });
 
+    it('should apply option defaults', () => {
+      expect(model.getOptions().showThresholds).toBeTruthy();
+    });
+
     it('should set model props on instance', () => {
       expect(model.showColumns).toBe(true);
     });
@@ -89,11 +114,22 @@ describe('PanelModel', () => {
     });
 
     describe('when changing panel type', () => {
+      const newPanelPluginDefaults = {
+        showThresholdLabels: false,
+      };
+
       beforeEach(() => {
-        model.changePlugin(getPanelPlugin({ id: 'graph' }));
+        const newPlugin = getPanelPlugin({ id: 'graph' });
+        newPlugin.setDefaults(newPanelPluginDefaults);
+        model.changePlugin(newPlugin);
         model.alert = { id: 2 };
       });
 
+      it('should apply next panel option defaults', () => {
+        expect(model.getOptions().showThresholdLabels).toBeFalsy();
+        expect(model.getOptions().showThresholds).toBeUndefined();
+      });
+
       it('should remove table properties but keep core props', () => {
         expect(model.showColumns).toBe(undefined);
       });
@@ -153,19 +189,5 @@ describe('PanelModel', () => {
         expect(panelQueryRunner).toBe(sameQueryRunner);
       });
     });
-
-    describe('get panel options', () => {
-      it('should apply defaults', () => {
-        model.options = { existingProp: 10 };
-        const options = model.getOptions({
-          defaultProp: true,
-          existingProp: 0,
-        });
-
-        expect(options.defaultProp).toBe(true);
-        expect(options.existingProp).toBe(10);
-        expect(model.options).toBe(options);
-      });
-    });
   });
 });
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index 156ae6dfa720..044d097e86ad 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -157,8 +157,8 @@ export class PanelModel {
     }
   }
 
-  getOptions(panelDefaults: any) {
-    return _.defaultsDeep(this.options || {}, panelDefaults);
+  getOptions() {
+    return this.options;
   }
 
   updateOptions(options: object) {
@@ -179,7 +179,6 @@ export class PanelModel {
 
       model[property] = _.cloneDeep(this[property]);
     }
-
     return model;
   }
 
@@ -247,9 +246,18 @@ export class PanelModel {
     });
   }
 
+  private applyPluginOptionDefaults(plugin: PanelPlugin) {
+    if (plugin.angularConfigCtrl) {
+      return;
+    }
+    this.options = _.defaultsDeep({}, this.options || {}, plugin.defaults);
+  }
+
   pluginLoaded(plugin: PanelPlugin) {
     this.plugin = plugin;
 
+    this.applyPluginOptionDefaults(plugin);
+
     if (plugin.panel && plugin.onPanelMigration) {
       const version = getPluginVersion(plugin);
       if (version !== this.pluginVersion) {
@@ -284,7 +292,7 @@ export class PanelModel {
     // switch
     this.type = pluginId;
     this.plugin = newPlugin;
-
+    this.applyPluginOptionDefaults(newPlugin);
     // Let panel plugins inspect options from previous panel and keep any that it can use
     if (newPlugin.onPanelTypeChanged) {
       this.options = this.options || {};
diff --git a/public/app/features/dashboard/state/PanelQueryRunner.ts b/public/app/features/dashboard/state/PanelQueryRunner.ts
index 00f6e3a00f02..b75a538f496e 100644
--- a/public/app/features/dashboard/state/PanelQueryRunner.ts
+++ b/public/app/features/dashboard/state/PanelQueryRunner.ts
@@ -108,9 +108,6 @@ export class PanelQueryRunner {
       delayStateNotification,
     } = options;
 
-    // filter out hidden queries & deep clone them
-    const clonedAndFilteredQueries = cloneDeep(queries.filter(q => !q.hide));
-
     const request: DataQueryRequest = {
       requestId: getNextRequestId(),
       timezone,
@@ -120,7 +117,7 @@ export class PanelQueryRunner {
       timeInfo,
       interval: '',
       intervalMs: 0,
-      targets: clonedAndFilteredQueries,
+      targets: cloneDeep(queries),
       maxDataPoints: maxDataPoints || widthPixels,
       scopedVars: scopedVars || {},
       cacheTimeout,
@@ -135,6 +132,10 @@ export class PanelQueryRunner {
     try {
       const ds = await getDataSource(datasource, request.scopedVars);
 
+      if (ds.meta && !ds.meta.hiddenQueries) {
+        request.targets = request.targets.filter(q => !q.hide);
+      }
+
       // Attach the datasource name to each query
       request.targets = request.targets.map(query => {
         if (!query.datasource) {
diff --git a/public/app/features/dashboard/state/actions.ts b/public/app/features/dashboard/state/actions.ts
index 50f645095755..7b01975e29d3 100644
--- a/public/app/features/dashboard/state/actions.ts
+++ b/public/app/features/dashboard/state/actions.ts
@@ -1,5 +1,5 @@
 // Services & Utils
-import { getBackendSrv } from 'app/core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 import { actionCreatorFactory, noPayloadActionCreatorFactory } from 'app/core/redux';
 import { createSuccessNotification } from 'app/core/copy/appNotification';
 
diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx
index 6420225f2afe..bd16ba6e8840 100644
--- a/public/app/features/datasources/NewDataSourcePage.tsx
+++ b/public/app/features/datasources/NewDataSourcePage.tsx
@@ -6,7 +6,7 @@ import { StoreState } from 'app/types';
 import { addDataSource, loadDataSourceTypes, setDataSourceTypeSearchQuery } from './state/actions';
 import { getDataSourceTypes } from './state/selectors';
 import { FilterInput } from 'app/core/components/FilterInput/FilterInput';
-import { NavModel, DataSourcePluginMeta, List } from '@grafana/ui';
+import { NavModel, DataSourcePluginMeta, List, PluginType } from '@grafana/ui';
 
 export interface Props {
   navModel: NavModel;
@@ -43,6 +43,7 @@ class NewDataSourcePage extends PureComponent<Props> {
     loki: 90,
     mysql: 80,
     postgres: 79,
+    gcloud: -1,
   };
 
   componentDidMount() {
@@ -114,6 +115,8 @@ class NewDataSourcePage extends PureComponent<Props> {
       {} as DataSourceCategories
     );
 
+    categories['cloud'].push(getGrafanaCloudPhantomPlugin());
+
     return (
       <>
         {this.categoryInfoList.map(category => (
@@ -174,7 +177,9 @@ interface DataSourceTypeCardProps {
 }
 
 const DataSourceTypeCard: FC<DataSourceTypeCardProps> = props => {
-  const { plugin, onClick, onLearnMoreClick } = props;
+  const { plugin, onLearnMoreClick } = props;
+  const canSelect = plugin.id !== 'gcloud';
+  const onClick = canSelect ? props.onClick : () => {};
 
   // find first plugin info link
   const learnMoreLink = plugin.info.links && plugin.info.links.length > 0 ? plugin.info.links[0].url : null;
@@ -188,16 +193,45 @@ const DataSourceTypeCard: FC<DataSourceTypeCardProps> = props => {
       </div>
       <div className="add-data-source-item-actions">
         {learnMoreLink && (
-          <a className="btn btn-inverse" href={learnMoreLink} target="_blank" onClick={onLearnMoreClick}>
-            Learn more
+          <a
+            className="btn btn-inverse"
+            href={`${learnMoreLink}?utm_source=grafana_add_ds`}
+            target="_blank"
+            onClick={onLearnMoreClick}
+          >
+            Learn more <i className="fa fa-external-link add-datasource-item-actions__btn-icon" />
           </a>
         )}
-        <button className="btn btn-primary">Select</button>
+        {canSelect && <button className="btn btn-primary">Select</button>}
       </div>
     </div>
   );
 };
 
+function getGrafanaCloudPhantomPlugin(): DataSourcePluginMeta {
+  return {
+    id: 'gcloud',
+    name: 'Grafana Cloud',
+    type: PluginType.datasource,
+    module: '',
+    baseUrl: '',
+    info: {
+      description: 'Hosted Graphite, Prometheus and Loki',
+      logos: { small: 'public/img/grafana_icon.svg', large: 'asd' },
+      author: { name: 'Grafana Labs' },
+      links: [
+        {
+          url: 'https://grafana.com/cloud',
+          name: 'Learn more',
+        },
+      ],
+      screenshots: [],
+      updated: '2019-05-10',
+      version: '1.0.0',
+    },
+  };
+}
+
 export function getNavModel(): NavModel {
   const main = {
     icon: 'gicon gicon-add-datasources',
diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx
index 575311c2d174..af3b4d9e786f 100644
--- a/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx
+++ b/public/app/features/datasources/settings/DataSourceSettingsPage.test.tsx
@@ -8,6 +8,12 @@ import { setDataSourceName, setIsDefault } from '../state/actions';
 
 const pluginMock = new DataSourcePlugin({} as DataSourceConstructor<any>);
 
+jest.mock('app/features/plugins/plugin_loader', () => {
+  return {
+    importDataSourcePlugin: () => Promise.resolve(pluginMock),
+  };
+});
+
 const setup = (propOverrides?: object) => {
   const props: Props = {
     navModel: {} as NavModel,
@@ -19,7 +25,7 @@ const setup = (propOverrides?: object) => {
     setDataSourceName,
     updateDataSource: jest.fn(),
     setIsDefault,
-    plugin: pluginMock,
+    query: {},
     ...propOverrides,
   };
 
@@ -45,7 +51,6 @@ describe('Render', () => {
   it('should render beta info text', () => {
     const wrapper = setup({
       dataSourceMeta: { ...getMockPlugin(), state: 'beta' },
-      plugin: pluginMock,
     });
 
     expect(wrapper).toMatchSnapshot();
diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
index e02684d57fcc..a34031c487f3 100644
--- a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
+++ b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
@@ -2,6 +2,7 @@
 import React, { PureComponent } from 'react';
 import { hot } from 'react-hot-loader';
 import { connect } from 'react-redux';
+import isString from 'lodash/isString';
 
 // Components
 import Page from 'app/core/components/Page/Page';
@@ -22,6 +23,7 @@ import { getRouteParamsId } from 'app/core/selectors/location';
 
 // Types
 import { StoreState } from 'app/types/';
+import { UrlQueryMap } from '@grafana/runtime';
 import { NavModel, DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui';
 import { getDataSourceLoadingNav } from '../state/navModel';
 import PluginStateinfo from 'app/features/plugins/PluginStateInfo';
@@ -38,14 +40,17 @@ export interface Props {
   updateDataSource: typeof updateDataSource;
   setIsDefault: typeof setIsDefault;
   plugin?: GenericDataSourcePlugin;
+  query: UrlQueryMap;
+  page?: string;
 }
 
 interface State {
   dataSource: DataSourceSettings;
-  plugin: GenericDataSourcePlugin;
+  plugin?: GenericDataSourcePlugin;
   isTesting?: boolean;
   testingMessage?: string;
   testingStatus?: string;
+  loadError?: any;
 }
 
 export class DataSourceSettingsPage extends PureComponent<Props, State> {
@@ -73,9 +78,17 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
 
   async componentDidMount() {
     const { loadDataSource, pageId } = this.props;
-    await loadDataSource(pageId);
-    if (!this.state.plugin) {
-      await this.loadPlugin();
+    if (isNaN(pageId)) {
+      this.setState({ loadError: 'Invalid ID' });
+      return;
+    }
+    try {
+      await loadDataSource(pageId);
+      if (!this.state.plugin) {
+        await this.loadPlugin();
+      }
+    } catch (err) {
+      this.setState({ loadError: err });
     }
   }
 
@@ -174,70 +187,135 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
     return this.state.dataSource.id > 0;
   }
 
-  render() {
-    const { dataSourceMeta, navModel, setDataSourceName, setIsDefault } = this.props;
-    const { testingMessage, testingStatus, plugin, dataSource } = this.state;
+  renderLoadError(loadError: any) {
+    let showDelete = false;
+    let msg = loadError.toString();
+    if (loadError.data) {
+      if (loadError.data.message) {
+        msg = loadError.data.message;
+      }
+    } else if (isString(loadError)) {
+      showDelete = true;
+    }
+
+    const node = {
+      text: msg,
+      subTitle: 'Data Source Error',
+      icon: 'fa fa-fw fa-warning',
+    };
+    const nav = {
+      node: node,
+      main: node,
+    };
 
     return (
-      <Page navModel={navModel}>
-        <Page.Contents isLoading={!this.hasDataSource}>
-          {this.hasDataSource && (
-            <div>
-              <form onSubmit={this.onSubmit}>
-                {this.isReadOnly() && this.renderIsReadOnlyMessage()}
-                {dataSourceMeta.state && (
-                  <div className="gf-form">
-                    <label className="gf-form-label width-10">Plugin state</label>
-                    <label className="gf-form-label gf-form-label--transparent">
-                      <PluginStateinfo state={dataSourceMeta.state} />
-                    </label>
-                  </div>
-                )}
+      <Page navModel={nav}>
+        <Page.Contents>
+          <div>
+            <div className="gf-form-button-row">
+              {showDelete && (
+                <button type="submit" className="btn btn-danger" onClick={this.onDelete}>
+                  Delete
+                </button>
+              )}
+              <a className="btn btn-inverse" href="datasources">
+                Back
+              </a>
+            </div>
+          </div>
+        </Page.Contents>
+      </Page>
+    );
+  }
 
-                <BasicSettings
-                  dataSourceName={dataSource.name}
-                  isDefault={dataSource.isDefault}
-                  onDefaultChange={state => setIsDefault(state)}
-                  onNameChange={name => setDataSourceName(name)}
-                />
-
-                {dataSourceMeta.module && plugin && (
-                  <PluginSettings
-                    plugin={plugin}
-                    dataSource={this.state.dataSource}
-                    dataSourceMeta={dataSourceMeta}
-                    onModelChange={this.onModelChange}
-                  />
-                )}
+  renderConfigPageBody(page: string) {
+    const { plugin } = this.state;
+    if (!plugin || !plugin.configPages) {
+      return null; // still loading
+    }
 
-                <div className="gf-form-group">
-                  {testingMessage && (
-                    <div className={`alert-${testingStatus} alert`} aria-label="Datasource settings page Alert">
-                      <div className="alert-icon">
-                        {testingStatus === 'error' ? (
-                          <i className="fa fa-exclamation-triangle" />
-                        ) : (
-                          <i className="fa fa-check" />
-                        )}
-                      </div>
-                      <div className="alert-body">
-                        <div className="alert-title" aria-label="Datasource settings page Alert message">
-                          {testingMessage}
-                        </div>
-                      </div>
-                    </div>
-                  )}
-                </div>
+    for (const p of plugin.configPages) {
+      if (p.id === page) {
+        return <p.body plugin={plugin} query={this.props.query} />;
+      }
+    }
+
+    return <div>Page Not Found: {page}</div>;
+  }
 
-                <ButtonRow
-                  onSubmit={event => this.onSubmit(event)}
-                  isReadOnly={this.isReadOnly()}
-                  onDelete={this.onDelete}
-                  onTest={event => this.onTest(event)}
-                />
-              </form>
+  renderSettings() {
+    const { dataSourceMeta, setDataSourceName, setIsDefault } = this.props;
+    const { testingMessage, testingStatus, dataSource, plugin } = this.state;
+
+    return (
+      <form onSubmit={this.onSubmit}>
+        {this.isReadOnly() && this.renderIsReadOnlyMessage()}
+        {dataSourceMeta.state && (
+          <div className="gf-form">
+            <label className="gf-form-label width-10">Plugin state</label>
+            <label className="gf-form-label gf-form-label--transparent">
+              <PluginStateinfo state={dataSourceMeta.state} />
+            </label>
+          </div>
+        )}
+
+        <BasicSettings
+          dataSourceName={dataSource.name}
+          isDefault={dataSource.isDefault}
+          onDefaultChange={state => setIsDefault(state)}
+          onNameChange={name => setDataSourceName(name)}
+        />
+
+        {plugin && (
+          <PluginSettings
+            plugin={plugin}
+            dataSource={this.state.dataSource}
+            dataSourceMeta={dataSourceMeta}
+            onModelChange={this.onModelChange}
+          />
+        )}
+
+        <div className="gf-form-group">
+          {testingMessage && (
+            <div className={`alert-${testingStatus} alert`} aria-label="Datasource settings page Alert">
+              <div className="alert-icon">
+                {testingStatus === 'error' ? (
+                  <i className="fa fa-exclamation-triangle" />
+                ) : (
+                  <i className="fa fa-check" />
+                )}
+              </div>
+              <div className="alert-body">
+                <div className="alert-title" aria-label="Datasource settings page Alert message">
+                  {testingMessage}
+                </div>
+              </div>
             </div>
           )}
+        </div>
+
+        <ButtonRow
+          onSubmit={event => this.onSubmit(event)}
+          isReadOnly={this.isReadOnly()}
+          onDelete={this.onDelete}
+          onTest={event => this.onTest(event)}
+        />
+      </form>
+    );
+  }
+
+  render() {
+    const { navModel, page } = this.props;
+    const { loadError } = this.state;
+
+    if (loadError) {
+      return this.renderLoadError(loadError);
+    }
+
+    return (
+      <Page navModel={navModel}>
+        <Page.Contents isLoading={!this.hasDataSource}>
+          {this.hasDataSource && <div>{page ? this.renderConfigPageBody(page) : this.renderSettings()}</div>}
         </Page.Contents>
       </Page>
     );
@@ -247,11 +325,19 @@ export class DataSourceSettingsPage extends PureComponent<Props, State> {
 function mapStateToProps(state: StoreState) {
   const pageId = getRouteParamsId(state.location);
   const dataSource = getDataSource(state.dataSources, pageId);
+  const page = state.location.query.page as string;
+
   return {
-    navModel: getNavModel(state.navIndex, `datasource-settings-${pageId}`, getDataSourceLoadingNav('settings')),
+    navModel: getNavModel(
+      state.navIndex,
+      page ? `datasource-page-${page}` : `datasource-settings-${pageId}`,
+      getDataSourceLoadingNav('settings')
+    ),
     dataSource: getDataSource(state.dataSources, pageId),
     dataSourceMeta: getDataSourceMeta(state.dataSources, dataSource.type),
     pageId: pageId,
+    query: state.location.query,
+    page,
   };
 }
 
diff --git a/public/app/features/datasources/settings/PluginSettings.tsx b/public/app/features/datasources/settings/PluginSettings.tsx
index 94c054d56ee9..58da3cc55f49 100644
--- a/public/app/features/datasources/settings/PluginSettings.tsx
+++ b/public/app/features/datasources/settings/PluginSettings.tsx
@@ -8,7 +8,7 @@ import {
   DataQuery,
   DataSourceJsonData,
 } from '@grafana/ui';
-import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
+import { getAngularLoader, AngularComponent } from '@grafana/runtime';
 
 export type GenericDataSourcePlugin = DataSourcePlugin<DataSourceApi<DataQuery, DataSourceJsonData>>;
 
@@ -54,7 +54,7 @@ export class PluginSettings extends PureComponent<Props> {
     }
   }
 
-  componentDidUpdate(prevProps) {
+  componentDidUpdate(prevProps: Props) {
     const { plugin } = this.props;
     if (!plugin.components.ConfigEditor && this.props.dataSource !== prevProps.dataSource) {
       this.scopeProps.ctrl.current = _.cloneDeep(this.props.dataSource);
diff --git a/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap b/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
index 2ca6a2ee28f0..063ebf8418de 100644
--- a/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
+++ b/public/app/features/datasources/settings/__snapshots__/DataSourceSettingsPage.test.tsx.snap
@@ -153,78 +153,6 @@ exports[`Render should render beta info text 1`] = `
           onDefaultChange={[Function]}
           onNameChange={[Function]}
         />
-        <PluginSettings
-          dataSource={
-            Object {
-              "access": "",
-              "basicAuth": false,
-              "basicAuthPassword": "",
-              "basicAuthUser": "",
-              "database": "",
-              "id": 13,
-              "isDefault": false,
-              "jsonData": Object {
-                "authType": "credentials",
-                "defaultRegion": "eu-west-2",
-              },
-              "name": "gdev-cloudwatch",
-              "orgId": 1,
-              "password": "",
-              "readOnly": false,
-              "type": "cloudwatch",
-              "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
-              "url": "",
-              "user": "",
-              "withCredentials": false,
-            }
-          }
-          dataSourceMeta={
-            Object {
-              "baseUrl": "path/to/plugin",
-              "defaultNavUrl": "some/url",
-              "enabled": false,
-              "hasUpdate": false,
-              "id": "1",
-              "info": Object {
-                "author": Object {
-                  "name": "Grafana Labs",
-                  "url": "url/to/GrafanaLabs",
-                },
-                "description": "pretty decent plugin",
-                "links": Array [
-                  Object {
-                    "name": "project",
-                    "url": "one link",
-                  },
-                ],
-                "logos": Object {
-                  "large": "large/logo",
-                  "small": "small/logo",
-                },
-                "screenshots": Array [
-                  Object {
-                    "path": "screenshot",
-                  },
-                ],
-                "updated": "2018-09-26",
-                "version": "1",
-              },
-              "latestVersion": "1",
-              "module": "path/to/module",
-              "name": "pretty cool plugin 1",
-              "pinned": false,
-              "state": "beta",
-              "type": "panel",
-            }
-          }
-          onModelChange={[Function]}
-          plugin={
-            DataSourcePlugin {
-              "DataSourceClass": Object {},
-              "components": Object {},
-            }
-          }
-        />
         <div
           className="gf-form-group"
         />
@@ -257,77 +185,6 @@ exports[`Render should render component 1`] = `
           onDefaultChange={[Function]}
           onNameChange={[Function]}
         />
-        <PluginSettings
-          dataSource={
-            Object {
-              "access": "",
-              "basicAuth": false,
-              "basicAuthPassword": "",
-              "basicAuthUser": "",
-              "database": "",
-              "id": 13,
-              "isDefault": false,
-              "jsonData": Object {
-                "authType": "credentials",
-                "defaultRegion": "eu-west-2",
-              },
-              "name": "gdev-cloudwatch",
-              "orgId": 1,
-              "password": "",
-              "readOnly": false,
-              "type": "cloudwatch",
-              "typeLogoUrl": "public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png",
-              "url": "",
-              "user": "",
-              "withCredentials": false,
-            }
-          }
-          dataSourceMeta={
-            Object {
-              "baseUrl": "path/to/plugin",
-              "defaultNavUrl": "some/url",
-              "enabled": false,
-              "hasUpdate": false,
-              "id": "1",
-              "info": Object {
-                "author": Object {
-                  "name": "Grafana Labs",
-                  "url": "url/to/GrafanaLabs",
-                },
-                "description": "pretty decent plugin",
-                "links": Array [
-                  Object {
-                    "name": "project",
-                    "url": "one link",
-                  },
-                ],
-                "logos": Object {
-                  "large": "large/logo",
-                  "small": "small/logo",
-                },
-                "screenshots": Array [
-                  Object {
-                    "path": "screenshot",
-                  },
-                ],
-                "updated": "2018-09-26",
-                "version": "1",
-              },
-              "latestVersion": "1",
-              "module": "path/to/module",
-              "name": "pretty cool plugin 1",
-              "pinned": false,
-              "type": "panel",
-            }
-          }
-          onModelChange={[Function]}
-          plugin={
-            DataSourcePlugin {
-              "DataSourceClass": Object {},
-              "components": Object {},
-            }
-          }
-        />
         <div
           className="gf-form-group"
         />
diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts
index a74943aa9ecf..3df2c4454431 100644
--- a/public/app/features/datasources/state/actions.ts
+++ b/public/app/features/datasources/state/actions.ts
@@ -1,15 +1,17 @@
 import { ThunkAction } from 'redux-thunk';
 import config from '../../../core/config';
-import { getBackendSrv } from 'app/core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { LayoutMode } from 'app/core/components/LayoutSelector/LayoutSelector';
 import { updateLocation, updateNavIndex, UpdateNavIndexAction } from 'app/core/actions';
 import { buildNavModel } from './navModel';
 import { DataSourceSettings, DataSourcePluginMeta } from '@grafana/ui';
-import { StoreState, LocationUpdate } from 'app/types';
+import { StoreState } from 'app/types';
+import { LocationUpdate } from '@grafana/runtime';
 import { actionCreatorFactory } from 'app/core/redux';
 import { ActionOf, noPayloadActionCreatorFactory } from 'app/core/redux/actionCreatorFactory';
 import { getPluginSettings } from 'app/features/plugins/PluginSettingsCache';
+import { importDataSourcePlugin } from 'app/features/plugins/plugin_loader';
 
 export const dataSourceLoaded = actionCreatorFactory<DataSourceSettings>('LOAD_DATA_SOURCE').create();
 
@@ -52,9 +54,11 @@ export function loadDataSource(id: number): ThunkResult<void> {
   return async dispatch => {
     const dataSource = await getBackendSrv().get(`/api/datasources/${id}`);
     const pluginInfo = (await getPluginSettings(dataSource.type)) as DataSourcePluginMeta;
+    const plugin = await importDataSourcePlugin(pluginInfo);
+
     dispatch(dataSourceLoaded(dataSource));
     dispatch(dataSourceMetaLoaded(pluginInfo));
-    dispatch(updateNavIndex(buildNavModel(dataSource, pluginInfo)));
+    dispatch(updateNavIndex(buildNavModel(dataSource, plugin)));
   };
 }
 
diff --git a/public/app/features/datasources/state/navModel.ts b/public/app/features/datasources/state/navModel.ts
index 6fdc6f5762f8..6b5f679451de 100644
--- a/public/app/features/datasources/state/navModel.ts
+++ b/public/app/features/datasources/state/navModel.ts
@@ -1,7 +1,10 @@
-import { PluginMeta, DataSourceSettings, PluginType, NavModel, NavModelItem, PluginInclude } from '@grafana/ui';
+import { DataSourceSettings, PluginType, NavModel, NavModelItem, PluginInclude } from '@grafana/ui';
 import config from 'app/core/config';
+import { GenericDataSourcePlugin } from '../settings/PluginSettings';
+
+export function buildNavModel(dataSource: DataSourceSettings, plugin: GenericDataSourcePlugin): NavModelItem {
+  const pluginMeta = plugin.meta;
 
-export function buildNavModel(dataSource: DataSourceSettings, pluginMeta: PluginMeta): NavModelItem {
   const navModel = {
     img: pluginMeta.info.logos.large,
     id: 'datasource-' + dataSource.id,
@@ -20,6 +23,18 @@ export function buildNavModel(dataSource: DataSourceSettings, pluginMeta: Plugin
     ],
   };
 
+  if (plugin.configPages) {
+    for (const page of plugin.configPages) {
+      navModel.children.push({
+        active: false,
+        text: page.title,
+        icon: page.icon,
+        url: `datasources/edit/${dataSource.id}/?page=${page.id}`,
+        id: `datasource-page-${page.id}`,
+      });
+    }
+  }
+
   if (pluginMeta.includes && hasDashboards(pluginMeta.includes)) {
     navModel.children.push({
       active: false,
@@ -65,28 +80,30 @@ export function getDataSourceLoadingNav(pageName: string): NavModel {
       user: '',
     },
     {
-      id: '1',
-      type: PluginType.datasource,
-      name: '',
-      info: {
-        author: {
-          name: '',
-          url: '',
-        },
-        description: '',
-        links: [{ name: '', url: '' }],
-        logos: {
-          large: '',
-          small: '',
+      meta: {
+        id: '1',
+        type: PluginType.datasource,
+        name: '',
+        info: {
+          author: {
+            name: '',
+            url: '',
+          },
+          description: '',
+          links: [{ name: '', url: '' }],
+          logos: {
+            large: '',
+            small: '',
+          },
+          screenshots: [],
+          updated: '',
+          version: '',
         },
-        screenshots: [],
-        updated: '',
-        version: '',
+        includes: [],
+        module: '',
+        baseUrl: '',
       },
-      includes: [],
-      module: '',
-      baseUrl: '',
-    }
+    } as GenericDataSourcePlugin
   );
 
   let node: NavModelItem;
diff --git a/public/app/features/explore/ElapsedTime.tsx b/public/app/features/explore/ElapsedTime.tsx
index a2d941515cd6..7f649c497035 100644
--- a/public/app/features/explore/ElapsedTime.tsx
+++ b/public/app/features/explore/ElapsedTime.tsx
@@ -1,8 +1,20 @@
 import React, { PureComponent } from 'react';
+import { toDuration } from '@grafana/ui/src/utils/moment_wrapper';
 
 const INTERVAL = 150;
 
-export default class ElapsedTime extends PureComponent<any, any> {
+export interface Props {
+  time?: number;
+  renderCount?: number;
+  className?: string;
+  humanize?: boolean;
+}
+
+export interface State {
+  elapsed: number;
+}
+
+export default class ElapsedTime extends PureComponent<Props, State> {
   offset: number;
   timer: number;
 
@@ -21,12 +33,17 @@ export default class ElapsedTime extends PureComponent<any, any> {
     this.setState({ elapsed });
   };
 
-  componentWillReceiveProps(nextProps) {
+  componentWillReceiveProps(nextProps: Props) {
     if (nextProps.time) {
       clearInterval(this.timer);
     } else if (this.props.time) {
       this.start();
     }
+
+    if (nextProps.renderCount) {
+      clearInterval(this.timer);
+      this.start();
+    }
   }
 
   componentDidMount() {
@@ -39,8 +56,16 @@ export default class ElapsedTime extends PureComponent<any, any> {
 
   render() {
     const { elapsed } = this.state;
-    const { className, time } = this.props;
+    const { className, time, humanize } = this.props;
     const value = (time || elapsed) / 1000;
-    return <span className={`elapsed-time ${className}`}>{value.toFixed(1)}s</span>;
+    let displayValue = `${value.toFixed(1)}s`;
+    if (humanize) {
+      const duration = toDuration(elapsed);
+      const hours = duration.hours();
+      const minutes = duration.minutes();
+      const seconds = duration.seconds();
+      displayValue = hours ? `${hours}h ${minutes}m ${seconds}s` : minutes ? ` ${minutes}m ${seconds}s` : `${seconds}s`;
+    }
+    return <span className={`elapsed-time ${className}`}>{displayValue}</span>;
   }
 }
diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 643e1d0d0f90..e5dbb508edc8 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -31,7 +31,7 @@ import {
 } from './state/actions';
 
 // Types
-import { RawTimeRange, DataQuery, ExploreStartPageProps, ExploreDataSourceApi, DataQueryError } from '@grafana/ui';
+import { RawTimeRange, DataQuery, ExploreStartPageProps, DataSourceApi, DataQueryError } from '@grafana/ui';
 import {
   ExploreItemState,
   ExploreUrlState,
@@ -39,6 +39,7 @@ import {
   ExploreId,
   ExploreUpdateState,
   ExploreUIState,
+  ExploreMode,
 } from 'app/types/explore';
 import { StoreState } from 'app/types';
 import {
@@ -50,18 +51,18 @@ import {
 } from 'app/core/utils/explore';
 import { Emitter } from 'app/core/utils/emitter';
 import { ExploreToolbar } from './ExploreToolbar';
-import { scanStopAction } from './state/actionTypes';
 import { NoDataSourceCallToAction } from './NoDataSourceCallToAction';
 import { FadeIn } from 'app/core/components/Animations/FadeIn';
 import { getTimeZone } from '../profile/state/selectors';
 import { ErrorContainer } from './ErrorContainer';
+import { scanStopAction } from './state/actionTypes';
 
 interface ExploreProps {
   StartPage?: ComponentClass<ExploreStartPageProps>;
   changeSize: typeof changeSize;
   changeTime: typeof changeTime;
   datasourceError: string;
-  datasourceInstance: ExploreDataSourceApi;
+  datasourceInstance: DataSourceApi;
   datasourceLoading: boolean | null;
   datasourceMissing: boolean;
   exploreId: ExploreId;
@@ -79,15 +80,14 @@ interface ExploreProps {
   setQueries: typeof setQueries;
   split: boolean;
   showingStartPage?: boolean;
-  supportsGraph: boolean | null;
-  supportsLogs: boolean | null;
-  supportsTable: boolean | null;
   queryKeys: string[];
   initialDatasource: string;
   initialQueries: DataQuery[];
   initialRange: RawTimeRange;
   initialUI: ExploreUIState;
   queryErrors: DataQueryError[];
+  mode: ExploreMode;
+  isLive: boolean;
 }
 
 /**
@@ -234,11 +234,9 @@ export class Explore extends React.PureComponent<ExploreProps> {
       exploreId,
       showingStartPage,
       split,
-      supportsGraph,
-      supportsLogs,
-      supportsTable,
       queryKeys,
       queryErrors,
+      mode,
     } = this.props;
     const exploreClass = split ? 'explore explore-split' : 'explore';
 
@@ -273,9 +271,11 @@ export class Explore extends React.PureComponent<ExploreProps> {
                       {showingStartPage && <StartPage onClickExample={this.onClickExample} />}
                       {!showingStartPage && (
                         <>
-                          {supportsGraph && !supportsLogs && <GraphContainer width={width} exploreId={exploreId} />}
-                          {supportsTable && <TableContainer exploreId={exploreId} onClickCell={this.onClickLabel} />}
-                          {supportsLogs && (
+                          {mode === ExploreMode.Metrics && <GraphContainer width={width} exploreId={exploreId} />}
+                          {mode === ExploreMode.Metrics && (
+                            <TableContainer exploreId={exploreId} onClickCell={this.onClickLabel} />
+                          )}
+                          {mode === ExploreMode.Logs && (
                             <LogsContainer
                               width={width}
                               exploreId={exploreId}
@@ -311,13 +311,12 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) {
     datasourceMissing,
     initialized,
     showingStartPage,
-    supportsGraph,
-    supportsLogs,
-    supportsTable,
     queryKeys,
     urlState,
     update,
     queryErrors,
+    mode,
+    isLive,
   } = item;
 
   const { datasource, queries, range: urlRange, ui } = (urlState || {}) as ExploreUrlState;
@@ -335,9 +334,6 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) {
     initialized,
     showingStartPage,
     split,
-    supportsGraph,
-    supportsLogs,
-    supportsTable,
     queryKeys,
     update,
     initialDatasource,
@@ -345,6 +341,8 @@ function mapStateToProps(state: StoreState, { exploreId }: ExploreProps) {
     initialRange,
     initialUI,
     queryErrors,
+    mode,
+    isLive,
   };
 }
 
@@ -365,4 +363,4 @@ export default hot(module)(
     mapStateToProps,
     mapDispatchToProps
   )(Explore)
-);
+) as React.ComponentType<{ exploreId: ExploreId }>;
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 2038224d40fd..9d3cb9841208 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -2,8 +2,16 @@ import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 import { hot } from 'react-hot-loader';
 
-import { ExploreId } from 'app/types/explore';
-import { DataSourceSelectItem, RawTimeRange, ClickOutsideWrapper, TimeZone, TimeRange } from '@grafana/ui';
+import { ExploreId, ExploreMode } from 'app/types/explore';
+import {
+  DataSourceSelectItem,
+  RawTimeRange,
+  ClickOutsideWrapper,
+  TimeZone,
+  TimeRange,
+  SelectOptionItem,
+  LoadingState,
+} from '@grafana/ui';
 import { DataSourcePicker } from 'app/core/components/Select/DataSourcePicker';
 import { StoreState } from 'app/types/store';
 import {
@@ -13,10 +21,12 @@ import {
   runQueries,
   splitOpen,
   changeRefreshInterval,
+  changeMode,
 } from './state/actions';
 import TimePicker from './TimePicker';
 import { getTimeZone } from '../profile/state/selectors';
 import { RefreshPicker, SetInterval } from '@grafana/ui';
+import ToggleButtonGroup, { ToggleButton } from 'app/core/components/ToggleButtonGroup/ToggleButtonGroup';
 
 enum IconSide {
   left = 'left',
@@ -30,15 +40,20 @@ const createResponsiveButton = (options: {
   buttonClassName?: string;
   iconClassName?: string;
   iconSide?: IconSide;
+  disabled?: boolean;
 }) => {
   const defaultOptions = {
     iconSide: IconSide.left,
   };
   const props = { ...options, defaultOptions };
-  const { title, onClick, buttonClassName, iconClassName, splitted, iconSide } = props;
+  const { title, onClick, buttonClassName, iconClassName, splitted, iconSide, disabled } = props;
 
   return (
-    <button className={`btn navbar-button ${buttonClassName ? buttonClassName : ''}`} onClick={onClick}>
+    <button
+      className={`btn navbar-button ${buttonClassName ? buttonClassName : ''}`}
+      onClick={onClick}
+      disabled={disabled || false}
+    >
       {iconClassName && iconSide === IconSide.left ? <i className={`${iconClassName}`} /> : null}
       <span className="btn-title">{!splitted ? title : ''}</span>
       {iconClassName && iconSide === IconSide.right ? <i className={`${iconClassName}`} /> : null}
@@ -61,6 +76,10 @@ interface StateProps {
   selectedDatasource: DataSourceSelectItem;
   splitted: boolean;
   refreshInterval: string;
+  supportedModeOptions: Array<SelectOptionItem<ExploreMode>>;
+  selectedModeOption: SelectOptionItem<ExploreMode>;
+  hasLiveOption: boolean;
+  isLive: boolean;
 }
 
 interface DispatchProps {
@@ -70,6 +89,7 @@ interface DispatchProps {
   closeSplit: typeof splitClose;
   split: typeof splitOpen;
   changeRefreshInterval: typeof changeRefreshInterval;
+  changeMode: typeof changeMode;
 }
 
 type Props = StateProps & DispatchProps & OwnProps;
@@ -100,6 +120,11 @@ export class UnConnectedExploreToolbar extends PureComponent<Props, {}> {
     changeRefreshInterval(exploreId, item);
   };
 
+  onModeChange = (mode: ExploreMode) => {
+    const { changeMode, exploreId } = this.props;
+    changeMode(exploreId, mode);
+  };
+
   render() {
     const {
       datasourceMissing,
@@ -115,6 +140,10 @@ export class UnConnectedExploreToolbar extends PureComponent<Props, {}> {
       refreshInterval,
       onChangeTime,
       split,
+      supportedModeOptions,
+      selectedModeOption,
+      hasLiveOption,
+      isLive,
     } = this.props;
 
     return (
@@ -147,8 +176,31 @@ export class UnConnectedExploreToolbar extends PureComponent<Props, {}> {
                     current={selectedDatasource}
                   />
                 </div>
+                {supportedModeOptions.length > 1 ? (
+                  <div className="query-type-toggle">
+                    <ToggleButtonGroup label="" transparent={true}>
+                      <ToggleButton
+                        key={ExploreMode.Metrics}
+                        value={ExploreMode.Metrics}
+                        onChange={this.onModeChange}
+                        selected={selectedModeOption.value === ExploreMode.Metrics}
+                      >
+                        {'Metrics'}
+                      </ToggleButton>
+                      <ToggleButton
+                        key={ExploreMode.Logs}
+                        value={ExploreMode.Logs}
+                        onChange={this.onModeChange}
+                        selected={selectedModeOption.value === ExploreMode.Logs}
+                      >
+                        {'Logs'}
+                      </ToggleButton>
+                    </ToggleButtonGroup>
+                  </div>
+                ) : null}
               </div>
             ) : null}
+
             {exploreId === 'left' && !splitted ? (
               <div className="explore-toolbar-content-item">
                 {createResponsiveButton({
@@ -157,19 +209,23 @@ export class UnConnectedExploreToolbar extends PureComponent<Props, {}> {
                   onClick: split,
                   iconClassName: 'fa fa-fw fa-columns icon-margin-right',
                   iconSide: IconSide.left,
+                  disabled: isLive,
                 })}
               </div>
             ) : null}
             <div className="explore-toolbar-content-item timepicker">
-              <ClickOutsideWrapper onClick={this.onCloseTimePicker}>
-                <TimePicker ref={timepickerRef} range={range} isUtc={timeZone.isUtc} onChangeTime={onChangeTime} />
-              </ClickOutsideWrapper>
+              {!isLive && (
+                <ClickOutsideWrapper onClick={this.onCloseTimePicker}>
+                  <TimePicker ref={timepickerRef} range={range} isUtc={timeZone.isUtc} onChangeTime={onChangeTime} />
+                </ClickOutsideWrapper>
+              )}
 
               <RefreshPicker
                 onIntervalChanged={this.onChangeRefreshInterval}
                 onRefresh={this.onRunQuery}
                 value={refreshInterval}
                 tooltip="Refresh"
+                hasLiveOption={hasLiveOption}
               />
               {refreshInterval && <SetInterval func={this.onRunQuery} interval={refreshInterval} loading={loading} />}
             </div>
@@ -185,7 +241,8 @@ export class UnConnectedExploreToolbar extends PureComponent<Props, {}> {
                 title: 'Run Query',
                 onClick: this.onRunQuery,
                 buttonClassName: 'navbar-button--secondary',
-                iconClassName: loading ? 'fa fa-spinner fa-fw fa-spin run-icon' : 'fa fa-level-down fa-fw run-icon',
+                iconClassName:
+                  loading && !isLive ? 'fa fa-spinner fa-fw fa-spin run-icon' : 'fa fa-level-down fa-fw run-icon',
                 iconSide: IconSide.right,
               })}
             </div>
@@ -205,14 +262,44 @@ const mapStateToProps = (state: StoreState, { exploreId }: OwnProps): StateProps
     exploreDatasources,
     range,
     refreshInterval,
-    graphIsLoading,
-    logIsLoading,
-    tableIsLoading,
+    loadingState,
+    supportedModes,
+    mode,
+    isLive,
   } = exploreItem;
   const selectedDatasource = datasourceInstance
     ? exploreDatasources.find(datasource => datasource.name === datasourceInstance.name)
     : undefined;
-  const loading = graphIsLoading || logIsLoading || tableIsLoading;
+  const loading = loadingState === LoadingState.Loading || loadingState === LoadingState.Streaming;
+  const hasLiveOption =
+    datasourceInstance && datasourceInstance.meta && datasourceInstance.meta.streaming ? true : false;
+
+  const supportedModeOptions: Array<SelectOptionItem<ExploreMode>> = [];
+  let selectedModeOption = null;
+  for (const supportedMode of supportedModes) {
+    switch (supportedMode) {
+      case ExploreMode.Metrics:
+        const option1 = {
+          value: ExploreMode.Metrics,
+          label: ExploreMode.Metrics,
+        };
+        supportedModeOptions.push(option1);
+        if (mode === ExploreMode.Metrics) {
+          selectedModeOption = option1;
+        }
+        break;
+      case ExploreMode.Logs:
+        const option2 = {
+          value: ExploreMode.Logs,
+          label: ExploreMode.Logs,
+        };
+        supportedModeOptions.push(option2);
+        if (mode === ExploreMode.Logs) {
+          selectedModeOption = option2;
+        }
+        break;
+    }
+  }
 
   return {
     datasourceMissing,
@@ -223,6 +310,10 @@ const mapStateToProps = (state: StoreState, { exploreId }: OwnProps): StateProps
     selectedDatasource,
     splitted,
     refreshInterval,
+    supportedModeOptions,
+    selectedModeOption,
+    hasLiveOption,
+    isLive,
   };
 };
 
@@ -233,6 +324,7 @@ const mapDispatchToProps: DispatchProps = {
   runQueries,
   closeSplit: splitClose,
   split: splitOpen,
+  changeMode: changeMode,
 };
 
 export const ExploreToolbar = hot(module)(
diff --git a/public/app/features/explore/Graph.tsx b/public/app/features/explore/Graph.tsx
index f9c48fc92c72..b5cdca318afa 100644
--- a/public/app/features/explore/Graph.tsx
+++ b/public/app/features/explore/Graph.tsx
@@ -1,17 +1,15 @@
 import $ from 'jquery';
 import React, { PureComponent } from 'react';
+import difference from 'lodash/difference';
 
 import 'vendor/flot/jquery.flot';
 import 'vendor/flot/jquery.flot.time';
 import 'vendor/flot/jquery.flot.selection';
 import 'vendor/flot/jquery.flot.stack';
 
-import { TimeZone, AbsoluteTimeRange } from '@grafana/ui';
+import { TimeZone, AbsoluteTimeRange, GraphLegend, LegendItem, LegendDisplayMode } from '@grafana/ui';
 import TimeSeries from 'app/core/time_series2';
 
-import Legend from './Legend';
-import { equal, intersect } from './utils/set';
-
 const MAX_NUMBER_OF_TIME_SERIES = 20;
 
 // Copied from graph.ts
@@ -89,7 +87,7 @@ interface GraphState {
    * Type parameter refers to the `alias` property of a `TimeSeries`.
    * Consequently, all series sharing the same alias will share visibility state.
    */
-  hiddenSeries: Set<string>;
+  hiddenSeries: string[];
   showAllTimeSeries: boolean;
 }
 
@@ -98,11 +96,11 @@ export class Graph extends PureComponent<GraphProps, GraphState> {
   dynamicOptions = null;
 
   state = {
-    hiddenSeries: new Set(),
+    hiddenSeries: [],
     showAllTimeSeries: false,
   };
 
-  getGraphData() {
+  getGraphData(): TimeSeries[] {
     const { data } = this.props;
 
     return this.state.showAllTimeSeries ? data : data.slice(0, MAX_NUMBER_OF_TIME_SERIES);
@@ -121,7 +119,7 @@ export class Graph extends PureComponent<GraphProps, GraphState> {
       prevProps.split !== this.props.split ||
       prevProps.height !== this.props.height ||
       prevProps.width !== this.props.width ||
-      !equal(prevState.hiddenSeries, this.state.hiddenSeries)
+      prevState.hiddenSeries !== this.state.hiddenSeries
     ) {
       this.draw();
     }
@@ -168,38 +166,6 @@ export class Graph extends PureComponent<GraphProps, GraphState> {
     );
   };
 
-  onToggleSeries = (series: TimeSeries, exclusive: boolean) => {
-    this.setState((state, props) => {
-      const { data, onToggleSeries } = props;
-      const { hiddenSeries } = state;
-
-      // Deduplicate series as visibility tracks the alias property
-      const oneSeriesVisible = hiddenSeries.size === new Set(data.map(d => d.alias)).size - 1;
-
-      let nextHiddenSeries = new Set();
-      if (exclusive) {
-        if (hiddenSeries.has(series.alias) || !oneSeriesVisible) {
-          nextHiddenSeries = new Set(data.filter(d => d.alias !== series.alias).map(d => d.alias));
-        }
-      } else {
-        // Prune hidden series no longer part of those available from the most recent query
-        const availableSeries = new Set(data.map(d => d.alias));
-        nextHiddenSeries = intersect(new Set(hiddenSeries), availableSeries);
-        if (nextHiddenSeries.has(series.alias)) {
-          nextHiddenSeries.delete(series.alias);
-        } else {
-          nextHiddenSeries.add(series.alias);
-        }
-      }
-      if (onToggleSeries) {
-        onToggleSeries(series.alias, nextHiddenSeries);
-      }
-      return {
-        hiddenSeries: nextHiddenSeries,
-      };
-    }, this.draw);
-  };
-
   draw() {
     const { userOptions = {} } = this.props;
     const { hiddenSeries } = this.state;
@@ -210,7 +176,7 @@ export class Graph extends PureComponent<GraphProps, GraphState> {
 
     if (data && data.length > 0) {
       series = data
-        .filter((ts: TimeSeries) => !hiddenSeries.has(ts.alias))
+        .filter((ts: TimeSeries) => hiddenSeries.indexOf(ts.alias) === -1)
         .map((ts: TimeSeries) => ({
           color: ts.color,
           label: ts.label,
@@ -229,11 +195,57 @@ export class Graph extends PureComponent<GraphProps, GraphState> {
     $.plot($el, series, options);
   }
 
-  render() {
-    const { height = 100, id = 'graph' } = this.props;
+  getLegendItems = (): LegendItem[] => {
     const { hiddenSeries } = this.state;
     const data = this.getGraphData();
 
+    return data.map(series => {
+      return {
+        label: series.alias,
+        color: series.color,
+        isVisible: hiddenSeries.indexOf(series.alias) === -1,
+        yAxis: 1,
+      };
+    });
+  };
+
+  onSeriesToggle(label: string, event: React.MouseEvent<HTMLElement>) {
+    // This implementation is more or less a copy of GraphPanel's logic.
+    // TODO: we need to use Graph's panel controller or split it into smaller
+    // controllers to remove code duplication. Right now we cant easily use that, since Explore
+    // is not using SeriesData for graph yet
+
+    const exclusive = event.ctrlKey || event.metaKey || event.shiftKey;
+
+    this.setState((state, props) => {
+      const { data } = props;
+      let nextHiddenSeries = [];
+      if (exclusive) {
+        // Toggling series with key makes the series itself to toggle
+        if (state.hiddenSeries.indexOf(label) > -1) {
+          nextHiddenSeries = state.hiddenSeries.filter(series => series !== label);
+        } else {
+          nextHiddenSeries = state.hiddenSeries.concat([label]);
+        }
+      } else {
+        // Toggling series with out key toggles all the series but the clicked one
+        const allSeriesLabels = data.map(series => series.label);
+
+        if (state.hiddenSeries.length + 1 === allSeriesLabels.length) {
+          nextHiddenSeries = [];
+        } else {
+          nextHiddenSeries = difference(allSeriesLabels, [label]);
+        }
+      }
+
+      return {
+        hiddenSeries: nextHiddenSeries,
+      };
+    });
+  }
+
+  render() {
+    const { height = 100, id = 'graph' } = this.props;
     return (
       <>
         {this.props.data && this.props.data.length > MAX_NUMBER_OF_TIME_SERIES && !this.state.showAllTimeSeries && (
@@ -246,7 +258,15 @@ export class Graph extends PureComponent<GraphProps, GraphState> {
           </div>
         )}
         <div id={id} className="explore-graph" style={{ height }} />
-        <Legend data={data} hiddenSeries={hiddenSeries} onToggleSeries={this.onToggleSeries} />
+
+        <GraphLegend
+          items={this.getLegendItems()}
+          displayMode={LegendDisplayMode.List}
+          placement="under"
+          onLabelClick={(item, event) => {
+            this.onSeriesToggle(item.label, event);
+          }}
+        />
       </>
     );
   }
diff --git a/public/app/features/explore/GraphContainer.tsx b/public/app/features/explore/GraphContainer.tsx
index 7033473a33b3..6d1bb6c4e387 100644
--- a/public/app/features/explore/GraphContainer.tsx
+++ b/public/app/features/explore/GraphContainer.tsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import { hot } from 'react-hot-loader';
 import { connect } from 'react-redux';
-import { TimeRange, TimeZone, AbsoluteTimeRange } from '@grafana/ui';
+import { TimeRange, TimeZone, AbsoluteTimeRange, LoadingState } from '@grafana/ui';
 
 import { ExploreId, ExploreItemState } from 'app/types/explore';
 import { StoreState } from 'app/types';
@@ -46,22 +46,20 @@ export class GraphContainer extends PureComponent<GraphContainerProps> {
     const graphHeight = showingGraph && showingTable ? 200 : 400;
     const timeRange = { from: range.from.valueOf(), to: range.to.valueOf() };
 
-    if (!graphResult) {
-      return null;
-    }
-
     return (
-      <Panel label="Graph" isOpen={showingGraph} loading={loading} onToggle={this.onClickGraphButton}>
-        <Graph
-          data={graphResult}
-          height={graphHeight}
-          id={`explore-graph-${exploreId}`}
-          onChangeTime={this.onChangeTime}
-          range={timeRange}
-          timeZone={timeZone}
-          split={split}
-          width={width}
-        />
+      <Panel label="Graph" collapsible isOpen={showingGraph} loading={loading} onToggle={this.onClickGraphButton}>
+        {graphResult && (
+          <Graph
+            data={graphResult}
+            height={graphHeight}
+            id={`explore-graph-${exploreId}`}
+            onChangeTime={this.onChangeTime}
+            range={timeRange}
+            timeZone={timeZone}
+            split={split}
+            width={width}
+          />
+        )}
       </Panel>
     );
   }
@@ -71,8 +69,8 @@ function mapStateToProps(state: StoreState, { exploreId }) {
   const explore = state.explore;
   const { split } = explore;
   const item: ExploreItemState = explore[exploreId];
-  const { graphResult, graphIsLoading, range, showingGraph, showingTable } = item;
-  const loading = graphIsLoading;
+  const { graphResult, loadingState, range, showingGraph, showingTable } = item;
+  const loading = loadingState === LoadingState.Loading || loadingState === LoadingState.Streaming;
   return { graphResult, loading, range, showingGraph, showingTable, split, timeZone: getTimeZone(state.user) };
 }
 
diff --git a/public/app/features/explore/Legend.tsx b/public/app/features/explore/Legend.tsx
deleted file mode 100644
index 3b67aa74d917..000000000000
--- a/public/app/features/explore/Legend.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import React, { MouseEvent, PureComponent } from 'react';
-import classNames from 'classnames';
-import { TimeSeries } from 'app/core/core';
-
-interface LegendProps {
-  data: TimeSeries[];
-  hiddenSeries: Set<string>;
-  onToggleSeries?: (series: TimeSeries, exclusive: boolean) => void;
-}
-
-interface LegendItemProps {
-  hidden: boolean;
-  onClickLabel?: (series: TimeSeries, event: MouseEvent) => void;
-  series: TimeSeries;
-}
-
-class LegendItem extends PureComponent<LegendItemProps> {
-  onClickLabel = e => this.props.onClickLabel(this.props.series, e);
-
-  render() {
-    const { hidden, series } = this.props;
-    const seriesClasses = classNames({
-      'graph-legend-series-hidden': hidden,
-    });
-    return (
-      <div className={`graph-legend-series ${seriesClasses}`}>
-        <div className="graph-legend-icon">
-          <i className="fa fa-minus pointer" style={{ color: series.color }} />
-        </div>
-        <a className="graph-legend-alias pointer" title={series.alias} onClick={this.onClickLabel}>
-          {series.alias}
-        </a>
-      </div>
-    );
-  }
-}
-
-export default class Legend extends PureComponent<LegendProps> {
-  static defaultProps = {
-    onToggleSeries: () => {},
-  };
-
-  onClickLabel = (series: TimeSeries, event: MouseEvent) => {
-    const { onToggleSeries } = this.props;
-    const exclusive = event.ctrlKey || event.metaKey || event.shiftKey;
-    onToggleSeries(series, !exclusive);
-  };
-
-  render() {
-    const { data, hiddenSeries } = this.props;
-    const items = data || [];
-    return (
-      <div className="graph-legend ps">
-        {items.map((series, i) => (
-          <LegendItem
-            hidden={hiddenSeries.has(series.alias)}
-            // Workaround to resolve conflicts since series visibility tracks the alias property
-            key={`${series.id}-${i}`}
-            onClickLabel={this.onClickLabel}
-            series={series}
-          />
-        ))}
-      </div>
-    );
-  }
-}
diff --git a/public/app/features/explore/LiveLogs.tsx b/public/app/features/explore/LiveLogs.tsx
new file mode 100644
index 000000000000..040beae2aec8
--- /dev/null
+++ b/public/app/features/explore/LiveLogs.tsx
@@ -0,0 +1,125 @@
+import React, { PureComponent } from 'react';
+import { css, cx } from 'emotion';
+import {
+  Themeable,
+  withTheme,
+  GrafanaTheme,
+  selectThemeVariant,
+  LinkButton,
+  LogsModel,
+  LogRowModel,
+} from '@grafana/ui';
+
+import ElapsedTime from './ElapsedTime';
+import { ButtonSize, ButtonVariant } from '@grafana/ui/src/components/Button/AbstractButton';
+
+const getStyles = (theme: GrafanaTheme) => ({
+  logsRowsLive: css`
+    label: logs-rows-live;
+    display: flex;
+    flex-flow: column nowrap;
+    height: 65vh;
+    overflow-y: auto;
+    :first-child {
+      margin-top: auto !important;
+    }
+  `,
+  logsRowFresh: css`
+    label: logs-row-fresh;
+    color: ${theme.colors.text};
+    background-color: ${selectThemeVariant({ light: theme.colors.gray6, dark: theme.colors.gray1 }, theme.type)};
+  `,
+  logsRowOld: css`
+    label: logs-row-old;
+    opacity: 0.8;
+  `,
+  logsRowsIndicator: css`
+    font-size: ${theme.typography.size.md};
+    padding: ${theme.spacing.sm} 0;
+    display: flex;
+    align-items: center;
+  `,
+});
+
+export interface Props extends Themeable {
+  logsResult?: LogsModel;
+  stopLive: () => void;
+}
+
+export interface State {
+  renderCount: number;
+}
+
+class LiveLogs extends PureComponent<Props, State> {
+  private liveEndDiv: HTMLDivElement = null;
+
+  constructor(props: Props) {
+    super(props);
+    this.state = { renderCount: 0 };
+  }
+
+  componentDidUpdate(prevProps: Props) {
+    const prevRows: LogRowModel[] = prevProps.logsResult ? prevProps.logsResult.rows : [];
+    const rows: LogRowModel[] = this.props.logsResult ? this.props.logsResult.rows : [];
+
+    if (prevRows !== rows) {
+      this.setState({
+        renderCount: this.state.renderCount + 1,
+      });
+    }
+
+    if (this.liveEndDiv) {
+      this.liveEndDiv.scrollIntoView(false);
+    }
+  }
+
+  render() {
+    const { theme } = this.props;
+    const { renderCount } = this.state;
+    const styles = getStyles(theme);
+    const rowsToRender: LogRowModel[] = this.props.logsResult ? this.props.logsResult.rows : [];
+
+    return (
+      <>
+        <div className={cx(['logs-rows', styles.logsRowsLive])}>
+          {rowsToRender.map((row: any, index) => {
+            return (
+              <div
+                className={row.fresh ? cx(['logs-row', styles.logsRowFresh]) : cx(['logs-row', styles.logsRowOld])}
+                key={`${row.timeEpochMs}-${index}`}
+              >
+                <div className="logs-row__localtime" title={`${row.timestamp} (${row.timeFromNow})`}>
+                  {row.timeLocal}
+                </div>
+                <div className="logs-row__message">{row.entry}</div>
+              </div>
+            );
+          })}
+          <div
+            ref={element => {
+              this.liveEndDiv = element;
+              if (this.liveEndDiv) {
+                this.liveEndDiv.scrollIntoView(false);
+              }
+            }}
+          />
+        </div>
+        <div className={cx([styles.logsRowsIndicator])}>
+          <span>
+            Last line received: <ElapsedTime renderCount={renderCount} humanize={true} /> ago
+          </span>
+          <LinkButton
+            onClick={this.props.stopLive}
+            size={ButtonSize.Medium}
+            variant={ButtonVariant.Transparent}
+            style={{ color: theme.colors.orange }}
+          >
+            Stop Live
+          </LinkButton>
+        </div>
+      </>
+    );
+  }
+}
+
+export const LiveLogsWithTheme = withTheme(LiveLogs);
diff --git a/public/app/features/explore/LogLabel.tsx b/public/app/features/explore/LogLabel.tsx
index b4570f10c826..1794d60b6891 100644
--- a/public/app/features/explore/LogLabel.tsx
+++ b/public/app/features/explore/LogLabel.tsx
@@ -1,7 +1,8 @@
 import React, { PureComponent } from 'react';
 
-import { calculateLogsLabelStats, LogLabelStatsModel, LogRowModel } from 'app/core/logs_model';
 import { LogLabelStats } from './LogLabelStats';
+import { LogRowModel, LogLabelStatsModel } from '@grafana/ui';
+import { calculateLogsLabelStats } from 'app/core/logs_model';
 
 interface Props {
   getRows?: () => LogRowModel[];
diff --git a/public/app/features/explore/LogLabelStats.tsx b/public/app/features/explore/LogLabelStats.tsx
index 466cc050e43b..07f33d8aff71 100644
--- a/public/app/features/explore/LogLabelStats.tsx
+++ b/public/app/features/explore/LogLabelStats.tsx
@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import classnames from 'classnames';
-import { LogLabelStatsModel } from 'app/core/logs_model';
+import { LogLabelStatsModel } from '@grafana/ui';
 
 function LogLabelStatsRow(logLabelStatsModel: LogLabelStatsModel) {
   const { active, count, proportion, value } = logLabelStatsModel;
diff --git a/public/app/features/explore/LogLabels.tsx b/public/app/features/explore/LogLabels.tsx
index f89836055c53..9dffca38a66a 100644
--- a/public/app/features/explore/LogLabels.tsx
+++ b/public/app/features/explore/LogLabels.tsx
@@ -1,8 +1,7 @@
 import React, { PureComponent } from 'react';
 
-import { LogRowModel } from 'app/core/logs_model';
 import { LogLabel } from './LogLabel';
-import { Labels } from '@grafana/ui';
+import { Labels, LogRowModel } from '@grafana/ui';
 
 interface Props {
   getRows?: () => LogRowModel[];
diff --git a/public/app/features/explore/LogRow.tsx b/public/app/features/explore/LogRow.tsx
index 19930a8a3393..ad2aced592f4 100644
--- a/public/app/features/explore/LogRow.tsx
+++ b/public/app/features/explore/LogRow.tsx
@@ -3,11 +3,29 @@ import _ from 'lodash';
 import Highlighter from 'react-highlight-words';
 import classnames from 'classnames';
 
-import { LogRowModel, LogLabelStatsModel, LogsParser, calculateFieldStats, getParser } from 'app/core/logs_model';
+import { calculateFieldStats, getParser } from 'app/core/logs_model';
 import { LogLabels } from './LogLabels';
 import { findHighlightChunksInText } from 'app/core/utils/text';
 import { LogLabelStats } from './LogLabelStats';
 import { LogMessageAnsi } from './LogMessageAnsi';
+import { css, cx } from 'emotion';
+import {
+  LogRowContextProvider,
+  LogRowContextRows,
+  HasMoreContextRows,
+  LogRowContextQueryErrors,
+} from './LogRowContextProvider';
+import {
+  ThemeContext,
+  selectThemeVariant,
+  GrafanaTheme,
+  DataQueryResponse,
+  LogRowModel,
+  LogLabelStatsModel,
+  LogsParser,
+} from '@grafana/ui';
+import { LogRowContext } from './LogRowContext';
+import tinycolor from 'tinycolor2';
 
 interface Props {
   highlighterExpressions?: string[];
@@ -18,6 +36,9 @@ interface Props {
   showUtc: boolean;
   getRows: () => LogRowModel[];
   onClickLabel?: (label: string, value: string) => void;
+  onContextClick?: () => void;
+  getRowContext?: (row: LogRowModel, options?: any) => Promise<DataQueryResponse>;
+  className?: string;
 }
 
 interface State {
@@ -29,6 +50,7 @@ interface State {
   parser?: LogsParser;
   parsedFieldHighlights: string[];
   showFieldStats: boolean;
+  showContext: boolean;
 }
 
 /**
@@ -44,6 +66,32 @@ const FieldHighlight = onClick => props => {
   );
 };
 
+const logRowStyles = css`
+  position: relative;
+  /* z-index: 0; */
+  /* outline: none; */
+`;
+
+const getLogRowWithContextStyles = (theme: GrafanaTheme, state: State) => {
+  const outlineColor = selectThemeVariant(
+    {
+      light: theme.colors.white,
+      dark: theme.colors.black,
+    },
+    theme.type
+  );
+
+  return {
+    row: css`
+      z-index: 1;
+      outline: 9999px solid
+        ${tinycolor(outlineColor)
+          .setAlpha(0.7)
+          .toRgbString()};
+    `,
+  };
+};
+
 /**
  * Renders a log line.
  *
@@ -63,6 +111,7 @@ export class LogRow extends PureComponent<Props, State> {
     parser: undefined,
     parsedFieldHighlights: [],
     showFieldStats: false,
+    showContext: false,
   };
 
   componentWillUnmount() {
@@ -89,11 +138,21 @@ export class LogRow extends PureComponent<Props, State> {
   };
 
   onMouseOverMessage = () => {
+    if (this.state.showContext || this.isTextSelected()) {
+      // When showing context we don't want to the LogRow rerender as it will mess up state of context block
+      // making the "after" context to be scrolled to the top, what is desired only on open
+      // The log row message needs to be refactored to separate component that encapsulates parsing and parsed message state
+      return;
+    }
     // Don't parse right away, user might move along
     this.mouseMessageTimer = setTimeout(this.parseMessage, 500);
   };
 
   onMouseOutMessage = () => {
+    if (this.state.showContext) {
+      // See comment in onMouseOverMessage method
+      return;
+    }
     clearTimeout(this.mouseMessageTimer);
     this.setState({ parsed: false });
   };
@@ -110,7 +169,39 @@ export class LogRow extends PureComponent<Props, State> {
     }
   };
 
-  render() {
+  isTextSelected() {
+    if (!window.getSelection) {
+      return false;
+    }
+
+    const selection = window.getSelection();
+
+    if (!selection) {
+      return false;
+    }
+
+    return selection.anchorNode !== null && selection.isCollapsed === false;
+  }
+
+  toggleContext = () => {
+    this.setState(state => {
+      return {
+        showContext: !state.showContext,
+      };
+    });
+  };
+
+  onContextToggle = (e: React.SyntheticEvent<HTMLElement>) => {
+    e.stopPropagation();
+    this.toggleContext();
+  };
+
+  renderLogRow(
+    context?: LogRowContextRows,
+    errors?: LogRowContextQueryErrors,
+    hasMoreContextRows?: HasMoreContextRows,
+    updateLimit?: () => void
+  ) {
     const {
       getRows,
       highlighterExpressions,
@@ -129,69 +220,142 @@ export class LogRow extends PureComponent<Props, State> {
       parsed,
       parsedFieldHighlights,
       showFieldStats,
+      showContext,
     } = this.state;
     const { entry, hasAnsi, raw } = row;
     const previewHighlights = highlighterExpressions && !_.isEqual(highlighterExpressions, row.searchWords);
     const highlights = previewHighlights ? highlighterExpressions : row.searchWords;
-    const needsHighlighter = highlights && highlights.length > 0 && highlights[0].length > 0;
+    const needsHighlighter = highlights && highlights.length > 0 && highlights[0] && highlights[0].length > 0;
     const highlightClassName = classnames('logs-row__match-highlight', {
       'logs-row__match-highlight--preview': previewHighlights,
     });
 
     return (
-      <div className="logs-row">
-        {showDuplicates && (
-          <div className="logs-row__duplicates">{row.duplicates > 0 ? `${row.duplicates + 1}x` : null}</div>
-        )}
-        <div className={row.logLevel ? `logs-row__level logs-row__level--${row.logLevel}` : ''} />
-        {showUtc && (
-          <div className="logs-row__time" title={`Local: ${row.timeLocal} (${row.timeFromNow})`}>
-            {row.timestamp}
-          </div>
-        )}
-        {showLocalTime && (
-          <div className="logs-row__localtime" title={`${row.timestamp} (${row.timeFromNow})`}>
-            {row.timeLocal}
-          </div>
-        )}
-        {showLabels && (
-          <div className="logs-row__labels">
-            <LogLabels getRows={getRows} labels={row.uniqueLabels} onClickLabel={onClickLabel} />
-          </div>
-        )}
-        <div className="logs-row__message" onMouseEnter={this.onMouseOverMessage} onMouseLeave={this.onMouseOutMessage}>
-          {parsed && (
-            <Highlighter
-              autoEscape
-              highlightTag={FieldHighlight(this.onClickHighlight)}
-              textToHighlight={entry}
-              searchWords={parsedFieldHighlights}
-              highlightClassName="logs-row__field-highlight"
-            />
-          )}
-          {!parsed && needsHighlighter && (
-            <Highlighter
-              textToHighlight={entry}
-              searchWords={highlights}
-              findChunks={findHighlightChunksInText}
-              highlightClassName={highlightClassName}
-            />
-          )}
-          {hasAnsi && !parsed && !needsHighlighter && <LogMessageAnsi value={raw} />}
-          {!hasAnsi && !parsed && !needsHighlighter && entry}
-          {showFieldStats && (
-            <div className="logs-row__stats">
-              <LogLabelStats
-                stats={fieldStats}
-                label={fieldLabel}
-                value={fieldValue}
-                onClickClose={this.onClickClose}
-                rowCount={fieldCount}
-              />
+      <ThemeContext.Consumer>
+        {theme => {
+          const styles = this.state.showContext
+            ? cx(logRowStyles, getLogRowWithContextStyles(theme, this.state).row)
+            : logRowStyles;
+          return (
+            <div className={`logs-row ${this.props.className}`}>
+              {showDuplicates && (
+                <div className="logs-row__duplicates">{row.duplicates > 0 ? `${row.duplicates + 1}x` : null}</div>
+              )}
+              <div className={row.logLevel ? `logs-row__level logs-row__level--${row.logLevel}` : ''} />
+              {showUtc && (
+                <div className="logs-row__time" title={`Local: ${row.timeLocal} (${row.timeFromNow})`}>
+                  {row.timestamp}
+                </div>
+              )}
+              {showLocalTime && (
+                <div className="logs-row__localtime" title={`${row.timestamp} (${row.timeFromNow})`}>
+                  {row.timeLocal}
+                </div>
+              )}
+              {showLabels && (
+                <div className="logs-row__labels">
+                  <LogLabels getRows={getRows} labels={row.uniqueLabels} onClickLabel={onClickLabel} />
+                </div>
+              )}
+              <div
+                className="logs-row__message"
+                onMouseEnter={this.onMouseOverMessage}
+                onMouseLeave={this.onMouseOutMessage}
+              >
+                <div
+                  className={css`
+                    position: relative;
+                  `}
+                >
+                  {showContext && context && (
+                    <LogRowContext
+                      row={row}
+                      context={context}
+                      errors={errors}
+                      hasMoreContextRows={hasMoreContextRows}
+                      onOutsideClick={this.toggleContext}
+                      onLoadMoreContext={() => {
+                        if (updateLimit) {
+                          updateLimit();
+                        }
+                      }}
+                    />
+                  )}
+                  <span className={styles}>
+                    {parsed && (
+                      <Highlighter
+                        autoEscape
+                        highlightTag={FieldHighlight(this.onClickHighlight)}
+                        textToHighlight={entry}
+                        searchWords={parsedFieldHighlights}
+                        highlightClassName="logs-row__field-highlight"
+                      />
+                    )}
+                    {!parsed && needsHighlighter && (
+                      <Highlighter
+                        textToHighlight={entry}
+                        searchWords={highlights}
+                        findChunks={findHighlightChunksInText}
+                        highlightClassName={highlightClassName}
+                      />
+                    )}
+                    {hasAnsi && !parsed && !needsHighlighter && <LogMessageAnsi value={raw} />}
+                    {!hasAnsi && !parsed && !needsHighlighter && entry}
+                    {showFieldStats && (
+                      <div className="logs-row__stats">
+                        <LogLabelStats
+                          stats={fieldStats}
+                          label={fieldLabel}
+                          value={fieldValue}
+                          onClickClose={this.onClickClose}
+                          rowCount={fieldCount}
+                        />
+                      </div>
+                    )}
+                  </span>
+                  {row.searchWords && row.searchWords.length > 0 && (
+                    <span
+                      onClick={this.onContextToggle}
+                      className={css`
+                        visibility: hidden;
+                        white-space: nowrap;
+                        position: relative;
+                        z-index: ${showContext ? 1 : 0};
+                        cursor: pointer;
+                        .logs-row:hover & {
+                          visibility: visible;
+                          margin-left: 10px;
+                          text-decoration: underline;
+                        }
+                      `}
+                    >
+                      {showContext ? 'Hide' : 'Show'} context
+                    </span>
+                  )}
+                </div>
+              </div>
             </div>
-          )}
-        </div>
-      </div>
+          );
+        }}
+      </ThemeContext.Consumer>
     );
   }
+
+  render() {
+    const { showContext } = this.state;
+
+    if (showContext) {
+      return (
+        <>
+          <LogRowContextProvider row={this.props.row} getRowContext={this.props.getRowContext}>
+            {({ result, errors, hasMoreContextRows, updateLimit }) => {
+              return <>{this.renderLogRow(result, errors, hasMoreContextRows, updateLimit)}</>;
+            }}
+          </LogRowContextProvider>
+        </>
+      );
+    }
+
+    return this.renderLogRow();
+  }
 }
diff --git a/public/app/features/explore/LogRowContext.tsx b/public/app/features/explore/LogRowContext.tsx
new file mode 100644
index 000000000000..da9c3ec48123
--- /dev/null
+++ b/public/app/features/explore/LogRowContext.tsx
@@ -0,0 +1,239 @@
+import React, { useContext, useRef, useState, useLayoutEffect } from 'react';
+import {
+  ThemeContext,
+  List,
+  GrafanaTheme,
+  selectThemeVariant,
+  ClickOutsideWrapper,
+  CustomScrollbar,
+  DataQueryError,
+  LogRowModel,
+} from '@grafana/ui';
+import { css, cx } from 'emotion';
+import { LogRowContextRows, HasMoreContextRows, LogRowContextQueryErrors } from './LogRowContextProvider';
+import { Alert } from './Error';
+
+interface LogRowContextProps {
+  row: LogRowModel;
+  context: LogRowContextRows;
+  errors?: LogRowContextQueryErrors;
+  hasMoreContextRows: HasMoreContextRows;
+  onOutsideClick: () => void;
+  onLoadMoreContext: () => void;
+}
+
+const getLogRowContextStyles = (theme: GrafanaTheme) => {
+  const gradientTop = selectThemeVariant(
+    {
+      light: theme.colors.white,
+      dark: theme.colors.dark1,
+    },
+    theme.type
+  );
+  const gradientBottom = selectThemeVariant(
+    {
+      light: theme.colors.gray7,
+      dark: theme.colors.dark2,
+    },
+    theme.type
+  );
+
+  const boxShadowColor = selectThemeVariant(
+    {
+      light: theme.colors.gray5,
+      dark: theme.colors.black,
+    },
+    theme.type
+  );
+  const borderColor = selectThemeVariant(
+    {
+      light: theme.colors.gray5,
+      dark: theme.colors.dark9,
+    },
+    theme.type
+  );
+
+  return {
+    commonStyles: css`
+      position: absolute;
+      width: calc(100% + 20px);
+      left: -10px;
+      height: 250px;
+      z-index: 2;
+      overflow: hidden;
+      background: ${theme.colors.pageBg};
+      background: linear-gradient(180deg, ${gradientTop} 0%, ${gradientBottom} 104.25%);
+      box-shadow: 0px 2px 4px ${boxShadowColor}, 0px 0px 2px ${boxShadowColor};
+      border: 1px solid ${borderColor};
+      border-radius: ${theme.border.radius.md};
+    `,
+    header: css`
+      height: 30px;
+      padding: 0 10px;
+      display: flex;
+      align-items: center;
+      background: ${borderColor};
+    `,
+    logs: css`
+      height: 220px;
+      padding: 10px;
+    `,
+  };
+};
+
+interface LogRowContextGroupHeaderProps {
+  row: LogRowModel;
+  rows: Array<string | DataQueryError>;
+  onLoadMoreContext: () => void;
+  shouldScrollToBottom?: boolean;
+  canLoadMoreRows?: boolean;
+}
+interface LogRowContextGroupProps extends LogRowContextGroupHeaderProps {
+  rows: Array<string | DataQueryError>;
+  className: string;
+  error?: string;
+}
+
+const LogRowContextGroupHeader: React.FunctionComponent<LogRowContextGroupHeaderProps> = ({
+  row,
+  rows,
+  onLoadMoreContext,
+  canLoadMoreRows,
+}) => {
+  const theme = useContext(ThemeContext);
+  const { header } = getLogRowContextStyles(theme);
+
+  // Filtering out the original row from the context.
+  // Loki requires a rowTimestamp+1ns for the following logs to be queried.
+  // We don't to ns-precision calculations in Loki log row context retrieval, hence the filtering here
+  // Also see: https://github.com/grafana/loki/issues/597
+  const logRowsToRender = rows.filter(contextRow => contextRow !== row.raw);
+
+  return (
+    <div className={header}>
+      <span
+        className={css`
+          opacity: 0.6;
+        `}
+      >
+        Found {logRowsToRender.length} rows.
+      </span>
+      {(rows.length >= 10 || (rows.length > 10 && rows.length % 10 !== 0)) && canLoadMoreRows && (
+        <span
+          className={css`
+            margin-left: 10px;
+            &:hover {
+              text-decoration: underline;
+              cursor: pointer;
+            }
+          `}
+          onClick={() => onLoadMoreContext()}
+        >
+          Load 10 more
+        </span>
+      )}
+    </div>
+  );
+};
+
+const LogRowContextGroup: React.FunctionComponent<LogRowContextGroupProps> = ({
+  row,
+  rows,
+  error,
+  className,
+  shouldScrollToBottom,
+  canLoadMoreRows,
+  onLoadMoreContext,
+}) => {
+  const theme = useContext(ThemeContext);
+  const { commonStyles, logs } = getLogRowContextStyles(theme);
+  const [scrollTop, setScrollTop] = useState(0);
+  const listContainerRef = useRef<HTMLDivElement>();
+
+  useLayoutEffect(() => {
+    if (shouldScrollToBottom && listContainerRef.current) {
+      setScrollTop(listContainerRef.current.offsetHeight);
+    }
+  });
+
+  const headerProps = {
+    row,
+    rows,
+    onLoadMoreContext,
+    canLoadMoreRows,
+  };
+
+  return (
+    <div className={cx(className, commonStyles)}>
+      {/* When displaying "after" context */}
+      {shouldScrollToBottom && !error && <LogRowContextGroupHeader {...headerProps} />}
+      <div className={logs}>
+        <CustomScrollbar autoHide scrollTop={scrollTop}>
+          <div ref={listContainerRef}>
+            {!error && (
+              <List
+                items={rows}
+                renderItem={item => {
+                  return (
+                    <div
+                      className={css`
+                        padding: 5px 0;
+                      `}
+                    >
+                      {item}
+                    </div>
+                  );
+                }}
+              />
+            )}
+            {error && <Alert message={error} />}
+          </div>
+        </CustomScrollbar>
+      </div>
+      {/* When displaying "before" context */}
+      {!shouldScrollToBottom && !error && <LogRowContextGroupHeader {...headerProps} />}
+    </div>
+  );
+};
+
+export const LogRowContext: React.FunctionComponent<LogRowContextProps> = ({
+  row,
+  context,
+  errors,
+  onOutsideClick,
+  onLoadMoreContext,
+  hasMoreContextRows,
+}) => {
+  return (
+    <ClickOutsideWrapper onClick={onOutsideClick}>
+      <div>
+        {context.after && (
+          <LogRowContextGroup
+            rows={context.after}
+            error={errors && errors.after}
+            row={row}
+            className={css`
+              top: -250px;
+            `}
+            shouldScrollToBottom
+            canLoadMoreRows={hasMoreContextRows.after}
+            onLoadMoreContext={onLoadMoreContext}
+          />
+        )}
+
+        {context.before && (
+          <LogRowContextGroup
+            onLoadMoreContext={onLoadMoreContext}
+            canLoadMoreRows={hasMoreContextRows.before}
+            row={row}
+            rows={context.before}
+            error={errors && errors.before}
+            className={css`
+              top: 100%;
+            `}
+          />
+        )}
+      </div>
+    </ClickOutsideWrapper>
+  );
+};
diff --git a/public/app/features/explore/LogRowContextProvider.tsx b/public/app/features/explore/LogRowContextProvider.tsx
new file mode 100644
index 000000000000..a43d982e2b48
--- /dev/null
+++ b/public/app/features/explore/LogRowContextProvider.tsx
@@ -0,0 +1,115 @@
+import { DataQueryResponse, DataQueryError, LogRowModel } from '@grafana/ui';
+import { useState, useEffect } from 'react';
+import flatten from 'lodash/flatten';
+import useAsync from 'react-use/lib/useAsync';
+
+export interface LogRowContextRows {
+  before?: string[];
+  after?: string[];
+}
+export interface LogRowContextQueryErrors {
+  before?: string;
+  after?: string;
+}
+
+export interface HasMoreContextRows {
+  before: boolean;
+  after: boolean;
+}
+
+interface LogRowContextProviderProps {
+  row: LogRowModel;
+  getRowContext: (row: LogRowModel, options?: any) => Promise<DataQueryResponse>;
+  children: (props: {
+    result: LogRowContextRows;
+    errors: LogRowContextQueryErrors;
+    hasMoreContextRows: HasMoreContextRows;
+    updateLimit: () => void;
+  }) => JSX.Element;
+}
+
+export const LogRowContextProvider: React.FunctionComponent<LogRowContextProviderProps> = ({
+  getRowContext,
+  row,
+  children,
+}) => {
+  const [limit, setLimit] = useState(10);
+  const [result, setResult] = useState<{
+    data: string[][];
+    errors: string[];
+  }>(null);
+  const [hasMoreContextRows, setHasMoreContextRows] = useState({
+    before: true,
+    after: true,
+  });
+
+  const { value } = useAsync(async () => {
+    const promises = [
+      getRowContext(row, {
+        limit,
+      }),
+      getRowContext(row, {
+        limit,
+        direction: 'FORWARD',
+      }),
+    ];
+
+    const results: Array<DataQueryResponse | DataQueryError> = await Promise.all(promises.map(p => p.catch(e => e)));
+
+    return {
+      data: results.map(result => {
+        if ((result as DataQueryResponse).data) {
+          return (result as DataQueryResponse).data.map(series => {
+            return series.rows.map(row => row[1]);
+          });
+        } else {
+          return [];
+        }
+      }),
+      errors: results.map(result => {
+        if ((result as DataQueryError).message) {
+          return (result as DataQueryError).message;
+        } else {
+          return null;
+        }
+      }),
+    };
+  }, [limit]);
+
+  useEffect(() => {
+    if (value) {
+      setResult(currentResult => {
+        let hasMoreLogsBefore = true,
+          hasMoreLogsAfter = true;
+
+        if (currentResult && currentResult.data[0].length === value.data[0].length) {
+          hasMoreLogsBefore = false;
+        }
+
+        if (currentResult && currentResult.data[1].length === value.data[1].length) {
+          hasMoreLogsAfter = false;
+        }
+
+        setHasMoreContextRows({
+          before: hasMoreLogsBefore,
+          after: hasMoreLogsAfter,
+        });
+
+        return value;
+      });
+    }
+  }, [value]);
+
+  return children({
+    result: {
+      before: result ? flatten(result.data[0]) : [],
+      after: result ? flatten(result.data[1]) : [],
+    },
+    errors: {
+      before: result ? result.errors[0] : null,
+      after: result ? result.errors[1] : null,
+    },
+    hasMoreContextRows,
+    updateLimit: () => setLimit(limit + 10),
+  });
+};
diff --git a/public/app/features/explore/Logs.tsx b/public/app/features/explore/Logs.tsx
index 6603ac0330dc..b6ee5a7f7312 100644
--- a/public/app/features/explore/Logs.tsx
+++ b/public/app/features/explore/Logs.tsx
@@ -2,16 +2,26 @@ import _ from 'lodash';
 import React, { PureComponent } from 'react';
 
 import * as rangeUtil from '@grafana/ui/src/utils/rangeutil';
-import { RawTimeRange, Switch, LogLevel, TimeZone, TimeRange, AbsoluteTimeRange } from '@grafana/ui';
+import {
+  RawTimeRange,
+  Switch,
+  LogLevel,
+  TimeZone,
+  TimeRange,
+  AbsoluteTimeRange,
+  LogsMetaKind,
+  LogsModel,
+  LogsDedupStrategy,
+  LogRowModel,
+} from '@grafana/ui';
 import TimeSeries from 'app/core/time_series2';
 
-import { LogsDedupDescription, LogsDedupStrategy, LogsModel, LogsMetaKind } from 'app/core/logs_model';
-
 import ToggleButtonGroup, { ToggleButton } from 'app/core/components/ToggleButtonGroup/ToggleButtonGroup';
 
 import Graph from './Graph';
 import { LogLabels } from './LogLabels';
 import { LogRow } from './LogRow';
+import { LogsDedupDescription } from 'app/core/logs_model';
 
 const PREVIEW_LIMIT = 100;
 
@@ -60,6 +70,7 @@ interface Props {
   onStopScanning?: () => void;
   onDedupStrategyChange: (dedupStrategy: LogsDedupStrategy) => void;
   onToggleLogLevel: (hiddenLogLevels: Set<LogLevel>) => void;
+  getRowContext?: (row: LogRowModel, options?: any) => Promise<any>;
 }
 
 interface State {
@@ -174,7 +185,7 @@ export default class Logs extends PureComponent<Props, State> {
     const hasLabel = hasData && dedupedData.hasUniqueLabels;
     const dedupCount = dedupedData.rows.reduce((sum, row) => sum + row.duplicates, 0);
     const showDuplicates = dedupStrategy !== LogsDedupStrategy.none && dedupCount > 0;
-    const meta = [...data.meta];
+    const meta = data.meta ? [...data.meta] : [];
 
     if (dedupStrategy !== LogsDedupStrategy.none) {
       meta.push({
@@ -192,7 +203,9 @@ export default class Logs extends PureComponent<Props, State> {
 
     // React profiler becomes unusable if we pass all rows to all rows and their labels, using getter instead
     const getRows = () => processedRows;
-    const timeSeries = data.series.map(series => new TimeSeries(series));
+    const timeSeries = data.series
+      ? data.series.map(series => new TimeSeries(series))
+      : [new TimeSeries({ datapoints: [] })];
     const absRange = {
       from: range.from.valueOf(),
       to: range.to.valueOf(),
@@ -252,6 +265,7 @@ export default class Logs extends PureComponent<Props, State> {
               <LogRow
                 key={index}
                 getRows={getRows}
+                getRowContext={this.props.getRowContext}
                 highlighterExpressions={highlighterExpressions}
                 row={row}
                 showDuplicates={showDuplicates}
@@ -268,6 +282,7 @@ export default class Logs extends PureComponent<Props, State> {
               <LogRow
                 key={PREVIEW_LIMIT + index}
                 getRows={getRows}
+                getRowContext={this.props.getRowContext}
                 row={row}
                 showDuplicates={showDuplicates}
                 showLabels={showLabels && hasLabel}
diff --git a/public/app/features/explore/LogsContainer.tsx b/public/app/features/explore/LogsContainer.tsx
index 83cce42c7d19..79846e1d4bc9 100644
--- a/public/app/features/explore/LogsContainer.tsx
+++ b/public/app/features/explore/LogsContainer.tsx
@@ -1,22 +1,38 @@
 import React, { PureComponent } from 'react';
 import { hot } from 'react-hot-loader';
 import { connect } from 'react-redux';
-import { RawTimeRange, TimeRange, LogLevel, TimeZone, AbsoluteTimeRange, toUtc, dateTime } from '@grafana/ui';
+import {
+  RawTimeRange,
+  TimeRange,
+  LogLevel,
+  TimeZone,
+  AbsoluteTimeRange,
+  toUtc,
+  dateTime,
+  DataSourceApi,
+  LogsModel,
+  LogRowModel,
+  LogsDedupStrategy,
+  LoadingState,
+} from '@grafana/ui';
 
 import { ExploreId, ExploreItemState } from 'app/types/explore';
-import { LogsModel, LogsDedupStrategy } from 'app/core/logs_model';
 import { StoreState } from 'app/types';
 
-import { toggleLogs, changeDedupStrategy, changeTime } from './state/actions';
+import { changeDedupStrategy, changeTime } from './state/actions';
 import Logs from './Logs';
 import Panel from './Panel';
-import { toggleLogLevelAction } from 'app/features/explore/state/actionTypes';
+import { toggleLogLevelAction, changeRefreshIntervalAction } from 'app/features/explore/state/actionTypes';
 import { deduplicatedLogsSelector, exploreItemUIStateSelector } from 'app/features/explore/state/selectors';
 import { getTimeZone } from '../profile/state/selectors';
+import { LiveLogsWithTheme } from './LiveLogs';
+import { offOption } from '@grafana/ui/src/components/RefreshPicker/RefreshPicker';
 
 interface LogsContainerProps {
+  datasourceInstance: DataSourceApi | null;
   exploreId: ExploreId;
   loading: boolean;
+
   logsHighlighterExpressions?: string[];
   logsResult?: LogsModel;
   dedupedResult?: LogsModel;
@@ -27,14 +43,14 @@ interface LogsContainerProps {
   timeZone: TimeZone;
   scanning?: boolean;
   scanRange?: RawTimeRange;
-  showingLogs: boolean;
-  toggleLogs: typeof toggleLogs;
   toggleLogLevelAction: typeof toggleLogLevelAction;
   changeDedupStrategy: typeof changeDedupStrategy;
   dedupStrategy: LogsDedupStrategy;
   hiddenLogLevels: Set<LogLevel>;
   width: number;
   changeTime: typeof changeTime;
+  isLive: boolean;
+  stopLive: typeof changeRefreshIntervalAction;
 }
 
 export class LogsContainer extends PureComponent<LogsContainerProps> {
@@ -48,8 +64,9 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
     changeTime(exploreId, range);
   };
 
-  onClickLogsButton = () => {
-    this.props.toggleLogs(this.props.exploreId, this.props.showingLogs);
+  onStopLive = () => {
+    const { exploreId } = this.props;
+    this.props.stopLive({ exploreId, refreshInterval: offOption.value });
   };
 
   handleDedupStrategyChange = (dedupStrategy: LogsDedupStrategy) => {
@@ -64,6 +81,16 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
     });
   };
 
+  getLogRowContext = async (row: LogRowModel, options?: any) => {
+    const { datasourceInstance } = this.props;
+
+    if (datasourceInstance) {
+      return datasourceInstance.getLogRowContext(row, options);
+    }
+
+    return [];
+  };
+
   render() {
     const {
       exploreId,
@@ -76,15 +103,23 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
       onStopScanning,
       range,
       timeZone,
-      showingLogs,
       scanning,
       scanRange,
       width,
       hiddenLogLevels,
+      isLive,
     } = this.props;
 
+    if (isLive) {
+      return (
+        <Panel label="Logs" loading={false} isOpen>
+          <LiveLogsWithTheme logsResult={logsResult} stopLive={this.onStopLive} />
+        </Panel>
+      );
+    }
+
     return (
-      <Panel label="Logs" loading={loading} isOpen={showingLogs} onToggle={this.onClickLogsButton}>
+      <Panel label="Logs" loading={loading} isOpen>
         <Logs
           dedupStrategy={this.props.dedupStrategy || LogsDedupStrategy.none}
           data={logsResult}
@@ -104,6 +139,7 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
           scanRange={scanRange}
           width={width}
           hiddenLogLevels={hiddenLogLevels}
+          getRowContext={this.getLogRowContext}
         />
       </Panel>
     );
@@ -113,9 +149,18 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
 function mapStateToProps(state: StoreState, { exploreId }) {
   const explore = state.explore;
   const item: ExploreItemState = explore[exploreId];
-  const { logsHighlighterExpressions, logsResult, logIsLoading, scanning, scanRange, range } = item;
-  const loading = logIsLoading;
-  const { showingLogs, dedupStrategy } = exploreItemUIStateSelector(item);
+  const {
+    logsHighlighterExpressions,
+    logsResult,
+    loadingState,
+    scanning,
+    scanRange,
+    range,
+    datasourceInstance,
+    isLive,
+  } = item;
+  const loading = loadingState === LoadingState.Loading || loadingState === LoadingState.Streaming;
+  const { dedupStrategy } = exploreItemUIStateSelector(item);
   const hiddenLogLevels = new Set(item.hiddenLogLevels);
   const dedupedResult = deduplicatedLogsSelector(item);
   const timeZone = getTimeZone(state.user);
@@ -126,20 +171,21 @@ function mapStateToProps(state: StoreState, { exploreId }) {
     logsResult,
     scanning,
     scanRange,
-    showingLogs,
     range,
     timeZone,
     dedupStrategy,
     hiddenLogLevels,
     dedupedResult,
+    datasourceInstance,
+    isLive,
   };
 }
 
 const mapDispatchToProps = {
-  toggleLogs,
   changeDedupStrategy,
   toggleLogLevelAction,
   changeTime,
+  stopLive: changeRefreshIntervalAction,
 };
 
 export default hot(module)(
diff --git a/public/app/features/explore/Panel.tsx b/public/app/features/explore/Panel.tsx
index dc75cb0ecca2..841a19dba2a6 100644
--- a/public/app/features/explore/Panel.tsx
+++ b/public/app/features/explore/Panel.tsx
@@ -4,18 +4,27 @@ interface Props {
   isOpen: boolean;
   label: string;
   loading?: boolean;
-  onToggle: (isOpen: boolean) => void;
+  collapsible?: boolean;
+  onToggle?: (isOpen: boolean) => void;
 }
 
 export default class Panel extends PureComponent<Props> {
-  onClickToggle = () => this.props.onToggle(!this.props.isOpen);
+  onClickToggle = () => {
+    const { onToggle, isOpen } = this.props;
+    if (onToggle) {
+      onToggle(!isOpen);
+    }
+  };
 
   render() {
-    const { isOpen, loading } = this.props;
+    const { isOpen, loading, collapsible } = this.props;
+    const panelClass = collapsible
+      ? 'explore-panel explore-panel--collapsible panel-container'
+      : 'explore-panel panel-container';
     const iconClass = isOpen ? 'fa fa-caret-up' : 'fa fa-caret-down';
     const loaderClass = loading ? 'explore-panel__loader explore-panel__loader--active' : 'explore-panel__loader';
     return (
-      <div className="explore-panel panel-container">
+      <div className={panelClass}>
         <div className="explore-panel__header" onClick={this.onClickToggle}>
           <div className="explore-panel__header-buttons">
             <span className={iconClass} />
diff --git a/public/app/features/explore/QueryEditor.tsx b/public/app/features/explore/QueryEditor.tsx
index 30f876886c19..d29e8a0e8925 100644
--- a/public/app/features/explore/QueryEditor.tsx
+++ b/public/app/features/explore/QueryEditor.tsx
@@ -2,7 +2,7 @@
 import React, { PureComponent } from 'react';
 
 // Services
-import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
+import { getAngularLoader, AngularComponent } from '@grafana/runtime';
 import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
 // Types
@@ -60,6 +60,7 @@ export default class QueryEditor extends PureComponent<QueryEditorProps, any> {
     this.component = loader.load(this.element, scopeProps, template);
     setTimeout(() => {
       this.props.onQueryChange(target);
+      this.props.onExecuteQuery();
     }, 1);
   }
 
diff --git a/public/app/features/explore/QueryField.tsx b/public/app/features/explore/QueryField.tsx
index e5d7ff436313..d2a5d04e0d44 100644
--- a/public/app/features/explore/QueryField.tsx
+++ b/public/app/features/explore/QueryField.tsx
@@ -329,11 +329,13 @@ export class QueryField extends React.PureComponent<QueryFieldProps, QueryFieldS
       }
 
       return true;
-    } else {
+    } else if (!event.shiftKey) {
+      // Run queries if Shift is not pressed, otherwise pass through
       this.executeOnChangeAndRunQueries();
 
-      return undefined;
+      return true;
     }
+    return undefined;
   };
 
   onKeyDown = (event: KeyboardEvent, change: Change) => {
diff --git a/public/app/features/explore/QueryRow.tsx b/public/app/features/explore/QueryRow.tsx
index 969d39db7b4b..cad509d20716 100644
--- a/public/app/features/explore/QueryRow.tsx
+++ b/public/app/features/explore/QueryRow.tsx
@@ -16,37 +16,41 @@ import { StoreState } from 'app/types';
 import {
   TimeRange,
   DataQuery,
-  ExploreDataSourceApi,
+  DataSourceApi,
   QueryFixAction,
   DataSourceStatus,
   PanelData,
-  LoadingState,
   DataQueryError,
 } from '@grafana/ui';
-import { HistoryItem, ExploreItemState, ExploreId } from 'app/types/explore';
+import { HistoryItem, ExploreItemState, ExploreId, ExploreMode } from 'app/types/explore';
 import { Emitter } from 'app/core/utils/emitter';
 import { highlightLogsExpressionAction, removeQueryRowAction } from './state/actionTypes';
 import QueryStatus from './QueryStatus';
 
-interface QueryRowProps {
+interface PropsFromParent {
+  exploreId: ExploreId;
+  index: number;
+  exploreEvents: Emitter;
+}
+
+interface QueryRowProps extends PropsFromParent {
   addQueryRow: typeof addQueryRow;
   changeQuery: typeof changeQuery;
   className?: string;
   exploreId: ExploreId;
-  datasourceInstance: ExploreDataSourceApi;
+  datasourceInstance: DataSourceApi;
   datasourceStatus: DataSourceStatus;
   highlightLogsExpressionAction: typeof highlightLogsExpressionAction;
   history: HistoryItem[];
-  index: number;
   query: DataQuery;
   modifyQueries: typeof modifyQueries;
-  exploreEvents: Emitter;
   range: TimeRange;
   removeQueryRowAction: typeof removeQueryRowAction;
   runQueries: typeof runQueries;
   queryResponse: PanelData;
   latency: number;
   queryErrors: DataQueryError[];
+  mode: ExploreMode;
 }
 
 export class QueryRow extends PureComponent<QueryRowProps> {
@@ -95,7 +99,7 @@ export class QueryRow extends PureComponent<QueryRowProps> {
     const { datasourceInstance } = this.props;
     if (datasourceInstance.getHighlighterExpression) {
       const { exploreId } = this.props;
-      const expressions = [datasourceInstance.getHighlighterExpression(value)];
+      const expressions = datasourceInstance.getHighlighterExpression(value);
       this.props.highlightLogsExpressionAction({ exploreId, expressions });
     }
   }, 500);
@@ -111,8 +115,17 @@ export class QueryRow extends PureComponent<QueryRowProps> {
       queryResponse,
       latency,
       queryErrors,
+      mode,
     } = this.props;
-    const QueryField = datasourceInstance.components.ExploreQueryField;
+    let QueryField;
+
+    if (mode === ExploreMode.Metrics && datasourceInstance.components.ExploreMetricsQueryField) {
+      QueryField = datasourceInstance.components.ExploreMetricsQueryField;
+    } else if (mode === ExploreMode.Logs && datasourceInstance.components.ExploreLogsQueryField) {
+      QueryField = datasourceInstance.components.ExploreLogsQueryField;
+    } else {
+      QueryField = datasourceInstance.components.ExploreQueryField;
+    }
 
     return (
       <div className="query-row">
@@ -176,25 +189,18 @@ function mapStateToProps(state: StoreState, { exploreId, index }: QueryRowProps)
     range,
     datasourceError,
     graphResult,
-    graphIsLoading,
-    tableIsLoading,
-    logIsLoading,
+    loadingState,
     latency,
     queryErrors,
+    mode,
   } = item;
   const query = queries[index];
   const datasourceStatus = datasourceError ? DataSourceStatus.Disconnected : DataSourceStatus.Connected;
   const error = queryErrors.filter(queryError => queryError.refId === query.refId)[0];
   const series = graphResult ? graphResult : []; // TODO: use SeriesData
-  const queryResponseState =
-    graphIsLoading || tableIsLoading || logIsLoading
-      ? LoadingState.Loading
-      : error
-      ? LoadingState.Error
-      : LoadingState.Done;
   const queryResponse: PanelData = {
     series,
-    state: queryResponseState,
+    state: loadingState,
     error,
   };
 
@@ -207,6 +213,7 @@ function mapStateToProps(state: StoreState, { exploreId, index }: QueryRowProps)
     queryResponse,
     latency,
     queryErrors,
+    mode,
   };
 }
 
@@ -219,9 +226,7 @@ const mapDispatchToProps = {
   runQueries,
 };
 
-export default hot(module)(
-  connect(
-    mapStateToProps,
-    mapDispatchToProps
-  )(QueryRow)
-);
+export default hot(module)(connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(QueryRow) as React.ComponentType<PropsFromParent>);
diff --git a/public/app/features/explore/Table.tsx b/public/app/features/explore/Table.tsx
index bbf338df8f90..8c1891de8755 100644
--- a/public/app/features/explore/Table.tsx
+++ b/public/app/features/explore/Table.tsx
@@ -26,7 +26,7 @@ export default class Table extends PureComponent<TableProps> {
         if (e.target) {
           const link = e.target as HTMLElement;
           if (link.className === 'link') {
-            const columnKey = column.Header;
+            const columnKey = column.Header().props.title;
             const rowValue = rowInfo.row[columnKey];
             this.props.onClickCell(columnKey, rowValue);
           }
diff --git a/public/app/features/explore/TableContainer.tsx b/public/app/features/explore/TableContainer.tsx
index 78f190a05cb8..ea227e78b976 100644
--- a/public/app/features/explore/TableContainer.tsx
+++ b/public/app/features/explore/TableContainer.tsx
@@ -9,6 +9,7 @@ import { toggleTable } from './state/actions';
 import Table from './Table';
 import Panel from './Panel';
 import TableModel from 'app/core/table_model';
+import { LoadingState } from '@grafana/ui';
 
 interface TableContainerProps {
   exploreId: ExploreId;
@@ -27,13 +28,9 @@ export class TableContainer extends PureComponent<TableContainerProps> {
   render() {
     const { loading, onClickCell, showingTable, tableResult } = this.props;
 
-    if (!tableResult) {
-      return null;
-    }
-
     return (
-      <Panel label="Table" loading={loading} isOpen={showingTable} onToggle={this.onClickTableButton}>
-        <Table data={tableResult} loading={loading} onClickCell={onClickCell} />
+      <Panel label="Table" loading={loading} collapsible isOpen={showingTable} onToggle={this.onClickTableButton}>
+        {tableResult && <Table data={tableResult} loading={loading} onClickCell={onClickCell} />}
       </Panel>
     );
   }
@@ -42,8 +39,11 @@ export class TableContainer extends PureComponent<TableContainerProps> {
 function mapStateToProps(state: StoreState, { exploreId }) {
   const explore = state.explore;
   const item: ExploreItemState = explore[exploreId];
-  const { tableIsLoading, showingTable, tableResult } = item;
-  const loading = tableIsLoading;
+  const { loadingState, showingTable, tableResult } = item;
+  const loading =
+    tableResult && tableResult.rows.length > 0
+      ? false
+      : loadingState === LoadingState.Loading || loadingState === LoadingState.Streaming;
   return { loading, showingTable, tableResult };
 }
 
diff --git a/public/app/features/explore/__snapshots__/Graph.test.tsx.snap b/public/app/features/explore/__snapshots__/Graph.test.tsx.snap
index c38fb26a2523..d43f94856055 100644
--- a/public/app/features/explore/__snapshots__/Graph.test.tsx.snap
+++ b/public/app/features/explore/__snapshots__/Graph.test.tsx.snap
@@ -11,450 +11,128 @@ exports[`Render should render component 1`] = `
       }
     }
   />
-  <Legend
-    data={
+  <GraphLegend
+    displayMode="list"
+    items={
       Array [
         Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "+Inf",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.1",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.2",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.4",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "1",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "120",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "20",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "3",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "60",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "8",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "+Inf",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.1",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.4",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "1",
-          },
-          "values": Array [
-            Array [
-              1537847900,
-              "953",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "120",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "20",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "3",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "60",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "8",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
         },
       ]
     }
-    hiddenSeries={Set {}}
-    onToggleSeries={[Function]}
+    onLabelClick={[Function]}
+    placement="under"
   />
 </Fragment>
 `;
@@ -484,473 +162,134 @@ exports[`Render should render component with disclaimer 1`] = `
       }
     }
   />
-  <Legend
-    data={
+  <GraphLegend
+    displayMode="list"
+    items={
       Array [
         Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "+Inf",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.1",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.2",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.4",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "1",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "120",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "20",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "3",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "60",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/label/:name/values",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "8",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "16",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "+Inf",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.1",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "0.4",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "1",
-          },
-          "values": Array [
-            Array [
-              1537847900,
-              "953",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "120",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "20",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "3",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "60",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/metrics",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "8",
-          },
-          "values": Array [
-            Array [
-              1537858060,
-              "1195",
-            ],
-            Array [
-              1537858080,
-              "1195",
-            ],
-            Array [
-              1537858100,
-              "1195",
-            ],
-          ],
-        },
-        Object {
-          "metric": Object {
-            "__name__": "prometheus_http_request_duration_seconds_bucket",
-            "handler": "/query",
-            "instance": "localhost:9090",
-            "job": "prometheus",
-            "le": "+Inf",
-          },
-          "values": Array [
-            Array [
-              1537858100,
-              "55",
-            ],
-            Array [
-              1537861960,
-              "1",
-            ],
-            Array [
-              1537861980,
-              "1",
-            ],
-          ],
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
+        },
+        Object {
+          "color": undefined,
+          "isVisible": true,
+          "label": undefined,
+          "yAxis": 1,
         },
       ]
     }
-    hiddenSeries={Set {}}
-    onToggleSeries={[Function]}
+    onLabelClick={[Function]}
+    placement="under"
   />
 </Fragment>
 `;
@@ -966,10 +305,11 @@ exports[`Render should show query return no time series 1`] = `
       }
     }
   />
-  <Legend
-    data={Array []}
-    hiddenSeries={Set {}}
-    onToggleSeries={[Function]}
+  <GraphLegend
+    displayMode="list"
+    items={Array []}
+    onLabelClick={[Function]}
+    placement="under"
   />
 </Fragment>
 `;
diff --git a/public/app/features/explore/state/actionTypes.ts b/public/app/features/explore/state/actionTypes.ts
index cce8d649c9d2..68b9ac604eb1 100644
--- a/public/app/features/explore/state/actionTypes.ts
+++ b/public/app/features/explore/state/actionTypes.ts
@@ -9,17 +9,23 @@ import {
   LogLevel,
   TimeRange,
   DataQueryError,
+  SeriesData,
+  LogsModel,
+  TimeSeries,
+  DataQueryResponseData,
+  LoadingState,
 } from '@grafana/ui/src/types';
 import {
   ExploreId,
   ExploreItemState,
   HistoryItem,
   RangeScanner,
-  ResultType,
-  QueryTransaction,
   ExploreUIState,
+  ExploreMode,
+  QueryOptions,
 } from 'app/types/explore';
 import { actionCreatorFactory, noPayloadActionCreatorFactory, ActionOf } from 'app/core/redux/actionCreatorFactory';
+import TableModel from 'app/core/table_model';
 
 /**  Higher order actions
  *
@@ -49,6 +55,11 @@ export interface AddQueryRowPayload {
   query: DataQuery;
 }
 
+export interface ChangeModePayload {
+  exploreId: ExploreId;
+  mode: ExploreMode;
+}
+
 export interface ChangeQueryPayload {
   exploreId: ExploreId;
   query: DataQuery;
@@ -136,21 +147,19 @@ export interface ModifyQueriesPayload {
 export interface QueryFailurePayload {
   exploreId: ExploreId;
   response: DataQueryError;
-  resultType: ResultType;
 }
 
 export interface QueryStartPayload {
   exploreId: ExploreId;
-  resultType: ResultType;
-  rowIndex: number;
-  transaction: QueryTransaction;
 }
 
 export interface QuerySuccessPayload {
   exploreId: ExploreId;
-  result: any;
-  resultType: ResultType;
   latency: number;
+  loadingState: LoadingState;
+  graphResult: TimeSeries[];
+  tableResult: TableModel;
+  logsResult: LogsModel;
 }
 
 export interface HistoryUpdatedPayload {
@@ -198,10 +207,6 @@ export interface ToggleGraphPayload {
   exploreId: ExploreId;
 }
 
-export interface ToggleLogsPayload {
-  exploreId: ExploreId;
-}
-
 export interface UpdateUIStatePayload extends Partial<ExploreUIState> {
   exploreId: ExploreId;
 }
@@ -228,6 +233,7 @@ export interface LoadExploreDataSourcesPayload {
 
 export interface RunQueriesPayload {
   exploreId: ExploreId;
+  range: TimeRange;
 }
 
 export interface ResetQueryErrorPayload {
@@ -235,6 +241,41 @@ export interface ResetQueryErrorPayload {
   refIds: string[];
 }
 
+export interface SetUrlReplacedPayload {
+  exploreId: ExploreId;
+}
+
+export interface ProcessQueryErrorsPayload {
+  exploreId: ExploreId;
+  response: any;
+  datasourceId: string;
+}
+
+export interface ProcessQueryResultsPayload {
+  exploreId: ExploreId;
+  latency: number;
+  datasourceId: string;
+  loadingState: LoadingState;
+  series?: DataQueryResponseData[];
+  delta?: SeriesData[];
+}
+
+export interface RunQueriesBatchPayload {
+  exploreId: ExploreId;
+  queryOptions: QueryOptions;
+}
+
+export interface LimitMessageRatePayload {
+  series: SeriesData[];
+  exploreId: ExploreId;
+  datasourceId: string;
+}
+
+export interface ChangeRangePayload {
+  exploreId: ExploreId;
+  range: TimeRange;
+}
+
 /**
  * Adds a query row after the row with the given index.
  */
@@ -245,6 +286,11 @@ export const addQueryRowAction = actionCreatorFactory<AddQueryRowPayload>('explo
  */
 export const changeDatasourceAction = noPayloadActionCreatorFactory('explore/CHANGE_DATASOURCE').create();
 
+/**
+ * Change the mode of Explore.
+ */
+export const changeModeAction = actionCreatorFactory<ChangeModePayload>('explore/CHANGE_MODE').create();
+
 /**
  * Query change handler for the query row with the given index.
  * If `override` is reset the query modifications and run the queries. Use this to set queries via a link.
@@ -325,13 +371,6 @@ export const modifyQueriesAction = actionCreatorFactory<ModifyQueriesPayload>('e
  */
 export const queryFailureAction = actionCreatorFactory<QueryFailurePayload>('explore/QUERY_FAILURE').create();
 
-/**
- * Start a query transaction for the given result type.
- * @param exploreId Explore area
- * @param transaction Query options and `done` status.
- * @param resultType Associate the transaction with a result viewer, e.g., Graph
- * @param rowIndex Index is used to associate latency for this transaction with a query row
- */
 export const queryStartAction = actionCreatorFactory<QueryStartPayload>('explore/QUERY_START').create();
 
 /**
@@ -384,6 +423,7 @@ export const splitCloseAction = actionCreatorFactory<SplitCloseActionPayload>('e
  * The copy keeps all query modifications but wipes the query results.
  */
 export const splitOpenAction = actionCreatorFactory<SplitOpenPayload>('explore/SPLIT_OPEN').create();
+
 export const stateSaveAction = noPayloadActionCreatorFactory('explore/STATE_SAVE').create();
 
 /**
@@ -401,11 +441,6 @@ export const toggleTableAction = actionCreatorFactory<ToggleTablePayload>('explo
  */
 export const toggleGraphAction = actionCreatorFactory<ToggleGraphPayload>('explore/TOGGLE_GRAPH').create();
 
-/**
- * Expand/collapse the logs result viewer. When collapsed, log queries won't be run.
- */
-export const toggleLogsAction = actionCreatorFactory<ToggleLogsPayload>('explore/TOGGLE_LOGS').create();
-
 /**
  * Updates datasource instance before datasouce loading has started
  */
@@ -437,6 +472,24 @@ export const historyUpdatedAction = actionCreatorFactory<HistoryUpdatedPayload>(
 
 export const resetQueryErrorAction = actionCreatorFactory<ResetQueryErrorPayload>('explore/RESET_QUERY_ERROR').create();
 
+export const setUrlReplacedAction = actionCreatorFactory<SetUrlReplacedPayload>('explore/SET_URL_REPLACED').create();
+
+export const processQueryErrorsAction = actionCreatorFactory<ProcessQueryErrorsPayload>(
+  'explore/PROCESS_QUERY_ERRORS'
+).create();
+
+export const processQueryResultsAction = actionCreatorFactory<ProcessQueryResultsPayload>(
+  'explore/PROCESS_QUERY_RESULTS'
+).create();
+
+export const runQueriesBatchAction = actionCreatorFactory<RunQueriesBatchPayload>('explore/RUN_QUERIES_BATCH').create();
+
+export const limitMessageRatePayloadAction = actionCreatorFactory<LimitMessageRatePayload>(
+  'explore/LIMIT_MESSAGE_RATE_PAYLOAD'
+).create();
+
+export const changeRangeAction = actionCreatorFactory<ChangeRangePayload>('explore/CHANGE_RANGE').create();
+
 export type HigherOrderAction =
   | ActionOf<SplitCloseActionPayload>
   | SplitOpenAction
diff --git a/public/app/features/explore/state/actions.test.ts b/public/app/features/explore/state/actions.test.ts
index 0bae4dc1d958..ba096602c050 100644
--- a/public/app/features/explore/state/actions.test.ts
+++ b/public/app/features/explore/state/actions.test.ts
@@ -1,7 +1,6 @@
 import { refreshExplore, testDatasource, loadDatasource } from './actions';
 import { ExploreId, ExploreUrlState, ExploreUpdateState } from 'app/types';
 import { thunkTester } from 'test/core/thunk/thunkTester';
-import { LogsDedupStrategy } from 'app/core/logs_model';
 import {
   initializeExploreAction,
   InitializeExplorePayload,
@@ -18,7 +17,7 @@ import { Emitter } from 'app/core/core';
 import { ActionOf } from 'app/core/redux/actionCreatorFactory';
 import { makeInitialUpdateState } from './reducers';
 import { DataQuery } from '@grafana/ui/src/types/datasource';
-import { DefaultTimeZone, RawTimeRange } from '@grafana/ui';
+import { DefaultTimeZone, RawTimeRange, LogsDedupStrategy } from '@grafana/ui';
 import { toUtc } from '@grafana/ui/src/utils/moment_wrapper';
 
 jest.mock('app/features/plugins/datasource_srv', () => ({
diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts
index 12b1a1b8b69d..4f95744eb479 100644
--- a/public/app/features/explore/state/actions.ts
+++ b/public/app/features/explore/state/actions.ts
@@ -7,25 +7,14 @@ import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { Emitter } from 'app/core/core';
 import {
   LAST_USED_DATASOURCE_KEY,
-  clearQueryKeys,
   ensureQueries,
   generateEmptyQuery,
-  hasNonEmptyQuery,
-  makeTimeSeriesList,
-  updateHistory,
-  buildQueryTransaction,
-  serializeStateToUrlParam,
   parseUrlState,
   getTimeRange,
   getTimeRangeFromUrl,
   generateNewKeyAndAddRefIdIfMissing,
-  instanceOfDataQueryError,
-  getRefIds,
 } from 'app/core/utils/explore';
 
-// Actions
-import { updateLocation } from 'app/core/actions';
-
 // Types
 import { ThunkResult } from 'app/types';
 import {
@@ -34,17 +23,9 @@ import {
   DataQuery,
   DataSourceSelectItem,
   QueryFixAction,
-  TimeRange,
-} from '@grafana/ui/src/types';
-import {
-  ExploreId,
-  ExploreUrlState,
-  RangeScanner,
-  ResultType,
-  QueryOptions,
-  ExploreUIState,
-  QueryTransaction,
-} from 'app/types/explore';
+  LogsDedupStrategy,
+} from '@grafana/ui';
+import { ExploreId, RangeScanner, ExploreUIState, QueryTransaction, ExploreMode } from 'app/types/explore';
 import {
   updateDatasourceInstanceAction,
   changeQueryAction,
@@ -53,7 +34,6 @@ import {
   changeSizeAction,
   ChangeSizePayload,
   changeTimeAction,
-  scanStopAction,
   clearQueriesAction,
   initializeExploreAction,
   loadDatasourceMissingAction,
@@ -62,35 +42,29 @@ import {
   LoadDatasourceReadyPayload,
   loadDatasourceReadyAction,
   modifyQueriesAction,
-  queryFailureAction,
-  querySuccessAction,
-  scanRangeAction,
   scanStartAction,
   setQueriesAction,
   splitCloseAction,
   splitOpenAction,
   addQueryRowAction,
   toggleGraphAction,
-  toggleLogsAction,
   toggleTableAction,
   ToggleGraphPayload,
-  ToggleLogsPayload,
   ToggleTablePayload,
   updateUIStateAction,
-  runQueriesAction,
   testDataSourcePendingAction,
   testDataSourceSuccessAction,
   testDataSourceFailureAction,
   loadExploreDatasources,
-  queryStartAction,
-  historyUpdatedAction,
-  resetQueryErrorAction,
+  changeModeAction,
+  scanStopAction,
+  scanRangeAction,
+  runQueriesAction,
+  stateSaveAction,
 } from './actionTypes';
 import { ActionOf, ActionCreator } from 'app/core/redux/actionCreatorFactory';
-import { LogsDedupStrategy } from 'app/core/logs_model';
 import { getTimeZone } from 'app/features/profile/state/selectors';
-import { isDateTime } from '@grafana/ui/src/utils/moment_wrapper';
-import { toDataQueryError } from 'app/features/dashboard/state/PanelQueryState';
+import { offOption } from '@grafana/ui/src/components/RefreshPicker/RefreshPicker';
 
 /**
  * Updates UI state and save it to the URL
@@ -98,7 +72,7 @@ import { toDataQueryError } from 'app/features/dashboard/state/PanelQueryState';
 const updateExploreUIState = (exploreId: ExploreId, uiStateFragment: Partial<ExploreUIState>): ThunkResult<void> => {
   return dispatch => {
     dispatch(updateUIStateAction({ exploreId, ...uiStateFragment }));
-    dispatch(stateSave());
+    dispatch(stateSaveAction());
   };
 };
 
@@ -134,8 +108,21 @@ export function changeDatasource(exploreId: ExploreId, datasource: string): Thun
 
     dispatch(updateDatasourceInstanceAction({ exploreId, datasourceInstance: newDataSourceInstance }));
 
+    if (getState().explore[exploreId].isLive) {
+      dispatch(changeRefreshInterval(exploreId, offOption.value));
+    }
+
     await dispatch(loadDatasource(exploreId, newDataSourceInstance));
+    dispatch(runQueries(exploreId));
+  };
+}
 
+/**
+ * Change the display mode in Explore.
+ */
+export function changeMode(exploreId: ExploreId, mode: ExploreMode): ThunkResult<void> {
+  return dispatch => {
+    dispatch(changeModeAction({ exploreId, mode }));
     dispatch(runQueries(exploreId));
   };
 }
@@ -205,7 +192,7 @@ export function clearQueries(exploreId: ExploreId): ThunkResult<void> {
   return dispatch => {
     dispatch(scanStopAction({ exploreId }));
     dispatch(clearQueriesAction({ exploreId }));
-    dispatch(stateSave());
+    dispatch(stateSaveAction());
   };
 }
 
@@ -409,190 +396,17 @@ export function modifyQueries(
   };
 }
 
-export function processQueryErrors(
-  exploreId: ExploreId,
-  response: any,
-  resultType: ResultType,
-  datasourceId: string
-): ThunkResult<void> {
-  return (dispatch, getState) => {
-    const { datasourceInstance } = getState().explore[exploreId];
-
-    if (datasourceInstance.meta.id !== datasourceId || response.cancelled) {
-      // Navigated away, queries did not matter
-      return;
-    }
-
-    console.error(response); // To help finding problems with query syntax
-
-    if (!instanceOfDataQueryError(response)) {
-      response = toDataQueryError(response);
-    }
-
-    dispatch(
-      queryFailureAction({
-        exploreId,
-        response,
-        resultType,
-      })
-    );
-  };
-}
-
-/**
- * @param exploreId Explore area
- * @param response Response from `datasourceInstance.query()`
- * @param latency Duration between request and response
- * @param resultType The type of result
- * @param datasourceId Origin datasource instance, used to discard results if current datasource is different
- */
-export function processQueryResults(
-  exploreId: ExploreId,
-  response: any,
-  latency: number,
-  resultType: ResultType,
-  datasourceId: string
-): ThunkResult<void> {
-  return (dispatch, getState) => {
-    const { datasourceInstance, scanning, scanner } = getState().explore[exploreId];
-
-    // If datasource already changed, results do not matter
-    if (datasourceInstance.meta.id !== datasourceId) {
-      return;
-    }
-
-    const series: any[] = response.data;
-    const refIds = getRefIds(series);
-
-    // Clears any previous errors that now have a successful query, important so Angular editors are updated correctly
-    dispatch(
-      resetQueryErrorAction({
-        exploreId,
-        refIds,
-      })
-    );
-
-    const resultGetter =
-      resultType === 'Graph' ? makeTimeSeriesList : resultType === 'Table' ? (data: any[]) => data : null;
-    const result = resultGetter ? resultGetter(series, null, []) : series;
-
-    dispatch(
-      querySuccessAction({
-        exploreId,
-        result,
-        resultType,
-        latency,
-      })
-    );
-
-    // Keep scanning for results if this was the last scanning transaction
-    if (scanning) {
-      if (_.size(result) === 0) {
-        const range = scanner();
-        dispatch(scanRangeAction({ exploreId, range }));
-      } else {
-        // We can stop scanning if we have a result
-        dispatch(scanStopAction({ exploreId }));
-      }
-    }
-  };
-}
-
 /**
  * Main action to run queries and dispatches sub-actions based on which result viewers are active
  */
-export function runQueries(exploreId: ExploreId, ignoreUIState = false): ThunkResult<void> {
+export function runQueries(exploreId: ExploreId): ThunkResult<void> {
   return (dispatch, getState) => {
-    const {
-      datasourceInstance,
-      queries,
-      showingLogs,
-      showingGraph,
-      showingTable,
-      supportsGraph,
-      supportsLogs,
-      supportsTable,
-      datasourceError,
-      containerWidth,
-    } = getState().explore[exploreId];
-
-    if (datasourceError) {
-      // let's not run any queries if data source is in a faulty state
-      return;
-    }
+    const { range } = getState().explore[exploreId];
 
-    if (!hasNonEmptyQuery(queries)) {
-      dispatch(clearQueriesAction({ exploreId }));
-      dispatch(stateSave()); // Remember to saves to state and update location
-      return;
-    }
-
-    // Some datasource's query builders allow per-query interval limits,
-    // but we're using the datasource interval limit for now
-    const interval = datasourceInstance.interval;
-
-    dispatch(runQueriesAction({ exploreId }));
-    // Keep table queries first since they need to return quickly
-    if ((ignoreUIState || showingTable) && supportsTable) {
-      dispatch(
-        runQueriesForType(exploreId, 'Table', {
-          interval,
-          format: 'table',
-          instant: true,
-          valueWithRefId: true,
-        })
-      );
-    }
-    if ((ignoreUIState || showingGraph) && supportsGraph) {
-      dispatch(
-        runQueriesForType(exploreId, 'Graph', {
-          interval,
-          format: 'time_series',
-          instant: false,
-          maxDataPoints: containerWidth,
-        })
-      );
-    }
-    if ((ignoreUIState || showingLogs) && supportsLogs) {
-      dispatch(runQueriesForType(exploreId, 'Logs', { interval, format: 'logs' }));
-    }
+    const timeZone = getTimeZone(getState().user);
+    const updatedRange = getTimeRange(timeZone, range.raw);
 
-    dispatch(stateSave());
-  };
-}
-
-/**
- * Helper action to build a query transaction object and handing the query to the datasource.
- * @param exploreId Explore area
- * @param resultType Result viewer that will be associated with this query result
- * @param queryOptions Query options as required by the datasource's `query()` function.
- * @param resultGetter Optional result extractor, e.g., if the result is a list and you only need the first element.
- */
-function runQueriesForType(
-  exploreId: ExploreId,
-  resultType: ResultType,
-  queryOptions: QueryOptions
-): ThunkResult<void> {
-  return async (dispatch, getState) => {
-    const { datasourceInstance, eventBridge, queries, queryIntervals, range, scanning, history } = getState().explore[
-      exploreId
-    ];
-    const datasourceId = datasourceInstance.meta.id;
-    const transaction = buildQueryTransaction(queries, resultType, queryOptions, range, queryIntervals, scanning);
-    dispatch(queryStartAction({ exploreId, resultType, rowIndex: 0, transaction }));
-    try {
-      const now = Date.now();
-      const response = await datasourceInstance.query(transaction.options);
-      eventBridge.emit('data-received', response.data || []);
-      const latency = Date.now() - now;
-      // Side-effect: Saving history in localstorage
-      const nextHistory = updateHistory(history, datasourceId, queries);
-      dispatch(historyUpdatedAction({ exploreId, history: nextHistory }));
-      dispatch(processQueryResults(exploreId, response, latency, resultType, datasourceId));
-    } catch (err) {
-      eventBridge.emit('data-error', err);
-      dispatch(processQueryErrors(exploreId, err, resultType, datasourceId));
-    }
+    dispatch(runQueriesAction({ exploreId, range: updatedRange }));
   };
 }
 
@@ -632,7 +446,7 @@ export function setQueries(exploreId: ExploreId, rawQueries: DataQuery[]): Thunk
 export function splitClose(itemId: ExploreId): ThunkResult<void> {
   return dispatch => {
     dispatch(splitCloseAction({ itemId }));
-    dispatch(stateSave());
+    dispatch(stateSaveAction());
   };
 }
 
@@ -656,64 +470,7 @@ export function splitOpen(): ThunkResult<void> {
       urlState,
     };
     dispatch(splitOpenAction({ itemState }));
-    dispatch(stateSave());
-  };
-}
-
-const toRawTimeRange = (range: TimeRange): RawTimeRange => {
-  let from = range.raw.from;
-  if (isDateTime(from)) {
-    from = from.valueOf().toString(10);
-  }
-
-  let to = range.raw.to;
-  if (isDateTime(to)) {
-    to = to.valueOf().toString(10);
-  }
-
-  return {
-    from,
-    to,
-  };
-};
-
-/**
- * Saves Explore state to URL using the `left` and `right` parameters.
- * If split view is not active, `right` will not be set.
- */
-export function stateSave(): ThunkResult<void> {
-  return (dispatch, getState) => {
-    const { left, right, split } = getState().explore;
-    const urlStates: { [index: string]: string } = {};
-    const leftUrlState: ExploreUrlState = {
-      datasource: left.datasourceInstance.name,
-      queries: left.queries.map(clearQueryKeys),
-      range: toRawTimeRange(left.range),
-      ui: {
-        showingGraph: left.showingGraph,
-        showingLogs: left.showingLogs,
-        showingTable: left.showingTable,
-        dedupStrategy: left.dedupStrategy,
-      },
-    };
-    urlStates.left = serializeStateToUrlParam(leftUrlState, true);
-    if (split) {
-      const rightUrlState: ExploreUrlState = {
-        datasource: right.datasourceInstance.name,
-        queries: right.queries.map(clearQueryKeys),
-        range: toRawTimeRange(right.range),
-        ui: {
-          showingGraph: right.showingGraph,
-          showingLogs: right.showingLogs,
-          showingTable: right.showingTable,
-          dedupStrategy: right.dedupStrategy,
-        },
-      };
-
-      urlStates.right = serializeStateToUrlParam(rightUrlState, true);
-    }
-
-    dispatch(updateLocation({ query: urlStates }));
+    dispatch(stateSaveAction());
   };
 }
 
@@ -722,10 +479,7 @@ export function stateSave(): ThunkResult<void> {
  * queries won't be run
  */
 const togglePanelActionCreator = (
-  actionCreator:
-    | ActionCreator<ToggleGraphPayload>
-    | ActionCreator<ToggleLogsPayload>
-    | ActionCreator<ToggleTablePayload>
+  actionCreator: ActionCreator<ToggleGraphPayload> | ActionCreator<ToggleTablePayload>
 ) => (exploreId: ExploreId, isPanelVisible: boolean): ThunkResult<void> => {
   return dispatch => {
     let uiFragmentStateUpdate: Partial<ExploreUIState>;
@@ -735,9 +489,6 @@ const togglePanelActionCreator = (
       case toggleGraphAction.type:
         uiFragmentStateUpdate = { showingGraph: !isPanelVisible };
         break;
-      case toggleLogsAction.type:
-        uiFragmentStateUpdate = { showingLogs: !isPanelVisible };
-        break;
       case toggleTableAction.type:
         uiFragmentStateUpdate = { showingTable: !isPanelVisible };
         break;
@@ -757,11 +508,6 @@ const togglePanelActionCreator = (
  */
 export const toggleGraph = togglePanelActionCreator(toggleGraphAction);
 
-/**
- * Expand/collapse the logs result viewer. When collapsed, log queries won't be run.
- */
-export const toggleLogs = togglePanelActionCreator(toggleLogsAction);
-
 /**
  * Expand/collapse the table result viewer. When collapsed, table queries won't be run.
  */
diff --git a/public/app/features/explore/state/epics/limitMessageRateEpic.ts b/public/app/features/explore/state/epics/limitMessageRateEpic.ts
new file mode 100644
index 000000000000..620137069687
--- /dev/null
+++ b/public/app/features/explore/state/epics/limitMessageRateEpic.ts
@@ -0,0 +1,25 @@
+import { Epic } from 'redux-observable';
+import { map, throttleTime } from 'rxjs/operators';
+import { LoadingState } from '@grafana/ui';
+
+import { StoreState } from 'app/types';
+import { ActionOf } from '../../../../core/redux/actionCreatorFactory';
+import { limitMessageRatePayloadAction, LimitMessageRatePayload, processQueryResultsAction } from '../actionTypes';
+import { EpicDependencies } from 'app/store/configureStore';
+
+export const limitMessageRateEpic: Epic<ActionOf<any>, ActionOf<any>, StoreState, EpicDependencies> = action$ => {
+  return action$.ofType(limitMessageRatePayloadAction.type).pipe(
+    throttleTime(1),
+    map((action: ActionOf<LimitMessageRatePayload>) => {
+      const { exploreId, series, datasourceId } = action.payload;
+      return processQueryResultsAction({
+        exploreId,
+        latency: 0,
+        datasourceId,
+        loadingState: LoadingState.Streaming,
+        series: null,
+        delta: series,
+      });
+    })
+  );
+};
diff --git a/public/app/features/explore/state/epics/processQueryErrorsEpic.test.ts b/public/app/features/explore/state/epics/processQueryErrorsEpic.test.ts
new file mode 100644
index 000000000000..7cdaca78f7d0
--- /dev/null
+++ b/public/app/features/explore/state/epics/processQueryErrorsEpic.test.ts
@@ -0,0 +1,67 @@
+import { mockExploreState } from 'test/mocks/mockExploreState';
+import { epicTester } from 'test/core/redux/epicTester';
+import { processQueryErrorsAction, queryFailureAction } from '../actionTypes';
+import { processQueryErrorsEpic } from './processQueryErrorsEpic';
+
+describe('processQueryErrorsEpic', () => {
+  let originalConsoleError = console.error;
+
+  beforeEach(() => {
+    originalConsoleError = console.error;
+    console.error = jest.fn();
+  });
+
+  afterEach(() => {
+    console.error = originalConsoleError;
+  });
+
+  describe('when processQueryErrorsAction is dispatched', () => {
+    describe('and datasourceInstance is the same', () => {
+      describe('and the response is not cancelled', () => {
+        it('then queryFailureAction is dispatched', () => {
+          const { datasourceId, exploreId, state, eventBridge } = mockExploreState();
+          const response = { message: 'Something went terribly wrong!' };
+
+          epicTester(processQueryErrorsEpic, state)
+            .whenActionIsDispatched(processQueryErrorsAction({ exploreId, datasourceId, response }))
+            .thenResultingActionsEqual(queryFailureAction({ exploreId, response }));
+
+          expect(console.error).toBeCalledTimes(1);
+          expect(console.error).toBeCalledWith(response);
+          expect(eventBridge.emit).toBeCalledTimes(1);
+          expect(eventBridge.emit).toBeCalledWith('data-error', response);
+        });
+      });
+
+      describe('and the response is cancelled', () => {
+        it('then no actions are dispatched', () => {
+          const { datasourceId, exploreId, state, eventBridge } = mockExploreState();
+          const response = { cancelled: true, message: 'Something went terribly wrong!' };
+
+          epicTester(processQueryErrorsEpic, state)
+            .whenActionIsDispatched(processQueryErrorsAction({ exploreId, datasourceId, response }))
+            .thenNoActionsWhereDispatched();
+
+          expect(console.error).not.toBeCalled();
+          expect(eventBridge.emit).not.toBeCalled();
+        });
+      });
+    });
+
+    describe('and datasourceInstance is not the same', () => {
+      describe('and the response is not cancelled', () => {
+        it('then no actions are dispatched', () => {
+          const { exploreId, state, eventBridge } = mockExploreState();
+          const response = { message: 'Something went terribly wrong!' };
+
+          epicTester(processQueryErrorsEpic, state)
+            .whenActionIsDispatched(processQueryErrorsAction({ exploreId, datasourceId: 'other id', response }))
+            .thenNoActionsWhereDispatched();
+
+          expect(console.error).not.toBeCalled();
+          expect(eventBridge.emit).not.toBeCalled();
+        });
+      });
+    });
+  });
+});
diff --git a/public/app/features/explore/state/epics/processQueryErrorsEpic.ts b/public/app/features/explore/state/epics/processQueryErrorsEpic.ts
new file mode 100644
index 000000000000..ea029186dc89
--- /dev/null
+++ b/public/app/features/explore/state/epics/processQueryErrorsEpic.ts
@@ -0,0 +1,40 @@
+import { Epic } from 'redux-observable';
+import { mergeMap } from 'rxjs/operators';
+import { NEVER, of } from 'rxjs';
+
+import { ActionOf } from 'app/core/redux/actionCreatorFactory';
+import { StoreState } from 'app/types/store';
+import { instanceOfDataQueryError } from 'app/core/utils/explore';
+import { toDataQueryError } from 'app/features/dashboard/state/PanelQueryState';
+import { processQueryErrorsAction, ProcessQueryErrorsPayload, queryFailureAction } from '../actionTypes';
+
+export const processQueryErrorsEpic: Epic<ActionOf<any>, ActionOf<any>, StoreState> = (action$, state$) => {
+  return action$.ofType(processQueryErrorsAction.type).pipe(
+    mergeMap((action: ActionOf<ProcessQueryErrorsPayload>) => {
+      const { exploreId, datasourceId } = action.payload;
+      let { response } = action.payload;
+      const { datasourceInstance, eventBridge } = state$.value.explore[exploreId];
+
+      if (datasourceInstance.meta.id !== datasourceId || response.cancelled) {
+        // Navigated away, queries did not matter
+        return NEVER;
+      }
+
+      // For Angular editors
+      eventBridge.emit('data-error', response);
+
+      console.error(response); // To help finding problems with query syntax
+
+      if (!instanceOfDataQueryError(response)) {
+        response = toDataQueryError(response);
+      }
+
+      return of(
+        queryFailureAction({
+          exploreId,
+          response,
+        })
+      );
+    })
+  );
+};
diff --git a/public/app/features/explore/state/epics/processQueryResultsEpic.test.ts b/public/app/features/explore/state/epics/processQueryResultsEpic.test.ts
new file mode 100644
index 000000000000..c5da93081aa5
--- /dev/null
+++ b/public/app/features/explore/state/epics/processQueryResultsEpic.test.ts
@@ -0,0 +1,119 @@
+import { mockExploreState } from 'test/mocks/mockExploreState';
+import { epicTester } from 'test/core/redux/epicTester';
+import {
+  processQueryResultsAction,
+  resetQueryErrorAction,
+  querySuccessAction,
+  scanStopAction,
+  scanRangeAction,
+} from '../actionTypes';
+import { SeriesData, LoadingState } from '@grafana/ui';
+import { processQueryResultsEpic } from './processQueryResultsEpic';
+import TableModel from 'app/core/table_model';
+
+const testContext = () => {
+  const serieA: SeriesData = {
+    fields: [],
+    refId: 'A',
+    rows: [],
+  };
+  const serieB: SeriesData = {
+    fields: [],
+    refId: 'B',
+    rows: [],
+  };
+  const series = [serieA, serieB];
+  const latency = 0;
+  const loadingState = LoadingState.Done;
+
+  return {
+    latency,
+    series,
+    loadingState,
+  };
+};
+
+describe('processQueryResultsEpic', () => {
+  describe('when processQueryResultsAction is dispatched', () => {
+    describe('and datasourceInstance is the same', () => {
+      describe('and explore is not scanning', () => {
+        it('then resetQueryErrorAction and querySuccessAction are dispatched and eventBridge emits correct message', () => {
+          const { datasourceId, exploreId, state, eventBridge } = mockExploreState();
+          const { latency, series, loadingState } = testContext();
+          const graphResult = [];
+          const tableResult = new TableModel();
+          const logsResult = null;
+
+          epicTester(processQueryResultsEpic, state)
+            .whenActionIsDispatched(
+              processQueryResultsAction({ exploreId, datasourceId, loadingState, series, latency })
+            )
+            .thenResultingActionsEqual(
+              resetQueryErrorAction({ exploreId, refIds: ['A', 'B'] }),
+              querySuccessAction({ exploreId, loadingState, graphResult, tableResult, logsResult, latency })
+            );
+
+          expect(eventBridge.emit).toBeCalledTimes(1);
+          expect(eventBridge.emit).toBeCalledWith('data-received', series);
+        });
+      });
+
+      describe('and explore is scanning', () => {
+        describe('and we have a result', () => {
+          it('then correct actions are dispatched', () => {
+            const { datasourceId, exploreId, state } = mockExploreState({ scanning: true });
+            const { latency, series, loadingState } = testContext();
+            const graphResult = [];
+            const tableResult = new TableModel();
+            const logsResult = null;
+
+            epicTester(processQueryResultsEpic, state)
+              .whenActionIsDispatched(
+                processQueryResultsAction({ exploreId, datasourceId, loadingState, series, latency })
+              )
+              .thenResultingActionsEqual(
+                resetQueryErrorAction({ exploreId, refIds: ['A', 'B'] }),
+                querySuccessAction({ exploreId, loadingState, graphResult, tableResult, logsResult, latency }),
+                scanStopAction({ exploreId })
+              );
+          });
+        });
+
+        describe('and we do not have a result', () => {
+          it('then correct actions are dispatched', () => {
+            const { datasourceId, exploreId, state, scanner } = mockExploreState({ scanning: true });
+            const { latency, loadingState } = testContext();
+            const graphResult = [];
+            const tableResult = new TableModel();
+            const logsResult = null;
+
+            epicTester(processQueryResultsEpic, state)
+              .whenActionIsDispatched(
+                processQueryResultsAction({ exploreId, datasourceId, loadingState, series: [], latency })
+              )
+              .thenResultingActionsEqual(
+                resetQueryErrorAction({ exploreId, refIds: [] }),
+                querySuccessAction({ exploreId, loadingState, graphResult, tableResult, logsResult, latency }),
+                scanRangeAction({ exploreId, range: scanner() })
+              );
+          });
+        });
+      });
+    });
+
+    describe('and datasourceInstance is not the same', () => {
+      it('then no actions are dispatched and eventBridge does not emit message', () => {
+        const { exploreId, state, eventBridge } = mockExploreState();
+        const { series, loadingState } = testContext();
+
+        epicTester(processQueryResultsEpic, state)
+          .whenActionIsDispatched(
+            processQueryResultsAction({ exploreId, datasourceId: 'other id', loadingState, series, latency: 0 })
+          )
+          .thenNoActionsWhereDispatched();
+
+        expect(eventBridge.emit).not.toBeCalled();
+      });
+    });
+  });
+});
diff --git a/public/app/features/explore/state/epics/processQueryResultsEpic.ts b/public/app/features/explore/state/epics/processQueryResultsEpic.ts
new file mode 100644
index 000000000000..76e767c36a09
--- /dev/null
+++ b/public/app/features/explore/state/epics/processQueryResultsEpic.ts
@@ -0,0 +1,76 @@
+import _ from 'lodash';
+import { Epic } from 'redux-observable';
+import { mergeMap } from 'rxjs/operators';
+import { NEVER } from 'rxjs';
+import { LoadingState } from '@grafana/ui';
+
+import { ActionOf } from 'app/core/redux/actionCreatorFactory';
+import { StoreState } from 'app/types/store';
+import { getRefIds } from 'app/core/utils/explore';
+import {
+  processQueryResultsAction,
+  ProcessQueryResultsPayload,
+  querySuccessAction,
+  scanRangeAction,
+  resetQueryErrorAction,
+  scanStopAction,
+} from '../actionTypes';
+import { ResultProcessor } from '../../utils/ResultProcessor';
+
+export const processQueryResultsEpic: Epic<ActionOf<any>, ActionOf<any>, StoreState> = (action$, state$) => {
+  return action$.ofType(processQueryResultsAction.type).pipe(
+    mergeMap((action: ActionOf<ProcessQueryResultsPayload>) => {
+      const { exploreId, datasourceId, latency, loadingState, series, delta } = action.payload;
+      const { datasourceInstance, scanning, scanner, eventBridge } = state$.value.explore[exploreId];
+
+      // If datasource already changed, results do not matter
+      if (datasourceInstance.meta.id !== datasourceId) {
+        return NEVER;
+      }
+
+      const result = series || delta || [];
+      const replacePreviousResults = loadingState === LoadingState.Done && series && !delta ? true : false;
+      const resultProcessor = new ResultProcessor(state$.value.explore[exploreId], replacePreviousResults, result);
+      const graphResult = resultProcessor.getGraphResult();
+      const tableResult = resultProcessor.getTableResult();
+      const logsResult = resultProcessor.getLogsResult();
+      const refIds = getRefIds(result);
+      const actions: Array<ActionOf<any>> = [];
+
+      // For Angular editors
+      eventBridge.emit('data-received', resultProcessor.getRawData());
+
+      // Clears any previous errors that now have a successful query, important so Angular editors are updated correctly
+      actions.push(
+        resetQueryErrorAction({
+          exploreId,
+          refIds,
+        })
+      );
+
+      actions.push(
+        querySuccessAction({
+          exploreId,
+          latency,
+          loadingState,
+          graphResult,
+          tableResult,
+          logsResult,
+        })
+      );
+
+      // Keep scanning for results if this was the last scanning transaction
+      if (scanning) {
+        if (_.size(result) === 0) {
+          const range = scanner();
+          actions.push(scanRangeAction({ exploreId, range }));
+        } else {
+          // We can stop scanning if we have a result
+          actions.push(scanStopAction({ exploreId }));
+        }
+      }
+
+      return actions;
+    })
+  );
+};
diff --git a/public/app/features/explore/state/epics/runQueriesBatchEpic.test.ts b/public/app/features/explore/state/epics/runQueriesBatchEpic.test.ts
new file mode 100644
index 000000000000..6ddada2bc32a
--- /dev/null
+++ b/public/app/features/explore/state/epics/runQueriesBatchEpic.test.ts
@@ -0,0 +1,421 @@
+import { mockExploreState } from 'test/mocks/mockExploreState';
+import { epicTester } from 'test/core/redux/epicTester';
+import { runQueriesBatchEpic } from './runQueriesBatchEpic';
+import {
+  runQueriesBatchAction,
+  queryStartAction,
+  historyUpdatedAction,
+  processQueryResultsAction,
+  processQueryErrorsAction,
+  limitMessageRatePayloadAction,
+  resetExploreAction,
+  updateDatasourceInstanceAction,
+  changeRefreshIntervalAction,
+  clearQueriesAction,
+  stateSaveAction,
+} from '../actionTypes';
+import { LoadingState, DataQueryRequest, SeriesData, FieldType } from '@grafana/ui';
+
+const testContext = () => {
+  const series: SeriesData[] = [
+    {
+      fields: [
+        {
+          name: 'Value',
+        },
+        {
+          name: 'Time',
+          type: FieldType.time,
+          unit: 'dateTimeAsIso',
+        },
+      ],
+      rows: [],
+      refId: 'A',
+    },
+  ];
+  const response = { data: series };
+
+  return {
+    response,
+    series,
+  };
+};
+
+describe('runQueriesBatchEpic', () => {
+  let originalDateNow = Date.now;
+  beforeEach(() => {
+    originalDateNow = Date.now;
+    Date.now = () => 1337;
+  });
+
+  afterEach(() => {
+    Date.now = originalDateNow;
+  });
+
+  describe('when runQueriesBatchAction is dispatched', () => {
+    describe('and query targets are not live', () => {
+      describe('and query is successful', () => {
+        it('then correct actions are dispatched', () => {
+          const { response, series } = testContext();
+          const { exploreId, state, history, datasourceId } = mockExploreState();
+
+          epicTester(runQueriesBatchEpic, state)
+            .whenActionIsDispatched(
+              runQueriesBatchAction({ exploreId, queryOptions: { live: false, interval: '', maxDataPoints: 1980 } })
+            )
+            .whenQueryReceivesResponse(response)
+            .thenResultingActionsEqual(
+              queryStartAction({ exploreId }),
+              historyUpdatedAction({ exploreId, history }),
+              processQueryResultsAction({
+                exploreId,
+                delta: null,
+                series,
+                latency: 0,
+                datasourceId,
+                loadingState: LoadingState.Done,
+              }),
+              stateSaveAction()
+            );
+        });
+      });
+
+      describe('and query is not successful', () => {
+        it('then correct actions are dispatched', () => {
+          const error = {
+            message: 'Error parsing line x',
+          };
+          const { exploreId, state, datasourceId } = mockExploreState();
+
+          epicTester(runQueriesBatchEpic, state)
+            .whenActionIsDispatched(
+              runQueriesBatchAction({ exploreId, queryOptions: { live: false, interval: '', maxDataPoints: 1980 } })
+            )
+            .whenQueryThrowsError(error)
+            .thenResultingActionsEqual(
+              queryStartAction({ exploreId }),
+              processQueryErrorsAction({ exploreId, response: error, datasourceId })
+            );
+        });
+      });
+    });
+
+    describe('and query targets are live', () => {
+      describe('and state equals Streaming', () => {
+        it('then correct actions are dispatched', () => {
+          const { exploreId, state, datasourceId } = mockExploreState();
+          const unsubscribe = jest.fn();
+          const serieA = {
+            fields: [],
+            rows: [],
+            refId: 'A',
+          };
+          const serieB = {
+            fields: [],
+            rows: [],
+            refId: 'B',
+          };
+
+          epicTester(runQueriesBatchEpic, state)
+            .whenActionIsDispatched(
+              runQueriesBatchAction({ exploreId, queryOptions: { live: true, interval: '', maxDataPoints: 1980 } })
+            )
+            .whenQueryObserverReceivesEvent({
+              state: LoadingState.Streaming,
+              delta: [serieA],
+              key: 'some key',
+              request: {} as DataQueryRequest,
+              unsubscribe,
+            })
+            .whenQueryObserverReceivesEvent({
+              state: LoadingState.Streaming,
+              delta: [serieB],
+              key: 'some key',
+              request: {} as DataQueryRequest,
+              unsubscribe,
+            })
+            .thenResultingActionsEqual(
+              queryStartAction({ exploreId }),
+              limitMessageRatePayloadAction({ exploreId, series: [serieA], datasourceId }),
+              limitMessageRatePayloadAction({ exploreId, series: [serieB], datasourceId })
+            );
+        });
+      });
+
+      describe('and state equals Error', () => {
+        it('then correct actions are dispatched', () => {
+          const { exploreId, state, datasourceId } = mockExploreState();
+          const unsubscribe = jest.fn();
+          const error = { message: 'Something went really wrong!' };
+
+          epicTester(runQueriesBatchEpic, state)
+            .whenActionIsDispatched(
+              runQueriesBatchAction({ exploreId, queryOptions: { live: true, interval: '', maxDataPoints: 1980 } })
+            )
+            .whenQueryObserverReceivesEvent({
+              state: LoadingState.Error,
+              error,
+              key: 'some key',
+              request: {} as DataQueryRequest,
+              unsubscribe,
+            })
+            .thenResultingActionsEqual(
+              queryStartAction({ exploreId }),
+              processQueryErrorsAction({ exploreId, response: error, datasourceId })
+            );
+        });
+      });
+
+      describe('and state equals Done', () => {
+        it('then correct actions are dispatched', () => {
+          const { exploreId, state, datasourceId, history } = mockExploreState();
+          const unsubscribe = jest.fn();
+          const serieA = {
+            fields: [],
+            rows: [],
+            refId: 'A',
+          };
+          const serieB = {
+            fields: [],
+            rows: [],
+            refId: 'B',
+          };
+          const delta = [serieA, serieB];
+
+          epicTester(runQueriesBatchEpic, state)
+            .whenActionIsDispatched(
+              runQueriesBatchAction({ exploreId, queryOptions: { live: true, interval: '', maxDataPoints: 1980 } })
+            )
+            .whenQueryObserverReceivesEvent({
+              state: LoadingState.Done,
+              series: null,
+              delta,
+              key: 'some key',
+              request: {} as DataQueryRequest,
+              unsubscribe,
+            })
+            .thenResultingActionsEqual(
+              queryStartAction({ exploreId }),
+              historyUpdatedAction({ exploreId, history }),
+              processQueryResultsAction({
+                exploreId,
+                delta,
+                series: null,
+                latency: 0,
+                datasourceId,
+                loadingState: LoadingState.Done,
+              }),
+              stateSaveAction()
+            );
+        });
+      });
+    });
+
+    describe('and another runQueriesBatchAction is dispatched', () => {
+      it('then the observable should be unsubscribed', () => {
+        const { response, series } = testContext();
+        const { exploreId, state, history, datasourceId } = mockExploreState();
+        const unsubscribe = jest.fn();
+
+        epicTester(runQueriesBatchEpic, state)
+          .whenActionIsDispatched(
+            runQueriesBatchAction({ exploreId, queryOptions: { live: false, interval: '', maxDataPoints: 1980 } }) // first observable
+          )
+          .whenQueryReceivesResponse(response)
+          .whenQueryObserverReceivesEvent({
+            key: 'some key',
+            request: {} as DataQueryRequest,
+            state: LoadingState.Loading, // fake just to setup and test unsubscribe
+            unsubscribe,
+          })
+          .whenActionIsDispatched(
+            // second observable and unsubscribes the first observable
+            runQueriesBatchAction({ exploreId, queryOptions: { live: true, interval: '', maxDataPoints: 800 } })
+          )
+          .whenQueryReceivesResponse(response)
+          .whenQueryObserverReceivesEvent({
+            key: 'some key',
+            request: {} as DataQueryRequest,
+            state: LoadingState.Loading, // fake just to setup and test unsubscribe
+            unsubscribe,
+          })
+          .thenResultingActionsEqual(
+            queryStartAction({ exploreId }), // output from first observable
+            historyUpdatedAction({ exploreId, history }), // output from first observable
+            processQueryResultsAction({
+              exploreId,
+              delta: null,
+              series,
+              latency: 0,
+              datasourceId,
+              loadingState: LoadingState.Done,
+            }),
+            stateSaveAction(),
+            // output from first observable
+            queryStartAction({ exploreId }), // output from second observable
+            historyUpdatedAction({ exploreId, history }), // output from second observable
+            processQueryResultsAction({
+              exploreId,
+              delta: null,
+              series,
+              latency: 0,
+              datasourceId,
+              loadingState: LoadingState.Done,
+            }),
+            stateSaveAction()
+            // output from second observable
+          );
+
+        expect(unsubscribe).toBeCalledTimes(1); // first unsubscribe should be called but not second as that isn't unsubscribed
+      });
+    });
+
+    describe('and resetExploreAction is dispatched', () => {
+      it('then the observable should be unsubscribed', () => {
+        const { response, series } = testContext();
+        const { exploreId, state, history, datasourceId } = mockExploreState();
+        const unsubscribe = jest.fn();
+
+        epicTester(runQueriesBatchEpic, state)
+          .whenActionIsDispatched(
+            runQueriesBatchAction({ exploreId, queryOptions: { live: false, interval: '', maxDataPoints: 1980 } })
+          )
+          .whenQueryReceivesResponse(response)
+          .whenQueryObserverReceivesEvent({
+            key: 'some key',
+            request: {} as DataQueryRequest,
+            state: LoadingState.Loading, // fake just to setup and test unsubscribe
+            unsubscribe,
+          })
+          .whenActionIsDispatched(resetExploreAction()) // unsubscribes the observable
+          .whenQueryReceivesResponse(response) // new updates will not reach anywhere
+          .thenResultingActionsEqual(
+            queryStartAction({ exploreId }),
+            historyUpdatedAction({ exploreId, history }),
+            processQueryResultsAction({
+              exploreId,
+              delta: null,
+              series,
+              latency: 0,
+              datasourceId,
+              loadingState: LoadingState.Done,
+            }),
+            stateSaveAction()
+          );
+
+        expect(unsubscribe).toBeCalledTimes(1);
+      });
+    });
+
+    describe('and updateDatasourceInstanceAction is dispatched', () => {
+      it('then the observable should be unsubscribed', () => {
+        const { response, series } = testContext();
+        const { exploreId, state, history, datasourceId, datasourceInstance } = mockExploreState();
+        const unsubscribe = jest.fn();
+
+        epicTester(runQueriesBatchEpic, state)
+          .whenActionIsDispatched(
+            runQueriesBatchAction({ exploreId, queryOptions: { live: false, interval: '', maxDataPoints: 1980 } })
+          )
+          .whenQueryReceivesResponse(response)
+          .whenQueryObserverReceivesEvent({
+            key: 'some key',
+            request: {} as DataQueryRequest,
+            state: LoadingState.Loading, // fake just to setup and test unsubscribe
+            unsubscribe,
+          })
+          .whenActionIsDispatched(updateDatasourceInstanceAction({ exploreId, datasourceInstance })) // unsubscribes the observable
+          .whenQueryReceivesResponse(response) // new updates will not reach anywhere
+          .thenResultingActionsEqual(
+            queryStartAction({ exploreId }),
+            historyUpdatedAction({ exploreId, history }),
+            processQueryResultsAction({
+              exploreId,
+              delta: null,
+              series,
+              latency: 0,
+              datasourceId,
+              loadingState: LoadingState.Done,
+            }),
+            stateSaveAction()
+          );
+
+        expect(unsubscribe).toBeCalledTimes(1);
+      });
+    });
+
+    describe('and changeRefreshIntervalAction is dispatched', () => {
+      it('then the observable should be unsubscribed', () => {
+        const { response, series } = testContext();
+        const { exploreId, state, history, datasourceId } = mockExploreState();
+        const unsubscribe = jest.fn();
+
+        epicTester(runQueriesBatchEpic, state)
+          .whenActionIsDispatched(
+            runQueriesBatchAction({ exploreId, queryOptions: { live: false, interval: '', maxDataPoints: 1980 } })
+          )
+          .whenQueryReceivesResponse(response)
+          .whenQueryObserverReceivesEvent({
+            key: 'some key',
+            request: {} as DataQueryRequest,
+            state: LoadingState.Loading, // fake just to setup and test unsubscribe
+            unsubscribe,
+          })
+          .whenActionIsDispatched(changeRefreshIntervalAction({ exploreId, refreshInterval: '' })) // unsubscribes the observable
+          .whenQueryReceivesResponse(response) // new updates will not reach anywhere
+          .thenResultingActionsEqual(
+            queryStartAction({ exploreId }),
+            historyUpdatedAction({ exploreId, history }),
+            processQueryResultsAction({
+              exploreId,
+              delta: null,
+              series,
+              latency: 0,
+              datasourceId,
+              loadingState: LoadingState.Done,
+            }),
+            stateSaveAction()
+          );
+
+        expect(unsubscribe).toBeCalledTimes(1);
+      });
+    });
+
+    describe('and clearQueriesAction is dispatched', () => {
+      it('then the observable should be unsubscribed', () => {
+        const { response, series } = testContext();
+        const { exploreId, state, history, datasourceId } = mockExploreState();
+        const unsubscribe = jest.fn();
+
+        epicTester(runQueriesBatchEpic, state)
+          .whenActionIsDispatched(
+            runQueriesBatchAction({ exploreId, queryOptions: { live: false, interval: '', maxDataPoints: 1980 } })
+          )
+          .whenQueryReceivesResponse(response)
+          .whenQueryObserverReceivesEvent({
+            key: 'some key',
+            request: {} as DataQueryRequest,
+            state: LoadingState.Loading, // fake just to setup and test unsubscribe
+            unsubscribe,
+          })
+          .whenActionIsDispatched(clearQueriesAction({ exploreId })) // unsubscribes the observable
+          .whenQueryReceivesResponse(response) // new updates will not reach anywhere
+          .thenResultingActionsEqual(
+            queryStartAction({ exploreId }),
+            historyUpdatedAction({ exploreId, history }),
+            processQueryResultsAction({
+              exploreId,
+              delta: null,
+              series,
+              latency: 0,
+              datasourceId,
+              loadingState: LoadingState.Done,
+            }),
+            stateSaveAction()
+          );
+
+        expect(unsubscribe).toBeCalledTimes(1);
+      });
+    });
+  });
+});
diff --git a/public/app/features/explore/state/epics/runQueriesBatchEpic.ts b/public/app/features/explore/state/epics/runQueriesBatchEpic.ts
new file mode 100644
index 000000000000..8e2642f193f8
--- /dev/null
+++ b/public/app/features/explore/state/epics/runQueriesBatchEpic.ts
@@ -0,0 +1,220 @@
+import { Epic } from 'redux-observable';
+import { Observable, Subject } from 'rxjs';
+import { mergeMap, catchError, takeUntil, filter } from 'rxjs/operators';
+import _, { isString } from 'lodash';
+import { isLive } from '@grafana/ui/src/components/RefreshPicker/RefreshPicker';
+import { DataStreamState, LoadingState, DataQueryResponse, SeriesData, DataQueryResponseData } from '@grafana/ui';
+import * as dateMath from '@grafana/ui/src/utils/datemath';
+
+import { ActionOf } from 'app/core/redux/actionCreatorFactory';
+import { StoreState } from 'app/types/store';
+import { buildQueryTransaction, updateHistory } from 'app/core/utils/explore';
+import {
+  clearQueriesAction,
+  historyUpdatedAction,
+  resetExploreAction,
+  updateDatasourceInstanceAction,
+  changeRefreshIntervalAction,
+  processQueryErrorsAction,
+  processQueryResultsAction,
+  runQueriesBatchAction,
+  RunQueriesBatchPayload,
+  queryStartAction,
+  limitMessageRatePayloadAction,
+  stateSaveAction,
+  changeRangeAction,
+} from '../actionTypes';
+import { ExploreId, ExploreItemState } from 'app/types';
+
+const publishActions = (outerObservable: Subject<any>, actions: Array<ActionOf<any>>) => {
+  for (const action of actions) {
+    outerObservable.next(action);
+  }
+};
+
+interface ProcessResponseConfig {
+  exploreId: ExploreId;
+  exploreItemState: ExploreItemState;
+  datasourceId: string;
+  now: number;
+  loadingState: LoadingState;
+  series?: DataQueryResponseData[];
+  delta?: SeriesData[];
+}
+
+const processResponse = (config: ProcessResponseConfig) => {
+  const { exploreId, exploreItemState, datasourceId, now, loadingState, series, delta } = config;
+  const { queries, history } = exploreItemState;
+  const latency = Date.now() - now;
+
+  // Side-effect: Saving history in localstorage
+  const nextHistory = updateHistory(history, datasourceId, queries);
+  return [
+    historyUpdatedAction({ exploreId, history: nextHistory }),
+    processQueryResultsAction({ exploreId, latency, datasourceId, loadingState, series, delta }),
+    stateSaveAction(),
+  ];
+};
+
+interface ProcessErrorConfig {
+  exploreId: ExploreId;
+  datasourceId: string;
+  error: any;
+}
+
+const processError = (config: ProcessErrorConfig) => {
+  const { exploreId, datasourceId, error } = config;
+
+  return [processQueryErrorsAction({ exploreId, response: error, datasourceId })];
+};
+
+export const runQueriesBatchEpic: Epic<ActionOf<any>, ActionOf<any>, StoreState> = (
+  action$,
+  state$,
+  { getQueryResponse }
+) => {
+  return action$.ofType(runQueriesBatchAction.type).pipe(
+    mergeMap((action: ActionOf<RunQueriesBatchPayload>) => {
+      const { exploreId, queryOptions } = action.payload;
+      const exploreItemState = state$.value.explore[exploreId];
+      const { datasourceInstance, queries, queryIntervals, range, scanning } = exploreItemState;
+
+      // Create an observable per run queries action
+      // Within the observable create two subscriptions
+      // First subscription: 'querySubscription' subscribes to the call to query method on datasourceinstance
+      // Second subscription: 'streamSubscription' subscribes to events from the query methods observer callback
+      const observable: Observable<ActionOf<any>> = Observable.create((outerObservable: Subject<any>) => {
+        const datasourceId = datasourceInstance.meta.id;
+        const transaction = buildQueryTransaction(queries, queryOptions, range, queryIntervals, scanning);
+        outerObservable.next(queryStartAction({ exploreId }));
+
+        const now = Date.now();
+        let datasourceUnsubscribe: Function = null;
+        const streamHandler = new Subject<DataStreamState>();
+        const observer = (event: DataStreamState) => {
+          datasourceUnsubscribe = event.unsubscribe;
+          if (!streamHandler.closed) {
+            // their might be a race condition when unsubscribing
+            streamHandler.next(event);
+          }
+        };
+
+        // observer subscription, handles datasourceInstance.query observer events and pushes that forward
+        const streamSubscription = streamHandler.subscribe({
+          next: event => {
+            const { state, error, series, delta } = event;
+            if (!series && !delta && !error) {
+              return;
+            }
+
+            if (state === LoadingState.Error) {
+              const actions = processError({ exploreId, datasourceId, error });
+              publishActions(outerObservable, actions);
+            }
+
+            if (state === LoadingState.Streaming) {
+              if (event.request && event.request.range) {
+                let newRange = event.request.range;
+                if (isString(newRange.raw.from)) {
+                  newRange = {
+                    from: dateMath.parse(newRange.raw.from, false),
+                    to: dateMath.parse(newRange.raw.to, true),
+                    raw: newRange.raw,
+                  };
+                }
+                outerObservable.next(changeRangeAction({ exploreId, range: newRange }));
+              }
+              outerObservable.next(
+                limitMessageRatePayloadAction({
+                  exploreId,
+                  series: delta,
+                  datasourceId,
+                })
+              );
+            }
+
+            if (state === LoadingState.Done || state === LoadingState.Loading) {
+              const actions = processResponse({
+                exploreId,
+                exploreItemState,
+                datasourceId,
+                now,
+                loadingState: state,
+                series: null,
+                delta,
+              });
+              publishActions(outerObservable, actions);
+            }
+          },
+        });
+
+        // query subscription, handles datasourceInstance.query response and pushes that forward
+        const querySubscription = getQueryResponse(datasourceInstance, transaction.options, observer)
+          .pipe(
+            mergeMap((response: DataQueryResponse) => {
+              return processResponse({
+                exploreId,
+                exploreItemState,
+                datasourceId,
+                now,
+                loadingState: LoadingState.Done,
+                series: response && response.data ? response.data : [],
+                delta: null,
+              });
+            }),
+            catchError(error => {
+              return processError({ exploreId, datasourceId, error });
+            })
+          )
+          .subscribe({ next: (action: ActionOf<any>) => outerObservable.next(action) });
+
+        // this unsubscribe method will be called when any of the takeUntil actions below happen
+        const unsubscribe = () => {
+          if (datasourceUnsubscribe) {
+            datasourceUnsubscribe();
+          }
+          querySubscription.unsubscribe();
+          streamSubscription.unsubscribe();
+          streamHandler.unsubscribe();
+          outerObservable.unsubscribe();
+        };
+
+        return unsubscribe;
+      });
+
+      return observable.pipe(
+        takeUntil(
+          action$
+            .ofType(
+              runQueriesBatchAction.type,
+              resetExploreAction.type,
+              updateDatasourceInstanceAction.type,
+              changeRefreshIntervalAction.type,
+              clearQueriesAction.type
+            )
+            .pipe(
+              filter(action => {
+                if (action.type === resetExploreAction.type) {
+                  return true; // stops all subscriptions if user navigates away
+                }
+
+                if (action.type === updateDatasourceInstanceAction.type && action.payload.exploreId === exploreId) {
+                  return true; // stops subscriptions if user changes data source
+                }
+
+                if (action.type === changeRefreshIntervalAction.type && action.payload.exploreId === exploreId) {
+                  return !isLive(action.payload.refreshInterval); // stops subscriptions if user changes refresh interval away from 'Live'
+                }
+
+                if (action.type === clearQueriesAction.type && action.payload.exploreId === exploreId) {
+                  return true; // stops subscriptions if user clears all queries
+                }
+
+                return action.payload.exploreId === exploreId;
+              })
+            )
+        )
+      );
+    })
+  );
+};
diff --git a/public/app/features/explore/state/epics/runQueriesEpic.test.ts b/public/app/features/explore/state/epics/runQueriesEpic.test.ts
new file mode 100644
index 000000000000..87b1f86513f1
--- /dev/null
+++ b/public/app/features/explore/state/epics/runQueriesEpic.test.ts
@@ -0,0 +1,71 @@
+import { mockExploreState } from 'test/mocks/mockExploreState';
+import { epicTester } from 'test/core/redux/epicTester';
+import { runQueriesAction, stateSaveAction, runQueriesBatchAction, clearQueriesAction } from '../actionTypes';
+import { runQueriesEpic } from './runQueriesEpic';
+
+describe('runQueriesEpic', () => {
+  describe('when runQueriesAction is dispatched', () => {
+    describe('and there is no datasourceError', () => {
+      describe('and we have non empty queries', () => {
+        describe('and explore is not live', () => {
+          it('then runQueriesBatchAction and stateSaveAction are dispatched', () => {
+            const queries = [{ refId: 'A', key: '123456', expr: '{__filename__="some.log"}' }];
+            const { exploreId, state, datasourceInterval, containerWidth } = mockExploreState({ queries });
+
+            epicTester(runQueriesEpic, state)
+              .whenActionIsDispatched(runQueriesAction({ exploreId, range: null }))
+              .thenResultingActionsEqual(
+                runQueriesBatchAction({
+                  exploreId,
+                  queryOptions: { interval: datasourceInterval, maxDataPoints: containerWidth, live: false },
+                })
+              );
+          });
+        });
+
+        describe('and explore is live', () => {
+          it('then runQueriesBatchAction and stateSaveAction are dispatched', () => {
+            const queries = [{ refId: 'A', key: '123456', expr: '{__filename__="some.log"}' }];
+            const { exploreId, state, datasourceInterval, containerWidth } = mockExploreState({
+              queries,
+              isLive: true,
+              streaming: true,
+            });
+
+            epicTester(runQueriesEpic, state)
+              .whenActionIsDispatched(runQueriesAction({ exploreId, range: null }))
+              .thenResultingActionsEqual(
+                runQueriesBatchAction({
+                  exploreId,
+                  queryOptions: { interval: datasourceInterval, maxDataPoints: containerWidth, live: true },
+                })
+              );
+          });
+        });
+      });
+
+      describe('and we have no queries', () => {
+        it('then clearQueriesAction and stateSaveAction are dispatched', () => {
+          const queries = [];
+          const { exploreId, state } = mockExploreState({ queries });
+
+          epicTester(runQueriesEpic, state)
+            .whenActionIsDispatched(runQueriesAction({ exploreId, range: null }))
+            .thenResultingActionsEqual(clearQueriesAction({ exploreId }), stateSaveAction());
+        });
+      });
+    });
+
+    describe('and there is a datasourceError', () => {
+      it('then no actions are dispatched', () => {
+        const { exploreId, state } = mockExploreState({
+          datasourceError: { message: 'Some error' },
+        });
+
+        epicTester(runQueriesEpic, state)
+          .whenActionIsDispatched(runQueriesAction({ exploreId, range: null }))
+          .thenNoActionsWhereDispatched();
+      });
+    });
+  });
+});
diff --git a/public/app/features/explore/state/epics/runQueriesEpic.ts b/public/app/features/explore/state/epics/runQueriesEpic.ts
new file mode 100644
index 000000000000..2102c11b103c
--- /dev/null
+++ b/public/app/features/explore/state/epics/runQueriesEpic.ts
@@ -0,0 +1,39 @@
+import { Epic } from 'redux-observable';
+import { NEVER } from 'rxjs';
+import { mergeMap } from 'rxjs/operators';
+
+import { ActionOf } from 'app/core/redux/actionCreatorFactory';
+import { StoreState } from 'app/types/store';
+import { hasNonEmptyQuery } from 'app/core/utils/explore';
+import {
+  clearQueriesAction,
+  runQueriesAction,
+  RunQueriesPayload,
+  runQueriesBatchAction,
+  stateSaveAction,
+} from '../actionTypes';
+
+export const runQueriesEpic: Epic<ActionOf<any>, ActionOf<any>, StoreState> = (action$, state$) => {
+  return action$.ofType(runQueriesAction.type).pipe(
+    mergeMap((action: ActionOf<RunQueriesPayload>) => {
+      const { exploreId } = action.payload;
+      const { datasourceInstance, queries, datasourceError, containerWidth, isLive } = state$.value.explore[exploreId];
+
+      if (datasourceError) {
+        // let's not run any queries if data source is in a faulty state
+        return NEVER;
+      }
+
+      if (!hasNonEmptyQuery(queries)) {
+        return [clearQueriesAction({ exploreId }), stateSaveAction()]; // Remember to save to state and update location
+      }
+
+      // Some datasource's query builders allow per-query interval limits,
+      // but we're using the datasource interval limit for now
+      const interval = datasourceInstance.interval;
+      const live = isLive;
+
+      return [runQueriesBatchAction({ exploreId, queryOptions: { interval, maxDataPoints: containerWidth, live } })];
+    })
+  );
+};
diff --git a/public/app/features/explore/state/epics/stateSaveEpic.test.ts b/public/app/features/explore/state/epics/stateSaveEpic.test.ts
new file mode 100644
index 000000000000..bee12ad92a9e
--- /dev/null
+++ b/public/app/features/explore/state/epics/stateSaveEpic.test.ts
@@ -0,0 +1,61 @@
+import { epicTester } from 'test/core/redux/epicTester';
+import { stateSaveEpic } from './stateSaveEpic';
+import { stateSaveAction, setUrlReplacedAction } from '../actionTypes';
+import { updateLocation } from 'app/core/actions/location';
+import { mockExploreState } from 'test/mocks/mockExploreState';
+
+describe('stateSaveEpic', () => {
+  describe('when stateSaveAction is dispatched', () => {
+    describe('and there is a left state', () => {
+      describe('and no split', () => {
+        it('then the correct actions are dispatched', () => {
+          const { exploreId, state } = mockExploreState();
+
+          epicTester(stateSaveEpic, state)
+            .whenActionIsDispatched(stateSaveAction())
+            .thenResultingActionsEqual(
+              updateLocation({
+                query: { left: '["now-6h","now","test",{"ui":[true,true,true,null]}]' },
+                replace: true,
+              }),
+              setUrlReplacedAction({ exploreId })
+            );
+        });
+      });
+
+      describe('and explore is splitted', () => {
+        it('then the correct actions are dispatched', () => {
+          const { exploreId, state } = mockExploreState({ split: true });
+
+          epicTester(stateSaveEpic, state)
+            .whenActionIsDispatched(stateSaveAction())
+            .thenResultingActionsEqual(
+              updateLocation({
+                query: {
+                  left: '["now-6h","now","test",{"ui":[true,true,true,null]}]',
+                  right: '["now-6h","now","test",{"ui":[true,true,true,null]}]',
+                },
+                replace: true,
+              }),
+              setUrlReplacedAction({ exploreId })
+            );
+        });
+      });
+    });
+
+    describe('and urlReplaced is true', () => {
+      it('then setUrlReplacedAction should not be dispatched', () => {
+        const { state } = mockExploreState({ urlReplaced: true });
+
+        epicTester(stateSaveEpic, state)
+          .whenActionIsDispatched(stateSaveAction())
+          .thenResultingActionsEqual(
+            updateLocation({
+              query: { left: '["now-6h","now","test",{"ui":[true,true,true,null]}]' },
+              replace: false,
+            })
+          );
+      });
+    });
+  });
+});
diff --git a/public/app/features/explore/state/epics/stateSaveEpic.ts b/public/app/features/explore/state/epics/stateSaveEpic.ts
new file mode 100644
index 000000000000..107f1de547b4
--- /dev/null
+++ b/public/app/features/explore/state/epics/stateSaveEpic.ts
@@ -0,0 +1,72 @@
+import { Epic } from 'redux-observable';
+import { mergeMap } from 'rxjs/operators';
+import { RawTimeRange, TimeRange } from '@grafana/ui/src/types/time';
+import { isDateTime } from '@grafana/ui/src/utils/moment_wrapper';
+
+import { ActionOf } from 'app/core/redux/actionCreatorFactory';
+import { StoreState } from 'app/types/store';
+import { ExploreUrlState, ExploreId } from 'app/types/explore';
+import { clearQueryKeys, serializeStateToUrlParam } from 'app/core/utils/explore';
+import { updateLocation } from 'app/core/actions/location';
+import { setUrlReplacedAction, stateSaveAction } from '../actionTypes';
+
+const toRawTimeRange = (range: TimeRange): RawTimeRange => {
+  let from = range.raw.from;
+  if (isDateTime(from)) {
+    from = from.valueOf().toString(10);
+  }
+
+  let to = range.raw.to;
+  if (isDateTime(to)) {
+    to = to.valueOf().toString(10);
+  }
+
+  return {
+    from,
+    to,
+  };
+};
+
+export const stateSaveEpic: Epic<ActionOf<any>, ActionOf<any>, StoreState> = (action$, state$) => {
+  return action$.ofType(stateSaveAction.type).pipe(
+    mergeMap(() => {
+      const { left, right, split } = state$.value.explore;
+      const replace = left && left.urlReplaced === false;
+      const urlStates: { [index: string]: string } = {};
+      const leftUrlState: ExploreUrlState = {
+        datasource: left.datasourceInstance.name,
+        queries: left.queries.map(clearQueryKeys),
+        range: toRawTimeRange(left.range),
+        ui: {
+          showingGraph: left.showingGraph,
+          showingLogs: true,
+          showingTable: left.showingTable,
+          dedupStrategy: left.dedupStrategy,
+        },
+      };
+      urlStates.left = serializeStateToUrlParam(leftUrlState, true);
+      if (split) {
+        const rightUrlState: ExploreUrlState = {
+          datasource: right.datasourceInstance.name,
+          queries: right.queries.map(clearQueryKeys),
+          range: toRawTimeRange(right.range),
+          ui: {
+            showingGraph: right.showingGraph,
+            showingLogs: true,
+            showingTable: right.showingTable,
+            dedupStrategy: right.dedupStrategy,
+          },
+        };
+
+        urlStates.right = serializeStateToUrlParam(rightUrlState, true);
+      }
+
+      const actions: Array<ActionOf<any>> = [updateLocation({ query: urlStates, replace })];
+      if (replace) {
+        actions.push(setUrlReplacedAction({ exploreId: ExploreId.left }));
+      }
+
+      return actions;
+    })
+  );
+};
diff --git a/public/app/features/explore/state/reducers.test.ts b/public/app/features/explore/state/reducers.test.ts
index 428d208e17a8..1f553313f807 100644
--- a/public/app/features/explore/state/reducers.test.ts
+++ b/public/app/features/explore/state/reducers.test.ts
@@ -4,37 +4,39 @@ import {
   exploreReducer,
   makeInitialUpdateState,
   initialExploreState,
+  DEFAULT_RANGE,
 } from './reducers';
 import {
   ExploreId,
   ExploreItemState,
   ExploreUrlState,
   ExploreState,
-  QueryTransaction,
   RangeScanner,
+  ExploreMode,
 } from 'app/types/explore';
 import { reducerTester } from 'test/core/redux/reducerTester';
 import {
   scanStartAction,
-  scanStopAction,
   testDataSourcePendingAction,
   testDataSourceSuccessAction,
   testDataSourceFailureAction,
   updateDatasourceInstanceAction,
   splitOpenAction,
   splitCloseAction,
+  changeModeAction,
+  scanStopAction,
+  runQueriesAction,
 } from './actionTypes';
 import { Reducer } from 'redux';
 import { ActionOf } from 'app/core/redux/actionCreatorFactory';
 import { updateLocation } from 'app/core/actions/location';
-import { LogsDedupStrategy, LogsModel } from 'app/core/logs_model';
 import { serializeStateToUrlParam } from 'app/core/utils/explore';
 import TableModel from 'app/core/table_model';
-import { DataSourceApi, DataQuery } from '@grafana/ui';
+import { DataSourceApi, DataQuery, LogsModel, LogsDedupStrategy, LoadingState, dateTime } from '@grafana/ui';
 
 describe('Explore item reducer', () => {
   describe('scanning', () => {
-    test('should start scanning', () => {
+    it('should start scanning', () => {
       const scanner = jest.fn();
       const initalState = {
         ...makeExploreItemState(),
@@ -51,7 +53,7 @@ describe('Explore item reducer', () => {
           scanner,
         });
     });
-    test('should stop scanning', () => {
+    it('should stop scanning', () => {
       const scanner = jest.fn();
       const initalState = {
         ...makeExploreItemState(),
@@ -94,7 +96,6 @@ describe('Explore item reducer', () => {
     describe('when testDataSourceFailureAction is dispatched', () => {
       it('then it should set correct state', () => {
         const error = 'some error';
-        const queryTransactions: QueryTransaction[] = [];
         const initalState: Partial<ExploreItemState> = {
           datasourceError: null,
           graphResult: [],
@@ -109,7 +110,6 @@ describe('Explore item reducer', () => {
         };
         const expectedState = {
           datasourceError: error,
-          queryTransactions,
           graphResult: undefined as any[],
           tableResult: undefined as TableModel,
           logsResult: undefined as LogsModel,
@@ -122,6 +122,17 @@ describe('Explore item reducer', () => {
           .thenStateShouldEqual(expectedState);
       });
     });
+
+    describe('when changeDataType is dispatched', () => {
+      it('then it should set correct state', () => {
+        reducerTester()
+          .givenReducer(itemReducer, {})
+          .whenActionIsDispatched(changeModeAction({ exploreId: ExploreId.left, mode: ExploreMode.Logs }))
+          .thenStateShouldEqual({
+            mode: ExploreMode.Logs,
+          });
+      });
+    });
   });
 
   describe('changing datasource', () => {
@@ -131,9 +142,8 @@ describe('Explore item reducer', () => {
           const StartPage = {};
           const datasourceInstance = {
             meta: {
-              metrics: {},
-              logs: {},
-              tables: {},
+              metrics: true,
+              logs: true,
             },
             components: {
               ExploreStartPage: StartPage,
@@ -143,9 +153,6 @@ describe('Explore item reducer', () => {
           const queryKeys: string[] = [];
           const initalState: Partial<ExploreItemState> = {
             datasourceInstance: null,
-            supportsGraph: false,
-            supportsLogs: false,
-            supportsTable: false,
             StartPage: null,
             showingStartPage: false,
             queries,
@@ -153,13 +160,15 @@ describe('Explore item reducer', () => {
           };
           const expectedState = {
             datasourceInstance,
-            supportsGraph: true,
-            supportsLogs: true,
-            supportsTable: true,
             StartPage,
             showingStartPage: true,
             queries,
             queryKeys,
+            supportedModes: [ExploreMode.Metrics, ExploreMode.Logs],
+            mode: ExploreMode.Metrics,
+            loadingState: LoadingState.NotStarted,
+            latency: 0,
+            queryErrors: [],
           };
 
           reducerTester()
@@ -170,6 +179,34 @@ describe('Explore item reducer', () => {
       });
     });
   });
+
+  describe('run queries', () => {
+    describe('when runQueriesAction is dispatched', () => {
+      it('then it should set correct state', () => {
+        const initalState: Partial<ExploreItemState> = {
+          showingStartPage: true,
+          range: null,
+        };
+        const expectedState = {
+          queryIntervals: {
+            interval: '1s',
+            intervalMs: 1000,
+          },
+          showingStartPage: false,
+          range: {
+            from: dateTime(),
+            to: dateTime(),
+            raw: DEFAULT_RANGE,
+          },
+        };
+
+        reducerTester()
+          .givenReducer(itemReducer, initalState)
+          .whenActionIsDispatched(runQueriesAction({ exploreId: ExploreId.left, range: expectedState.range }))
+          .thenStateShouldEqual(expectedState);
+      });
+    });
+  });
 });
 
 export const setup = (urlStateOverrides?: any) => {
@@ -514,46 +551,8 @@ describe('Explore reducer', () => {
             });
           });
 
-          describe('and refreshInterval differs', () => {
-            it('then it should return update refreshInterval', () => {
-              const { initalState, serializedUrlState } = setup();
-              const expectedState = {
-                ...initalState,
-                left: {
-                  ...initalState.left,
-                  update: {
-                    ...initalState.left.update,
-                    refreshInterval: true,
-                  },
-                },
-              };
-              const stateWithDifferentDataSource = {
-                ...initalState,
-                left: {
-                  ...initalState.left,
-                  urlState: {
-                    ...initalState.left.urlState,
-                    refreshInterval: '5s',
-                  },
-                },
-              };
-
-              reducerTester()
-                .givenReducer(exploreReducer, stateWithDifferentDataSource)
-                .whenActionIsDispatched(
-                  updateLocation({
-                    query: {
-                      left: serializedUrlState,
-                    },
-                    path: '/explore',
-                  })
-                )
-                .thenStateShouldEqual(expectedState);
-            });
-          });
-
           describe('and nothing differs', () => {
-            fit('then it should return update ui', () => {
+            it('then it should return update ui', () => {
               const { initalState, serializedUrlState } = setup();
               const expectedState = { ...initalState };
 
diff --git a/public/app/features/explore/state/reducers.ts b/public/app/features/explore/state/reducers.ts
index 9807bcb8ad85..eed4be614ac5 100644
--- a/public/app/features/explore/state/reducers.ts
+++ b/public/app/features/explore/state/reducers.ts
@@ -1,15 +1,15 @@
 import _ from 'lodash';
 import {
-  calculateResultsFromQueryTransactions,
   getIntervals,
   ensureQueries,
   getQueryKeys,
   parseUrlState,
   DEFAULT_UI_STATE,
   generateNewKeyAndAddRefIdIfMissing,
+  sortLogsResult,
 } from 'app/core/utils/explore';
-import { ExploreItemState, ExploreState, ExploreId, ExploreUpdateState } from 'app/types/explore';
-import { DataQuery } from '@grafana/ui/src/types';
+import { ExploreItemState, ExploreState, ExploreId, ExploreUpdateState, ExploreMode } from 'app/types/explore';
+import { DataQuery, LoadingState } from '@grafana/ui';
 import {
   HigherOrderAction,
   ActionTypes,
@@ -19,9 +19,17 @@ import {
   splitCloseAction,
   SplitCloseActionPayload,
   loadExploreDatasources,
-  runQueriesAction,
   historyUpdatedAction,
+  changeModeAction,
+  queryFailureAction,
+  setUrlReplacedAction,
+  querySuccessAction,
+  scanRangeAction,
+  scanStopAction,
   resetQueryErrorAction,
+  queryStartAction,
+  runQueriesAction,
+  changeRangeAction,
 } from './actionTypes';
 import { reducerFactory } from 'app/core/redux';
 import {
@@ -38,13 +46,8 @@ import {
   loadDatasourcePendingAction,
   loadDatasourceReadyAction,
   modifyQueriesAction,
-  queryFailureAction,
-  queryStartAction,
-  querySuccessAction,
   removeQueryRowAction,
-  scanRangeAction,
   scanStartAction,
-  scanStopAction,
   setQueriesAction,
   toggleTableAction,
   queriesImportedAction,
@@ -52,8 +55,9 @@ import {
   toggleLogLevelAction,
 } from './actionTypes';
 import { updateLocation } from 'app/core/actions/location';
-import { LocationUpdate } from 'app/types';
+import { LocationUpdate } from '@grafana/runtime';
 import TableModel from 'app/core/table_model';
+import { isLive } from '@grafana/ui/src/components/RefreshPicker/RefreshPicker';
 
 export const DEFAULT_RANGE = {
   from: 'now-6h',
@@ -94,19 +98,17 @@ export const makeExploreItemState = (): ExploreItemState => ({
   scanning: false,
   scanRange: null,
   showingGraph: true,
-  showingLogs: true,
   showingTable: true,
-  graphIsLoading: false,
-  logIsLoading: false,
-  tableIsLoading: false,
-  supportsGraph: null,
-  supportsLogs: null,
-  supportsTable: null,
+  loadingState: LoadingState.NotStarted,
   queryKeys: [],
   urlState: null,
   update: makeInitialUpdateState(),
   queryErrors: [],
   latency: 0,
+  supportedModes: [],
+  mode: null,
+  isLive: false,
+  urlReplaced: false,
 });
 
 /**
@@ -165,6 +167,13 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
       return { ...state, containerWidth };
     },
   })
+  .addMapper({
+    filter: changeModeAction,
+    mapper: (state, action): ExploreItemState => {
+      const mode = action.payload.mode;
+      return { ...state, mode };
+    },
+  })
   .addMapper({
     filter: changeTimeAction,
     mapper: (state, action): ExploreItemState => {
@@ -175,9 +184,15 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
     filter: changeRefreshIntervalAction,
     mapper: (state, action): ExploreItemState => {
       const { refreshInterval } = action.payload;
+      const live = isLive(refreshInterval);
+      const logsResult = sortLogsResult(state.logsResult, refreshInterval);
+
       return {
         ...state,
-        refreshInterval: refreshInterval,
+        refreshInterval,
+        loadingState: live ? LoadingState.Streaming : LoadingState.NotStarted,
+        isLive: live,
+        logsResult,
       };
     },
   })
@@ -224,7 +239,21 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
       // Capabilities
       const supportsGraph = datasourceInstance.meta.metrics;
       const supportsLogs = datasourceInstance.meta.logs;
-      const supportsTable = datasourceInstance.meta.tables;
+
+      let mode = ExploreMode.Metrics;
+      const supportedModes: ExploreMode[] = [];
+
+      if (supportsGraph) {
+        supportedModes.push(ExploreMode.Metrics);
+      }
+
+      if (supportsLogs) {
+        supportedModes.push(ExploreMode.Logs);
+      }
+
+      if (supportedModes.length === 1) {
+        mode = supportedModes[0];
+      }
 
       // Custom components
       const StartPage = datasourceInstance.components.ExploreStartPage;
@@ -234,15 +263,12 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
         datasourceInstance,
         queryErrors: [],
         latency: 0,
-        graphIsLoading: false,
-        logIsLoading: false,
-        tableIsLoading: false,
-        supportsGraph,
-        supportsLogs,
-        supportsTable,
+        loadingState: LoadingState.NotStarted,
         StartPage,
         showingStartPage: Boolean(StartPage),
         queryKeys: getQueryKeys(state.queries, datasourceInstance),
+        supportedModes,
+        mode,
       };
     },
   })
@@ -314,37 +340,29 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
   .addMapper({
     filter: queryFailureAction,
     mapper: (state, action): ExploreItemState => {
-      const { resultType, response } = action.payload;
+      const { response } = action.payload;
       const queryErrors = state.queryErrors.concat(response);
 
       return {
         ...state,
-        graphResult: resultType === 'Graph' ? null : state.graphResult,
-        tableResult: resultType === 'Table' ? null : state.tableResult,
-        logsResult: resultType === 'Logs' ? null : state.logsResult,
+        graphResult: null,
+        tableResult: null,
+        logsResult: null,
         latency: 0,
         queryErrors,
-        showingStartPage: false,
-        graphIsLoading: resultType === 'Graph' ? false : state.graphIsLoading,
-        logIsLoading: resultType === 'Logs' ? false : state.logIsLoading,
-        tableIsLoading: resultType === 'Table' ? false : state.tableIsLoading,
+        loadingState: LoadingState.Error,
         update: makeInitialUpdateState(),
       };
     },
   })
   .addMapper({
     filter: queryStartAction,
-    mapper: (state, action): ExploreItemState => {
-      const { resultType } = action.payload;
-
+    mapper: (state): ExploreItemState => {
       return {
         ...state,
         queryErrors: [],
         latency: 0,
-        graphIsLoading: resultType === 'Graph' ? true : state.graphIsLoading,
-        logIsLoading: resultType === 'Logs' ? true : state.logIsLoading,
-        tableIsLoading: resultType === 'Table' ? true : state.tableIsLoading,
-        showingStartPage: false,
+        loadingState: LoadingState.Loading,
         update: makeInitialUpdateState(),
       };
     },
@@ -352,19 +370,15 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
   .addMapper({
     filter: querySuccessAction,
     mapper: (state, action): ExploreItemState => {
-      const { queryIntervals } = state;
-      const { result, resultType, latency } = action.payload;
-      const results = calculateResultsFromQueryTransactions(result, resultType, queryIntervals.intervalMs);
+      const { latency, loadingState, graphResult, tableResult, logsResult } = action.payload;
 
       return {
         ...state,
-        graphResult: resultType === 'Graph' ? results.graphResult : state.graphResult,
-        tableResult: resultType === 'Table' ? results.tableResult : state.tableResult,
-        logsResult: resultType === 'Logs' ? results.logsResult : state.logsResult,
+        loadingState,
+        graphResult,
+        tableResult,
+        logsResult,
         latency,
-        graphIsLoading: false,
-        logIsLoading: false,
-        tableIsLoading: false,
         showingStartPage: false,
         update: makeInitialUpdateState(),
       };
@@ -506,8 +520,9 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
   })
   .addMapper({
     filter: runQueriesAction,
-    mapper: (state): ExploreItemState => {
-      const { range, datasourceInstance, containerWidth } = state;
+    mapper: (state, action): ExploreItemState => {
+      const { range } = action.payload;
+      const { datasourceInstance, containerWidth } = state;
       let interval = '1s';
       if (datasourceInstance && datasourceInstance.interval) {
         interval = datasourceInstance.interval;
@@ -515,7 +530,9 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
       const queryIntervals = getIntervals(range, interval, containerWidth);
       return {
         ...state,
+        range,
         queryIntervals,
+        showingStartPage: false,
       };
     },
   })
@@ -546,6 +563,24 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
       };
     },
   })
+  .addMapper({
+    filter: setUrlReplacedAction,
+    mapper: (state): ExploreItemState => {
+      return {
+        ...state,
+        urlReplaced: true,
+      };
+    },
+  })
+  .addMapper({
+    filter: changeRangeAction,
+    mapper: (state, action): ExploreItemState => {
+      return {
+        ...state,
+        range: action.payload.range,
+      };
+    },
+  })
   .create();
 
 export const updateChildRefreshState = (
diff --git a/public/app/features/explore/state/selectors.test.ts b/public/app/features/explore/state/selectors.test.ts
index 3a1fa5102ae3..52f8d27811dc 100644
--- a/public/app/features/explore/state/selectors.test.ts
+++ b/public/app/features/explore/state/selectors.test.ts
@@ -1,5 +1,5 @@
 import { deduplicatedLogsSelector } from './selectors';
-import { LogsDedupStrategy } from 'app/core/logs_model';
+import { LogsDedupStrategy } from '@grafana/ui';
 import { ExploreItemState } from 'app/types';
 
 const state = {
diff --git a/public/app/features/explore/state/selectors.ts b/public/app/features/explore/state/selectors.ts
index fff52651646c..6925e706d4f4 100644
--- a/public/app/features/explore/state/selectors.ts
+++ b/public/app/features/explore/state/selectors.ts
@@ -3,10 +3,9 @@ import { ExploreItemState } from 'app/types';
 import { filterLogLevels, dedupLogRows } from 'app/core/logs_model';
 
 export const exploreItemUIStateSelector = (itemState: ExploreItemState) => {
-  const { showingGraph, showingLogs, showingTable, showingStartPage, dedupStrategy } = itemState;
+  const { showingGraph, showingTable, showingStartPage, dedupStrategy } = itemState;
   return {
     showingGraph,
-    showingLogs,
     showingTable,
     showingStartPage,
     dedupStrategy,
diff --git a/public/app/features/explore/utils/ResultProcessor.test.ts b/public/app/features/explore/utils/ResultProcessor.test.ts
new file mode 100644
index 000000000000..4979afa538cb
--- /dev/null
+++ b/public/app/features/explore/utils/ResultProcessor.test.ts
@@ -0,0 +1,453 @@
+jest.mock('@grafana/ui/src/utils/moment_wrapper', () => ({
+  dateTime: (ts: any) => {
+    return {
+      valueOf: () => ts,
+      fromNow: () => 'fromNow() jest mocked',
+      format: (fmt: string) => 'format() jest mocked',
+    };
+  },
+}));
+
+import { ResultProcessor } from './ResultProcessor';
+import { ExploreItemState, ExploreMode } from 'app/types/explore';
+import TableModel from 'app/core/table_model';
+import { toFixed } from '@grafana/ui';
+
+const testContext = (options: any = {}) => {
+  const response = [
+    {
+      target: 'A-series',
+      alias: 'A-series',
+      datapoints: [[39.91264531864214, 1559038518831], [40.35179822906545, 1559038519831]],
+      refId: 'A',
+    },
+    {
+      columns: [
+        {
+          text: 'Time',
+        },
+        {
+          text: 'Message',
+        },
+        {
+          text: 'Description',
+        },
+        {
+          text: 'Value',
+        },
+      ],
+      rows: [
+        [1559038518831, 'This is a message', 'Description', 23.1],
+        [1559038519831, 'This is a message', 'Description', 23.1],
+      ],
+      refId: 'B',
+    },
+  ];
+  const defaultOptions = {
+    mode: ExploreMode.Metrics,
+    replacePreviousResults: true,
+    result: { data: response },
+    graphResult: [],
+    tableResult: new TableModel(),
+    logsResult: { hasUniqueLabels: false, rows: [] },
+  };
+  const combinedOptions = { ...defaultOptions, ...options };
+  const state = ({
+    mode: combinedOptions.mode,
+    graphResult: combinedOptions.graphResult,
+    tableResult: combinedOptions.tableResult,
+    logsResult: combinedOptions.logsResult,
+    queryIntervals: { intervalMs: 10 },
+  } as any) as ExploreItemState;
+  const resultProcessor = new ResultProcessor(state, combinedOptions.replacePreviousResults, combinedOptions.result);
+
+  return {
+    result: combinedOptions.result,
+    resultProcessor,
+  };
+};
+
+describe('ResultProcessor', () => {
+  describe('constructed without result', () => {
+    describe('when calling getRawData', () => {
+      it('then it should return an empty array', () => {
+        const { resultProcessor } = testContext({ result: null });
+        const theResult = resultProcessor.getRawData();
+
+        expect(theResult).toEqual([]);
+      });
+    });
+
+    describe('when calling getGraphResult', () => {
+      it('then it should return an empty array', () => {
+        const { resultProcessor } = testContext({ result: null });
+        const theResult = resultProcessor.getGraphResult();
+
+        expect(theResult).toEqual([]);
+      });
+    });
+
+    describe('when calling getTableResult', () => {
+      it('then it should return an empty TableModel', () => {
+        const { resultProcessor } = testContext({ result: null });
+        const theResult = resultProcessor.getTableResult();
+
+        expect(theResult).toEqual(new TableModel());
+      });
+    });
+
+    describe('when calling getLogsResult', () => {
+      it('then it should return null', () => {
+        const { resultProcessor } = testContext({ result: null });
+        const theResult = resultProcessor.getLogsResult();
+
+        expect(theResult).toBeNull();
+      });
+    });
+  });
+
+  describe('constructed with a result that is a DataQueryResponse', () => {
+    describe('when calling getRawData', () => {
+      it('then it should return result.data', () => {
+        const { result, resultProcessor } = testContext();
+        const theResult = resultProcessor.getRawData();
+
+        expect(theResult).toEqual(result.data);
+      });
+    });
+
+    describe('when calling getGraphResult', () => {
+      it('then it should return correct graph result', () => {
+        const { resultProcessor } = testContext();
+        const theResult = resultProcessor.getGraphResult();
+
+        expect(theResult).toEqual([
+          {
+            alias: 'A-series',
+            aliasEscaped: 'A-series',
+            bars: {
+              fillColor: '#7EB26D',
+            },
+            hasMsResolution: true,
+            id: 'A-series',
+            label: 'A-series',
+            legend: true,
+            stats: {},
+            color: '#7EB26D',
+            datapoints: [[39.91264531864214, 1559038518831], [40.35179822906545, 1559038519831]],
+            unit: undefined,
+            valueFormater: toFixed,
+          },
+        ]);
+      });
+    });
+
+    describe('when calling getTableResult', () => {
+      it('then it should return correct table result', () => {
+        const { resultProcessor } = testContext();
+        const theResult = resultProcessor.getTableResult();
+
+        expect(theResult).toEqual({
+          columnMap: {},
+          columns: [{ text: 'Time' }, { text: 'Message' }, { text: 'Description' }, { text: 'Value' }],
+          rows: [
+            [1559038518831, 'This is a message', 'Description', 23.1],
+            [1559038519831, 'This is a message', 'Description', 23.1],
+          ],
+          type: 'table',
+        });
+      });
+    });
+
+    describe('when calling getLogsResult', () => {
+      it('then it should return correct logs result', () => {
+        const { resultProcessor } = testContext({ mode: ExploreMode.Logs, observerResponse: null });
+        const theResult = resultProcessor.getLogsResult();
+
+        expect(theResult).toEqual({
+          hasUniqueLabels: false,
+          meta: [],
+          rows: [
+            {
+              entry: 'This is a message',
+              hasAnsi: false,
+              labels: undefined,
+              logLevel: 'unknown',
+              raw: 'This is a message',
+              searchWords: [],
+              timeEpochMs: 1559038519831,
+              timeFromNow: 'fromNow() jest mocked',
+              timeLocal: 'format() jest mocked',
+              timestamp: 1559038519831,
+              uniqueLabels: {},
+            },
+            {
+              entry: 'This is a message',
+              hasAnsi: false,
+              labels: undefined,
+              logLevel: 'unknown',
+              raw: 'This is a message',
+              searchWords: [],
+              timeEpochMs: 1559038518831,
+              timeFromNow: 'fromNow() jest mocked',
+              timeLocal: 'format() jest mocked',
+              timestamp: 1559038518831,
+              uniqueLabels: {},
+            },
+          ],
+          series: [
+            {
+              alias: 'A-series',
+              datapoints: [[39.91264531864214, 1559038518831], [40.35179822906545, 1559038519831]],
+              meta: undefined,
+              refId: 'A',
+              target: 'A-series',
+              unit: undefined,
+            },
+          ],
+        });
+      });
+    });
+  });
+
+  describe('constructed with result that is a DataQueryResponse and merging with previous results', () => {
+    describe('when calling getRawData', () => {
+      it('then it should return result.data', () => {
+        const { result, resultProcessor } = testContext();
+        const theResult = resultProcessor.getRawData();
+
+        expect(theResult).toEqual(result.data);
+      });
+    });
+
+    describe('when calling getGraphResult', () => {
+      it('then it should return correct graph result', () => {
+        const { resultProcessor } = testContext({
+          replacePreviousResults: false,
+          graphResult: [
+            {
+              alias: 'A-series',
+              aliasEscaped: 'A-series',
+              bars: {
+                fillColor: '#7EB26D',
+              },
+              hasMsResolution: true,
+              id: 'A-series',
+              label: 'A-series',
+              legend: true,
+              stats: {},
+              color: '#7EB26D',
+              datapoints: [[19.91264531864214, 1558038518831], [20.35179822906545, 1558038519831]],
+              unit: undefined,
+              valueFormater: toFixed,
+            },
+          ],
+        });
+        const theResult = resultProcessor.getGraphResult();
+
+        expect(theResult).toEqual([
+          {
+            alias: 'A-series',
+            aliasEscaped: 'A-series',
+            bars: {
+              fillColor: '#7EB26D',
+            },
+            hasMsResolution: true,
+            id: 'A-series',
+            label: 'A-series',
+            legend: true,
+            stats: {},
+            color: '#7EB26D',
+            datapoints: [
+              [19.91264531864214, 1558038518831],
+              [20.35179822906545, 1558038519831],
+              [39.91264531864214, 1559038518831],
+              [40.35179822906545, 1559038519831],
+            ],
+            unit: undefined,
+            valueFormater: toFixed,
+          },
+        ]);
+      });
+    });
+
+    describe('when calling getTableResult', () => {
+      it('then it should return correct table result', () => {
+        const { resultProcessor } = testContext({
+          replacePreviousResults: false,
+          tableResult: {
+            columnMap: {},
+            columns: [{ text: 'Time' }, { text: 'Message' }, { text: 'Description' }, { text: 'Value' }],
+            rows: [
+              [1558038518831, 'This is a previous message 1', 'Previous Description 1', 21.1],
+              [1558038519831, 'This is a previous message 2', 'Previous Description 2', 22.1],
+            ],
+            type: 'table',
+          },
+        });
+        const theResult = resultProcessor.getTableResult();
+
+        expect(theResult).toEqual({
+          columnMap: {},
+          columns: [{ text: 'Time' }, { text: 'Message' }, { text: 'Description' }, { text: 'Value' }],
+          rows: [
+            [1558038518831, 'This is a previous message 1', 'Previous Description 1', 21.1],
+            [1558038519831, 'This is a previous message 2', 'Previous Description 2', 22.1],
+            [1559038518831, 'This is a message', 'Description', 23.1],
+            [1559038519831, 'This is a message', 'Description', 23.1],
+          ],
+          type: 'table',
+        });
+      });
+    });
+
+    describe('when calling getLogsResult', () => {
+      it('then it should return correct logs result', () => {
+        const { resultProcessor } = testContext({
+          mode: ExploreMode.Logs,
+          replacePreviousResults: false,
+          logsResult: {
+            hasUniqueLabels: false,
+            meta: [],
+            rows: [
+              {
+                entry: 'This is a previous message 1',
+                fresh: true,
+                hasAnsi: false,
+                labels: { cluster: 'some-cluster' },
+                logLevel: 'unknown',
+                raw: 'This is a previous message 1',
+                searchWords: [],
+                timeEpochMs: 1558038519831,
+                timeFromNow: 'fromNow() jest mocked',
+                timeLocal: 'format() jest mocked',
+                timestamp: 1558038519831,
+                uniqueLabels: {},
+              },
+              {
+                entry: 'This is a previous message 2',
+                fresh: true,
+                hasAnsi: false,
+                labels: { cluster: 'some-cluster' },
+                logLevel: 'unknown',
+                raw: 'This is a previous message 2',
+                searchWords: [],
+                timeEpochMs: 1558038518831,
+                timeFromNow: 'fromNow() jest mocked',
+                timeLocal: 'format() jest mocked',
+                timestamp: 1558038518831,
+                uniqueLabels: {},
+              },
+            ],
+            series: [
+              {
+                alias: 'A-series',
+                aliasEscaped: 'A-series',
+                bars: {
+                  fillColor: '#7EB26D',
+                },
+                hasMsResolution: true,
+                id: 'A-series',
+                label: 'A-series',
+                legend: true,
+                stats: {},
+                color: '#7EB26D',
+                datapoints: [[37.91264531864214, 1558038518831], [38.35179822906545, 1558038519831]],
+                unit: undefined,
+                valueFormater: toFixed,
+              },
+            ],
+          },
+        });
+        const theResult = resultProcessor.getLogsResult();
+        const expected = {
+          hasUniqueLabels: false,
+          meta: [],
+          rows: [
+            {
+              entry: 'This is a previous message 1',
+              fresh: false,
+              hasAnsi: false,
+              labels: { cluster: 'some-cluster' },
+              logLevel: 'unknown',
+              raw: 'This is a previous message 1',
+              searchWords: [],
+              timeEpochMs: 1558038519831,
+              timeFromNow: 'fromNow() jest mocked',
+              timeLocal: 'format() jest mocked',
+              timestamp: 1558038519831,
+              uniqueLabels: {},
+            },
+            {
+              entry: 'This is a previous message 2',
+              fresh: false,
+              hasAnsi: false,
+              labels: { cluster: 'some-cluster' },
+              logLevel: 'unknown',
+              raw: 'This is a previous message 2',
+              searchWords: [],
+              timeEpochMs: 1558038518831,
+              timeFromNow: 'fromNow() jest mocked',
+              timeLocal: 'format() jest mocked',
+              timestamp: 1558038518831,
+              uniqueLabels: {},
+            },
+            {
+              entry: 'This is a message',
+              fresh: true,
+              hasAnsi: false,
+              labels: undefined,
+              logLevel: 'unknown',
+              raw: 'This is a message',
+              searchWords: [],
+              timeEpochMs: 1559038519831,
+              timeFromNow: 'fromNow() jest mocked',
+              timeLocal: 'format() jest mocked',
+              timestamp: 1559038519831,
+              uniqueLabels: {},
+            },
+            {
+              entry: 'This is a message',
+              fresh: true,
+              hasAnsi: false,
+              labels: undefined,
+              logLevel: 'unknown',
+              raw: 'This is a message',
+              searchWords: [],
+              timeEpochMs: 1559038518831,
+              timeFromNow: 'fromNow() jest mocked',
+              timeLocal: 'format() jest mocked',
+              timestamp: 1559038518831,
+              uniqueLabels: {},
+            },
+          ],
+          series: [
+            {
+              alias: 'A-series',
+              aliasEscaped: 'A-series',
+              bars: {
+                fillColor: '#7EB26D',
+              },
+              hasMsResolution: true,
+              id: 'A-series',
+              label: 'A-series',
+              legend: true,
+              stats: {},
+              color: '#7EB26D',
+              datapoints: [
+                [37.91264531864214, 1558038518831],
+                [38.35179822906545, 1558038519831],
+                [39.91264531864214, 1559038518831],
+                [40.35179822906545, 1559038519831],
+              ],
+              unit: undefined,
+              valueFormater: toFixed,
+            },
+          ],
+        };
+
+        expect(theResult).toEqual(expected);
+      });
+    });
+  });
+});
diff --git a/public/app/features/explore/utils/ResultProcessor.ts b/public/app/features/explore/utils/ResultProcessor.ts
new file mode 100644
index 000000000000..2521c4914f8e
--- /dev/null
+++ b/public/app/features/explore/utils/ResultProcessor.ts
@@ -0,0 +1,176 @@
+import {
+  DataQueryResponse,
+  TableData,
+  isTableData,
+  LogsModel,
+  toSeriesData,
+  guessFieldTypes,
+  DataQueryResponseData,
+  TimeSeries,
+} from '@grafana/ui';
+
+import { ExploreItemState, ExploreMode } from 'app/types/explore';
+import { getProcessedSeriesData } from 'app/features/dashboard/state/PanelQueryState';
+import TableModel, { mergeTablesIntoModel } from 'app/core/table_model';
+import { sortLogsResult } from 'app/core/utils/explore';
+import { seriesDataToLogsModel } from 'app/core/logs_model';
+import { default as TimeSeries2 } from 'app/core/time_series2';
+import { DataProcessor } from 'app/plugins/panel/graph/data_processor';
+
+export class ResultProcessor {
+  private rawData: DataQueryResponseData[] = [];
+  private metrics: TimeSeries[] = [];
+  private tables: TableData[] = [];
+
+  constructor(
+    private state: ExploreItemState,
+    private replacePreviousResults: boolean,
+    result?: DataQueryResponse | DataQueryResponseData[]
+  ) {
+    if (result && result.hasOwnProperty('data')) {
+      this.rawData = (result as DataQueryResponse).data;
+    } else {
+      this.rawData = (result as DataQueryResponseData[]) || [];
+    }
+
+    if (this.state.mode !== ExploreMode.Metrics) {
+      return;
+    }
+
+    for (let index = 0; index < this.rawData.length; index++) {
+      const res: any = this.rawData[index];
+      const isTable = isTableData(res);
+      if (isTable) {
+        this.tables.push(res);
+      } else {
+        this.metrics.push(res);
+      }
+    }
+  }
+
+  getRawData = (): any[] => {
+    return this.rawData;
+  };
+
+  getGraphResult = (): TimeSeries[] => {
+    if (this.state.mode !== ExploreMode.Metrics) {
+      return [];
+    }
+
+    const newResults = this.makeTimeSeriesList(this.metrics);
+    return this.mergeGraphResults(newResults, this.state.graphResult);
+  };
+
+  getTableResult = (): TableModel => {
+    if (this.state.mode !== ExploreMode.Metrics) {
+      return new TableModel();
+    }
+
+    const prevTableResults = this.state.tableResult || [];
+    const tablesToMerge = this.replacePreviousResults ? this.tables : [].concat(prevTableResults, this.tables);
+
+    return mergeTablesIntoModel(new TableModel(), ...tablesToMerge);
+  };
+
+  getLogsResult = (): LogsModel => {
+    if (this.state.mode !== ExploreMode.Logs) {
+      return null;
+    }
+    const graphInterval = this.state.queryIntervals.intervalMs;
+    const seriesData = this.rawData.map(result => guessFieldTypes(toSeriesData(result)));
+    const newResults = this.rawData ? seriesDataToLogsModel(seriesData, graphInterval) : null;
+
+    if (this.replacePreviousResults) {
+      return newResults;
+    }
+
+    const prevLogsResult: LogsModel = this.state.logsResult || { hasUniqueLabels: false, rows: [] };
+    const sortedLogResult = sortLogsResult(prevLogsResult, this.state.refreshInterval);
+    const rowsInState = sortedLogResult.rows;
+    const seriesInState = sortedLogResult.series || [];
+
+    const processedRows = [];
+    for (const row of rowsInState) {
+      processedRows.push({ ...row, fresh: false });
+    }
+    for (const row of newResults.rows) {
+      processedRows.push({ ...row, fresh: true });
+    }
+
+    const processedSeries = this.mergeGraphResults(newResults.series, seriesInState);
+
+    const slice = -1000;
+    const rows = processedRows.slice(slice);
+    const series = processedSeries.slice(slice);
+
+    return { ...newResults, rows, series };
+  };
+
+  private makeTimeSeriesList = (rawData: any[]) => {
+    const dataList = getProcessedSeriesData(rawData);
+    const dataProcessor = new DataProcessor({ xaxis: {}, aliasColors: [] }); // Hack before we use GraphSeriesXY instead
+    const timeSeries = dataProcessor.getSeriesList({ dataList });
+
+    return (timeSeries as any) as TimeSeries[]; // Hack before we use GraphSeriesXY instead
+  };
+
+  private isSameTimeSeries = (a: TimeSeries | TimeSeries2, b: TimeSeries | TimeSeries2) => {
+    if (a.hasOwnProperty('id') && b.hasOwnProperty('id')) {
+      if (a['id'] !== undefined && b['id'] !== undefined && a['id'] === b['id']) {
+        return true;
+      }
+    }
+
+    if (a.hasOwnProperty('alias') && b.hasOwnProperty('alias')) {
+      if (a['alias'] !== undefined && b['alias'] !== undefined && a['alias'] === b['alias']) {
+        return true;
+      }
+    }
+
+    return false;
+  };
+
+  private mergeGraphResults = (
+    newResults: TimeSeries[] | TimeSeries2[],
+    prevResults: TimeSeries[] | TimeSeries2[]
+  ): TimeSeries[] => {
+    if (!prevResults || prevResults.length === 0 || this.replacePreviousResults) {
+      return (newResults as any) as TimeSeries[]; // Hack before we use GraphSeriesXY instead
+    }
+
+    const results: TimeSeries[] = prevResults.slice() as TimeSeries[];
+
+    // update existing results
+    for (let index = 0; index < results.length; index++) {
+      const prevResult = results[index];
+      for (const newResult of newResults) {
+        const isSame = this.isSameTimeSeries(prevResult, newResult);
+
+        if (isSame) {
+          prevResult.datapoints = prevResult.datapoints.concat(newResult.datapoints);
+          break;
+        }
+      }
+    }
+
+    // add new results
+    for (const newResult of newResults) {
+      let isNew = true;
+      for (const prevResult of results) {
+        const isSame = this.isSameTimeSeries(prevResult, newResult);
+        if (isSame) {
+          isNew = false;
+          break;
+        }
+      }
+
+      if (isNew) {
+        const timeSeries2Result = new TimeSeries2({ ...newResult });
+
+        const result = (timeSeries2Result as any) as TimeSeries; // Hack before we use GraphSeriesXY instead
+        results.push(result);
+      }
+    }
+    return results;
+  };
+}
diff --git a/public/app/features/org/state/actions.ts b/public/app/features/org/state/actions.ts
index 52793698a45d..214674783cef 100644
--- a/public/app/features/org/state/actions.ts
+++ b/public/app/features/org/state/actions.ts
@@ -1,8 +1,5 @@
-import { ThunkAction } from 'redux-thunk';
-import { Organization, StoreState } from 'app/types';
-import { getBackendSrv } from 'app/core/services/backend_srv';
-
-type ThunkResult<R> = ThunkAction<R, StoreState, undefined, any>;
+import { Organization, ThunkResult } from 'app/types';
+import { getBackendSrv } from '@grafana/runtime';
 
 export enum ActionTypes {
   LoadOrganization = 'LOAD_ORGANIZATION',
@@ -31,7 +28,7 @@ export const setOrganizationName = (orgName: string) => ({
 
 export type Action = LoadOrganizationAction | SetOrganizationNameAction;
 
-export function loadOrganization(): ThunkResult<void> {
+export function loadOrganization(): ThunkResult<any> {
   return async dispatch => {
     const organizationResponse = await getBackendSrv().get('/api/org');
     dispatch(organizationLoaded(organizationResponse));
@@ -40,7 +37,7 @@ export function loadOrganization(): ThunkResult<void> {
   };
 }
 
-export function updateOrganization() {
+export function updateOrganization(): ThunkResult<any> {
   return async (dispatch, getStore) => {
     const organization = getStore().organization.organization;
 
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index 068aa03d0f9e..a03a431ae0fd 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -15,6 +15,7 @@ import {
   PanelData,
   LoadingState,
   DataQueryResponse,
+  SeriesData,
 } from '@grafana/ui';
 import { Unsubscribable } from 'rxjs';
 import { PanelModel } from 'app/features/dashboard/state';
@@ -37,6 +38,7 @@ class MetricsPanelCtrl extends PanelCtrl {
   skipDataOnInit: boolean;
   dataList: LegacyResponseData[];
   querySubscription?: Unsubscribable;
+  dataFormat = PanelQueryRunnerFormat.legacy;
 
   constructor($scope: any, $injector: any) {
     super($scope, $injector);
@@ -129,9 +131,22 @@ class MetricsPanelCtrl extends PanelCtrl {
       if (data.state === LoadingState.Error) {
         this.loading = false;
         this.processDataError(data.error);
-      } else if (data.state === LoadingState.Done) {
-        this.loading = false;
+        return;
+      }
+
+      this.loading = false;
+
+      if (data.request) {
+        const { range, timeInfo } = data.request;
+        if (range) {
+          this.range = range;
+        }
+        if (timeInfo) {
+          this.timeInfo = timeInfo;
+        }
+      }
 
+      if (this.dataFormat === PanelQueryRunnerFormat.legacy) {
         // The result should already be processed, but just in case
         if (!data.legacy) {
           data.legacy = data.series.map(v => {
@@ -147,6 +162,8 @@ class MetricsPanelCtrl extends PanelCtrl {
         this.handleQueryResult({
           data: data.legacy,
         });
+      } else {
+        this.handleSeriesData(data.series);
       }
     },
   };
@@ -187,7 +204,7 @@ class MetricsPanelCtrl extends PanelCtrl {
     const queryRunner = panel.getQueryRunner();
 
     if (!this.querySubscription) {
-      this.querySubscription = queryRunner.subscribe(this.panelDataObserver, PanelQueryRunnerFormat.legacy);
+      this.querySubscription = queryRunner.subscribe(this.panelDataObserver, this.dataFormat);
     }
 
     return queryRunner.run({
@@ -205,6 +222,16 @@ class MetricsPanelCtrl extends PanelCtrl {
     });
   }
 
+  handleSeriesData(data: SeriesData[]) {
+    this.loading = false;
+
+    if (this.dashboard && this.dashboard.snapshot) {
+      this.panel.snapshotData = data;
+    }
+
+    // Subclasses that asked for SeriesData will override
+  }
+
   handleQueryResult(result: DataQueryResponse) {
     this.loading = false;
 
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index e81312aa0de2..cf110cdc705b 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -60,7 +60,7 @@ export class PanelCtrl {
   }
 
   renderingCompleted() {
-    profiler.renderingCompleted(this.panel.id);
+    profiler.renderingCompleted();
   }
 
   refresh() {
diff --git a/public/app/features/plugins/AppRootPage.tsx b/public/app/features/plugins/AppRootPage.tsx
index 8c337670890a..ec6c6c00e176 100644
--- a/public/app/features/plugins/AppRootPage.tsx
+++ b/public/app/features/plugins/AppRootPage.tsx
@@ -4,7 +4,8 @@ import { hot } from 'react-hot-loader';
 import { connect } from 'react-redux';
 
 // Types
-import { StoreState, UrlQueryMap } from 'app/types';
+import { StoreState } from 'app/types';
+import { UrlQueryMap } from '@grafana/runtime';
 
 import Page from 'app/core/components/Page/Page';
 import { getPluginSettings } from './PluginSettingsCache';
diff --git a/public/app/features/plugins/PluginPage.tsx b/public/app/features/plugins/PluginPage.tsx
index 176c03c6b6ca..a2ca435f9c90 100644
--- a/public/app/features/plugins/PluginPage.tsx
+++ b/public/app/features/plugins/PluginPage.tsx
@@ -5,7 +5,8 @@ import { connect } from 'react-redux';
 import find from 'lodash/find';
 
 // Types
-import { StoreState, UrlQueryMap } from 'app/types';
+import { UrlQueryMap } from '@grafana/runtime';
+import { StoreState } from 'app/types';
 import {
   NavModel,
   NavModelItem,
@@ -74,12 +75,12 @@ interface State {
   loading: boolean;
   plugin?: GrafanaPlugin;
   nav: NavModel;
-  defaultTab: string; // The first configured one or readme
+  defaultPage: string; // The first configured one or readme
 }
 
-const TAB_ID_README = 'readme';
-const TAB_ID_DASHBOARDS = 'dashboards';
-const TAB_ID_CONFIG_CTRL = 'config';
+const PAGE_ID_README = 'readme';
+const PAGE_ID_DASHBOARDS = 'dashboards';
+const PAGE_ID_CONFIG_CTRL = 'config';
 
 class PluginPage extends PureComponent<Props, State> {
   constructor(props: Props) {
@@ -87,7 +88,7 @@ class PluginPage extends PureComponent<Props, State> {
     this.state = {
       loading: true,
       nav: getLoadingNav(),
-      defaultTab: TAB_ID_README,
+      defaultPage: PAGE_ID_README,
     };
   }
 
@@ -103,14 +104,14 @@ class PluginPage extends PureComponent<Props, State> {
     }
     const { meta } = plugin;
 
-    let defaultTab: string;
-    const tabs: NavModelItem[] = [];
+    let defaultPage: string;
+    const pages: NavModelItem[] = [];
     if (true) {
-      tabs.push({
+      pages.push({
         text: 'Readme',
         icon: 'fa fa-fw fa-file-text-o',
-        url: path + '?tab=' + TAB_ID_README,
-        id: TAB_ID_README,
+        url: path + '?page=' + PAGE_ID_README,
+        id: PAGE_ID_README,
       });
     }
 
@@ -118,42 +119,42 @@ class PluginPage extends PureComponent<Props, State> {
     if (meta.type === PluginType.app) {
       // Legacy App Config
       if (plugin.angularConfigCtrl) {
-        tabs.push({
+        pages.push({
           text: 'Config',
           icon: 'gicon gicon-cog',
-          url: path + '?tab=' + TAB_ID_CONFIG_CTRL,
-          id: TAB_ID_CONFIG_CTRL,
+          url: path + '?page=' + PAGE_ID_CONFIG_CTRL,
+          id: PAGE_ID_CONFIG_CTRL,
         });
-        defaultTab = TAB_ID_CONFIG_CTRL;
+        defaultPage = PAGE_ID_CONFIG_CTRL;
       }
 
-      if (plugin.configTabs) {
-        for (const tab of plugin.configTabs) {
-          tabs.push({
-            text: tab.title,
-            icon: tab.icon,
-            url: path + '?tab=' + tab.id,
-            id: tab.id,
+      if (plugin.configPages) {
+        for (const page of plugin.configPages) {
+          pages.push({
+            text: page.title,
+            icon: page.icon,
+            url: path + '?page=' + page.id,
+            id: page.id,
           });
-          if (!defaultTab) {
-            defaultTab = tab.id;
+          if (!defaultPage) {
+            defaultPage = page.id;
           }
         }
       }
 
-      // Check for the dashboard tabs
+      // Check for the dashboard pages
       if (find(meta.includes, { type: 'dashboard' })) {
-        tabs.push({
+        pages.push({
           text: 'Dashboards',
           icon: 'gicon gicon-dashboard',
-          url: path + '?tab=' + TAB_ID_DASHBOARDS,
-          id: TAB_ID_DASHBOARDS,
+          url: path + '?page=' + PAGE_ID_DASHBOARDS,
+          id: PAGE_ID_DASHBOARDS,
         });
       }
     }
 
-    if (!defaultTab) {
-      defaultTab = tabs[0].id; // the first tab
+    if (!defaultPage) {
+      defaultPage = pages[0].id; // the first tab
     }
 
     const node = {
@@ -162,13 +163,13 @@ class PluginPage extends PureComponent<Props, State> {
       subTitle: meta.info.author.name,
       breadcrumbs: [{ title: 'Plugins', url: '/plugins' }],
       url: path,
-      children: this.setActiveTab(query.tab as string, tabs, defaultTab),
+      children: this.setActivePage(query.page as string, pages, defaultPage),
     };
 
     this.setState({
       loading: false,
       plugin,
-      defaultTab,
+      defaultPage,
       nav: {
         node: node,
         main: node,
@@ -176,15 +177,15 @@ class PluginPage extends PureComponent<Props, State> {
     });
   }
 
-  setActiveTab(tabId: string, tabs: NavModelItem[], defaultTabId: string): NavModelItem[] {
+  setActivePage(pageId: string, pages: NavModelItem[], defaultPageId: string): NavModelItem[] {
     let found = false;
-    const selected = tabId || defaultTabId;
-    const changed = tabs.map(tab => {
-      const active = !found && selected === tab.id;
+    const selected = pageId || defaultPageId;
+    const changed = pages.map(p => {
+      const active = !found && selected === p.id;
       if (active) {
         found = true;
       }
-      return { ...tab, active };
+      return { ...p, active };
     });
     if (!found) {
       changed[0].active = true;
@@ -193,13 +194,13 @@ class PluginPage extends PureComponent<Props, State> {
   }
 
   componentDidUpdate(prevProps: Props) {
-    const prevTab = prevProps.query.tab as string;
-    const tab = this.props.query.tab as string;
-    if (prevTab !== tab) {
-      const { nav, defaultTab } = this.state;
+    const prevPage = prevProps.query.page as string;
+    const page = this.props.query.page as string;
+    if (prevPage !== page) {
+      const { nav, defaultPage } = this.state;
       const node = {
         ...nav.node,
-        children: this.setActiveTab(tab, nav.node.children, defaultTab),
+        children: this.setActivePage(page, nav.node.children, defaultPage),
       };
       this.setState({
         nav: {
@@ -221,21 +222,21 @@ class PluginPage extends PureComponent<Props, State> {
     const active = nav.main.children.find(tab => tab.active);
     if (active) {
       // Find the current config tab
-      if (plugin.configTabs) {
-        for (const tab of plugin.configTabs) {
+      if (plugin.configPages) {
+        for (const tab of plugin.configPages) {
           if (tab.id === active.id) {
-            return <tab.body meta={plugin.meta} query={query} />;
+            return <tab.body plugin={plugin} query={query} />;
           }
         }
       }
 
       // Apps have some special behavior
       if (plugin.meta.type === PluginType.app) {
-        if (active.id === TAB_ID_DASHBOARDS) {
+        if (active.id === PAGE_ID_DASHBOARDS) {
           return <PluginDashboards plugin={plugin.meta} />;
         }
 
-        if (active.id === TAB_ID_CONFIG_CTRL && plugin.angularConfigCtrl) {
+        if (active.id === PAGE_ID_CONFIG_CTRL && plugin.angularConfigCtrl) {
           return <AppConfigCtrlWrapper app={plugin as AppPlugin} />;
         }
       }
diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts
index 6143a5e182ba..c1c45f8acc40 100644
--- a/public/app/features/plugins/datasource_srv.ts
+++ b/public/app/features/plugins/datasource_srv.ts
@@ -5,11 +5,12 @@ import coreModule from 'app/core/core_module';
 // Services & Utils
 import config from 'app/core/config';
 import { importDataSourcePlugin } from './plugin_loader';
+import { DataSourceSrv as DataSourceService, getDataSourceSrv as getDataSourceService } from '@grafana/runtime';
 
 // Types
 import { DataSourceApi, DataSourceSelectItem, ScopedVars } from '@grafana/ui/src/types';
 
-export class DatasourceSrv {
+export class DatasourceSrv implements DataSourceService {
   datasources: { [name: string]: DataSourceApi };
 
   /** @ngInject */
@@ -61,9 +62,13 @@ export class DatasourceSrv {
           return;
         }
 
-        const instance: DataSourceApi = this.$injector.instantiate(dsPlugin.DataSourceClass, {
-          instanceSettings: dsConfig,
-        });
+        // If there is only one constructor argument it is instanceSettings
+        const useAngular = dsPlugin.DataSourceClass.length !== 1;
+        const instance: DataSourceApi = useAngular
+          ? this.$injector.instantiate(dsPlugin.DataSourceClass, {
+              instanceSettings: dsConfig,
+            })
+          : new dsPlugin.DataSourceClass(dsConfig);
 
         instance.components = dsPlugin.components;
         instance.meta = dsConfig.meta;
@@ -171,14 +176,8 @@ export class DatasourceSrv {
   }
 }
 
-let singleton: DatasourceSrv;
-
-export function setDatasourceSrv(srv: DatasourceSrv) {
-  singleton = srv;
-}
-
 export function getDatasourceSrv(): DatasourceSrv {
-  return singleton;
+  return getDataSourceService() as DatasourceSrv;
 }
 
 coreModule.service('datasourceSrv', DatasourceSrv);
diff --git a/public/app/features/plugins/plugin_loader.test.ts b/public/app/features/plugins/plugin_loader.test.ts
new file mode 100644
index 000000000000..845a5dde62aa
--- /dev/null
+++ b/public/app/features/plugins/plugin_loader.test.ts
@@ -0,0 +1,68 @@
+// Use the real plugin_loader (stubbed by default)
+jest.unmock('app/features/plugins/plugin_loader');
+
+(global as any).ace = {
+  define: jest.fn(),
+};
+
+jest.mock('app/core/core', () => {
+  return {
+    coreModule: {
+      directive: jest.fn(),
+    },
+  };
+});
+
+/* tslint:disable:import-blacklist */
+import System from 'systemjs/dist/system.js';
+
+import { AppPluginMeta, PluginMetaInfo, PluginType, AppPlugin } from '@grafana/ui';
+import { importAppPlugin } from './plugin_loader';
+
+class MyCustomApp extends AppPlugin {
+  initWasCalled = false;
+  calledTwice = false;
+
+  init(meta: AppPluginMeta) {
+    this.initWasCalled = true;
+    this.calledTwice = this.meta === meta;
+  }
+}
+
+describe('Load App', () => {
+  const app = new MyCustomApp();
+  const modulePath = 'my/custom/plugin/module';
+
+  beforeAll(() => {
+    System.set(modulePath, System.newModule({ plugin: app }));
+  });
+
+  afterAll(() => {
+    System.delete(modulePath);
+  });
+
+  it('should call init and set meta', async () => {
+    const meta: AppPluginMeta = {
+      id: 'test-app',
+      module: modulePath,
+      baseUrl: 'xxx',
+      info: {} as PluginMetaInfo,
+      type: PluginType.app,
+      name: 'test',
+    };
+
+    // Check that we mocked the import OK
+    const m = await System.import(modulePath);
+    expect(m.plugin).toBe(app);
+
+    const loaded = await importAppPlugin(meta);
+    expect(loaded).toBe(app);
+    expect(app.meta).toBe(meta);
+    expect(app.initWasCalled).toBeTruthy();
+    expect(app.calledTwice).toBeFalsy();
+
+    const again = await importAppPlugin(meta);
+    expect(again).toBe(app);
+    expect(app.calledTwice).toBeTruthy();
+  });
+});
diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts
index 2ee31a7b6aa2..74986466a49a 100644
--- a/public/app/features/plugins/plugin_loader.ts
+++ b/public/app/features/plugins/plugin_loader.ts
@@ -29,6 +29,7 @@ import impressionSrv from 'app/core/services/impression_srv';
 import builtInPlugins from './built_in_plugins';
 import * as d3 from 'd3';
 import * as grafanaUI from '@grafana/ui';
+import * as grafanaRT from '@grafana/runtime';
 
 // rxjs
 import { Observable, Subject } from 'rxjs';
@@ -68,6 +69,7 @@ function exposeToPlugin(name: string, component: any) {
 }
 
 exposeToPlugin('@grafana/ui', grafanaUI);
+exposeToPlugin('@grafana/runtime', grafanaRT);
 exposeToPlugin('lodash', _);
 exposeToPlugin('moment', moment);
 exposeToPlugin('jquery', jquery);
@@ -75,6 +77,10 @@ exposeToPlugin('angular', angular);
 exposeToPlugin('d3', d3);
 exposeToPlugin('rxjs/Subject', Subject);
 exposeToPlugin('rxjs/Observable', Observable);
+exposeToPlugin('rxjs', {
+  Subject: Subject,
+  Observable: Observable,
+});
 
 // Experimental modules
 exposeToPlugin('prismjs', prismjs);
@@ -84,12 +90,6 @@ exposeToPlugin('slate-plain-serializer', slatePlain);
 exposeToPlugin('react', react);
 exposeToPlugin('react-dom', reactDom);
 
-// backward compatible path
-exposeToPlugin('vendor/npm/rxjs/Rx', {
-  Subject: Subject,
-  Observable: Observable,
-});
-
 exposeToPlugin('app/features/dashboard/impression_store', {
   impressions: impressionSrv,
   __esModule: true,
@@ -183,8 +183,9 @@ export function importDataSourcePlugin(meta: DataSourcePluginMeta): Promise<Data
 export function importAppPlugin(meta: PluginMeta): Promise<AppPlugin> {
   return importPluginModule(meta.module).then(pluginExports => {
     const plugin = pluginExports.plugin ? (pluginExports.plugin as AppPlugin) : new AppPlugin();
-    plugin.meta = meta;
     plugin.setComponentsFromLegacyExports(pluginExports);
+    plugin.init(meta);
+    plugin.meta = meta;
     return plugin;
   });
 }
diff --git a/public/app/features/plugins/state/actions.ts b/public/app/features/plugins/state/actions.ts
index 9a1dbde7bffc..da0e14717633 100644
--- a/public/app/features/plugins/state/actions.ts
+++ b/public/app/features/plugins/state/actions.ts
@@ -1,6 +1,6 @@
 import { StoreState } from 'app/types';
 import { ThunkAction } from 'redux-thunk';
-import { getBackendSrv } from '../../../core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 import { LayoutMode } from '../../../core/components/LayoutSelector/LayoutSelector';
 import { PluginDashboard } from '../../../types/plugins';
 import { PluginMeta } from '@grafana/ui';
diff --git a/public/app/features/plugins/wrappers/AppConfigWrapper.tsx b/public/app/features/plugins/wrappers/AppConfigWrapper.tsx
index de6c670679d6..eb9afa9cf679 100644
--- a/public/app/features/plugins/wrappers/AppConfigWrapper.tsx
+++ b/public/app/features/plugins/wrappers/AppConfigWrapper.tsx
@@ -5,7 +5,7 @@ import extend from 'lodash/extend';
 
 import { PluginMeta, AppPlugin, Button } from '@grafana/ui';
 
-import { AngularComponent, getAngularLoader } from 'app/core/services/AngularLoader';
+import { AngularComponent, getAngularLoader } from '@grafana/runtime';
 import { getBackendSrv } from 'app/core/services/backend_srv';
 import { ButtonVariant } from '@grafana/ui/src/components/Button/AbstractButton';
 import { css } from 'emotion';
diff --git a/public/app/features/teams/__snapshots__/TeamMemberRow.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamMemberRow.test.tsx.snap
index 6072b1046fcc..96ff1b4cbc99 100644
--- a/public/app/features/teams/__snapshots__/TeamMemberRow.test.tsx.snap
+++ b/public/app/features/teams/__snapshots__/TeamMemberRow.test.tsx.snap
@@ -99,7 +99,6 @@ exports[`Render when feature toggle editorsCanAdmin is turned off should not ren
           isMulti={false}
           isSearchable={false}
           maxMenuHeight={300}
-          menuIsOpen={false}
           onChange={[Function]}
           openMenuOnFocus={false}
           options={
@@ -123,7 +122,6 @@ exports[`Render when feature toggle editorsCanAdmin is turned off should not ren
               "value": 0,
             }
           }
-          width={null}
         />
       </div>
     </td>
@@ -185,7 +183,6 @@ exports[`Render when feature toggle editorsCanAdmin is turned on should render p
           isMulti={false}
           isSearchable={false}
           maxMenuHeight={300}
-          menuIsOpen={false}
           onChange={[Function]}
           openMenuOnFocus={false}
           options={
@@ -209,7 +206,6 @@ exports[`Render when feature toggle editorsCanAdmin is turned on should render p
               "value": 0,
             }
           }
-          width={null}
         />
       </div>
     </td>
diff --git a/public/app/features/teams/state/actions.ts b/public/app/features/teams/state/actions.ts
index e2582839233f..cd369b86e922 100644
--- a/public/app/features/teams/state/actions.ts
+++ b/public/app/features/teams/state/actions.ts
@@ -1,5 +1,5 @@
 import { ThunkAction } from 'redux-thunk';
-import { getBackendSrv } from 'app/core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 import { StoreState, Team, TeamGroup, TeamMember } from 'app/types';
 import { updateNavIndex, UpdateNavIndexAction } from 'app/core/actions';
 import { buildNavModel } from './navModel';
diff --git a/public/app/features/users/state/actions.ts b/public/app/features/users/state/actions.ts
index 5c50aa290965..3d69e6638596 100644
--- a/public/app/features/users/state/actions.ts
+++ b/public/app/features/users/state/actions.ts
@@ -1,6 +1,6 @@
 import { ThunkAction } from 'redux-thunk';
 import { StoreState } from '../../../types';
-import { getBackendSrv } from '../../../core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 import { Invitee, OrgUser } from 'app/types';
 
 export enum ActionTypes {
diff --git a/public/app/plugins/app/example-app/ExampleRootPage.tsx b/public/app/plugins/app/example-app/ExampleRootPage.tsx
index 488d3b511a11..565a9fa37d45 100644
--- a/public/app/plugins/app/example-app/ExampleRootPage.tsx
+++ b/public/app/plugins/app/example-app/ExampleRootPage.tsx
@@ -10,7 +10,7 @@ const TAB_ID_A = 'A';
 const TAB_ID_B = 'B';
 const TAB_ID_C = 'C';
 
-export class ExampleRootPage extends PureComponent<Props> {
+export class ExampleRootPage<ExampleAppSettings> extends PureComponent<Props> {
   constructor(props: Props) {
     super(props);
   }
@@ -79,7 +79,7 @@ export class ExampleRootPage extends PureComponent<Props> {
   }
 
   render() {
-    const { path, query } = this.props;
+    const { path, query, meta } = this.props;
 
     return (
       <div>
@@ -96,6 +96,7 @@ export class ExampleRootPage extends PureComponent<Props> {
             <a href={path + '?x=1&y=2&y=3'}>ZZZ</a>
           </li>
         </ul>
+        <pre>{JSON.stringify(meta.jsonData)}</pre>
       </div>
     );
   }
diff --git a/public/app/plugins/app/example-app/config/ExampleTab1.tsx b/public/app/plugins/app/example-app/config/ExamplePage1.tsx
similarity index 65%
rename from public/app/plugins/app/example-app/config/ExampleTab1.tsx
rename to public/app/plugins/app/example-app/config/ExamplePage1.tsx
index cf79a880f435..c25eee35e535 100644
--- a/public/app/plugins/app/example-app/config/ExampleTab1.tsx
+++ b/public/app/plugins/app/example-app/config/ExamplePage1.tsx
@@ -2,11 +2,11 @@
 import React, { PureComponent } from 'react';
 
 // Types
-import { PluginConfigTabProps, AppPluginMeta } from '@grafana/ui';
+import { PluginConfigPageProps, AppPlugin } from '@grafana/ui';
 
-interface Props extends PluginConfigTabProps<AppPluginMeta> {}
+interface Props extends PluginConfigPageProps<AppPlugin> {}
 
-export class ExampleTab1 extends PureComponent<Props> {
+export class ExamplePage1 extends PureComponent<Props> {
   constructor(props: Props) {
     super(props);
   }
diff --git a/public/app/plugins/app/example-app/config/ExampleTab2.tsx b/public/app/plugins/app/example-app/config/ExamplePage2.tsx
similarity index 65%
rename from public/app/plugins/app/example-app/config/ExampleTab2.tsx
rename to public/app/plugins/app/example-app/config/ExamplePage2.tsx
index bf2ae181405a..596bb88e9ba0 100644
--- a/public/app/plugins/app/example-app/config/ExampleTab2.tsx
+++ b/public/app/plugins/app/example-app/config/ExamplePage2.tsx
@@ -2,11 +2,11 @@
 import React, { PureComponent } from 'react';
 
 // Types
-import { PluginConfigTabProps, AppPluginMeta } from '@grafana/ui';
+import { PluginConfigPageProps, AppPlugin } from '@grafana/ui';
 
-interface Props extends PluginConfigTabProps<AppPluginMeta> {}
+interface Props extends PluginConfigPageProps<AppPlugin> {}
 
-export class ExampleTab2 extends PureComponent<Props> {
+export class ExamplePage2 extends PureComponent<Props> {
   constructor(props: Props) {
     super(props);
   }
diff --git a/public/app/plugins/app/example-app/module.ts b/public/app/plugins/app/example-app/module.ts
index 0b4a2ae646a9..8b7ea7b42f47 100644
--- a/public/app/plugins/app/example-app/module.ts
+++ b/public/app/plugins/app/example-app/module.ts
@@ -2,9 +2,10 @@
 import { ExampleConfigCtrl } from './legacy/config';
 import { AngularExamplePageCtrl } from './legacy/angular_example_page';
 import { AppPlugin } from '@grafana/ui';
-import { ExampleTab1 } from './config/ExampleTab1';
-import { ExampleTab2 } from './config/ExampleTab2';
+import { ExamplePage1 } from './config/ExamplePage1';
+import { ExamplePage2 } from './config/ExamplePage2';
 import { ExampleRootPage } from './ExampleRootPage';
+import { ExampleAppSettings } from './types';
 
 // Legacy exports just for testing
 export {
@@ -12,17 +13,17 @@ export {
   AngularExamplePageCtrl, // Must match `pages.component` in plugin.json
 };
 
-export const plugin = new AppPlugin()
+export const plugin = new AppPlugin<ExampleAppSettings>()
   .setRootPage(ExampleRootPage)
-  .addConfigTab({
-    title: 'Tab 1',
+  .addConfigPage({
+    title: 'Page 1',
     icon: 'fa fa-info',
-    body: ExampleTab1,
-    id: 'tab1',
+    body: ExamplePage1,
+    id: 'page1',
   })
-  .addConfigTab({
-    title: 'Tab 2',
+  .addConfigPage({
+    title: 'Page 2',
     icon: 'fa fa-user',
-    body: ExampleTab2,
-    id: 'tab2',
+    body: ExamplePage2,
+    id: 'page2',
   });
diff --git a/public/app/plugins/app/example-app/types.ts b/public/app/plugins/app/example-app/types.ts
new file mode 100644
index 000000000000..c3c5bad5e767
--- /dev/null
+++ b/public/app/plugins/app/example-app/types.ts
@@ -0,0 +1,4 @@
+export interface ExampleAppSettings {
+  customText?: string;
+  customCheckbox?: boolean;
+}
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts
index bd2bd67248ca..5a92122f221c 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.ts
+++ b/public/app/plugins/datasource/cloudwatch/datasource.ts
@@ -149,12 +149,14 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery>
       if (res.results) {
         for (const query of request.queries) {
           const queryRes = res.results[query.refId];
-          for (const series of queryRes.series) {
-            const s = { target: series.name, datapoints: series.points } as any;
-            if (queryRes.meta.unit) {
-              s.unit = queryRes.meta.unit;
+          if (queryRes) {
+            for (const series of queryRes.series) {
+              const s = { target: series.name, datapoints: series.points } as any;
+              if (queryRes.meta.unit) {
+                s.unit = queryRes.meta.unit;
+              }
+              data.push(s);
             }
-            data.push(s);
           }
         }
       }
diff --git a/public/app/plugins/datasource/cloudwatch/partials/query.parameter.html b/public/app/plugins/datasource/cloudwatch/partials/query.parameter.html
index 1b252e1dda3e..ce272bb4d64a 100644
--- a/public/app/plugins/datasource/cloudwatch/partials/query.parameter.html
+++ b/public/app/plugins/datasource/cloudwatch/partials/query.parameter.html
@@ -1,8 +1,18 @@
+<div class="gf-form-inline">
+        <div class="gf-form">
+                <label class="gf-form-label query-keyword width-8">Region</label>
+                <metric-segment segment="regionSegment" get-options="getRegions()" on-change="regionChanged()"></metric-segment>
+        </div>
+
+        <div class="gf-form gf-form--grow">
+                <div class="gf-form-label gf-form-label--grow"></div>
+        </div>
+</div>
+
 <div class="gf-form-inline" ng-if="target.expression.length === 0">
 	<div class="gf-form">
 		<label class="gf-form-label query-keyword width-8">Metric</label>
 
-		<metric-segment segment="regionSegment" get-options="getRegions()" on-change="regionChanged()"></metric-segment>
 		<metric-segment segment="namespaceSegment" get-options="getNamespaces()" on-change="namespaceChanged()"></metric-segment>
 		<metric-segment segment="metricSegment" get-options="getMetrics()" on-change="metricChanged()"></metric-segment>
 	</div>
diff --git a/public/app/plugins/datasource/cloudwatch/plugin.json b/public/app/plugins/datasource/cloudwatch/plugin.json
index 212bb20a059f..2e71355975ce 100644
--- a/public/app/plugins/datasource/cloudwatch/plugin.json
+++ b/public/app/plugins/datasource/cloudwatch/plugin.json
@@ -4,6 +4,7 @@
   "id": "cloudwatch",
   "category": "cloud",
 
+  "hiddenQueries": true,
   "metrics": true,
   "alerting": true,
   "annotations": true,
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts
index 5bf7dfb19eb5..172aa5ee077a 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/kusto/kusto.ts
@@ -649,6 +649,16 @@ export const grafanaMacros = [
     display: '$__timeFilter()',
     hint: 'Macro that uses the selected timerange in Grafana to filter the query.',
   },
+  {
+    text: '$__timeTo',
+    display: '$__timeTo()',
+    hint: 'Returns the From datetime from the Grafana picker. Example: datetime(2018-06-05T20:09:58.907Z).',
+  },
+  {
+    text: '$__timeFrom',
+    display: '$__timeFrom()',
+    hint: 'Returns the From datetime from the Grafana picker. Example: datetime(2018-06-05T18:09:58.907Z).',
+  },
   {
     text: '$__escapeMulti',
     display: '$__escapeMulti()',
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts
index fab268a34401..186c78743f8c 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.test.ts
@@ -90,27 +90,27 @@ describe('LogAnalyticsDatasource', () => {
     });
   });
 
-  describe('when using $__from and $__to is in the query and range is until now', () => {
+  describe('when using $__timeFrom and $__timeTo is in the query and range is until now', () => {
     beforeEach(() => {
-      builder.rawQueryString = 'query=Tablename | where myTime >= $__from and myTime <= $__to';
+      builder.rawQueryString = 'query=Tablename | where myTime >= $__timeFrom() and myTime <= $__timeTo()';
     });
 
-    it('should replace $__from and $__to with a datetime and the now() function', () => {
+    it('should replace $__timeFrom and $__timeTo with a datetime and the now() function', () => {
       const query = builder.generate().uriString;
 
       expect(query).toContain('where%20myTime%20%3E%3D%20datetime(');
-      expect(query).toContain('myTime%20%3C%3D%20now()');
+      expect(query).toContain('myTime%20%3C%3D%20datetime(');
     });
   });
 
-  describe('when using $__from and $__to is in the query and range is a specific interval', () => {
+  describe('when using $__timeFrom and $__timeTo is in the query and range is a specific interval', () => {
     beforeEach(() => {
-      builder.rawQueryString = 'query=Tablename | where myTime >= $__from and myTime <= $__to';
+      builder.rawQueryString = 'query=Tablename | where myTime >= $__timeFrom() and myTime <= $__timeTo()';
       builder.options.range.to = dateTime().subtract(1, 'hour');
       builder.options.rangeRaw.to = 'now-1h';
     });
 
-    it('should replace $__from and $__to with datetimes', () => {
+    it('should replace $__timeFrom and $__timeTo with datetimes', () => {
       const query = builder.generate().uriString;
 
       expect(query).toContain('where%20myTime%20%3E%3D%20datetime(');
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts
index afb64da8f4c6..ad72c4eb2eb9 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts
@@ -21,12 +21,16 @@ export default class LogAnalyticsQuerystringBuilder {
         if (p1 === 'timeFilter') {
           return this.getTimeFilter(p2, this.options);
         }
+        if (p1 === 'timeFrom') {
+          return this.getFrom(this.options);
+        }
+        if (p1 === 'timeTo') {
+          return this.getUntil(this.options);
+        }
 
         return match;
       });
       queryString = queryString.replace(/\$__interval/gi, this.options.interval);
-      queryString = queryString.replace(/\$__from/gi, this.getFrom(this.options));
-      queryString = queryString.replace(/\$__to/gi, this.getUntil(this.options));
     }
     const rawQuery = queryString;
     queryString = encodeURIComponent(queryString);
@@ -44,7 +48,10 @@ export default class LogAnalyticsQuerystringBuilder {
 
   getUntil(options) {
     if (options.rangeRaw.to === 'now') {
-      return 'now()';
+      const now = Date.now();
+      return `datetime(${dateTime(now)
+        .startOf('minute')
+        .toISOString()})`;
     } else {
       const until = options.range.to;
       return `datetime(${dateTime(until)
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/annotations.editor.html b/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/annotations.editor.html
index a5b2b2adc5be..7a855a10b44b 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/annotations.editor.html
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/annotations.editor.html
@@ -67,8 +67,8 @@
     - $__timeFilter(datetimeColumn) -&gt;  datetimeColumn  &ge; datetime(2018-06-05T18:09:58.907Z) and datetimeColumn &le; datetime(2018-06-05T20:09:58.907Z)
 
     Or build your own conditionals using these built-in variables which just return the values:
-    - $__from -&gt;  datetime(2018-06-05T18:09:58.907Z)
-    - $__to -&gt; datetime(2018-06-05T20:09:58.907Z)
+    - $__timeFrom -&gt;  datetime(2018-06-05T18:09:58.907Z)
+    - $__timeTo -&gt; datetime(2018-06-05T20:09:58.907Z)
     - $__interval -&gt; 5m
 </pre>
   </div>
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/query.editor.html b/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/query.editor.html
index c2461eb67ead..1c2b14f366ed 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/query.editor.html
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/query.editor.html
@@ -10,7 +10,7 @@
     <div class="gf-form" ng-if="ctrl.target.queryType === 'Azure Monitor' || ctrl.target.queryType === 'Azure Log Analytics'">
       <label class="gf-form-label query-keyword width-9">Subscription</label>
       <gf-form-dropdown model="ctrl.target.subscription" allow-custom="true" lookup-text="true"
-        get-options="ctrl.subscriptions" on-change="ctrl.onSubscriptionChange()" css-class="min-width-12">
+        get-options="ctrl.getSubscriptions()" on-change="ctrl.onSubscriptionChange()" css-class="min-width-12">
       </gf-form-dropdown>
     </div>
     <div class="gf-form gf-form--grow">
@@ -108,17 +108,18 @@
         <gf-form-dropdown model="ctrl.target.azureLogAnalytics.workspace" allow-custom="true" lookup-text="true"
           get-options="ctrl.workspaces" on-change="ctrl.refresh()" css-class="min-width-12">
         </gf-form-dropdown>
-      <div class="gf-form">
-        <div class="width-1"></div>
-      </div>
-      <div class="gf-form">
-        <button class="btn btn-primary width-10" ng-click="ctrl.refresh()">Run</button>
-      </div>
-      <div class="gf-form">
-        <label class="gf-form-label">(Run Query: Shift+Enter, Trigger Suggestion: Ctrl+Space)</label>
-      </div>
-      <div class="gf-form gf-form--grow">
-        <div class="gf-form-label gf-form-label--grow"></div>
+        <div class="gf-form">
+          <div class="width-1"></div>
+        </div>
+        <div class="gf-form">
+          <button class="btn btn-primary width-10" ng-click="ctrl.refresh()">Run</button>
+        </div>
+        <div class="gf-form">
+          <label class="gf-form-label">(Run Query: Shift+Enter, Trigger Suggestion: Ctrl+Space)</label>
+        </div>
+        <div class="gf-form gf-form--grow">
+          <div class="gf-form-label gf-form-label--grow"></div>
+        </div>
       </div>
     </div>
 
@@ -188,13 +189,13 @@
       If using the All option, then check the Include All Option checkbox and in the Custom all value field type in: all. If All is chosen -&gt; 1 == 1
 
     Or build your own conditionals using these built-in variables which just return the values:
-    - $__from -&gt;  datetime(2018-06-05T18:09:58.907Z)
-    - $__to -&gt; datetime(2018-06-05T20:09:58.907Z)
+    - $__timeFrom -&gt;  datetime(2018-06-05T18:09:58.907Z)
+    - $__timeTo -&gt; datetime(2018-06-05T20:09:58.907Z)
     - $__interval -&gt; 5m
 
     Examples:
     - ¡ where $__timeFilter
-    - | where TimeGenerated &ge; $__from and TimeGenerated &le; $__to
+    - | where TimeGenerated &ge; $__timeFrom and TimeGenerated &le; $__timeTo
     - | summarize count() by Category, bin(TimeGenerated, $__interval)
       </pre>
     </div>
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.test.ts
index 015ba0df9f60..cbdd3f54aba9 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.test.ts
@@ -189,11 +189,19 @@ describe('AzureMonitorQueryCtrl', () => {
       };
 
       beforeEach(() => {
+        queryCtrl.target.subscription = 'sub1';
         queryCtrl.target.azureMonitor.resourceGroup = 'test';
         queryCtrl.target.azureMonitor.metricDefinition = 'Microsoft.Compute/virtualMachines';
         queryCtrl.target.azureMonitor.resourceName = 'test';
         queryCtrl.target.azureMonitor.metricName = 'Percentage CPU';
-        queryCtrl.datasource.getMetricMetadata = function(resourceGroup, metricDefinition, resourceName, metricName) {
+        queryCtrl.datasource.getMetricMetadata = function(
+          subscription,
+          resourceGroup,
+          metricDefinition,
+          resourceName,
+          metricName
+        ) {
+          expect(subscription).toBe('sub1');
           expect(resourceGroup).toBe('test');
           expect(metricDefinition).toBe('Microsoft.Compute/virtualMachines');
           expect(resourceName).toBe('test');
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts
index 3d896f27a0a1..9fc12e9b9169 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts
@@ -110,6 +110,8 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
 
     this.migrateTimeGrains();
 
+    this.migrateToFromTimes();
+
     this.panelCtrl.events.on('data-received', this.onDataReceived.bind(this), $scope);
     this.panelCtrl.events.on('data-error', this.onDataError.bind(this), $scope);
     this.resultFormats = [{ text: 'Time series', value: 'time_series' }, { text: 'Table', value: 'table' }];
@@ -171,6 +173,11 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
     }
   }
 
+  migrateToFromTimes() {
+    this.target.azureLogAnalytics.query = this.target.azureLogAnalytics.query.replace(/\$__from\s/gi, '$__timeFrom() ');
+    this.target.azureLogAnalytics.query = this.target.azureLogAnalytics.query.replace(/\$__to\s/gi, '$__timeTo() ');
+  }
+
   replace(variable: string) {
     return this.templateSrv.replace(variable, this.panelCtrl.panel.scopedVars);
   }
@@ -197,6 +204,8 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
       if (!this.target.subscription && this.subscriptions.length > 0) {
         this.target.subscription = this.subscriptions[0].value;
       }
+
+      return this.subscriptions;
     });
   }
 
@@ -204,6 +213,18 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
     if (this.target.queryType === 'Azure Log Analytics') {
       return this.getWorkspaces();
     }
+
+    if (this.target.queryType === 'Azure Monitor') {
+      this.target.azureMonitor.resourceGroup = this.defaultDropdownValue;
+      this.target.azureMonitor.metricDefinition = this.defaultDropdownValue;
+      this.target.azureMonitor.resourceName = this.defaultDropdownValue;
+      this.target.azureMonitor.metricName = this.defaultDropdownValue;
+      this.target.azureMonitor.aggregation = '';
+      this.target.azureMonitor.timeGrains = [];
+      this.target.azureMonitor.timeGrain = '';
+      this.target.azureMonitor.dimensions = [];
+      this.target.azureMonitor.dimension = '';
+    }
   }
 
   /* Azure Monitor Section */
@@ -282,6 +303,9 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
     this.target.azureMonitor.metricDefinition = this.defaultDropdownValue;
     this.target.azureMonitor.resourceName = this.defaultDropdownValue;
     this.target.azureMonitor.metricName = this.defaultDropdownValue;
+    this.target.azureMonitor.aggregation = '';
+    this.target.azureMonitor.timeGrains = [];
+    this.target.azureMonitor.timeGrain = '';
     this.target.azureMonitor.dimensions = [];
     this.target.azureMonitor.dimension = '';
   }
@@ -289,12 +313,18 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
   onMetricDefinitionChange() {
     this.target.azureMonitor.resourceName = this.defaultDropdownValue;
     this.target.azureMonitor.metricName = this.defaultDropdownValue;
+    this.target.azureMonitor.aggregation = '';
+    this.target.azureMonitor.timeGrains = [];
+    this.target.azureMonitor.timeGrain = '';
     this.target.azureMonitor.dimensions = [];
     this.target.azureMonitor.dimension = '';
   }
 
   onResourceNameChange() {
     this.target.azureMonitor.metricName = this.defaultDropdownValue;
+    this.target.azureMonitor.aggregation = '';
+    this.target.azureMonitor.timeGrains = [];
+    this.target.azureMonitor.timeGrain = '';
     this.target.azureMonitor.dimensions = [];
     this.target.azureMonitor.dimension = '';
   }
@@ -306,6 +336,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
 
     return this.datasource
       .getMetricMetadata(
+        this.replace(this.target.subscription),
         this.replace(this.target.azureMonitor.resourceGroup),
         this.replace(this.target.azureMonitor.metricDefinition),
         this.replace(this.target.azureMonitor.resourceName),
@@ -315,6 +346,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
         this.target.azureMonitor.aggOptions = metadata.supportedAggTypes || [metadata.primaryAggType];
         this.target.azureMonitor.aggregation = metadata.primaryAggType;
         this.target.azureMonitor.timeGrains = [{ text: 'auto', value: 'auto' }].concat(metadata.supportedTimeGrains);
+        this.target.azureMonitor.timeGrain = 'auto';
 
         this.target.azureMonitor.dimensions = metadata.dimensions;
         if (metadata.dimensions.length > 0) {
diff --git a/public/app/plugins/datasource/grafana/partials/annotations.editor.html b/public/app/plugins/datasource/grafana/partials/annotations.editor.html
index e5a67d6a7dc7..c1164f7f8c74 100644
--- a/public/app/plugins/datasource/grafana/partials/annotations.editor.html
+++ b/public/app/plugins/datasource/grafana/partials/annotations.editor.html
@@ -7,7 +7,7 @@
 				<info-popover mode="right-normal">
 					<ul>
 						<li>Dashboard: This will fetch annotation and alert state changes for whole dashboard and show them only on the event's originating panel.</li>
-						<li>All: This will fetch any annotation events that match the tags filter.</li>
+						<li>Tags: This will fetch any annotation events that match the tags filter.</li>
 					</ul>
 				</info-popover>
 			</span>
@@ -32,10 +32,19 @@
 				label-class="width-9"
 				checked="ctrl.annotation.matchAny"
 				on-change="ctrl.refresh()"
-				tooltip="By default Grafana will only show annotation that matches all tags in the query. Enabling this will make Grafana return any annotation with the tags you specify."></gf-form-switch>
+				tooltip="By default Grafana only shows annotations that match all tags in the query. Enabling this returns annotations that match any of the tags in the query."></gf-form-switch>
 		</div>
 		<div class="gf-form" ng-if="ctrl.annotation.type === 'tags'">
-			<span class="gf-form-label">Tags</span>
+			<span class="gf-form-label">
+				Tags
+				<info-popover mode="right-normal">
+					A tag entered here as 'foo' will match
+					<ul>
+						<li>annotation tags 'foo'</li>
+						<li>annotation key-value tags formatted as 'foo:bar'</li>
+					</ul>
+				</info-popover>
+			</span>
 			<bootstrap-tagsinput ng-model="ctrl.annotation.tags" tagclass="label label-tag" placeholder="add tags">
 			</bootstrap-tagsinput>
 		</div>
diff --git a/public/app/plugins/datasource/graphite/plugin.json b/public/app/plugins/datasource/graphite/plugin.json
index f66c7fb202f6..a1cc0335b68e 100644
--- a/public/app/plugins/datasource/graphite/plugin.json
+++ b/public/app/plugins/datasource/graphite/plugin.json
@@ -6,10 +6,10 @@
 
   "includes": [{ "type": "dashboard", "name": "Graphite Carbon Metrics", "path": "dashboards/carbon_metrics.json" }],
 
+  "hiddenQueries": true,
   "metrics": true,
   "alerting": true,
   "annotations": true,
-  "tables": false,
 
   "queryOptions": {
     "maxDataPoints": true,
diff --git a/public/app/plugins/datasource/influxdb/influx_query.ts b/public/app/plugins/datasource/influxdb/influx_query.ts
index 3ee9d703c54b..a655705ffcb6 100644
--- a/public/app/plugins/datasource/influxdb/influx_query.ts
+++ b/public/app/plugins/datasource/influxdb/influx_query.ts
@@ -146,7 +146,7 @@ export default class InfluxQuery {
         value = this.templateSrv.replace(value, this.scopedVars);
       }
       if (operator !== '>' && operator !== '<') {
-        value = "'" + value.replace(/\\/g, '\\\\') + "'";
+        value = "'" + value.replace(/\\/g, '\\\\').replace(/\'/g, "\\'") + "'";
       }
     } else if (interpolate) {
       value = this.templateSrv.replace(value, this.scopedVars, 'regex');
diff --git a/public/app/plugins/datasource/influxdb/plugin.json b/public/app/plugins/datasource/influxdb/plugin.json
index fa660ee12329..785706dfc401 100644
--- a/public/app/plugins/datasource/influxdb/plugin.json
+++ b/public/app/plugins/datasource/influxdb/plugin.json
@@ -8,7 +8,6 @@
   "metrics": true,
   "annotations": true,
   "alerting": true,
-  "tables": true,
 
   "queryOptions": {
     "minInterval": true
diff --git a/public/app/plugins/datasource/influxdb/specs/influx_query.test.ts b/public/app/plugins/datasource/influxdb/specs/influx_query.test.ts
index f8e65c21f2d2..ad76ea5309c5 100644
--- a/public/app/plugins/datasource/influxdb/specs/influx_query.test.ts
+++ b/public/app/plugins/datasource/influxdb/specs/influx_query.test.ts
@@ -139,6 +139,26 @@ describe('InfluxQuery', () => {
     });
   });
 
+  describe('field name with single quote should be escaped and', () => {
+    it('should generate correct query', () => {
+      const query = new InfluxQuery(
+        {
+          measurement: 'cpu',
+          groupBy: [{ type: 'time', params: ['auto'] }],
+          tags: [{ key: 'name', value: "Let's encrypt." }, { key: 'hostname', value: 'server2', condition: 'OR' }],
+        },
+        templateSrv,
+        {}
+      );
+
+      const queryText = query.render();
+      expect(queryText).toBe(
+        'SELECT mean("value") FROM "cpu" WHERE ("name" = \'Let\\\'s encrypt.\' OR "hostname" = \'server2\') AND ' +
+          '$timeFilter GROUP BY time($__interval)'
+      );
+    });
+  });
+
   describe('query with value condition', () => {
     it('should not quote value', () => {
       const query = new InfluxQuery(
diff --git a/public/app/plugins/datasource/input/InputDatasource.test.ts b/public/app/plugins/datasource/input/InputDatasource.test.ts
index 2a8412dca88d..e4c23bf47d0f 100644
--- a/public/app/plugins/datasource/input/InputDatasource.test.ts
+++ b/public/app/plugins/datasource/input/InputDatasource.test.ts
@@ -1,4 +1,4 @@
-import InputDatasource from './InputDatasource';
+import InputDatasource, { describeSeriesData } from './InputDatasource';
 import { InputQuery, InputOptions } from './types';
 import { readCSV, DataSourceInstanceSettings, PluginMeta } from '@grafana/ui';
 import { getQueryOptions } from 'test/helpers/getQueryOptions';
@@ -31,4 +31,18 @@ describe('InputDatasource', () => {
       });
     });
   });
+
+  test('SeriesData descriptions', () => {
+    expect(describeSeriesData([])).toEqual('');
+    expect(describeSeriesData(null)).toEqual('');
+    expect(
+      describeSeriesData([
+        {
+          name: 'x',
+          fields: [{ name: 'a' }],
+          rows: [],
+        },
+      ])
+    ).toEqual('1 Fields, 0 Rows');
+  });
 });
diff --git a/public/app/plugins/datasource/input/InputDatasource.ts b/public/app/plugins/datasource/input/InputDatasource.ts
index f208260aa2ae..246ebeb7a05b 100644
--- a/public/app/plugins/datasource/input/InputDatasource.ts
+++ b/public/app/plugins/datasource/input/InputDatasource.ts
@@ -17,28 +17,14 @@ export class InputDatasource extends DataSourceApi<InputQuery, InputOptions> {
     this.data = instanceSettings.jsonData.data ? instanceSettings.jsonData.data : [];
   }
 
-  getDescription(data: SeriesData[]): string {
-    if (!data) {
-      return '';
-    }
-    if (data.length > 1) {
-      const count = data.reduce((acc, series) => {
-        return acc + series.rows.length;
-      }, 0);
-      return `${data.length} Series, ${count} Rows`;
-    }
-    const series = data[0];
-    return `${series.fields.length} Fields, ${series.rows.length} Rows`;
-  }
-
   /**
    * Convert a query to a simple text string
    */
   getQueryDisplayText(query: InputQuery): string {
     if (query.data) {
-      return 'Panel Data: ' + this.getDescription(query.data);
+      return 'Panel Data: ' + describeSeriesData(query.data);
     }
-    return `Shared Data From: ${this.name} (${this.getDescription(this.data)})`;
+    return `Shared Data From: ${this.name} (${describeSeriesData(this.data)})`;
   }
 
   metricFindQuery(query: string, options?: any) {
@@ -96,4 +82,21 @@ export class InputDatasource extends DataSourceApi<InputQuery, InputOptions> {
   }
 }
 
+export function describeSeriesData(data: SeriesData[]): string {
+  if (!data || !data.length) {
+    return '';
+  }
+  if (data.length > 1) {
+    const count = data.reduce((acc, series) => {
+      return acc + series.rows.length;
+    }, 0);
+    return `${data.length} Series, ${count} Rows`;
+  }
+  const series = data[0];
+  if (!series.fields) {
+    return 'Missing Fields';
+  }
+  return `${series.fields.length} Fields, ${series.rows.length} Rows`;
+}
+
 export default InputDatasource;
diff --git a/public/app/plugins/datasource/input/InputQueryEditor.tsx b/public/app/plugins/datasource/input/InputQueryEditor.tsx
index 68e1cb5516eb..2e9a473f5d90 100644
--- a/public/app/plugins/datasource/input/InputQueryEditor.tsx
+++ b/public/app/plugins/datasource/input/InputQueryEditor.tsx
@@ -2,7 +2,7 @@
 import React, { PureComponent } from 'react';
 
 // Types
-import { InputDatasource } from './InputDatasource';
+import { InputDatasource, describeSeriesData } from './InputDatasource';
 import { InputQuery, InputOptions } from './types';
 
 import { FormLabel, Select, QueryEditorProps, SelectOptionItem, SeriesData, TableInputCSV, toCSV } from '@grafana/ui';
@@ -80,10 +80,10 @@ export class InputQueryEditor extends PureComponent<Props, State> {
 
           <div className="btn btn-link">
             {query.data ? (
-              datasource.getDescription(query.data)
+              describeSeriesData(query.data)
             ) : (
               <a href={`datasources/edit/${id}/`}>
-                {name}: {datasource.getDescription(datasource.data)} &nbsp;&nbsp;
+                {name}: {describeSeriesData(datasource.data)} &nbsp;&nbsp;
                 <i className="fa fa-pencil-square-o" />
               </a>
             )}
diff --git a/public/app/plugins/datasource/input/plugin.json b/public/app/plugins/datasource/input/plugin.json
index 91782a348065..dbfa0ad489a4 100644
--- a/public/app/plugins/datasource/input/plugin.json
+++ b/public/app/plugins/datasource/input/plugin.json
@@ -8,7 +8,6 @@
   "alerting": false,
   "annotations": false,
   "logs": false,
-  "explore": false,
 
   "info": {
     "description": "Data source that supports manual table & CSV input",
diff --git a/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx b/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx
index 76e94904c1f3..a23cd86ad588 100644
--- a/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx
@@ -12,12 +12,11 @@ import QueryField, { TypeaheadInput, QueryFieldState } from 'app/features/explor
 // dom also includes Element polyfills
 import { getNextCharacter, getPreviousCousin } from 'app/features/explore/utils/dom';
 import BracesPlugin from 'app/features/explore/slate-plugins/braces';
-import RunnerPlugin from 'app/features/explore/slate-plugins/runner';
 
 // Types
 import { LokiQuery } from '../types';
 import { TypeaheadOutput, HistoryItem } from 'app/types/explore';
-import { ExploreDataSourceApi, ExploreQueryFieldProps, DataSourceStatus } from '@grafana/ui';
+import { DataSourceApi, ExploreQueryFieldProps, DataSourceStatus } from '@grafana/ui';
 
 function getChooserText(hasSyntax: boolean, hasLogLabels: boolean, datasourceStatus: DataSourceStatus) {
   if (datasourceStatus === DataSourceStatus.Disconnected) {
@@ -66,7 +65,7 @@ export interface CascaderOption {
   disabled?: boolean;
 }
 
-export interface LokiQueryFieldFormProps extends ExploreQueryFieldProps<ExploreDataSourceApi<LokiQuery>, LokiQuery> {
+export interface LokiQueryFieldFormProps extends ExploreQueryFieldProps<DataSourceApi<LokiQuery>, LokiQuery> {
   history: HistoryItem[];
   syntax: any;
   logLabelOptions: any[];
@@ -77,7 +76,6 @@ export interface LokiQueryFieldFormProps extends ExploreQueryFieldProps<ExploreD
 
 export class LokiQueryFieldForm extends React.PureComponent<LokiQueryFieldFormProps> {
   plugins: any[];
-  pluginsSearch: any[];
   modifiedSearch: string;
   modifiedQuery: string;
 
@@ -86,14 +84,11 @@ export class LokiQueryFieldForm extends React.PureComponent<LokiQueryFieldFormPr
 
     this.plugins = [
       BracesPlugin(),
-      RunnerPlugin({ handler: props.onRunQuery }),
       PluginPrism({
         onlyIn: (node: any) => node.type === 'code_block',
         getSyntax: (node: any) => 'promql',
       }),
     ];
-
-    this.pluginsSearch = [RunnerPlugin({ handler: props.onRunQuery })];
   }
 
   loadOptions = (selectedOptions: CascaderOption[]) => {
diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index 8b970f05f63e..8200cf0f4a14 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -61,7 +61,7 @@ describe('LokiDatasource', () => {
       backendSrvMock.datasourceRequest = jest.fn(() => Promise.resolve(testResp));
 
       const options = getQueryOptions<LokiQuery>({
-        targets: [{ expr: 'foo', refId: 'B' }],
+        targets: [{ expr: '{} foo', refId: 'B' }],
       });
 
       const res = await ds.query(options);
@@ -69,7 +69,7 @@ describe('LokiDatasource', () => {
       const seriesData = res.data[0] as SeriesData;
       expect(seriesData.rows[0][1]).toBe('hello');
       expect(seriesData.meta.limit).toBe(20);
-      expect(seriesData.meta.search).toBe('(?i)foo');
+      expect(seriesData.meta.searchWords).toEqual(['(?i)foo']);
       done();
     });
   });
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index 3e7e5f3b3968..b689d02ba135 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -1,12 +1,15 @@
 // Libraries
 import _ from 'lodash';
+import { Subscription, of } from 'rxjs';
+import { webSocket } from 'rxjs/webSocket';
+import { catchError, map } from 'rxjs/operators';
 
 // Services & Utils
 import * as dateMath from '@grafana/ui/src/utils/datemath';
 import { addLabelToSelector } from 'app/plugins/datasource/prometheus/add_label_to_query';
 import LanguageProvider from './language_provider';
 import { logStreamToSeriesData } from './result_transformer';
-import { formatQuery, parseQuery } from './query_utils';
+import { formatQuery, parseQuery, getHighlighterExpressionsFromQuery } from './query_utils';
 
 // Types
 import {
@@ -16,11 +19,15 @@ import {
   DataSourceApi,
   DataSourceInstanceSettings,
   DataQueryError,
-} from '@grafana/ui/src/types';
+  LogRowModel,
+  DataStreamObserver,
+  LoadingState,
+  DataStreamState,
+} from '@grafana/ui';
 import { LokiQuery, LokiOptions } from './types';
 import { BackendSrv } from 'app/core/services/backend_srv';
 import { TemplateSrv } from 'app/features/templating/template_srv';
-import { safeStringifyValue } from 'app/core/utils/explore';
+import { safeStringifyValue, convertToWebSocketUrl } from 'app/core/utils/explore';
 
 export const DEFAULT_MAX_LINES = 1000;
 
@@ -40,7 +47,13 @@ function serializeParams(data: any) {
     .join('&');
 }
 
+interface LokiContextQueryOptions {
+  direction?: 'BACKWARD' | 'FORWARD';
+  limit?: number;
+}
+
 export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
+  private subscriptions: { [key: string]: Subscription } = null;
   languageProvider: LanguageProvider;
   maxLines: number;
 
@@ -54,6 +67,7 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
     this.languageProvider = new LanguageProvider(this);
     const settingsData = instanceSettings.jsonData || {};
     this.maxLines = parseInt(settingsData.maxLines, 10) || DEFAULT_MAX_LINES;
+    this.subscriptions = {};
   }
 
   _request(apiUrl: string, data?, options?: any) {
@@ -67,14 +81,31 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
     return this.backendSrv.datasourceRequest(req);
   }
 
+  prepareLiveTarget(target: LokiQuery, options: DataQueryRequest<LokiQuery>) {
+    const interpolated = this.templateSrv.replace(target.expr);
+    const { query, regexp } = parseQuery(interpolated);
+    const refId = target.refId;
+    const baseUrl = this.instanceSettings.url;
+    const params = serializeParams({ query, regexp });
+    const url = convertToWebSocketUrl(`${baseUrl}/api/prom/tail?${params}`);
+    return {
+      query,
+      regexp,
+      url,
+      refId,
+    };
+  }
+
   prepareQueryTarget(target: LokiQuery, options: DataQueryRequest<LokiQuery>) {
     const interpolated = this.templateSrv.replace(target.expr);
+    const { query, regexp } = parseQuery(interpolated);
     const start = this.getTime(options.range.from, false);
     const end = this.getTime(options.range.to, true);
     const refId = target.refId;
     return {
       ...DEFAULT_QUERY_PARAMS,
-      ...parseQuery(interpolated),
+      query,
+      regexp,
       start,
       end,
       limit: this.maxLines,
@@ -82,9 +113,106 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
     };
   }
 
-  async query(options: DataQueryRequest<LokiQuery>) {
+  unsubscribe = (refId: string) => {
+    const subscription = this.subscriptions[refId];
+    if (subscription && !subscription.closed) {
+      subscription.unsubscribe();
+      delete this.subscriptions[refId];
+    }
+  };
+
+  processError = (err: any, target: any): DataQueryError => {
+    const error: DataQueryError = {
+      message: 'Unknown error during query transaction. Please check JS console logs.',
+      refId: target.refId,
+    };
+
+    if (err.data) {
+      if (typeof err.data === 'string') {
+        error.message = err.data;
+      } else if (err.data.error) {
+        error.message = safeStringifyValue(err.data.error);
+      }
+    } else if (err.message) {
+      error.message = err.message;
+    } else if (typeof err === 'string') {
+      error.message = err;
+    }
+
+    error.status = err.status;
+    error.statusText = err.statusText;
+
+    return error;
+  };
+
+  processResult = (data: any, target: any): SeriesData[] => {
+    const series: SeriesData[] = [];
+
+    if (Object.keys(data).length === 0) {
+      return series;
+    }
+
+    if (!data.streams) {
+      return [{ ...logStreamToSeriesData(data), refId: target.refId }];
+    }
+
+    for (const stream of data.streams || []) {
+      const seriesData = logStreamToSeriesData(stream);
+      seriesData.refId = target.refId;
+      seriesData.meta = {
+        searchWords: getHighlighterExpressionsFromQuery(formatQuery(target.query, target.regexp)),
+        limit: this.maxLines,
+      };
+      series.push(seriesData);
+    }
+
+    return series;
+  };
+
+  runLiveQueries = (options: DataQueryRequest<LokiQuery>, observer?: DataStreamObserver) => {
+    const liveTargets = options.targets
+      .filter(target => target.expr && !target.hide && target.live)
+      .map(target => this.prepareLiveTarget(target, options));
+
+    for (const liveTarget of liveTargets) {
+      const subscription = webSocket(liveTarget.url)
+        .pipe(
+          map((results: any[]) => {
+            const delta = this.processResult(results, liveTarget);
+            const state: DataStreamState = {
+              key: `loki-${liveTarget.refId}`,
+              request: options,
+              state: LoadingState.Streaming,
+              delta,
+              unsubscribe: () => this.unsubscribe(liveTarget.refId),
+            };
+
+            return state;
+          }),
+          catchError(err => {
+            const error = this.processError(err, liveTarget);
+            const state: DataStreamState = {
+              key: `loki-${liveTarget.refId}`,
+              request: options,
+              state: LoadingState.Error,
+              error,
+              unsubscribe: () => this.unsubscribe(liveTarget.refId),
+            };
+
+            return of(state);
+          })
+        )
+        .subscribe({
+          next: state => observer(state),
+        });
+
+      this.subscriptions[liveTarget.refId] = subscription;
+    }
+  };
+
+  runQueries = async (options: DataQueryRequest<LokiQuery>) => {
     const queryTargets = options.targets
-      .filter(target => target.expr && !target.hide)
+      .filter(target => target.expr && !target.hide && !target.live)
       .map(target => this.prepareQueryTarget(target, options));
 
     if (queryTargets.length === 0) {
@@ -97,52 +225,29 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
           return err;
         }
 
-        const error: DataQueryError = {
-          message: 'Unknown error during query transaction. Please check JS console logs.',
-          refId: target.refId,
-        };
-
-        if (err.data) {
-          if (typeof err.data === 'string') {
-            error.message = err.data;
-          } else if (err.data.error) {
-            error.message = safeStringifyValue(err.data.error);
-          }
-        } else if (err.message) {
-          error.message = err.message;
-        } else if (typeof err === 'string') {
-          error.message = err;
-        }
-
-        error.status = err.status;
-        error.statusText = err.statusText;
-
+        const error: DataQueryError = this.processError(err, target);
         throw error;
       })
     );
 
     return Promise.all(queries).then((results: any[]) => {
-      const series: Array<SeriesData | DataQueryError> = [];
+      let series: SeriesData[] = [];
 
       for (let i = 0; i < results.length; i++) {
         const result = results[i];
-
         if (result.data) {
-          const refId = queryTargets[i].refId;
-          for (const stream of result.data.streams || []) {
-            const seriesData = logStreamToSeriesData(stream);
-            seriesData.refId = refId;
-            seriesData.meta = {
-              search: queryTargets[i].regexp,
-              limit: this.maxLines,
-            };
-            series.push(seriesData);
-          }
+          series = series.concat(this.processResult(result.data, queryTargets[i]));
         }
       }
 
       return { data: series };
     });
+  };
+
+  async query(options: DataQueryRequest<LokiQuery>, observer?: DataStreamObserver) {
+    this.runLiveQueries(options, observer);
+
+    return this.runQueries(options);
   }
 
   async importQueries(queries: LokiQuery[], originMeta: PluginMeta): Promise<LokiQuery[]> {
@@ -160,7 +265,7 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
 
   modifyQuery(query: LokiQuery, action: any): LokiQuery {
     const parsed = parseQuery(query.expr || '');
-    let selector = parsed.query;
+    let { query: selector } = parsed;
     switch (action.type) {
       case 'ADD_FILTER': {
         selector = addLabelToSelector(selector, action.key, action.value);
@@ -173,8 +278,8 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
     return { ...query, expr: expression };
   }
 
-  getHighlighterExpression(query: LokiQuery): string {
-    return parseQuery(query.expr).regexp;
+  getHighlighterExpression(query: LokiQuery): string[] {
+    return getHighlighterExpressionsFromQuery(query.expr);
   }
 
   getTime(date, roundUp) {
@@ -184,6 +289,72 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
     return Math.ceil(date.valueOf() * 1e6);
   }
 
+  prepareLogRowContextQueryTarget = (row: LogRowModel, limit: number, direction: 'BACKWARD' | 'FORWARD') => {
+    const query = Object.keys(row.labels)
+      .map(label => {
+        return `${label}="${row.labels[label]}"`;
+      })
+      .join(',');
+    const contextTimeBuffer = 2 * 60 * 60 * 1000 * 1e6; // 2h buffer
+    const timeEpochNs = row.timeEpochMs * 1e6;
+
+    const commontTargetOptons = {
+      limit,
+      query: `{${query}}`,
+      direction,
+    };
+
+    if (direction === 'BACKWARD') {
+      return {
+        ...commontTargetOptons,
+        start: timeEpochNs - contextTimeBuffer,
+        end: timeEpochNs,
+        direction,
+      };
+    } else {
+      return {
+        ...commontTargetOptons,
+        start: timeEpochNs, // TODO: We should add 1ns here for the original row not no be included in the result
+        end: timeEpochNs + contextTimeBuffer,
+      };
+    }
+  };
+
+  getLogRowContext = async (row: LogRowModel, options?: LokiContextQueryOptions) => {
+    const target = this.prepareLogRowContextQueryTarget(
+      row,
+      (options && options.limit) || 10,
+      (options && options.direction) || 'BACKWARD'
+    );
+    const series: SeriesData[] = [];
+
+    try {
+      const result = await this._request('/api/prom/query', target);
+      if (result.data) {
+        for (const stream of result.data.streams || []) {
+          const seriesData = logStreamToSeriesData(stream);
+          series.push(seriesData);
+        }
+      }
+      if (options && options.direction === 'FORWARD') {
+        if (series[0] && series[0].rows) {
+          series[0].rows.reverse();
+        }
+      }
+
+      return {
+        data: series,
+      };
+    } catch (e) {
+      const error: DataQueryError = {
+        message: 'Error during context query. Please check JS console logs.',
+        status: e.status,
+        statusText: e.statusText,
+      };
+      throw error;
+    }
+  };
+
   testDatasource() {
     return this._request('/api/prom/label')
       .then(res => {
diff --git a/public/app/plugins/datasource/loki/language_provider.ts b/public/app/plugins/datasource/loki/language_provider.ts
index 64bf876f2c77..ff187bd88420 100644
--- a/public/app/plugins/datasource/loki/language_provider.ts
+++ b/public/app/plugins/datasource/loki/language_provider.ts
@@ -16,6 +16,7 @@ import {
 } from 'app/types/explore';
 import { LokiQuery } from './types';
 import { dateTime } from '@grafana/ui/src/utils/moment_wrapper';
+import { PromQuery } from '../prometheus/types';
 
 const DEFAULT_KEYS = ['job', 'namespace'];
 const EMPTY_SELECTOR = '{}';
@@ -168,8 +169,9 @@ export default class LokiLanguageProvider extends LanguageProvider {
       return Promise.all(
         queries.map(async query => {
           const expr = await this.importPrometheusQuery(query.expr);
+          const { context, ...rest } = query as PromQuery;
           return {
-            ...query,
+            ...rest,
             expr,
           };
         })
diff --git a/public/app/plugins/datasource/loki/plugin.json b/public/app/plugins/datasource/loki/plugin.json
index 66e0f1027e9e..ca630b56bc73 100644
--- a/public/app/plugins/datasource/loki/plugin.json
+++ b/public/app/plugins/datasource/loki/plugin.json
@@ -4,12 +4,11 @@
   "id": "loki",
   "category": "logging",
 
-  "metrics": true,
+  "metrics": false,
   "alerting": false,
   "annotations": false,
   "logs": true,
-  "explore": true,
-  "tables": false,
+  "streaming": true,
 
   "info": {
     "description": "Like Prometheus but for logs. OSS logging solution from Grafana Labs",
diff --git a/public/app/plugins/datasource/loki/query_utils.test.ts b/public/app/plugins/datasource/loki/query_utils.test.ts
index 3685a3dd358e..964f8678a795 100644
--- a/public/app/plugins/datasource/loki/query_utils.test.ts
+++ b/public/app/plugins/datasource/loki/query_utils.test.ts
@@ -1,56 +1,87 @@
-import { parseQuery } from './query_utils';
+import { parseQuery, getHighlighterExpressionsFromQuery } from './query_utils';
+import { LokiExpression } from './types';
 
 describe('parseQuery', () => {
   it('returns empty for empty string', () => {
     expect(parseQuery('')).toEqual({
       query: '',
       regexp: '',
-    });
+    } as LokiExpression);
   });
 
   it('returns regexp for strings without query', () => {
     expect(parseQuery('test')).toEqual({
-      query: '',
-      regexp: '(?i)test',
-    });
+      query: 'test',
+      regexp: '',
+    } as LokiExpression);
   });
 
   it('returns query for strings without regexp', () => {
     expect(parseQuery('{foo="bar"}')).toEqual({
       query: '{foo="bar"}',
       regexp: '',
-    });
+    } as LokiExpression);
   });
 
   it('returns query for strings with query and search string', () => {
     expect(parseQuery('x {foo="bar"}')).toEqual({
       query: '{foo="bar"}',
       regexp: '(?i)x',
-    });
+    } as LokiExpression);
   });
 
   it('returns query for strings with query and regexp', () => {
     expect(parseQuery('{foo="bar"} x|y')).toEqual({
       query: '{foo="bar"}',
       regexp: '(?i)x|y',
-    });
+    } as LokiExpression);
   });
 
   it('returns query for selector with two labels', () => {
     expect(parseQuery('{foo="bar", baz="42"}')).toEqual({
       query: '{foo="bar", baz="42"}',
       regexp: '',
-    });
+    } as LokiExpression);
   });
 
   it('returns query and regexp with quantifiers', () => {
     expect(parseQuery('{foo="bar"} \\.java:[0-9]{1,5}')).toEqual({
       query: '{foo="bar"}',
       regexp: '(?i)\\.java:[0-9]{1,5}',
-    });
+    } as LokiExpression);
     expect(parseQuery('\\.java:[0-9]{1,5} {foo="bar"}')).toEqual({
       query: '{foo="bar"}',
       regexp: '(?i)\\.java:[0-9]{1,5}',
-    });
+    } as LokiExpression);
+  });
+
+  it('returns query with filter operands as is', () => {
+    expect(parseQuery('{foo="bar"} |= "x|y"')).toEqual({
+      query: '{foo="bar"} |= "x|y"',
+      regexp: '',
+    } as LokiExpression);
+    expect(parseQuery('{foo="bar"} |~ "42"')).toEqual({
+      query: '{foo="bar"} |~ "42"',
+      regexp: '',
+    } as LokiExpression);
+  });
+});
+
+describe('getHighlighterExpressionsFromQuery', () => {
+  it('returns no expressions for empty query', () => {
+    expect(getHighlighterExpressionsFromQuery('')).toEqual([]);
+  });
+  it('returns a single expressions for legacy query', () => {
+    expect(getHighlighterExpressionsFromQuery('{} x')).toEqual(['(?i)x']);
+    expect(getHighlighterExpressionsFromQuery('{foo="bar"} x')).toEqual(['(?i)x']);
+  });
+  it('returns an expression for query with filter', () => {
+    expect(getHighlighterExpressionsFromQuery('{foo="bar"} |= "x"')).toEqual(['x']);
+  });
+  it('returns expressions for query with filter chain', () => {
+    expect(getHighlighterExpressionsFromQuery('{foo="bar"} |= "x" |~ "y"')).toEqual(['x', 'y']);
+  });
+  it('returns drops expressions for query with negative filter chain', () => {
+    expect(getHighlighterExpressionsFromQuery('{foo="bar"} |= "x" != "y"')).toEqual(['x']);
   });
 });
diff --git a/public/app/plugins/datasource/loki/query_utils.ts b/public/app/plugins/datasource/loki/query_utils.ts
index 7d2c6234f050..54fcca8809a3 100644
--- a/public/app/plugins/datasource/loki/query_utils.ts
+++ b/public/app/plugins/datasource/loki/query_utils.ts
@@ -1,22 +1,70 @@
+import { LokiExpression } from './types';
+
 const selectorRegexp = /(?:^|\s){[^{]*}/g;
 const caseInsensitive = '(?i)'; // Golang mode modifier for Loki, doesn't work in JavaScript
-export function parseQuery(input: string) {
+export function parseQuery(input: string): LokiExpression {
   input = input || '';
   const match = input.match(selectorRegexp);
-  let query = '';
-  let regexp = input;
+  let query = input;
+  let regexp = '';
 
   if (match) {
-    query = match[0].trim();
     regexp = input.replace(selectorRegexp, '').trim();
+    // Keep old-style regexp, otherwise take whole query
+    if (regexp && regexp.search(/\|=|\|~|!=|!~/) === -1) {
+      query = match[0].trim();
+      if (!regexp.startsWith(caseInsensitive)) {
+        regexp = `${caseInsensitive}${regexp}`;
+      }
+    } else {
+      regexp = '';
+    }
   }
 
-  if (regexp) {
-    regexp = caseInsensitive + regexp;
-  }
-  return { query, regexp };
+  return { regexp, query };
 }
 
 export function formatQuery(selector: string, search: string): string {
   return `${selector || ''} ${search || ''}`.trim();
 }
+
+/**
+ * Returns search terms from a LogQL query.
+ * E.g., `{} |= foo |=bar != baz` returns `['foo', 'bar']`.
+ */
+export function getHighlighterExpressionsFromQuery(input: string): string[] {
+  const parsed = parseQuery(input);
+  // Legacy syntax
+  if (parsed.regexp) {
+    return [parsed.regexp];
+  }
+  let expression = input;
+  const results = [];
+  // Consume filter expression from left to right
+  while (expression) {
+    const filterStart = expression.search(/\|=|\|~|!=|!~/);
+    // Nothing more to search
+    if (filterStart === -1) {
+      break;
+    }
+    // Drop terms for negative filters
+    const skip = expression.substr(filterStart).search(/!=|!~/) === 0;
+    expression = expression.substr(filterStart + 2);
+    if (skip) {
+      continue;
+    }
+    // Check if there is more chained
+    const filterEnd = expression.search(/\|=|\|~|!=|!~/);
+    let filterTerm;
+    if (filterEnd === -1) {
+      filterTerm = expression.trim();
+    } else {
+      filterTerm = expression.substr(0, filterEnd);
+      expression = expression.substr(filterEnd);
+    }
+
+    // Unwrap the filter term by removing quotes
+    results.push(filterTerm.replace(/^\s*"/g, '').replace(/"\s*$/g, ''));
+  }
+  return results;
+}
diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts
index c4cfa3fcdc43..e733c3b47cb6 100644
--- a/public/app/plugins/datasource/loki/types.ts
+++ b/public/app/plugins/datasource/loki/types.ts
@@ -2,6 +2,9 @@ import { DataQuery, Labels, DataSourceJsonData } from '@grafana/ui/src/types';
 
 export interface LokiQuery extends DataQuery {
   expr: string;
+  live?: boolean;
+  query?: string;
+  regexp?: string;
 }
 
 export interface LokiOptions extends DataSourceJsonData {
@@ -22,3 +25,8 @@ export interface LokiLogsStreamEntry {
   // Legacy, was renamed to ts
   timestamp?: string;
 }
+
+export interface LokiExpression {
+  regexp: string;
+  query: string;
+}
diff --git a/public/app/plugins/datasource/mssql/plugin.json b/public/app/plugins/datasource/mssql/plugin.json
index b3269b91100e..ef280e9209ee 100644
--- a/public/app/plugins/datasource/mssql/plugin.json
+++ b/public/app/plugins/datasource/mssql/plugin.json
@@ -19,7 +19,6 @@
   "alerting": true,
   "annotations": true,
   "metrics": true,
-  "tables": true,
 
   "queryOptions": {
     "minInterval": true
diff --git a/public/app/plugins/datasource/mysql/plugin.json b/public/app/plugins/datasource/mysql/plugin.json
index 49d1996332fa..be0714560927 100644
--- a/public/app/plugins/datasource/mysql/plugin.json
+++ b/public/app/plugins/datasource/mysql/plugin.json
@@ -19,7 +19,6 @@
   "alerting": true,
   "annotations": true,
   "metrics": true,
-  "tables": true,
 
   "queryOptions": {
     "minInterval": true
diff --git a/public/app/plugins/datasource/opentsdb/plugin.json b/public/app/plugins/datasource/opentsdb/plugin.json
index e7cae327c5b5..a19916482369 100644
--- a/public/app/plugins/datasource/opentsdb/plugin.json
+++ b/public/app/plugins/datasource/opentsdb/plugin.json
@@ -8,7 +8,6 @@
   "defaultMatchFormat": "pipe",
   "annotations": true,
   "alerting": true,
-  "tables": false,
 
   "info": {
     "description": "Open source time series database",
diff --git a/public/app/plugins/datasource/postgres/plugin.json b/public/app/plugins/datasource/postgres/plugin.json
index 994578a7f2c8..ce72d3b0f2f8 100644
--- a/public/app/plugins/datasource/postgres/plugin.json
+++ b/public/app/plugins/datasource/postgres/plugin.json
@@ -19,7 +19,6 @@
   "alerting": true,
   "annotations": true,
   "metrics": true,
-  "tables": true,
 
   "queryOptions": {
     "minInterval": true
diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
index a63e2ef52b97..7efb9185b048 100644
--- a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
@@ -12,11 +12,10 @@ import { TypeaheadOutput, HistoryItem } from 'app/types/explore';
 // dom also includes Element polyfills
 import { getNextCharacter, getPreviousCousin } from 'app/features/explore/utils/dom';
 import BracesPlugin from 'app/features/explore/slate-plugins/braces';
-import RunnerPlugin from 'app/features/explore/slate-plugins/runner';
 import QueryField, { TypeaheadInput, QueryFieldState } from 'app/features/explore/QueryField';
-import { PromQuery } from '../types';
+import { PromQuery, PromContext } from '../types';
 import { CancelablePromise, makePromiseCancelable } from 'app/core/utils/CancelablePromise';
-import { ExploreDataSourceApi, ExploreQueryFieldProps, DataSourceStatus, QueryHint } from '@grafana/ui';
+import { DataSourceApi, ExploreQueryFieldProps, DataSourceStatus, QueryHint } from '@grafana/ui';
 
 const HISTOGRAM_GROUP = '__histograms__';
 const METRIC_MARK = 'metric';
@@ -102,7 +101,7 @@ interface CascaderOption {
   disabled?: boolean;
 }
 
-interface PromQueryFieldProps extends ExploreQueryFieldProps<ExploreDataSourceApi<PromQuery>, PromQuery> {
+interface PromQueryFieldProps extends ExploreQueryFieldProps<DataSourceApi<PromQuery>, PromQuery> {
   history: HistoryItem[];
 }
 
@@ -126,7 +125,6 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
 
     this.plugins = [
       BracesPlugin(),
-      RunnerPlugin({ handler: props.onRunQuery }),
       PluginPrism({
         onlyIn: (node: any) => node.type === 'code_block',
         getSyntax: (node: any) => 'promql',
@@ -225,7 +223,7 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
     // Send text change to parent
     const { query, onChange, onRunQuery } = this.props;
     if (onChange) {
-      const nextQuery: PromQuery = { ...query, expr: value };
+      const nextQuery: PromQuery = { ...query, expr: value, context: PromContext.Explore };
       onChange(nextQuery);
 
       if (override && onRunQuery) {
diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index c80c30fc6827..a5cfc0568ec2 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -1,6 +1,8 @@
 // Libraries
 import _ from 'lodash';
 import $ from 'jquery';
+import { from, Observable } from 'rxjs';
+import { single, map, filter } from 'rxjs/operators';
 
 // Services & Utils
 import kbn from 'app/core/utils/kbn';
@@ -14,13 +16,15 @@ import { getQueryHints } from './query_hints';
 import { expandRecordingRules } from './language_utils';
 
 // Types
-import { PromQuery, PromOptions } from './types';
+import { PromQuery, PromOptions, PromQueryRequest, PromContext } from './types';
 import {
   DataQueryRequest,
   DataSourceApi,
   AnnotationEvent,
   DataSourceInstanceSettings,
   DataQueryError,
+  DataStreamObserver,
+  LoadingState,
 } from '@grafana/ui/src/types';
 import { ExploreUrlState } from 'app/types/explore';
 import { safeStringifyValue } from 'app/core/utils/explore';
@@ -83,7 +87,7 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
     }
   }
 
-  _request(url, data?, options?: any) {
+  _request(url: string, data?: any, options?: any) {
     options = _.defaults(options || {}, {
       url: this.url + url,
       method: this.httpMethod,
@@ -119,11 +123,11 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
   }
 
   // Use this for tab completion features, wont publish response to other components
-  metadataRequest(url) {
+  metadataRequest(url: string) {
     return this._request(url, null, { method: 'GET', silent: true });
   }
 
-  interpolateQueryExpr(value, variable, defaultFormatFn) {
+  interpolateQueryExpr(value: any, variable: any, defaultFormatFn: any) {
     // if no multi or include all do not regexEscape
     if (!variable.multi && !variable.includeAll) {
       return prometheusRegularEscape(value);
@@ -137,38 +141,139 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
     return escapedValues.join('|');
   }
 
-  targetContainsTemplate(target) {
+  targetContainsTemplate(target: PromQuery) {
     return this.templateSrv.variableExists(target.expr);
   }
 
-  query(options: DataQueryRequest<PromQuery>): Promise<{ data: any }> {
-    const start = this.getPrometheusTime(options.range.from, false);
-    const end = this.getPrometheusTime(options.range.to, true);
+  processResult = (response: any, query: PromQueryRequest, target: PromQuery, responseListLength: number) => {
+    // Keeping original start/end for transformers
+    const transformerOptions = {
+      format: target.format,
+      step: query.step,
+      legendFormat: target.legendFormat,
+      start: query.start,
+      end: query.end,
+      query: query.expr,
+      responseListLength,
+      refId: target.refId,
+      valueWithRefId: target.valueWithRefId,
+    };
+    const series = this.resultTransformer.transform(response, transformerOptions);
 
-    const queries = [];
-    const activeTargets = [];
+    return series;
+  };
 
-    options = _.clone(options);
+  runObserverQueries = (
+    options: DataQueryRequest<PromQuery>,
+    observer: DataStreamObserver,
+    queries: PromQueryRequest[],
+    activeTargets: PromQuery[],
+    end: number
+  ) => {
+    for (let index = 0; index < queries.length; index++) {
+      const query = queries[index];
+      const target = activeTargets[index];
+      let observable: Observable<any> = null;
+
+      if (query.instant) {
+        observable = from(this.performInstantQuery(query, end));
+      } else {
+        observable = from(this.performTimeSeriesQuery(query, query.start, query.end));
+      }
+
+      observable
+        .pipe(
+          single(), // unsubscribes automatically after first result
+          filter((response: any) => (response.cancelled ? false : true)),
+          map((response: any) => {
+            return this.processResult(response, query, target, queries.length);
+          })
+        )
+        .subscribe({
+          next: series => {
+            if (query.instant) {
+              observer({
+                key: `prometheus-${target.refId}`,
+                state: LoadingState.Loading,
+                request: options,
+                series: null,
+                delta: series,
+                unsubscribe: () => undefined,
+              });
+            } else {
+              observer({
+                key: `prometheus-${target.refId}`,
+                state: LoadingState.Done,
+                request: options,
+                series: null,
+                delta: series,
+                unsubscribe: () => undefined,
+              });
+            }
+          },
+        });
+    }
+  };
+
+  prepareTargets = (options: DataQueryRequest<PromQuery>, start: number, end: number) => {
+    const queries: PromQueryRequest[] = [];
+    const activeTargets: PromQuery[] = [];
 
     for (const target of options.targets) {
       if (!target.expr || target.hide) {
         continue;
       }
 
+      if (target.context === PromContext.Explore) {
+        target.format = 'time_series';
+        target.instant = false;
+        const instantTarget: any = _.cloneDeep(target);
+        instantTarget.format = 'table';
+        instantTarget.instant = true;
+        instantTarget.valueWithRefId = true;
+        delete instantTarget.maxDataPoints;
+        instantTarget.requestId += '_instant';
+        instantTarget.refId += '_instant';
+        activeTargets.push(instantTarget);
+        queries.push(this.createQuery(instantTarget, options, start, end));
+      }
+
       activeTargets.push(target);
       queries.push(this.createQuery(target, options, start, end));
     }
 
+    return {
+      queries,
+      activeTargets,
+    };
+  };
+
+  query(options: DataQueryRequest<PromQuery>, observer?: DataStreamObserver): Promise<{ data: any }> {
+    const start = this.getPrometheusTime(options.range.from, false);
+    const end = this.getPrometheusTime(options.range.to, true);
+
+    options = _.clone(options);
+    const { queries, activeTargets } = this.prepareTargets(options, start, end);
+
     // No valid targets, return the empty result to save a round trip.
     if (_.isEmpty(queries)) {
       return this.$q.when({ data: [] }) as Promise<{ data: any }>;
     }
 
+    if (
+      observer &&
+      options.targets.filter(target => target.context === PromContext.Explore).length === options.targets.length
+    ) {
+      // using observer to make the instant query return immediately
+      this.runObserverQueries(options, observer, queries, activeTargets, end);
+      return this.$q.when({ data: [] }) as Promise<{ data: any }>;
+    }
+
     const allQueryPromise = _.map(queries, query => {
-      if (!query.instant) {
-        return this.performTimeSeriesQuery(query, query.start, query.end);
-      } else {
+      if (query.instant) {
         return this.performInstantQuery(query, end);
+      } else {
+        return this.performTimeSeriesQuery(query, query.start, query.end);
       }
     });
 
@@ -180,19 +285,10 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
           return;
         }
 
-        // Keeping original start/end for transformers
-        const transformerOptions = {
-          format: activeTargets[index].format,
-          step: queries[index].step,
-          legendFormat: activeTargets[index].legendFormat,
-          start: queries[index].start,
-          end: queries[index].end,
-          query: queries[index].expr,
-          responseListLength: responseList.length,
-          refId: activeTargets[index].refId,
-          valueWithRefId: activeTargets[index].valueWithRefId,
-        };
-        const series = this.resultTransformer.transform(response, transformerOptions);
+        const target = activeTargets[index];
+        const query = queries[index];
+        const series = this.processResult(response, query, target, queries.length);
+
         result = [...result, ...series];
       });
 
@@ -202,10 +298,16 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
     return allPromise as Promise<{ data: any }>;
   }
 
-  createQuery(target, options, start, end) {
-    const query: any = {
+  createQuery(target: PromQuery, options: DataQueryRequest<PromQuery>, start: number, end: number) {
+    const query: PromQueryRequest = {
       hinting: target.hinting,
       instant: target.instant,
+      step: 0,
+      expr: '',
+      requestId: '',
+      refId: '',
+      start: 0,
+      end: 0,
     };
     const range = Math.ceil(end - start);
 
@@ -398,7 +500,7 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions>
     };
     // Unsetting min interval for accurate event resolution
     const minStep = '1s';
-    const query = this.createQuery({ expr, interval: minStep }, queryOptions, start, end);
+    const query = this.createQuery({ expr, interval: minStep, refId: 'X' }, queryOptions, start, end);
 
     const self = this;
     return this.performTimeSeriesQuery(query, query.start, query.end).then(results => {
@@ -602,7 +704,7 @@ export function prometheusRegularEscape(value) {
 
 export function prometheusSpecialRegexEscape(value) {
   if (typeof value === 'string') {
-    return prometheusRegularEscape(value.replace(/\\/g, '\\\\\\\\').replace(/[$^*{}\[\]+?.()]/g, '\\\\$&'));
+    return prometheusRegularEscape(value.replace(/\\/g, '\\\\\\\\').replace(/[$^*{}\[\]+?.()|]/g, '\\\\$&'));
   }
   return value;
 }
diff --git a/public/app/plugins/datasource/prometheus/plugin.json b/public/app/plugins/datasource/prometheus/plugin.json
index fb9ebbb52b10..ba1144549489 100644
--- a/public/app/plugins/datasource/prometheus/plugin.json
+++ b/public/app/plugins/datasource/prometheus/plugin.json
@@ -24,8 +24,6 @@
   "metrics": true,
   "alerting": true,
   "annotations": true,
-  "explore": true,
-  "tables": true,
   "queryOptions": {
     "minInterval": true
   },
diff --git a/public/app/plugins/datasource/prometheus/specs/completer.test.ts b/public/app/plugins/datasource/prometheus/specs/completer.test.ts
index 2580b87f6d7f..8a7b3b8c7c33 100644
--- a/public/app/plugins/datasource/prometheus/specs/completer.test.ts
+++ b/public/app/plugins/datasource/prometheus/specs/completer.test.ts
@@ -7,7 +7,7 @@ import { TemplateSrv } from 'app/features/templating/template_srv';
 import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { IQService } from 'angular';
 jest.mock('../datasource');
-jest.mock('app/core/services/backend_srv');
+jest.mock('@grafana/ui');
 
 describe('Prometheus editor completer', () => {
   function getSessionStub(data) {
diff --git a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
index 275671e0283d..77da99481226 100644
--- a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
@@ -12,6 +12,7 @@ import { DataSourceInstanceSettings } from '@grafana/ui';
 import { PromOptions } from '../types';
 import { TemplateSrv } from 'app/features/templating/template_srv';
 import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
+import { CustomVariable } from 'app/features/templating/custom_variable';
 
 jest.mock('../metric_find_query');
 
@@ -287,7 +288,7 @@ describe('PrometheusDatasource', () => {
     it('should not escape simple string', () => {
       expect(prometheusSpecialRegexEscape('cryptodepression')).toEqual('cryptodepression');
     });
-    it('should escape $^*+?.()\\', () => {
+    it('should escape $^*+?.()|\\', () => {
       expect(prometheusSpecialRegexEscape("looking'glass")).toEqual("looking\\\\'glass");
       expect(prometheusSpecialRegexEscape('looking{glass')).toEqual('looking\\\\{glass');
       expect(prometheusSpecialRegexEscape('looking}glass')).toEqual('looking\\\\}glass');
@@ -302,12 +303,60 @@ describe('PrometheusDatasource', () => {
       expect(prometheusSpecialRegexEscape('looking(glass')).toEqual('looking\\\\(glass');
       expect(prometheusSpecialRegexEscape('looking)glass')).toEqual('looking\\\\)glass');
       expect(prometheusSpecialRegexEscape('looking\\glass')).toEqual('looking\\\\\\\\glass');
+      expect(prometheusSpecialRegexEscape('looking|glass')).toEqual('looking\\\\|glass');
     });
     it('should escape multiple special characters', () => {
       expect(prometheusSpecialRegexEscape('+looking$glass?')).toEqual('\\\\+looking\\\\$glass\\\\?');
     });
   });
 
+  describe('When interpolating variables', () => {
+    beforeEach(() => {
+      ctx.ds = new PrometheusDatasource(instanceSettings, q, ctx.backendSrvMock, ctx.templateSrvMock, ctx.timeSrvMock);
+      ctx.variable = new CustomVariable({}, {});
+    });
+
+    describe('and value is a string', () => {
+      it('should only escape single quotes', () => {
+        expect(ctx.ds.interpolateQueryExpr("abc'$^*{}[]+?.()|", ctx.variable)).toEqual("abc\\\\'$^*{}[]+?.()|");
+      });
+    });
+
+    describe('and value is a number', () => {
+      it('should return a number', () => {
+        expect(ctx.ds.interpolateQueryExpr(1000, ctx.variable)).toEqual(1000);
+      });
+    });
+
+    describe('and variable allows multi-value', () => {
+      beforeEach(() => {
+        ctx.variable.multi = true;
+      });
+
+      it('should regex escape values if the value is a string', () => {
+        expect(ctx.ds.interpolateQueryExpr('looking*glass', ctx.variable)).toEqual('looking\\\\*glass');
+      });
+
+      it('should return pipe separated values if the value is an array of strings', () => {
+        expect(ctx.ds.interpolateQueryExpr(['a|bc', 'de|f'], ctx.variable)).toEqual('a\\\\|bc|de\\\\|f');
+      });
+    });
+
+    describe('and variable allows all', () => {
+      beforeEach(() => {
+        ctx.variable.includeAll = true;
+      });
+
+      it('should regex escape values if the array is a string', () => {
+        expect(ctx.ds.interpolateQueryExpr('looking*glass', ctx.variable)).toEqual('looking\\\\*glass');
+      });
+
+      it('should return pipe separated values if the value is an array of strings', () => {
+        expect(ctx.ds.interpolateQueryExpr(['a|bc', 'de|f'], ctx.variable)).toEqual('a\\\\|bc|de\\\\|f');
+      });
+    });
+  });
+
   describe('metricFindQuery', () => {
     beforeEach(() => {
       const query = 'query_result(topk(5,rate(http_request_duration_microseconds_count[$__interval])))';
@@ -418,7 +467,7 @@ describe('PrometheusDatasource', () => {
       expect(results.data[0].target).toBe('test{job="testjob"}');
     });
   });
-  describe('When querying prometheus with one target which return multiple series', () => {
+  describe('When querying prometheus with one target which returns multiple series', () => {
     let results;
     const start = 60;
     const end = 360;
diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts
index e83029df8356..7971ad65bdea 100644
--- a/public/app/plugins/datasource/prometheus/types.ts
+++ b/public/app/plugins/datasource/prometheus/types.ts
@@ -1,7 +1,20 @@
 import { DataQuery, DataSourceJsonData } from '@grafana/ui/src/types';
 
+export enum PromContext {
+  Explore = 'explore',
+  Panel = 'panel',
+}
+
 export interface PromQuery extends DataQuery {
   expr: string;
+  context?: PromContext;
+  format?: string;
+  instant?: boolean;
+  hinting?: boolean;
+  interval?: string;
+  intervalFactor?: number;
+  legendFormat?: string;
+  valueWithRefId?: boolean;
 }
 
 export interface PromOptions extends DataSourceJsonData {
@@ -10,3 +23,10 @@ export interface PromOptions extends DataSourceJsonData {
   httpMethod: string;
   directUrl: string;
 }
+
+export interface PromQueryRequest extends PromQuery {
+  step?: number;
+  requestId?: string;
+  start: number;
+  end: number;
+}
diff --git a/public/app/plugins/datasource/stackdriver/components/Filter.tsx b/public/app/plugins/datasource/stackdriver/components/Filter.tsx
index 6c63f1ed8913..08134789d3da 100644
--- a/public/app/plugins/datasource/stackdriver/components/Filter.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/Filter.tsx
@@ -3,7 +3,7 @@ import _ from 'lodash';
 import appEvents from 'app/core/app_events';
 
 import { QueryMeta } from '../types';
-import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
+import { getAngularLoader, AngularComponent } from '@grafana/runtime';
 import { TemplateSrv } from 'app/features/templating/template_srv';
 import StackdriverDatasource from '../datasource';
 import '../query_filter_ctrl';
diff --git a/public/app/plugins/datasource/stackdriver/plugin.json b/public/app/plugins/datasource/stackdriver/plugin.json
index 620a7b1c8cea..20cac315400a 100644
--- a/public/app/plugins/datasource/stackdriver/plugin.json
+++ b/public/app/plugins/datasource/stackdriver/plugin.json
@@ -7,7 +7,6 @@
   "metrics": true,
   "alerting": true,
   "annotations": true,
-  "tables": false,
   "queryOptions": {
     "maxDataPoints": true,
     "cacheTimeout": true
diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/testdata/QueryEditor.tsx
index f14d976ca384..324848400ffa 100644
--- a/public/app/plugins/datasource/testdata/QueryEditor.tsx
+++ b/public/app/plugins/datasource/testdata/QueryEditor.tsx
@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 import _ from 'lodash';
 
 // Services & Utils
-import { getBackendSrv, BackendSrv } from 'app/core/services/backend_srv';
+import { getBackendSrv } from '@grafana/runtime';
 
 // Components
 import { FormLabel, Select, SelectOptionItem } from '@grafana/ui';
@@ -21,7 +21,7 @@ interface State {
 type Props = QueryEditorProps<TestDataDatasource, TestDataQuery>;
 
 export class QueryEditor extends PureComponent<Props> {
-  backendSrv: BackendSrv = getBackendSrv();
+  backendSrv = getBackendSrv();
 
   state: State = {
     scenarioList: [],
diff --git a/public/app/plugins/datasource/testdata/TestInfoTab.tsx b/public/app/plugins/datasource/testdata/TestInfoTab.tsx
new file mode 100644
index 000000000000..686d8b94e4ab
--- /dev/null
+++ b/public/app/plugins/datasource/testdata/TestInfoTab.tsx
@@ -0,0 +1,28 @@
+// Libraries
+import React, { PureComponent } from 'react';
+
+// Types
+import { PluginConfigPageProps, DataSourcePlugin } from '@grafana/ui';
+import { TestDataDatasource } from './datasource';
+
+interface Props extends PluginConfigPageProps<DataSourcePlugin<TestDataDatasource>> {}
+
+export class TestInfoTab extends PureComponent<Props> {
+  constructor(props: Props) {
+    super(props);
+  }
+
+  render() {
+    return (
+      <div>
+        See github for more information about setting up a reproducable test environment.
+        <br />
+        <br />
+        <a className="btn btn-inverse" href="https://github.com/grafana/grafana/tree/master/devenv" target="_blank">
+          Github
+        </a>
+        <br />
+      </div>
+    );
+  }
+}
diff --git a/public/app/plugins/datasource/testdata/dashboards/streaming.json b/public/app/plugins/datasource/testdata/dashboards/streaming.json
index b2f2e9ecb6bb..9f38d2096ef1 100644
--- a/public/app/plugins/datasource/testdata/dashboards/streaming.json
+++ b/public/app/plugins/datasource/testdata/dashboards/streaming.json
@@ -14,7 +14,13 @@
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "6.2.0-pre"
+      "version": "6.3.0-pre"
+    },
+    {
+      "type": "panel",
+      "id": "graph",
+      "name": "Graph",
+      "version": ""
     },
     {
       "type": "panel",
@@ -48,6 +54,97 @@
   "id": null,
   "links": [],
   "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "fill": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 4,
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": true,
+        "max": false,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "streaming_client",
+          "stream": {
+            "noise": 2.2,
+            "speed": 100,
+            "spread": 3.5,
+            "type": "signal"
+          },
+          "stringInput": ""
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Angular Graph",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "decimals": 2,
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
     {
       "datasource": "${DS_TESTDATA_DB}",
       "description": "",
@@ -55,7 +152,7 @@
         "h": 6,
         "w": 24,
         "x": 0,
-        "y": 0
+        "y": 7
       },
       "id": 2,
       "links": [],
@@ -110,5 +207,5 @@
   "timezone": "",
   "title": "Simple Streaming Example",
   "uid": "TXSTREZ",
-  "version": 2
+  "version": 3
 }
diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/testdata/datasource.ts
index 0f69028f7848..c3b706153b3c 100644
--- a/public/app/plugins/datasource/testdata/datasource.ts
+++ b/public/app/plugins/datasource/testdata/datasource.ts
@@ -32,10 +32,11 @@ export class TestDataDatasource extends DataSourceApi<TestDataQuery> {
         scenarioId: item.scenarioId,
         intervalMs: options.intervalMs,
         maxDataPoints: options.maxDataPoints,
+        datasourceId: this.id,
         stringInput: item.stringInput,
         points: item.points,
         alias: item.alias,
-        datasourceId: this.id,
+        ...item,
       };
     });
 
diff --git a/public/app/plugins/datasource/testdata/module.tsx b/public/app/plugins/datasource/testdata/module.tsx
index 738149451b97..800f61db7370 100644
--- a/public/app/plugins/datasource/testdata/module.tsx
+++ b/public/app/plugins/datasource/testdata/module.tsx
@@ -1,6 +1,7 @@
 import { DataSourcePlugin } from '@grafana/ui';
 import { TestDataDatasource } from './datasource';
 import { TestDataQueryCtrl } from './query_ctrl';
+import { TestInfoTab } from './TestInfoTab';
 import { ConfigEditor } from './ConfigEditor';
 
 class TestDataAnnotationsQueryCtrl {
@@ -12,4 +13,10 @@ class TestDataAnnotationsQueryCtrl {
 export const plugin = new DataSourcePlugin(TestDataDatasource)
   .setConfigEditor(ConfigEditor)
   .setQueryCtrl(TestDataQueryCtrl)
-  .setAnnotationQueryCtrl(TestDataAnnotationsQueryCtrl);
+  .setAnnotationQueryCtrl(TestDataAnnotationsQueryCtrl)
+  .addConfigPage({
+    title: 'Setup',
+    icon: 'fa fa-list-alt',
+    body: TestInfoTab,
+    id: 'setup',
+  });
diff --git a/public/app/plugins/datasource/testdata/partials/query.editor.html b/public/app/plugins/datasource/testdata/partials/query.editor.html
index e982ce9fb61f..e70abb4d96de 100644
--- a/public/app/plugins/datasource/testdata/partials/query.editor.html
+++ b/public/app/plugins/datasource/testdata/partials/query.editor.html
@@ -40,8 +40,8 @@
 		<div class="gf-form gf-form">
 			<label class="gf-form-label query-keyword width-7">Type</label>
 			<div class="gf-form-select-wrapper">
-				<select 
-				  ng-model="ctrl.target.stream.type" 
+				<select
+				  ng-model="ctrl.target.stream.type"
 				  class="gf-form-input"
 					ng-options="type for type in ['signal','logs', 'fetch']"
 				  ng-change="ctrl.streamChanged()" />
@@ -50,45 +50,60 @@
 		</div>
 		<div class="gf-form">
 			<label class="gf-form-label query-keyword">Speed (ms)</label>
-			<input type="number" 
-				class="gf-form-input width-5" 
-				placeholder="value" 
-				ng-model="ctrl.target.stream.speed" 
+			<input type="number"
+				class="gf-form-input width-5"
+				placeholder="value"
+				ng-model="ctrl.target.stream.speed"
 				min="10"
 				step="10"
 				ng-change="ctrl.streamChanged()" />
 		</div>
 		<div class="gf-form" ng-if="ctrl.target.stream.type === 'signal'">
 			<label class="gf-form-label query-keyword">Spread</label>
-			<input type="number" 
-				class="gf-form-input width-5" 
-				placeholder="value" 
-				ng-model="ctrl.target.stream.spread" 
+			<input type="number"
+				class="gf-form-input width-5"
+				placeholder="value"
+				ng-model="ctrl.target.stream.spread"
 				min="0.5"
 				step="0.1"
 				ng-change="ctrl.streamChanged()" />
 		</div>
 		<div class="gf-form" ng-if="ctrl.target.stream.type === 'signal'">
 			<label class="gf-form-label query-keyword">Noise</label>
-			<input type="number" 
-				class="gf-form-input width-5" 
-				placeholder="value" 
-				ng-model="ctrl.target.stream.noise" 
+			<input type="number"
+				class="gf-form-input width-5"
+				placeholder="value"
+				ng-model="ctrl.target.stream.noise"
 				min="0"
 				step="0.1"
 				ng-change="ctrl.streamChanged()" />
 		</div>
 		<div class="gf-form gf-form--grow" ng-if="ctrl.target.stream.type === 'fetch'">
 			<label class="gf-form-label query-keyword">URL</label>
-			<input type="string" 
-				class="gf-form-input gf-form-label--grow" 
-				placeholder="Fetch URL" 
-				ng-model="ctrl.target.stream.url" 
-				ng-change="ctrl.streamChanged()" 
+			<input type="string"
+				class="gf-form-input gf-form-label--grow"
+				placeholder="Fetch URL"
+				ng-model="ctrl.target.stream.url"
+				ng-change="ctrl.streamChanged()"
 				ng-model-onblur />
 		</div>
 		<div class="gf-form gf-form--grow" ng-if="ctrl.target.stream.type !== 'fetch'">
 			<div class="gf-form-label gf-form-label--grow"></div>
 		</div>
 	</div>
+
+	<div class="gf-form-inline" ng-if="ctrl.scenario.id === 'logs'">
+		<div class="gf-form">
+			<label class="gf-form-label query-keyword">Lines</label>
+			<input type="number"
+				class="gf-form-input width-5"
+				placeholder="10"
+				ng-model="ctrl.target.lines"
+				ng-change="ctrl.refresh()"
+				ng-model-onblur />
+		</div>
+		<div class="gf-form">
+			<gf-form-switch class="gf-form" label="Level" label-class="query-keyword width-5" checked="ctrl.target.levelColumn" switch-class="max-width-6" on-change="ctrl.refresh()"></gf-form-switch>
+		</div>
+	</div>
 </query-editor-row>
diff --git a/public/app/plugins/datasource/testdata/plugin.json b/public/app/plugins/datasource/testdata/plugin.json
index 96c23b196659..f34498957be2 100644
--- a/public/app/plugins/datasource/testdata/plugin.json
+++ b/public/app/plugins/datasource/testdata/plugin.json
@@ -4,6 +4,7 @@
   "id": "testdata",
 
   "metrics": true,
+  "logs": true,
   "alerting": true,
   "annotations": true,
 
diff --git a/public/app/plugins/panel/gauge/GaugePanel.tsx b/public/app/plugins/panel/gauge/GaugePanel.tsx
index 0c8240256838..b08b49f01bf4 100644
--- a/public/app/plugins/panel/gauge/GaugePanel.tsx
+++ b/public/app/plugins/panel/gauge/GaugePanel.tsx
@@ -5,7 +5,7 @@ import React, { PureComponent } from 'react';
 import { config } from 'app/core/config';
 
 // Components
-import { Gauge, FieldDisplay, getFieldDisplayValues } from '@grafana/ui';
+import { Gauge, FieldDisplay, getFieldDisplayValues, VizOrientation } from '@grafana/ui';
 
 // Types
 import { GaugeOptions } from './types';
@@ -43,7 +43,7 @@ export class GaugePanel extends PureComponent<PanelProps<GaugeOptions>> {
   };
 
   render() {
-    const { height, width, options, data, renderCounter } = this.props;
+    const { height, width, data, renderCounter } = this.props;
     return (
       <VizRepeater
         getValues={this.getValues}
@@ -52,7 +52,7 @@ export class GaugePanel extends PureComponent<PanelProps<GaugeOptions>> {
         height={height}
         source={data}
         renderCounter={renderCounter}
-        orientation={options.orientation}
+        orientation={VizOrientation.Auto}
       />
     );
   }
diff --git a/public/app/plugins/panel/graph/Legend/Legend.tsx b/public/app/plugins/panel/graph/Legend/Legend.tsx
index c20623f8c0ed..b60755311a02 100644
--- a/public/app/plugins/panel/graph/Legend/Legend.tsx
+++ b/public/app/plugins/panel/graph/Legend/Legend.tsx
@@ -89,7 +89,7 @@ export class GraphLegend extends PureComponent<GraphLegendProps, LegendState> {
 
   sortLegend() {
     let seriesList: TimeSeries[] = [...this.props.seriesList] || [];
-    if (this.props.sort) {
+    if (this.props.sort && this.props[this.props.sort] && this.props.alignAsTable) {
       seriesList = _.sortBy(seriesList, series => {
         let sort = series.stats[this.props.sort];
         if (sort === null) {
diff --git a/public/app/plugins/panel/graph/axes_editor.ts b/public/app/plugins/panel/graph/axes_editor.ts
index 04ef62f16fbb..2cb7aa4eed0a 100644
--- a/public/app/plugins/panel/graph/axes_editor.ts
+++ b/public/app/plugins/panel/graph/axes_editor.ts
@@ -10,7 +10,7 @@ export class AxesEditorCtrl {
   xNameSegment: any;
 
   /** @ngInject */
-  constructor(private $scope, private $q) {
+  constructor(private $scope) {
     this.panelCtrl = $scope.ctrl;
     this.panel = this.panelCtrl.panel;
     this.$scope.ctrl = this;
@@ -65,15 +65,6 @@ export class AxesEditorCtrl {
   xAxisValueChanged() {
     this.panelCtrl.onDataReceived(this.panelCtrl.dataList);
   }
-
-  getDataFieldNames(onlyNumbers) {
-    const props = this.panelCtrl.processor.getDataFieldNames(this.panelCtrl.dataList, onlyNumbers);
-    const items = props.map(prop => {
-      return { text: prop, value: prop };
-    });
-
-    return this.$q.when(items);
-  }
 }
 
 /** @ngInject */
diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts
index 4b57934824cc..37fe9f3e2195 100644
--- a/public/app/plugins/panel/graph/data_processor.ts
+++ b/public/app/plugins/panel/graph/data_processor.ts
@@ -1,11 +1,10 @@
 import _ from 'lodash';
-import { colors, getColorFromHexRgbOrName } from '@grafana/ui';
+import { TimeRange, colors, getColorFromHexRgbOrName, FieldCache, FieldType, Field, SeriesData } from '@grafana/ui';
 import TimeSeries from 'app/core/time_series2';
 import config from 'app/core/config';
-import { LegacyResponseData, TimeRange } from '@grafana/ui';
 
 type Options = {
-  dataList: LegacyResponseData[];
+  dataList: SeriesData[];
   range?: TimeRange;
 };
 
@@ -13,68 +12,81 @@ export class DataProcessor {
   constructor(private panel) {}
 
   getSeriesList(options: Options): TimeSeries[] {
-    if (!options.dataList || options.dataList.length === 0) {
-      return [];
-    }
+    const list: TimeSeries[] = [];
+    const { dataList, range } = options;
 
-    // auto detect xaxis mode
-    let firstItem;
-    if (options.dataList && options.dataList.length > 0) {
-      firstItem = options.dataList[0];
-      const autoDetectMode = this.getAutoDetectXAxisMode(firstItem);
-      if (this.panel.xaxis.mode !== autoDetectMode) {
-        this.panel.xaxis.mode = autoDetectMode;
-        this.setPanelDefaultsForNewXAxisMode();
-      }
+    if (!dataList || !dataList.length) {
+      return list;
     }
 
-    switch (this.panel.xaxis.mode) {
-      case 'series':
-      case 'time': {
-        return options.dataList.map((item, index) => {
-          return this.timeSeriesHandler(item, index, options);
-        });
+    for (const series of dataList) {
+      const { fields } = series;
+      const cache = new FieldCache(fields);
+      const time = cache.getFirstFieldOfType(FieldType.time);
+
+      if (!time) {
+        continue;
       }
-      case 'histogram': {
-        let histogramDataList;
-        if (this.panel.stack) {
-          histogramDataList = options.dataList;
-        } else {
-          histogramDataList = [
-            {
-              target: 'count',
-              datapoints: _.concat([], _.flatten(_.map(options.dataList, 'datapoints'))),
-            },
-          ];
+
+      const seriesName = series.name ? series.name : series.refId;
+
+      for (let i = 0; i < fields.length; i++) {
+        if (fields[i].type !== FieldType.number) {
+          continue;
         }
-        return histogramDataList.map((item, index) => {
-          return this.timeSeriesHandler(item, index, options);
-        });
-      }
-      case 'field': {
-        return this.customHandler(firstItem);
+
+        const field = fields[i];
+        let name = field.title;
+
+        if (!field.title) {
+          name = field.name;
+        }
+
+        if (seriesName && dataList.length > 0 && name !== seriesName) {
+          name = seriesName + ' ' + name;
+        }
+
+        const datapoints = [];
+        for (const row of series.rows) {
+          datapoints.push([row[i], row[time.index]]);
+        }
+
+        list.push(this.toTimeSeries(field, name, datapoints, list.length, range));
       }
     }
 
-    return [];
+    // Merge all the rows if we want to show a histogram
+    if (this.panel.xaxis.mode === 'histogram' && !this.panel.stack && list.length > 1) {
+      const first = list[0];
+      first.alias = first.aliasEscaped = 'Count';
+      for (let i = 1; i < list.length; i++) {
+        first.datapoints = first.datapoints.concat(list[i].datapoints);
+      }
+      return [first];
+    }
+    return list;
   }
 
-  getAutoDetectXAxisMode(firstItem) {
-    switch (firstItem.type) {
-      case 'docs':
-        return 'field';
-      case 'table':
-        return 'field';
-      default: {
-        if (this.panel.xaxis.mode === 'series') {
-          return 'series';
-        }
-        if (this.panel.xaxis.mode === 'histogram') {
-          return 'histogram';
-        }
-        return 'time';
+  private toTimeSeries(field: Field, alias: string, datapoints: any[][], index: number, range?: TimeRange) {
+    const colorIndex = index % colors.length;
+    const color = this.panel.aliasColors[alias] || colors[colorIndex];
+
+    const series = new TimeSeries({
+      datapoints: datapoints || [],
+      alias: alias,
+      color: getColorFromHexRgbOrName(color, config.theme.type),
+      unit: field.unit,
+    });
+
+    if (datapoints && datapoints.length > 0 && range) {
+      const last = datapoints[datapoints.length - 1][1];
+      const from = range.from;
+
+      if (last - from.valueOf() < -10000) {
+        series.isOutsideRange = true;
       }
     }
+    return series;
   }
 
   setPanelDefaultsForNewXAxisMode() {
@@ -110,43 +122,6 @@ export class DataProcessor {
     }
   }
 
-  timeSeriesHandler(seriesData: LegacyResponseData, index: number, options: Options) {
-    const datapoints = seriesData.datapoints || [];
-    const alias = seriesData.target;
-
-    const colorIndex = index % colors.length;
-
-    const color = this.panel.aliasColors[alias] || colors[colorIndex];
-
-    const series = new TimeSeries({
-      datapoints: datapoints,
-      alias: alias,
-      color: getColorFromHexRgbOrName(color, config.theme.type),
-      unit: seriesData.unit,
-    });
-
-    if (datapoints && datapoints.length > 0) {
-      const last = datapoints[datapoints.length - 1][1];
-      const from = options.range.from;
-
-      if (last - from.valueOf() < -10000) {
-        series.isOutsideRange = true;
-      }
-    }
-
-    return series;
-  }
-
-  customHandler(dataItem) {
-    const nameField = this.panel.xaxis.name;
-    if (!nameField) {
-      throw {
-        message: 'No field name specified to use for x-axis, check your axes settings',
-      };
-    }
-    return [];
-  }
-
   validateXAxisSeriesValue() {
     switch (this.panel.xaxis.mode) {
       case 'series': {
@@ -165,40 +140,6 @@ export class DataProcessor {
     }
   }
 
-  getDataFieldNames(dataList, onlyNumbers) {
-    if (dataList.length === 0) {
-      return [];
-    }
-
-    const fields = [];
-    const firstItem = dataList[0];
-    const fieldParts = [];
-
-    function getPropertiesRecursive(obj) {
-      _.forEach(obj, (value, key) => {
-        if (_.isObject(value)) {
-          fieldParts.push(key);
-          getPropertiesRecursive(value);
-        } else {
-          if (!onlyNumbers || _.isNumber(value)) {
-            const field = fieldParts.concat(key).join('.');
-            fields.push(field);
-          }
-        }
-      });
-      fieldParts.pop();
-    }
-
-    if (firstItem.type === 'docs') {
-      if (firstItem.datapoints.length === 0) {
-        return [];
-      }
-      getPropertiesRecursive(firstItem.datapoints[0]);
-    }
-
-    return fields;
-  }
-
   getXAxisValueOptions(options) {
     switch (this.panel.xaxis.mode) {
       case 'series': {
diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts
index dad49788eb09..315f9b35cd53 100644
--- a/public/app/plugins/panel/graph/graph.ts
+++ b/public/app/plugins/panel/graph/graph.ts
@@ -461,9 +461,9 @@ class GraphElement {
   sortSeries(series, panel) {
     const sortBy = panel.legend.sort;
     const sortOrder = panel.legend.sortDesc;
-    const haveSortBy = sortBy !== null && sortBy !== undefined;
+    const haveSortBy = sortBy !== null && sortBy !== undefined && panel.legend[sortBy];
     const haveSortOrder = sortOrder !== null && sortOrder !== undefined;
-    const shouldSortBy = panel.stack && haveSortBy && haveSortOrder;
+    const shouldSortBy = panel.stack && haveSortBy && haveSortOrder && panel.legend.alignAsTable;
     const sortDesc = panel.legend.sortDesc === true ? -1 : 1;
 
     if (shouldSortBy) {
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 2412224eca6b..6d5b0b6abc1e 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -11,7 +11,9 @@ import { DataProcessor } from './data_processor';
 import { axesEditorComponent } from './axes_editor';
 import config from 'app/core/config';
 import TimeSeries from 'app/core/time_series2';
-import { getColorFromHexRgbOrName, LegacyResponseData } from '@grafana/ui';
+import { getColorFromHexRgbOrName, LegacyResponseData, SeriesData } from '@grafana/ui';
+import { getProcessedSeriesData } from 'app/features/dashboard/state/PanelQueryState';
+import { PanelQueryRunnerFormat } from 'app/features/dashboard/state/PanelQueryRunner';
 
 class GraphCtrl extends MetricsPanelCtrl {
   static template = template;
@@ -19,7 +21,7 @@ class GraphCtrl extends MetricsPanelCtrl {
   renderError: boolean;
   hiddenSeries: any = {};
   seriesList: TimeSeries[] = [];
-  dataList: LegacyResponseData[] = [];
+  dataList: SeriesData[] = [];
   annotations: any = [];
   alertState: any;
 
@@ -127,6 +129,7 @@ class GraphCtrl extends MetricsPanelCtrl {
     _.defaults(this.panel.legend, this.panelDefaults.legend);
     _.defaults(this.panel.xaxis, this.panelDefaults.xaxis);
 
+    this.dataFormat = PanelQueryRunnerFormat.series;
     this.processor = new DataProcessor(this.panel);
 
     this.events.on('render', this.onRender.bind(this));
@@ -187,10 +190,18 @@ class GraphCtrl extends MetricsPanelCtrl {
     this.render([]);
   }
 
+  // This should only be called from the snapshot callback
   onDataReceived(dataList: LegacyResponseData[]) {
-    this.dataList = dataList;
+    this.handleSeriesData(getProcessedSeriesData(dataList));
+  }
+
+  // Directly support SeriesData skipping event callbacks
+  handleSeriesData(data: SeriesData[]) {
+    super.handleSeriesData(data);
+
+    this.dataList = data;
     this.seriesList = this.processor.getSeriesList({
-      dataList: dataList,
+      dataList: this.dataList,
       range: this.range,
     });
 
diff --git a/public/app/plugins/panel/graph/specs/__snapshots__/data_processor.test.ts.snap b/public/app/plugins/panel/graph/specs/__snapshots__/data_processor.test.ts.snap
new file mode 100644
index 000000000000..99c3366fff3c
--- /dev/null
+++ b/public/app/plugins/panel/graph/specs/__snapshots__/data_processor.test.ts.snap
@@ -0,0 +1,233 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Graph DataProcessor getTimeSeries from LegacyResponseData Should return a new series for each field 1`] = `
+Array [
+  TimeSeries {
+    "alias": "Value",
+    "aliasEscaped": "Value",
+    "bars": Object {
+      "fillColor": "#7EB26D",
+    },
+    "color": "#7EB26D",
+    "datapoints": Array [
+      Array [
+        1,
+        1001,
+      ],
+      Array [
+        2,
+        1002,
+      ],
+      Array [
+        3,
+        1003,
+      ],
+    ],
+    "hasMsResolution": false,
+    "id": "Value",
+    "label": "Value",
+    "legend": true,
+    "stats": Object {},
+    "unit": "watt",
+    "valueFormater": [Function],
+  },
+  TimeSeries {
+    "alias": "table_data v1",
+    "aliasEscaped": "table_data v1",
+    "bars": Object {
+      "fillColor": "#EAB839",
+    },
+    "color": "#EAB839",
+    "datapoints": Array [
+      Array [
+        0.1,
+        1001,
+      ],
+      Array [
+        0.2,
+        1002,
+      ],
+      Array [
+        0.3,
+        1003,
+      ],
+    ],
+    "hasMsResolution": false,
+    "id": "table_data v1",
+    "label": "table_data v1",
+    "legend": true,
+    "stats": Object {},
+    "unit": "ohm",
+    "valueFormater": [Function],
+  },
+  TimeSeries {
+    "alias": "table_data v2",
+    "aliasEscaped": "table_data v2",
+    "bars": Object {
+      "fillColor": "#6ED0E0",
+    },
+    "color": "#6ED0E0",
+    "datapoints": Array [
+      Array [
+        1.1,
+        1001,
+      ],
+      Array [
+        2.2,
+        1002,
+      ],
+      Array [
+        3.3,
+        1003,
+      ],
+    ],
+    "hasMsResolution": false,
+    "id": "table_data v2",
+    "label": "table_data v2",
+    "legend": true,
+    "stats": Object {},
+    "unit": undefined,
+    "valueFormater": [Function],
+  },
+  TimeSeries {
+    "alias": "series v1",
+    "aliasEscaped": "series v1",
+    "bars": Object {
+      "fillColor": "#EF843C",
+    },
+    "color": "#EF843C",
+    "datapoints": Array [
+      Array [
+        0.1,
+        1001,
+      ],
+      Array [
+        0.2,
+        1002,
+      ],
+      Array [
+        0.3,
+        1003,
+      ],
+    ],
+    "hasMsResolution": false,
+    "id": "series v1",
+    "label": "series v1",
+    "legend": true,
+    "stats": Object {},
+    "unit": undefined,
+    "valueFormater": [Function],
+  },
+  TimeSeries {
+    "alias": "series v2",
+    "aliasEscaped": "series v2",
+    "bars": Object {
+      "fillColor": "#E24D42",
+    },
+    "color": "#E24D42",
+    "datapoints": Array [
+      Array [
+        1.1,
+        1001,
+      ],
+      Array [
+        2.2,
+        1002,
+      ],
+      Array [
+        3.3,
+        1003,
+      ],
+    ],
+    "hasMsResolution": false,
+    "id": "series v2",
+    "label": "series v2",
+    "legend": true,
+    "stats": Object {},
+    "unit": undefined,
+    "valueFormater": [Function],
+  },
+]
+`;
+
+exports[`Graph DataProcessor getTimeSeries from LegacyResponseData Should return single histogram 1`] = `
+Array [
+  TimeSeries {
+    "alias": "Count",
+    "aliasEscaped": "Count",
+    "bars": Object {
+      "fillColor": "#7EB26D",
+    },
+    "color": "#7EB26D",
+    "datapoints": Array [
+      Array [
+        1,
+        1001,
+      ],
+      Array [
+        2,
+        1002,
+      ],
+      Array [
+        3,
+        1003,
+      ],
+      Array [
+        0.1,
+        1001,
+      ],
+      Array [
+        0.2,
+        1002,
+      ],
+      Array [
+        0.3,
+        1003,
+      ],
+      Array [
+        1.1,
+        1001,
+      ],
+      Array [
+        2.2,
+        1002,
+      ],
+      Array [
+        3.3,
+        1003,
+      ],
+      Array [
+        0.1,
+        1001,
+      ],
+      Array [
+        0.2,
+        1002,
+      ],
+      Array [
+        0.3,
+        1003,
+      ],
+      Array [
+        1.1,
+        1001,
+      ],
+      Array [
+        2.2,
+        1002,
+      ],
+      Array [
+        3.3,
+        1003,
+      ],
+    ],
+    "hasMsResolution": false,
+    "id": "Value",
+    "label": "Value",
+    "legend": true,
+    "stats": Object {},
+    "unit": "watt",
+    "valueFormater": [Function],
+  },
+]
+`;
diff --git a/public/app/plugins/panel/graph/specs/data_processor.test.ts b/public/app/plugins/panel/graph/specs/data_processor.test.ts
index b919bb0f3b18..d8b791bd3863 100644
--- a/public/app/plugins/panel/graph/specs/data_processor.test.ts
+++ b/public/app/plugins/panel/graph/specs/data_processor.test.ts
@@ -1,62 +1,60 @@
 import { DataProcessor } from '../data_processor';
+import { getProcessedSeriesData } from 'app/features/dashboard/state/PanelQueryState';
 
 describe('Graph DataProcessor', () => {
   const panel: any = {
-    xaxis: {},
+    xaxis: { mode: 'series' },
+    aliasColors: {},
   };
 
   const processor = new DataProcessor(panel);
 
-  describe('Given default xaxis options and query that returns docs', () => {
-    beforeEach(() => {
-      panel.xaxis.mode = 'time';
-      panel.xaxis.name = 'hostname';
-      panel.xaxis.values = [];
-
-      processor.getSeriesList({
-        dataList: [
-          {
-            type: 'docs',
-            datapoints: [{ hostname: 'server1', avg: 10 }],
-          },
+  describe('getTimeSeries from LegacyResponseData', () => {
+    // Try each type of data
+    const dataList = getProcessedSeriesData([
+      {
+        alias: 'First (time_series)',
+        datapoints: [[1, 1001], [2, 1002], [3, 1003]],
+        unit: 'watt',
+      },
+      {
+        name: 'table_data',
+        columns: [
+          { text: 'time' },
+          { text: 'v1', unit: 'ohm' },
+          { text: 'v2' }, // no unit
+          { text: 'string' }, // skipped
         ],
-      });
-    });
-
-    it('Should automatically set xaxis mode to field', () => {
-      expect(panel.xaxis.mode).toBe('field');
-    });
-  });
-
-  describe('getDataFieldNames(', () => {
-    const dataList = [
+        rows: [
+          [1001, 0.1, 1.1, 'a'], // a
+          [1002, 0.2, 2.2, 'b'], // b
+          [1003, 0.3, 3.3, 'c'], // c
+        ],
+      },
       {
-        type: 'docs',
-        datapoints: [
-          {
-            hostname: 'server1',
-            valueField: 11,
-            nested: {
-              prop1: 'server2',
-              value2: 23,
-            },
-          },
+        name: 'series',
+        fields: [
+          { name: 'v1' }, // first
+          { name: 'v2' }, // second
+          { name: 'string' }, // skip
+          { name: 'time' }, // Time is last column
         ],
+        rows: [[0.1, 1.1, 'a', 1001], [0.2, 2.2, 'b', 1002], [0.3, 3.3, 'c', 1003]],
       },
-    ];
+    ]);
 
-    it('Should return all field names', () => {
-      const fields = processor.getDataFieldNames(dataList, false);
-      expect(fields).toContain('hostname');
-      expect(fields).toContain('valueField');
-      expect(fields).toContain('nested.prop1');
-      expect(fields).toContain('nested.value2');
+    it('Should return a new series for each field', () => {
+      panel.xaxis.mode = 'series';
+      const series = processor.getSeriesList({ dataList });
+      expect(series.length).toEqual(5);
+      expect(series).toMatchSnapshot();
     });
 
-    it('Should return all number fields', () => {
-      const fields = processor.getDataFieldNames(dataList, true);
-      expect(fields).toContain('valueField');
-      expect(fields).toContain('nested.value2');
+    it('Should return single histogram', () => {
+      panel.xaxis.mode = 'histogram';
+      const series = processor.getSeriesList({ dataList });
+      expect(series.length).toEqual(1);
+      expect(series).toMatchSnapshot();
     });
   });
 });
diff --git a/public/app/plugins/panel/graph/specs/graph.test.ts b/public/app/plugins/panel/graph/specs/graph.test.ts
index aa022c686079..ea340f38fed0 100644
--- a/public/app/plugins/panel/graph/specs/graph.test.ts
+++ b/public/app/plugins/panel/graph/specs/graph.test.ts
@@ -167,8 +167,11 @@ describe('grafanaGraph', () => {
   describe('sorting stacked series as legend. min descending order', () => {
     beforeEach(() => {
       setupCtx(() => {
-        ctrl.panel.legend.sort = 'min';
+        const sortKey = 'min';
+        ctrl.panel.legend.sort = sortKey;
         ctrl.panel.legend.sortDesc = true;
+        ctrl.panel.legend.alignAsTable = true;
+        ctrl.panel.legend[sortKey] = true;
         ctrl.panel.stack = true;
       });
     });
@@ -210,8 +213,11 @@ describe('grafanaGraph', () => {
   describe('sorting stacked series as legend. current descending order', () => {
     beforeEach(() => {
       setupCtx(() => {
-        ctrl.panel.legend.sort = 'current';
+        const sortKey = 'current';
+        ctrl.panel.legend.sort = sortKey;
         ctrl.panel.legend.sortDesc = true;
+        ctrl.panel.legend.alignAsTable = true;
+        ctrl.panel.legend[sortKey] = true;
         ctrl.panel.stack = true;
       });
     });
@@ -222,6 +228,23 @@ describe('grafanaGraph', () => {
     });
   });
 
+  describe('stacked series should not sort if legend is not as table or sort key column is not visible', () => {
+    beforeEach(() => {
+      setupCtx(() => {
+        const sortKey = 'min';
+        ctrl.panel.legend.sort = sortKey;
+        ctrl.panel.legend.sortDesc = true;
+        ctrl.panel.legend.alignAsTable = false;
+        ctrl.panel.legend[sortKey] = false;
+        ctrl.panel.stack = true;
+      });
+    });
+    it('highest value should be first', () => {
+      expect(ctx.plotData[0].alias).toBe('series1');
+      expect(ctx.plotData[1].alias).toBe('series2');
+    });
+  });
+
   describe('when logBase is log 10', () => {
     beforeEach(() => {
       setupCtx(() => {
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
index d0fa3c3183eb..3272323c3540 100644
--- a/public/app/plugins/panel/singlestat/module.ts
+++ b/public/app/plugins/panel/singlestat/module.ts
@@ -11,6 +11,8 @@ import TimeSeries from 'app/core/time_series2';
 import { MetricsPanelCtrl } from 'app/plugins/sdk';
 import { GrafanaThemeType, getValueFormat, getColorFromHexRgbOrName, isTableData } from '@grafana/ui';
 
+const BASE_FONT_SIZE = 38;
+
 class SingleStatCtrl extends MetricsPanelCtrl {
   static templateUrl = 'module.html';
 
@@ -384,10 +386,11 @@ class SingleStatCtrl extends MetricsPanelCtrl {
       return valueString;
     }
 
-    function getSpan(className, fontSize, applyColoring, value) {
+    function getSpan(className, fontSizePercent, applyColoring, value) {
       value = $sanitize(templateSrv.replace(value, data.scopedVars));
       value = applyColoring ? applyColoringThresholds(value) : value;
-      return '<span class="' + className + '" style="font-size:' + fontSize + '">' + value + '</span>';
+      const pixelSize = (parseInt(fontSizePercent, 10) / 100) * BASE_FONT_SIZE;
+      return '<span class="' + className + '" style="font-size:' + pixelSize + 'px">' + value + '</span>';
     }
 
     function getBigValueHtml() {
diff --git a/public/app/plugins/panel/table/specs/transformers.test.ts b/public/app/plugins/panel/table/specs/transformers.test.ts
index 49926aa00a8f..c82c9dd6cd09 100644
--- a/public/app/plugins/panel/table/specs/transformers.test.ts
+++ b/public/app/plugins/panel/table/specs/transformers.test.ts
@@ -108,7 +108,6 @@ describe('when transforming time series table', () => {
         {
           type: 'foo',
           columns: [{ text: 'Time' }, { text: 'Label Key 1' }, { text: 'Value' }],
-          rows: [[time, 'Label Value 1', 42]],
         },
       ];
 
diff --git a/public/app/plugins/panel/table/transformers.ts b/public/app/plugins/panel/table/transformers.ts
index dac63a935a09..ab3daf6c7be2 100644
--- a/public/app/plugins/panel/table/transformers.ts
+++ b/public/app/plugins/panel/table/transformers.ts
@@ -158,9 +158,8 @@ transformers['table'] = {
     if (!data || data.length === 0) {
       return;
     }
-
-    const noTableIndex = _.findIndex(data, d => d.type !== 'table');
-    if (noTableIndex > -1) {
+    const noTableIndex = _.findIndex(data, d => 'columns' in d && 'rows' in d);
+    if (noTableIndex < 0) {
       throw {
         message: `Result of query #${String.fromCharCode(
           65 + noTableIndex
diff --git a/public/app/routes/GrafanaCtrl.ts b/public/app/routes/GrafanaCtrl.ts
index a37222091d05..53e0431a0935 100644
--- a/public/app/routes/GrafanaCtrl.ts
+++ b/public/app/routes/GrafanaCtrl.ts
@@ -5,17 +5,20 @@ import Drop from 'tether-drop';
 
 // Utils and servies
 import { colors } from '@grafana/ui';
+import { setBackendSrv, BackendSrv, setDataSourceSrv } from '@grafana/runtime';
 import config from 'app/core/config';
 import coreModule from 'app/core/core_module';
 import { profiler } from 'app/core/profiler';
 import appEvents from 'app/core/app_events';
-import { BackendSrv, setBackendSrv } from 'app/core/services/backend_srv';
 import { TimeSrv, setTimeSrv } from 'app/features/dashboard/services/TimeSrv';
-import { DatasourceSrv, setDatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { DatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { KeybindingSrv, setKeybindingSrv } from 'app/core/services/keybindingSrv';
 import { AngularLoader, setAngularLoader } from 'app/core/services/AngularLoader';
 import { configureStore } from 'app/store/configureStore';
 
+import { LocationUpdate, setLocationSrv } from '@grafana/runtime';
+import { updateLocation } from 'app/core/actions';
+
 // Types
 import { KioskUrlValue } from 'app/types';
 
@@ -37,10 +40,15 @@ export class GrafanaCtrl {
     // make angular loader service available to react components
     setAngularLoader(angularLoader);
     setBackendSrv(backendSrv);
-    setDatasourceSrv(datasourceSrv);
+    setDataSourceSrv(datasourceSrv);
     setTimeSrv(timeSrv);
     setKeybindingSrv(keybindingSrv);
-    configureStore();
+    const store = configureStore();
+    setLocationSrv({
+      update: (opt: LocationUpdate) => {
+        store.dispatch(updateLocation(opt));
+      },
+    });
 
     $scope.init = () => {
       $scope.contextSrv = contextSrv;
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index 9a7c9b5d2d50..a863797dea04 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -110,6 +110,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
     })
     .when('/datasources/edit/:id/', {
       template: '<react-container />',
+      reloadOnSearch: false, // for tabs
       resolve: {
         component: () => DataSourceSettingsPage,
       },
diff --git a/public/app/store/configureStore.ts b/public/app/store/configureStore.ts
index 2638587e96d1..31c1d3964d7e 100644
--- a/public/app/store/configureStore.ts
+++ b/public/app/store/configureStore.ts
@@ -1,6 +1,7 @@
 import { createStore, applyMiddleware, compose, combineReducers } from 'redux';
 import thunk from 'redux-thunk';
-// import { createLogger } from 'redux-logger';
+import { combineEpics, createEpicMiddleware } from 'redux-observable';
+import { createLogger } from 'redux-logger';
 import sharedReducers from 'app/core/reducers';
 import alertingReducers from 'app/features/alerting/state/reducers';
 import teamsReducers from 'app/features/teams/state/reducers';
@@ -14,6 +15,24 @@ import usersReducers from 'app/features/users/state/reducers';
 import userReducers from 'app/features/profile/state/reducers';
 import organizationReducers from 'app/features/org/state/reducers';
 import { setStore } from './store';
+import { limitMessageRateEpic } from 'app/features/explore/state/epics/limitMessageRateEpic';
+import { stateSaveEpic } from 'app/features/explore/state/epics/stateSaveEpic';
+import { processQueryResultsEpic } from 'app/features/explore/state/epics/processQueryResultsEpic';
+import { processQueryErrorsEpic } from 'app/features/explore/state/epics/processQueryErrorsEpic';
+import { runQueriesEpic } from 'app/features/explore/state/epics/runQueriesEpic';
+import { runQueriesBatchEpic } from 'app/features/explore/state/epics/runQueriesBatchEpic';
+import {
+  DataSourceApi,
+  DataQueryResponse,
+  DataQuery,
+  DataSourceJsonData,
+  DataQueryRequest,
+  DataStreamObserver,
+} from '@grafana/ui';
+import { Observable } from 'rxjs';
+import { getQueryResponse } from 'app/core/utils/explore';
+import { StoreState } from 'app/types/store';
+import { toggleLogActionsMiddleware } from 'app/core/middlewares/application';
 
 const rootReducers = {
   ...sharedReducers,
@@ -34,15 +53,44 @@ export function addRootReducer(reducers) {
   Object.assign(rootReducers, ...reducers);
 }
 
+export const rootEpic: any = combineEpics(
+  limitMessageRateEpic,
+  stateSaveEpic,
+  runQueriesEpic,
+  runQueriesBatchEpic,
+  processQueryResultsEpic,
+  processQueryErrorsEpic
+);
+
+export interface EpicDependencies {
+  getQueryResponse: (
+    datasourceInstance: DataSourceApi<DataQuery, DataSourceJsonData>,
+    options: DataQueryRequest<DataQuery>,
+    observer?: DataStreamObserver
+  ) => Observable<DataQueryResponse>;
+}
+
+const dependencies: EpicDependencies = {
+  getQueryResponse,
+};
+
+const epicMiddleware = createEpicMiddleware({ dependencies });
+
 export function configureStore() {
   const composeEnhancers = (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
-
   const rootReducer = combineReducers(rootReducers);
+  const logger = createLogger({
+    predicate: (getState: () => StoreState) => {
+      return getState().application.logActions;
+    },
+  });
+  const storeEnhancers =
+    process.env.NODE_ENV !== 'production'
+      ? applyMiddleware(toggleLogActionsMiddleware, thunk, epicMiddleware, logger)
+      : applyMiddleware(thunk, epicMiddleware);
 
-  if (process.env.NODE_ENV !== 'production') {
-    // DEV builds we had the logger middleware
-    setStore(createStore(rootReducer, {}, composeEnhancers(applyMiddleware(thunk))));
-  } else {
-    setStore(createStore(rootReducer, {}, composeEnhancers(applyMiddleware(thunk))));
-  }
+  const store = createStore(rootReducer, {}, composeEnhancers(storeEnhancers));
+  setStore(store);
+  epicMiddleware.run(rootEpic);
+  return store;
 }
diff --git a/public/app/types/acl.ts b/public/app/types/acl.ts
index 55e9bff620bc..977791f41596 100644
--- a/public/app/types/acl.ts
+++ b/public/app/types/acl.ts
@@ -39,6 +39,8 @@ export interface DashboardAcl {
   name?: string;
   inherited?: boolean;
   sortRank?: number;
+  userAvatarUrl?: string;
+  teamAvatarUrl?: string;
 }
 
 export interface DashboardPermissionInfo {
diff --git a/public/app/types/alerting.ts b/public/app/types/alerting.ts
index c987c2d38ede..26516a052ab4 100644
--- a/public/app/types/alerting.ts
+++ b/public/app/types/alerting.ts
@@ -8,7 +8,7 @@ export interface AlertRuleDTO {
   state: string;
   newStateDate: string;
   evalDate: string;
-  evalData?: object;
+  evalData?: { noData?: boolean; evalMatches?: any };
   executionError: string;
   url: string;
 }
@@ -26,7 +26,7 @@ export interface AlertRule {
   url: string;
   info?: string;
   executionError?: string;
-  evalData?: { noData: boolean };
+  evalData?: { noData?: boolean; evalMatches?: any };
 }
 
 export interface AlertRulesState {
diff --git a/public/app/types/application.ts b/public/app/types/application.ts
new file mode 100644
index 000000000000..d4562d68c448
--- /dev/null
+++ b/public/app/types/application.ts
@@ -0,0 +1,3 @@
+export interface ApplicationState {
+  logActions: boolean;
+}
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index 404e53c28320..98d137f1e7a5 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -3,7 +3,6 @@ import { Value } from 'slate';
 import {
   RawTimeRange,
   DataQuery,
-  DataQueryResponseData,
   DataSourceSelectItem,
   DataSourceApi,
   QueryHint,
@@ -11,12 +10,19 @@ import {
   LogLevel,
   TimeRange,
   DataQueryError,
+  LogsModel,
+  LogsDedupStrategy,
+  LoadingState,
 } from '@grafana/ui';
 
-import { Emitter, TimeSeries } from 'app/core/core';
-import { LogsModel, LogsDedupStrategy } from 'app/core/logs_model';
+import { Emitter } from 'app/core/core';
 import TableModel from 'app/core/table_model';
 
+export enum ExploreMode {
+  Metrics = 'Metrics',
+  Logs = 'Logs',
+}
+
 export interface CompletionItem {
   /**
    * The label of this completion item. By default
@@ -174,6 +180,7 @@ export interface ExploreItemState {
    * Log query result to be displayed in the logs result viewer.
    */
   logsResult?: LogsModel;
+
   /**
    * Query intervals for graph queries to determine how many datapoints to return.
    * Needs to be updated when `datasourceInstance` or `containerWidth` is changed.
@@ -199,10 +206,6 @@ export interface ExploreItemState {
    * True if graph result viewer is expanded. Query runs will contain graph queries.
    */
   showingGraph: boolean;
-  /**
-   * True if logs result viewer is expanded. Query runs will contain logs queries.
-   */
-  showingLogs: boolean;
   /**
    * True StartPage needs to be shown. Typically set to `false` once queries have been run.
    */
@@ -211,22 +214,8 @@ export interface ExploreItemState {
    * True if table result viewer is expanded. Query runs will contain table queries.
    */
   showingTable: boolean;
-  /**
-   * True if `datasourceInstance` supports graph queries.
-   */
-  supportsGraph: boolean | null;
-  /**
-   * True if `datasourceInstance` supports logs queries.
-   */
-  supportsLogs: boolean | null;
-  /**
-   * True if `datasourceInstance` supports table queries.
-   */
-  supportsTable: boolean | null;
 
-  graphIsLoading: boolean;
-  logIsLoading: boolean;
-  tableIsLoading: boolean;
+  loadingState: LoadingState;
   /**
    * Table model that combines all query table results into a single table.
    */
@@ -257,7 +246,13 @@ export interface ExploreItemState {
   update: ExploreUpdateState;
 
   queryErrors: DataQueryError[];
+
   latency: number;
+  supportedModes: ExploreMode[];
+  mode: ExploreMode;
+
+  isLive: boolean;
+  urlReplaced: boolean;
 }
 
 export interface ExploreUpdateState {
@@ -318,11 +313,8 @@ export interface QueryIntervals {
 
 export interface QueryOptions {
   interval: string;
-  format: string;
-  hinting?: boolean;
-  instant?: boolean;
-  valueWithRefId?: boolean;
   maxDataPoints?: number;
+  live?: boolean;
 }
 
 export interface QueryTransaction {
@@ -334,23 +326,14 @@ export interface QueryTransaction {
   options: any;
   queries: DataQuery[];
   result?: any; // Table model / Timeseries[] / Logs
-  resultType: ResultType;
   scanning?: boolean;
 }
 
 export type RangeScanner = () => RawTimeRange;
 
-export type ResultGetter = (
-  result: DataQueryResponseData,
-  transaction: QueryTransaction,
-  allTransactions: QueryTransaction[]
-) => TimeSeries;
-
 export interface TextMatch {
   text: string;
   start: number;
   length: number;
   end: number;
 }
-
-export type ResultType = 'Graph' | 'Logs' | 'Table';
diff --git a/public/app/types/location.ts b/public/app/types/location.ts
index 4730f9d6ed72..13a4e88ab792 100644
--- a/public/app/types/location.ts
+++ b/public/app/types/location.ts
@@ -1,13 +1,4 @@
-export interface LocationUpdate {
-  path?: string;
-  query?: UrlQueryMap;
-  routeParams?: UrlQueryMap;
-  partial?: boolean;
-  /*
-   * If true this will replace url state (ie cause no new browser history)
-   */
-  replace?: boolean;
-}
+import { UrlQueryMap } from '@grafana/runtime';
 
 export interface LocationState {
   url: string;
@@ -17,6 +8,3 @@ export interface LocationState {
   replace: boolean;
   lastUpdated: number;
 }
-
-export type UrlQueryValue = string | number | boolean | string[] | number[] | boolean[];
-export type UrlQueryMap = { [s: string]: UrlQueryValue };
diff --git a/public/app/types/store.ts b/public/app/types/store.ts
index 975cd40ae71c..66a3db1a3cb9 100644
--- a/public/app/types/store.ts
+++ b/public/app/types/store.ts
@@ -13,6 +13,7 @@ import { OrganizationState } from './organization';
 import { AppNotificationsState } from './appNotifications';
 import { PluginsState } from './plugins';
 import { NavIndex } from '@grafana/ui';
+import { ApplicationState } from './application';
 
 export interface StoreState {
   navIndex: NavIndex;
@@ -29,6 +30,7 @@ export interface StoreState {
   appNotifications: AppNotificationsState;
   user: UserState;
   plugins: PluginsState;
+  application: ApplicationState;
 }
 
 /*
diff --git a/public/e2e-test/core/images.ts b/public/e2e-test/core/images.ts
index eb4ca3538d23..2897ba8aa2df 100644
--- a/public/e2e-test/core/images.ts
+++ b/public/e2e-test/core/images.ts
@@ -23,8 +23,21 @@ export const compareScreenShots = async (fileName: string) =>
         return;
       }
 
-      expect(screenShotFromTest.width).toEqual(screenShotFromTruth.width);
-      expect(screenShotFromTest.height).toEqual(screenShotFromTruth.height);
+      if (screenShotFromTest.width !== screenShotFromTruth.width) {
+        throw new Error(
+          `The screenshot:[${fileName}] taken during the test has a width:[${
+            screenShotFromTest.width
+          }] that differs from the expected: [${screenShotFromTruth.width}].`
+        );
+      }
+
+      if (screenShotFromTest.height !== screenShotFromTruth.height) {
+        throw new Error(
+          `The screenshot:[${fileName}] taken during the test has a width:[${
+            screenShotFromTest.height
+          }] that differs from the expected: [${screenShotFromTruth.height}].`
+        );
+      }
 
       const diff = new PNG({ width: screenShotFromTest.width, height: screenShotFromTruth.height });
       const numDiffPixels = pixelmatch(
@@ -36,7 +49,27 @@ export const compareScreenShots = async (fileName: string) =>
         { threshold: 0.1 }
       );
 
-      expect(numDiffPixels).toBe(0);
+      if (numDiffPixels !== 0) {
+        const localMessage = `\nCompare the output from expected:[${constants.screenShotsTruthDir}] with outcome:[${
+          constants.screenShotsOutputDir
+        }]`;
+        const circleCIMessage = '\nCheck the Artifacts tab in the CircleCi build output for the actual screenshots.';
+        const checkMessage = process.env.CIRCLE_SHA1 ? circleCIMessage : localMessage;
+        let msg = `\nThe screenshot:[${
+          constants.screenShotsOutputDir
+        }/${fileName}.png] taken during the test differs by:[${numDiffPixels}] pixels from the expected.`;
+        msg += '\n';
+        msg += checkMessage;
+        msg += '\n';
+        msg += '\n  If the difference between expected and outcome is NOT acceptable then do the following:';
+        msg += '\n    - Check the code for changes that causes this difference, fix that and retry.';
+        msg += '\n';
+        msg += '\n  If the difference between expected and outcome is acceptable then do the following:';
+        msg += '\n    - Replace the expected image with the outcome and retry.';
+        msg += '\n';
+        throw new Error(msg);
+      }
+
       resolve();
     };
 
diff --git a/public/e2e-test/install/install.ts b/public/e2e-test/install/install.ts
index fa71acfb7851..61bfca0bfca1 100644
--- a/public/e2e-test/install/install.ts
+++ b/public/e2e-test/install/install.ts
@@ -11,7 +11,9 @@ export const downloadBrowserIfNeeded = async (): Promise<void> => {
 
   console.log('Did not find any local revisions for browser, downloading latest this might take a while.');
   await browserFetcher.download(constants.chromiumRevision, (downloaded, total) => {
-    console.log(`Downloaded ${downloaded}bytes of ${total}bytes.`);
+    if (downloaded === total) {
+      console.log('Chromium successfully downloaded');
+    }
   });
 };
 
diff --git a/public/e2e-test/screenShots/theTruth/smoke-test-scenario.png b/public/e2e-test/screenShots/theTruth/smoke-test-scenario.png
index 8ea1294d4d6c..832163502300 100644
Binary files a/public/e2e-test/screenShots/theTruth/smoke-test-scenario.png and b/public/e2e-test/screenShots/theTruth/smoke-test-scenario.png differ
diff --git a/public/sass/components/_add_data_source.scss b/public/sass/components/_add_data_source.scss
index c14455d35c14..9e1bcb6ed778 100644
--- a/public/sass/components/_add_data_source.scss
+++ b/public/sass/components/_add_data_source.scss
@@ -77,6 +77,10 @@
   }
 }
 
+.add-datasource-item-actions__btn-icon {
+  margin-left: $space-sm;
+}
+
 .add-data-source-more {
   text-align: center;
   margin: $space-xl;
diff --git a/public/sass/components/_buttons.scss b/public/sass/components/_buttons.scss
index 1a9936bceab0..254ac5906abb 100644
--- a/public/sass/components/_buttons.scss
+++ b/public/sass/components/_buttons.scss
@@ -70,6 +70,7 @@
   @include button-size($btn-padding-y-lg, $space-lg, $font-size-lg, $border-radius-sm);
   font-weight: normal;
   height: $height-lg;
+
   .gicon {
     //font-size: 31px;
     margin-right: $space-sm;
diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss
index 8c950f728590..67071bb61c86 100644
--- a/public/sass/components/_navbar.scss
+++ b/public/sass/components/_navbar.scss
@@ -67,11 +67,6 @@
   min-height: $navbarHeight;
   line-height: $navbarHeight;
 
-  .fa-caret-down {
-    font-size: 60%;
-    padding-left: 6px;
-  }
-
   .gicon {
     top: -2px;
     position: relative;
@@ -85,17 +80,32 @@
       display: inline-block;
     }
   }
+}
 
-  &--folder {
-    color: $text-color-weak;
-    display: none;
+.navbar-page-btn__folder {
+  color: $text-color-weak;
+  display: none;
 
-    @include media-breakpoint-up(lg) {
-      display: inline-block;
-    }
+  @include media-breakpoint-up(lg) {
+    display: inline-block;
   }
 }
 
+// element is needed here to override font-awesome specificity
+i.navbar-page-btn__folder-icon {
+  font-size: $font-size-sm;
+  color: $text-color-weak;
+  padding: 0 $space-sm;
+  position: relative;
+  top: -1px;
+}
+
+// element is needed here to override font-awesome specificity
+i.navbar-page-btn__search {
+  font-size: $font-size-xs;
+  padding: 0 $space-xs;
+}
+
 .navbar-buttons {
   // height: $navbarHeight;
   display: flex;
diff --git a/public/sass/components/_panel_header.scss b/public/sass/components/_panel_header.scss
index 40afc2cd3aae..d9882d213511 100644
--- a/public/sass/components/_panel_header.scss
+++ b/public/sass/components/_panel_header.scss
@@ -167,6 +167,15 @@ $panel-header-no-title-zindex: 1;
   }
 }
 
+.panel-info-content {
+  a {
+    color: $white;
+    &:hover {
+      color: darken($white, 10%);
+    }
+  }
+}
+
 .panel-time-info {
   font-weight: $font-weight-semi-bold;
   float: right;
diff --git a/public/sass/components/_panel_logs.scss b/public/sass/components/_panel_logs.scss
index 8007e77a81d8..3c6ffd83a6fe 100644
--- a/public/sass/components/_panel_logs.scss
+++ b/public/sass/components/_panel_logs.scss
@@ -73,6 +73,7 @@ $column-horizontal-spacing: 10px;
     padding-right: $column-horizontal-spacing;
     border-top: 1px solid transparent;
     border-bottom: 1px solid transparent;
+    height: 100%;
   }
 
   &:hover {
diff --git a/public/sass/components/_panel_singlestat.scss b/public/sass/components/_panel_singlestat.scss
index 7854ac2093fa..df8cbd0c037b 100644
--- a/public/sass/components/_panel_singlestat.scss
+++ b/public/sass/components/_panel_singlestat.scss
@@ -6,17 +6,13 @@
 }
 
 .singlestat-panel-value-container {
-  // line-height 0 is imporant here as the font-size is on this
-  // level but overriden one level deeper and but the line-height: is still
-  // based on the base font size on this level. Using line-height: 0 fixes that
-  line-height: 0;
   display: table-cell;
   vertical-align: middle;
   text-align: center;
   position: relative;
   z-index: 1;
   font-weight: $font-weight-semi-bold;
-  font-size: 38px;
+  line-height: 1;
 }
 
 // Helps
diff --git a/public/sass/components/_panel_table.scss b/public/sass/components/_panel_table.scss
index e47e639a65ed..dbd76dcd3a15 100644
--- a/public/sass/components/_panel_table.scss
+++ b/public/sass/components/_panel_table.scss
@@ -123,7 +123,7 @@
 }
 
 .table-panel-table-header-inner {
-  padding: 0.45em 0 0.45em 1.1em;
+  padding: 0.3em 0 0.45em 1.1em;
   text-align: left;
   color: $blue;
   position: absolute;
diff --git a/public/sass/components/_search.scss b/public/sass/components/_search.scss
index 1fe950f8e53e..38b8533ee470 100644
--- a/public/sass/components/_search.scss
+++ b/public/sass/components/_search.scss
@@ -31,6 +31,7 @@
   display: flex;
   flex-direction: column;
   flex-grow: 1;
+  height: 100%; // Chrome 74 needs this to make the element scrollable
 
   .search-item--indent {
     margin-left: 14px;
@@ -258,10 +259,6 @@
     align-items: flex-start;
   }
 
-  .search-dropdown__col_1 {
-    height: 100%;
-  }
-
   .search-filter-box {
     margin: 0;
   }
diff --git a/public/sass/components/_view_states.scss b/public/sass/components/_view_states.scss
index e1ca3d44f835..fbc50cfca3c8 100644
--- a/public/sass/components/_view_states.scss
+++ b/public/sass/components/_view_states.scss
@@ -16,8 +16,7 @@
     }
   }
 
-  .navbar-button--zoom,
-  .navbar-button--refresh {
+  .navbar-button--zoom {
     display: none;
   }
 }
diff --git a/public/sass/pages/_alerting.scss b/public/sass/pages/_alerting.scss
index f285ab753ff1..28756756aa57 100644
--- a/public/sass/pages/_alerting.scss
+++ b/public/sass/pages/_alerting.scss
@@ -32,7 +32,7 @@
   .panel-alert-icon:before {
     content: '\e611';
     position: relative;
-    top: 5px;
+    top: 1px;
     left: -3px;
   }
 }
diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss
index dba0614e11b0..c06af5864c76 100644
--- a/public/sass/pages/_explore.scss
+++ b/public/sass/pages/_explore.scss
@@ -22,6 +22,11 @@
   .ds-picker {
     min-width: 200px;
     max-width: 200px;
+
+    .gf-form-select-box__img-value {
+      max-width: 150px;
+      overflow: hidden;
+    }
   }
 }
 
@@ -31,20 +36,24 @@
   flex-flow: row wrap;
   justify-content: flex-start;
   height: auto;
-  padding: 0 $dashboard-padding 0 50px;
+  padding: 0 $dashboard-padding;
   border-bottom: 1px solid #0000;
   transition-duration: 0.35s;
   transition-timing-function: ease-in-out;
   transition-property: box-shadow, border-bottom;
-
-  @include media-breakpoint-up(md) {
-    padding-left: $dashboard-padding;
-  }
 }
 
 .explore-toolbar-item {
   position: relative;
   align-self: center;
+
+  &:first-child {
+    padding-left: 34px;
+
+    @include media-breakpoint-up(md) {
+      padding-left: 0;
+    }
+  }
 }
 
 .explore-toolbar.splitted {
@@ -92,6 +101,7 @@
 .explore-toolbar-content-item:first-child {
   padding-left: $dashboard-padding;
   margin-right: auto;
+  display: flex;
 }
 
 @media only screen and (max-width: 1545px) {
@@ -133,7 +143,13 @@
 }
 
 .explore {
+  display: flex;
   flex: 1 1 auto;
+  flex-direction: column;
+}
+
+.explore.explore-live {
+  flex-direction: column-reverse;
 }
 
 .explore + .explore {
@@ -141,9 +157,16 @@
 }
 
 .explore-container {
+  display: flex;
+  flex: 1 1 auto;
+  flex-direction: column;
   padding: $dashboard-padding;
 }
 
+.explore-container.explore-live {
+  flex-direction: column-reverse;
+}
+
 .explore-wrapper {
   display: flex;
 
@@ -163,7 +186,7 @@
 .explore-panel__header {
   padding: $space-sm $space-md 0 $space-md;
   display: flex;
-  cursor: pointer;
+  cursor: inherit;
   transition: all 0.1s linear;
 }
 
@@ -175,9 +198,20 @@
 }
 
 .explore-panel__header-buttons {
-  margin-right: $space-sm;
-  font-size: $font-size-lg;
-  line-height: $font-size-h6;
+  display: none;
+}
+
+.explore-panel--collapsible {
+  .explore-panel__header {
+    cursor: pointer;
+  }
+
+  .explore-panel__header-buttons {
+    margin-right: $space-sm;
+    font-size: $font-size-lg;
+    line-height: $font-size-h6;
+    display: inherit;
+  }
 }
 
 .time-series-disclaimer {
@@ -413,3 +447,21 @@
   margin: $space-xs 0;
   cursor: pointer;
 }
+
+.query-type-toggle {
+  margin-left: 5px;
+
+  .toggle-button-group {
+    padding-top: 2px;
+  }
+
+  .btn.active {
+    background-color: $input-bg;
+    background-image: none;
+    background-clip: padding-box;
+    border: $input-border;
+    border-radius: $input-border-radius;
+    @include box-shadow($input-box-shadow);
+    color: $input-color;
+  }
+}
diff --git a/public/test/core/redux/epicTester.ts b/public/test/core/redux/epicTester.ts
new file mode 100644
index 000000000000..88638f556c68
--- /dev/null
+++ b/public/test/core/redux/epicTester.ts
@@ -0,0 +1,91 @@
+import { Epic, ActionsObservable, StateObservable } from 'redux-observable';
+import { Subject } from 'rxjs';
+import {
+  DataSourceApi,
+  DataQuery,
+  DataSourceJsonData,
+  DataQueryRequest,
+  DataStreamObserver,
+  DataQueryResponse,
+  DataStreamState,
+} from '@grafana/ui';
+
+import { ActionOf } from 'app/core/redux/actionCreatorFactory';
+import { StoreState } from 'app/types/store';
+import { EpicDependencies } from 'app/store/configureStore';
+
+export const epicTester = (
+  epic: Epic<ActionOf<any>, ActionOf<any>, StoreState, EpicDependencies>,
+  state?: Partial<StoreState>
+) => {
+  const resultingActions: Array<ActionOf<any>> = [];
+  const action$ = new Subject<ActionOf<any>>();
+  const state$ = new Subject<StoreState>();
+  const actionObservable$ = new ActionsObservable(action$);
+  const stateObservable$ = new StateObservable(state$, (state as StoreState) || ({} as StoreState));
+  const queryResponse$ = new Subject<DataQueryResponse>();
+  const observer$ = new Subject<DataStreamState>();
+  const getQueryResponse = (
+    datasourceInstance: DataSourceApi<DataQuery, DataSourceJsonData>,
+    options: DataQueryRequest<DataQuery>,
+    observer?: DataStreamObserver
+  ) => {
+    if (observer) {
+      observer$.subscribe({ next: event => observer(event) });
+    }
+    return queryResponse$;
+  };
+
+  const dependencies: EpicDependencies = {
+    getQueryResponse,
+  };
+
+  epic(actionObservable$, stateObservable$, dependencies).subscribe({ next: action => resultingActions.push(action) });
+
+  const whenActionIsDispatched = (action: ActionOf<any>) => {
+    action$.next(action);
+
+    return instance;
+  };
+
+  const whenQueryReceivesResponse = (response: DataQueryResponse) => {
+    queryResponse$.next(response);
+
+    return instance;
+  };
+
+  const whenQueryThrowsError = (error: any) => {
+    queryResponse$.error(error);
+
+    return instance;
+  };
+
+  const whenQueryObserverReceivesEvent = (event: DataStreamState) => {
+    observer$.next(event);
+
+    return instance;
+  };
+
+  const thenResultingActionsEqual = (...actions: Array<ActionOf<any>>) => {
+    expect(actions).toEqual(resultingActions);
+
+    return instance;
+  };
+
+  const thenNoActionsWhereDispatched = () => {
+    expect(resultingActions).toEqual([]);
+
+    return instance;
+  };
+
+  const instance = {
+    whenActionIsDispatched,
+    whenQueryReceivesResponse,
+    whenQueryThrowsError,
+    whenQueryObserverReceivesEvent,
+    thenResultingActionsEqual,
+    thenNoActionsWhereDispatched,
+  };
+
+  return instance;
+};
diff --git a/public/test/mocks/mockExploreState.ts b/public/test/mocks/mockExploreState.ts
new file mode 100644
index 000000000000..981f1fb2dbe4
--- /dev/null
+++ b/public/test/mocks/mockExploreState.ts
@@ -0,0 +1,86 @@
+import { DataSourceApi } from '@grafana/ui/src/types/datasource';
+
+import { ExploreId, ExploreItemState, ExploreState } from 'app/types/explore';
+import { makeExploreItemState } from 'app/features/explore/state/reducers';
+import { StoreState } from 'app/types';
+
+export const mockExploreState = (options: any = {}) => {
+  const isLive = options.isLive || false;
+  const history = [];
+  const eventBridge = {
+    emit: jest.fn(),
+  };
+  const streaming = options.streaming || undefined;
+  const datasourceInterval = options.datasourceInterval || '';
+  const refreshInterval = options.refreshInterval || '';
+  const containerWidth = options.containerWidth || 1980;
+  const queries = options.queries || [];
+  const datasourceError = options.datasourceError || null;
+  const scanner = options.scanner || jest.fn();
+  const scanning = options.scanning || false;
+  const datasourceId = options.datasourceId || '1337';
+  const exploreId = ExploreId.left;
+  const datasourceInstance: DataSourceApi<any> = options.datasourceInstance || {
+    id: 1337,
+    query: jest.fn(),
+    name: 'test',
+    testDatasource: jest.fn(),
+    meta: {
+      id: datasourceId,
+      streaming,
+    },
+    interval: datasourceInterval,
+  };
+  const urlReplaced = options.urlReplaced || false;
+  const left: ExploreItemState = options.left || {
+    ...makeExploreItemState(),
+    containerWidth,
+    datasourceError,
+    datasourceInstance,
+    eventBridge,
+    history,
+    isLive,
+    queries,
+    refreshInterval,
+    scanner,
+    scanning,
+    urlReplaced,
+  };
+  const right: ExploreItemState = options.right || {
+    ...makeExploreItemState(),
+    containerWidth,
+    datasourceError,
+    datasourceInstance,
+    eventBridge,
+    history,
+    isLive,
+    queries,
+    refreshInterval,
+    scanner,
+    scanning,
+    urlReplaced,
+  };
+  const split: boolean = options.split || false;
+  const explore: ExploreState = {
+    left,
+    right,
+    split,
+  };
+  const state: Partial<StoreState> = {
+    explore,
+  };
+
+  return {
+    containerWidth,
+    datasourceId,
+    datasourceInstance,
+    datasourceInterval,
+    eventBridge,
+    exploreId,
+    history,
+    queries,
+    refreshInterval,
+    state,
+    scanner,
+  };
+};
diff --git a/scripts/backend-lint.sh b/scripts/backend-lint.sh
index 064b8626fb2c..841eb39422ed 100755
--- a/scripts/backend-lint.sh
+++ b/scripts/backend-lint.sh
@@ -14,8 +14,6 @@ function exit_if_fail {
 go get -u github.com/alecthomas/gometalinter
 go get -u github.com/jgautheron/goconst/cmd/goconst
 go get -u honnef.co/go/tools/cmd/staticcheck
-go get -u github.com/mgechev/revive
-#go get -u github.com/securego/gosec/cmd/gosec/...
 go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 
 # use gometalinter when lints are not available in golangci or
@@ -29,6 +27,8 @@ exit_if_fail gometalinter --enable-gc --vendor --deadline 10m --disable-all \
 exit_if_fail golangci-lint run --deadline 10m --disable-all \
   --enable=deadcode\
   --enable=gofmt\
+  --enable=gosimple\
+  --enable=govet\
   --enable=ineffassign\
   --enable=structcheck\
   --enable=unconvert\
@@ -36,10 +36,6 @@ exit_if_fail golangci-lint run --deadline 10m --disable-all \
 
 exit_if_fail go vet ./pkg/...
 
-exit_if_fail revive -formatter stylish -config ./scripts/revive.toml
-
-# TODO recheck the rules and leave only necessary exclusions
-# exit_if_fail gosec -quiet \
-#  -exclude=G104,G107,G201,G202,G204,G301,G304,G401,G402,G501 \
-#  -conf=./scripts/gosec.json \
-#  ./pkg/...
+exit_if_fail make revive
+exit_if_fail make revive-alerting
+exit_if_fail make gosec
diff --git a/scripts/build/ci-msi-build/ci-msi-build-oss.sh b/scripts/build/ci-msi-build/ci-msi-build-oss.sh
index 74ba4b001a3f..02f015dae234 100755
--- a/scripts/build/ci-msi-build/ci-msi-build-oss.sh
+++ b/scripts/build/ci-msi-build/ci-msi-build-oss.sh
@@ -24,5 +24,11 @@ python3 generator/build.py "$@"
 chmod a+x /tmp/scratch/*.msi
 echo "MSI: Copy to $WORKING_DIRECTORY/dist"
 cp /tmp/scratch/*.msi $WORKING_DIRECTORY/dist
+echo "MSI: Generate SHA256"
+MSI_FILE=`ls $WORKING_DIRECTORY/dist/*.msi`
+SHA256SUM=`sha256sum $MSI_FILE | cut -f1 -d' '`
+echo $SHA256SUM > $MSI_FILE.sha256
+echo "MSI: SHA256 file content:"
+cat $MSI_FILE.sha256
 echo "MSI: contents of $WORKING_DIRECTORY/dist"
 ls -al $WORKING_DIRECTORY/dist
diff --git a/scripts/build/release_publisher/publisher.go b/scripts/build/release_publisher/publisher.go
index c0d62724a4e4..da4d36e49d54 100644
--- a/scripts/build/release_publisher/publisher.go
+++ b/scripts/build/release_publisher/publisher.go
@@ -174,6 +174,11 @@ var completeBuildArtifactConfigurations = []buildArtifact{
 		arch:       "amd64",
 		urlPostfix: ".windows-amd64.zip",
 	},
+	{
+		os:         "win-installer",
+		arch:       "amd64",
+		urlPostfix: ".windows-amd64.msi",
+	},
 }
 
 type artifactFilter struct {
diff --git a/scripts/build/release_publisher/publisher_test.go b/scripts/build/release_publisher/publisher_test.go
index 80d2cd477a47..7406eef74b61 100644
--- a/scripts/build/release_publisher/publisher_test.go
+++ b/scripts/build/release_publisher/publisher_test.go
@@ -74,6 +74,34 @@ func TestPreparingReleaseFromRemote(t *testing.T) {
 			baseArchiveURL:  "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
 			buildArtifacts:  []buildArtifact{{"linux", "armv6", "_armhf.deb", "-rpi"}},
 		},
+		{
+			version:         "v5.4.0-pre1asdf",
+			expectedVersion: "5.4.0-pre1asdf",
+			whatsNewURL:     "https://whatsnews.foo/",
+			relNotesURL:     "https://relnotes.foo/",
+			nightly:         true,
+			expectedBeta:    false,
+			expectedStable:  false,
+			expectedArch:    "amd64",
+			expectedOs:      "win-installer",
+			expectedURL:     "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.4.0-pre1asdf.windows-amd64.msi",
+			baseArchiveURL:  "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
+			buildArtifacts:  []buildArtifact{{"win-installer", "amd64", ".windows-amd64.msi", ""}},
+		},
+		{
+			version:         "v5.4.0-pre1asdf",
+			expectedVersion: "5.4.0-pre1asdf",
+			whatsNewURL:     "https://whatsnews.foo/",
+			relNotesURL:     "https://relnotes.foo/",
+			nightly:         true,
+			expectedBeta:    false,
+			expectedStable:  false,
+			expectedArch:    "amd64",
+			expectedOs:      "win",
+			expectedURL:     "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.4.0-pre1asdf.windows-amd64.zip",
+			baseArchiveURL:  "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
+			buildArtifacts:  []buildArtifact{{"win", "amd64", ".windows-amd64.zip", ""}},
+		},
 	}
 
 	for _, test := range cases {
diff --git a/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi b/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi.sha256 b/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi.sha256
new file mode 100644
index 000000000000..c3068040269a
--- /dev/null
+++ b/scripts/build/release_publisher/testdata/grafana-enterprise-5.4.0-123pre1.windows-amd64.msi.sha256
@@ -0,0 +1 @@
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
diff --git a/scripts/ci-frontend-metrics.sh b/scripts/ci-frontend-metrics.sh
index 85464aff3e0a..c39cf7cf7dac 100755
--- a/scripts/ci-frontend-metrics.sh
+++ b/scripts/ci-frontend-metrics.sh
@@ -2,7 +2,7 @@
 
 echo -e "Collecting code stats (typescript errors & more)"
 
-ERROR_COUNT_LIMIT=5564
+ERROR_COUNT_LIMIT=5150
 DIRECTIVES_LIMIT=172
 CONTROLLERS_LIMIT=139
 
diff --git a/scripts/cli/tasks/cherrypick.ts b/scripts/cli/tasks/cherrypick.ts
index 543b46a85869..ac92f223a7eb 100644
--- a/scripts/cli/tasks/cherrypick.ts
+++ b/scripts/cli/tasks/cherrypick.ts
@@ -7,6 +7,10 @@ const cherryPickRunner: TaskRunner<CherryPickOptions> = async () => {
   let client = axios.create({
     baseURL: 'https://api.github.com/repos/grafana/grafana',
     timeout: 10000,
+    // auth: {
+    //   username: '<username>',
+    //   password: '<personal access token>',
+    // },
   });
 
   const res = await client.get('/issues', {
@@ -16,22 +20,32 @@ const cherryPickRunner: TaskRunner<CherryPickOptions> = async () => {
     },
   });
 
-  // sort by closed date
+  // sort by closed date ASC
   res.data.sort(function(a, b) {
-    return new Date(b.closed_at).getTime() - new Date(a.closed_at).getTime();
+    return new Date(a.closed_at).getTime() - new Date(b.closed_at).getTime();
   });
 
+  let commands = '';
+
+  console.log('--------------------------------------------------------------------');
+  console.log('Printing PRs with cherry-pick-needed, in ASC merge date order');
+  console.log('--------------------------------------------------------------------');
+
   for (const item of res.data) {
     if (!item.milestone) {
       console.log(item.number + ' missing milestone!');
       continue;
     }
 
-    console.log(`${item.title} (${item.number}) closed_at ${item.closed_at}`);
-    console.log(`\tURL: ${item.closed_at} ${item.html_url}`);
     const issueDetails = await client.get(item.pull_request.url);
-    console.log(`\tMerge sha: ${issueDetails.data.merge_commit_sha}`);
+    console.log(`* ${item.title}, (#${item.number}), merge-sha: ${issueDetails.data.merge_commit_sha}`);
+    commands += `git cherry-pick -x ${issueDetails.data.merge_commit_sha}\n`;
   }
+
+  console.log('--------------------------------------------------------------------');
+  console.log('Commands (in order of how they should be executed)');
+  console.log('--------------------------------------------------------------------');
+  console.log(commands);
 };
 
 export const cherryPickTask = new Task<CherryPickOptions>();
diff --git a/scripts/cli/tasks/grafanaui.build.ts b/scripts/cli/tasks/grafanaui.build.ts
index 6fce809bef91..1a48bb1a7243 100644
--- a/scripts/cli/tasks/grafanaui.build.ts
+++ b/scripts/cli/tasks/grafanaui.build.ts
@@ -7,7 +7,7 @@ import { Task, TaskRunner } from './task';
 
 let distDir, cwd;
 
-const clean = useSpinner<void>('Cleaning', async () => await execa('npm', ['run', 'clean']));
+export const clean = useSpinner<void>('Cleaning', async () => await execa('npm', ['run', 'clean']));
 
 const compile = useSpinner<void>('Compiling sources', () => execa('tsc', ['-p', './tsconfig.build.json']));
 
diff --git a/scripts/cli/tasks/grafanaui.release.ts b/scripts/cli/tasks/grafanaui.release.ts
index f0e53a4e7bad..03bcdd0219e5 100644
--- a/scripts/cli/tasks/grafanaui.release.ts
+++ b/scripts/cli/tasks/grafanaui.release.ts
@@ -1,11 +1,11 @@
 import execa from 'execa';
 import { execTask } from '../utils/execTask';
-import { changeCwdToGrafanaUiDist, changeCwdToGrafanaUi } from '../utils/cwd';
+import { changeCwdToGrafanaUiDist, changeCwdToGrafanaUi, restoreCwd } from '../utils/cwd';
 import semver from 'semver';
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 import { useSpinner } from '../utils/useSpinner';
-import { savePackage, buildTask } from './grafanaui.build';
+import { savePackage, buildTask, clean } from './grafanaui.build';
 import { TaskRunner, Task } from './task';
 
 type VersionBumpType = 'prerelease' | 'patch' | 'minor' | 'major';
@@ -81,12 +81,6 @@ const bumpVersion = (version: string) =>
 const publishPackage = (name: string, version: string) =>
   useSpinner<void>(`Publishing ${name} @ ${version} to npm registry...`, async () => {
     changeCwdToGrafanaUiDist();
-    console.log(chalk.yellowBright.bold(`\nReview dist package.json before proceeding!\n`));
-    const { confirmed } = await promptConfirm('Are you ready to publish to npm?');
-
-    if (!confirmed) {
-      process.exit();
-    }
     await execa('npm', ['publish', '--access', 'public']);
   })();
 
@@ -111,13 +105,18 @@ const releaseTaskRunner: TaskRunner<ReleaseTaskOptions> = async ({
   usePackageJsonVersion,
   createVersionCommit,
 }) => {
-  await runChecksAndTests();
+  changeCwdToGrafanaUi();
+  await clean(); // Clean previous build if exists
+  restoreCwd();
+
   if (publishToNpm) {
     // TODO: Ensure release branch
     // When need to update this when we star keeping @grafana/ui releases in sync with core
     await ensureMasterBranch();
   }
 
+  runChecksAndTests();
+
   await execTask(buildTask)();
 
   let releaseConfirmed = false;
@@ -169,6 +168,13 @@ const releaseTaskRunner: TaskRunner<ReleaseTaskOptions> = async ({
   }
 
   if (publishToNpm) {
+    console.log(chalk.yellowBright.bold(`\nReview dist package.json before proceeding!\n`));
+    const { confirmed } = await promptConfirm('Are you ready to publish to npm?');
+
+    if (!confirmed) {
+      process.exit();
+    }
+
     await publishPackage(pkg.name, nextVersion);
     console.log(chalk.green(`\nVersion ${nextVersion} of ${pkg.name} succesfully released!`));
     console.log(chalk.yellow(`\nUpdated @grafana/ui/package.json with version bump created.`));
diff --git a/scripts/gosec.json b/scripts/go/configs/gosec.json
similarity index 100%
rename from scripts/gosec.json
rename to scripts/go/configs/gosec.json
diff --git a/scripts/revive.toml b/scripts/go/configs/revive.toml
similarity index 97%
rename from scripts/revive.toml
rename to scripts/go/configs/revive.toml
index 2d4410ee5489..a40486c31333 100644
--- a/scripts/revive.toml
+++ b/scripts/go/configs/revive.toml
@@ -1,7 +1,7 @@
 ignoreGeneratedHeader = false
 severity = "error"
 confidence = 0.8
-errorCode = 0
+errorCode = 1
 
 [rule.context-as-argument]
 [rule.error-return]
diff --git a/scripts/go/go.mod b/scripts/go/go.mod
new file mode 100644
index 000000000000..9ad4ef6b1323
--- /dev/null
+++ b/scripts/go/go.mod
@@ -0,0 +1,8 @@
+module github.com/grafana/grafana/scripts/go
+
+go 1.12
+
+require (
+	github.com/mgechev/revive v0.0.0-20190505013521-22b849f28677 // indirect
+	github.com/securego/gosec v0.0.0-20190510081509-ee80733faf72 // indirect
+)
diff --git a/scripts/go/go.sum b/scripts/go/go.sum
new file mode 100644
index 000000000000..7c69bd63684f
--- /dev/null
+++ b/scripts/go/go.sum
@@ -0,0 +1,61 @@
+github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY=
+github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/structtag v1.0.0 h1:pTHj65+u3RKWYPSGaU290FpI/dXxTaHdVwVwbcPKmEc=
+github.com/fatih/structtag v1.0.0/go.mod h1:IKitwq45uXL/yqi5mYghiD3w9H6eTOvI9vnk8tXMphA=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4=
+github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mgechev/dots v0.0.0-20180605013149-8e09d8ea2757 h1:KTwJ7Lo3KDKMknRYN5JEFRGIM4IkG59QjFFM2mxsMEU=
+github.com/mgechev/dots v0.0.0-20180605013149-8e09d8ea2757/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg=
+github.com/mgechev/revive v0.0.0-20190505013521-22b849f28677 h1:iOfPBHjVwDHHeKUerCrX3JRUU9YbRewSTzirEYE0x78=
+github.com/mgechev/revive v0.0.0-20190505013521-22b849f28677/go.mod h1:pVHj2KvxEhotJ6Lmr7zb3YgNMX1QKt8cyp6fdPHOrzU=
+github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk=
+github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E=
+github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
+github.com/olekukonko/tablewriter v0.0.0-20180912035003-be2c049b30cc h1:rQ1O4ZLYR2xXHXgBCCfIIGnuZ0lidMQw2S5n1oOv+Wg=
+github.com/olekukonko/tablewriter v0.0.0-20180912035003-be2c049b30cc/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
+github.com/securego/gosec v0.0.0-20190510081509-ee80733faf72 h1:403cuEGt3niQPAau/if+Fp34KjBzMKGejdBCu486W3s=
+github.com/securego/gosec v0.0.0-20190510081509-ee80733faf72/go.mod h1:shk+oGa7JTGg9taMxXk2skTwpt9KQAbryuwFIHCm/fw=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20180911133044-677d2ff680c1 h1:dzEuQYa6+a3gROnSlgly5ERUm4SZKJt+dh+4iSbO+bI=
+golang.org/x/tools v0.0.0-20180911133044-677d2ff680c1/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b h1:NVD8gBK33xpdqCaZVVtd6OFJp+3dxkXuz7+U7KaVN6s=
+golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/scripts/grunt/default_task.js b/scripts/grunt/default_task.js
index 95a2522ccfc5..f910941d630d 100644
--- a/scripts/grunt/default_task.js
+++ b/scripts/grunt/default_task.js
@@ -34,7 +34,8 @@ module.exports = function(grunt) {
   grunt.registerTask('no-only-tests', function() {
     var files = grunt.file.expand(
       'public/**/*@(_specs|.test).@(ts|js|tsx|jsx)',
-      'packages/grafana-ui/**/*@(_specs|.test).@(ts|js|tsx|jsx)'
+      'packages/grafana-ui/**/*@(_specs|.test).@(ts|js|tsx|jsx)',
+      'packages/grafana-runtime/**/*@(_specs|.test).@(ts|js|tsx|jsx)'
     );
     grepFiles(files, '.only(', 'found only statement in test: ');
   });
diff --git a/tsconfig.json b/tsconfig.json
index 7eaffeac0783..d58fc1aa6571 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -32,7 +32,8 @@
       "app": ["app"],
       "sass": ["sass"]
     },
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "preserveSymlinks": true
   },
   "include": [
     "public/app/**/*.ts",
diff --git a/yarn.lock b/yarn.lock
index 624f08d556b8..57a84a7d860d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1289,7 +1289,7 @@
     jest-runner "^24.8.0"
     jest-runtime "^24.8.0"
 
-"@jest/transform@^24.6.0", "@jest/transform@^24.8.0":
+"@jest/transform@^24.8.0":
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz#628fb99dce4f9d254c6fd9341e3eea262e06fef5"
   integrity sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==
@@ -1310,7 +1310,7 @@
     source-map "^0.6.1"
     write-file-atomic "2.4.1"
 
-"@jest/types@^24.5.0", "@jest/types@^24.6.0", "@jest/types@^24.8.0":
+"@jest/types@^24.5.0", "@jest/types@^24.8.0":
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
   integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
@@ -2219,6 +2219,14 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/hoist-non-react-statics@^3.3.0":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
+  integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
+  dependencies:
+    "@types/react" "*"
+    hoist-non-react-statics "^3.3.0"
+
 "@types/inquirer@0.0.43":
   version "0.0.43"
   resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.43.tgz#1eb0bbb4648e6cc568bd396c1e989f620ad01273"
@@ -2264,10 +2272,10 @@
   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.14.tgz#37daaf78069e7948520474c87b80092ea912520a"
   integrity sha512-Q5hTcfdudEL2yOmluA1zaSyPbzWPmJ3XfSWeP3RyoYvS9hnje1ZyagrZOuQ6+1nQC1Gw+7gap3pLNL3xL6UBug==
 
-"@types/jest@24.0.11":
-  version "24.0.11"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.11.tgz#1f099bea332c228ea6505a88159bfa86a5858340"
-  integrity sha512-2kLuPC5FDnWIDvaJBzsGTBQaBbnDweznicvK7UGYzlIJP4RJR2a4A/ByLUXEyEgag6jz8eHdlWExGDtH3EYUXQ==
+"@types/jest@24.0.13":
+  version "24.0.13"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.13.tgz#10f50b64cb05fb02411fbba49e9042a3a11da3f9"
+  integrity sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==
   dependencies:
     "@types/jest-diff" "*"
 
@@ -2384,6 +2392,15 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-redux@^7.0.8":
+  version "7.0.8"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.0.8.tgz#c928863058e334d41031c6bedd0f113bc514e234"
+  integrity sha512-vIBC15E84ehN6RzdGwRVa41whp9e4CkfPm+WfD0r6y6vqBf4tQPKZeKEBfLLM8k79uSwQC7rh3rH/MFaN1IESQ==
+  dependencies:
+    "@types/hoist-non-react-statics" "^3.3.0"
+    "@types/react" "*"
+    redux "^4.0.0"
+
 "@types/react-select@2.0.15":
   version "2.0.15"
   resolved "https://registry.yarnpkg.com/@types/react-select/-/react-select-2.0.15.tgz#51d607667f59a12e980abcc5bbf9636307293e44"
@@ -3493,13 +3510,13 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
-axios@0.18.0:
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
-  integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=
+axios@0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
+  integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
   dependencies:
-    follow-redirects "^1.3.0"
-    is-buffer "^1.1.5"
+    follow-redirects "1.5.10"
+    is-buffer "^2.0.2"
 
 babel-code-frame@^6.22.0:
   version "6.26.0"
@@ -3550,20 +3567,7 @@ babel-helper-to-multiple-sequence-expressions@^0.5.0:
   resolved "https://registry.yarnpkg.com/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.5.0.tgz#a3f924e3561882d42fcf48907aa98f7979a4588d"
   integrity sha512-m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==
 
-babel-jest@24.6.0:
-  version "24.6.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.6.0.tgz#58aa1e6a3d72fdd986644a92529f0ec7d2f1cf61"
-  integrity sha512-HpI/orChKlJZbWC2p52ghWeK+UYqU9ql+zYw+ctOr3vIuPZowcSL13RwReW5ZeYKxsRr8dZmQozGvPX93Gw1tw==
-  dependencies:
-    "@jest/transform" "^24.6.0"
-    "@jest/types" "^24.6.0"
-    "@types/babel__core" "^7.1.0"
-    babel-plugin-istanbul "^5.1.0"
-    babel-preset-jest "^24.6.0"
-    chalk "^2.4.2"
-    slash "^2.0.0"
-
-babel-jest@^24.8.0:
+babel-jest@24.8.0, babel-jest@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589"
   integrity sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==
@@ -4050,6 +4054,11 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
+bowser@^1.7.3:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.4.tgz#890c58a2813a9d3243704334fa81b96a5c150c9a"
+  integrity sha512-9IdMmj2KjigRq6oWhmwv1W36pDuA4STQZ8q6YO9um+x07xgYNCD3Oou+WP/3L1HNz7iqythGet3/p4wvc8AAwQ==
+
 boxen@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
@@ -5144,7 +5153,7 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-to-clipboard@^3.0.8:
+copy-to-clipboard@^3.0.8, copy-to-clipboard@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz#d2724a3ccbfed89706fac8a894872c979ac74467"
   integrity sha512-eOZERzvCmxS8HWzugj4Uxl8OJxa7T2k1Gi0X5qavwydHIfuSHq2dTD09LOg/XyGq4Zpb5IsR/2OJ5lbOegz78w==
@@ -5367,6 +5376,14 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
+css-in-js-utils@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-2.0.1.tgz#3b472b398787291b47cfe3e44fecfdd9e914ba99"
+  integrity sha512-PJF0SpJT+WdbVVt0AOYp9C8GnuruRlL/UFW7932nLWmFLQTaWEzTBQEx7/hn4BuV+WON75iAViSUJLiU3PKbpA==
+  dependencies:
+    hyphenate-style-name "^1.0.2"
+    isobject "^3.0.1"
+
 css-loader@2.1.1, css-loader@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea"
@@ -5417,7 +5434,7 @@ css-tree@1.0.0-alpha.28:
     mdn-data "~1.1.0"
     source-map "^0.5.3"
 
-css-tree@1.0.0-alpha.29:
+css-tree@1.0.0-alpha.29, css-tree@^1.0.0-alpha.28:
   version "1.0.0-alpha.29"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
   integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==
@@ -5542,7 +5559,7 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
-csstype@^2.2.0, csstype@^2.5.2, csstype@^2.5.7:
+csstype@^2.2.0, csstype@^2.5.2, csstype@^2.5.5, csstype@^2.5.7:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.4.tgz#d585a6062096e324e7187f80e04f92bd0f00e37f"
   integrity sha512-lAJUJP3M6HxFXbqtGRc0iZrdyeN+WzOWeY0q/VnFzI+kqVrYIzC7bWlKqCW7oCIdzoPkvfp82EVvrTlQ8zsWQg==
@@ -6096,7 +6113,7 @@ debug@2.6.9, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0:
+debug@3.1.0, debug@=3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
@@ -6802,6 +6819,13 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+error-stack-parser@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.2.tgz#4ae8dbaa2bf90a8b450707b9149dcabca135520d"
+  integrity sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==
+  dependencies:
+    stackframe "^1.0.4"
+
 es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.13.0, es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.7.0, es-abstract@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
@@ -7356,6 +7380,11 @@ fast-text-encoding@^1.0.0:
   resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz#3e5ce8293409cfaa7177a71b9ca84e1b1e6f25ef"
   integrity sha512-R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ==
 
+fastest-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fastest-stable-stringify/-/fastest-stable-stringify-1.0.1.tgz#9122d406d4c9d98bea644a6b6853d5874b87b028"
+  integrity sha1-kSLUBtTJ2YvqZEpraFPVh0uHsCg=
+
 fastparse@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
@@ -7607,7 +7636,14 @@ focus-lock@^0.6.3:
   resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.6.3.tgz#ef0e82ebac0023f841039d60bf329725d6438028"
   integrity sha512-EU6ePgEauhWrzJEN5RtG1d1ayrWXhEnfzTjnieHj+jG9tNHDEhKTAnCn1TN3gs9h6XWCDH6cpeX1VXY/lzLwZg==
 
-follow-redirects@^1.0.0, follow-redirects@^1.3.0:
+follow-redirects@1.5.10:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
+  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
+  dependencies:
+    debug "=3.1.0"
+
+follow-redirects@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
   integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
@@ -8838,6 +8874,11 @@ husky@1.3.1:
     run-node "^1.0.0"
     slash "^2.0.0"
 
+hyphenate-style-name@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48"
+  integrity sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==
+
 iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -9025,6 +9066,14 @@ init-package-json@^1.10.3:
     validate-npm-package-license "^3.0.1"
     validate-npm-package-name "^3.0.0"
 
+inline-style-prefixer@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-4.0.2.tgz#d390957d26f281255fe101da863158ac6eb60911"
+  integrity sha512-N8nVhwfYga9MiV9jWlwfdj1UDIaZlBFu4cJSJkIr7tZX7sHpHhGR5su1qdpW+7KPL8ISTvCIkcaFi/JdBknvPg==
+  dependencies:
+    bowser "^1.7.3"
+    css-in-js-utils "^2.0.0"
+
 inquirer@6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
@@ -9210,7 +9259,7 @@ is-buffer@^1.0.2, is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.0:
+is-buffer@^2.0.0, is-buffer@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
   integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
@@ -9753,7 +9802,7 @@ jest-changed-files@^24.8.0:
     execa "^1.0.0"
     throat "^4.0.0"
 
-jest-cli@^24.6.0:
+jest-cli@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz#b075ac914492ed114fa338ade7362a301693e989"
   integrity sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==
@@ -10093,18 +10142,18 @@ jest-worker@^24.0.0, jest-worker@^24.6.0:
     merge-stream "^1.0.1"
     supports-color "^6.1.0"
 
-jest@24.6.0:
-  version "24.6.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-24.6.0.tgz#133e46c3f92450402e5b6737f5a07620c3f8201e"
-  integrity sha512-09Y/1FUQIGRVY2hdt0VpiL5mH0MGKeNM+Rhd1qWUZEBI/HwI6upHQR5XxlTm5d0BpXvhB/8bDpHu5ehL7JGi1g==
+jest@24.8.0:
+  version "24.8.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz#d5dff1984d0d1002196e9b7f12f75af1b2809081"
+  integrity sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==
   dependencies:
     import-local "^2.0.0"
-    jest-cli "^24.6.0"
+    jest-cli "^24.8.0"
 
-jquery@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"
-  integrity sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ==
+jquery@3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
+  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
 
 js-base64@^2.1.8, js-base64@^2.1.9:
   version "2.5.1"
@@ -11566,6 +11615,20 @@ nan@^2.10.0, nan@^2.12.1, nan@^2.6.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
   integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
 
+nano-css@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.1.0.tgz#03c2b4ea2edefd445ac0c0e0f2565ea62e2aa81a"
+  integrity sha512-08F1rBmp0JuAteOR/uk/c40q/+UxWr224m/ZCHjjgy8dhkFQptvNwj/408KYQc13PIV9aGvqmtUD49PqBB5Ppg==
+  dependencies:
+    css-tree "^1.0.0-alpha.28"
+    csstype "^2.5.5"
+    fastest-stable-stringify "^1.0.1"
+    inline-style-prefixer "^4.0.0"
+    rtl-css-js "^1.9.0"
+    sourcemap-codec "^1.4.1"
+    stacktrace-js "^2.0.0"
+    stylis "3.5.0"
+
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -14101,7 +14164,7 @@ react-error-overlay@^5.1.4:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.5.tgz#884530fd055476c764eaa8ab13b8ecf1f57bbf2c"
   integrity sha512-O9JRum1Zq/qCPFH5qVEvDDrVun8Jv9vbHtZXCR1EuRj9sKg1xJTlHxBzU6AkCzpvxRLuiY4OKImy3cDLQ+UTdg==
 
-react-fast-compare@^2.0.2:
+react-fast-compare@^2.0.2, react-fast-compare@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
@@ -14380,6 +14443,19 @@ react-transition-group@^2.2.1:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
+react-use@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/react-use/-/react-use-9.0.0.tgz#142bec53fa465db2a6e43c68a8c9ef2acc000592"
+  integrity sha512-jlXJneB96yl4VvAXDKyE6cmdIeWk0cO7Gomh870Qu0vXZ9YM2JjjR09E9vIPPPI2M27RWo2dZKXspv44Wxtoog==
+  dependencies:
+    copy-to-clipboard "^3.1.0"
+    nano-css "^5.1.0"
+    react-fast-compare "^2.0.4"
+    react-wait "^0.3.0"
+    screenfull "^4.1.0"
+    throttle-debounce "^2.0.1"
+    ts-easing "^0.2.0"
+
 react-virtualized@9.21.0:
   version "9.21.0"
   resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.21.0.tgz#8267c40ffb48db35b242a36dea85edcf280a6506"
@@ -14392,6 +14468,11 @@ react-virtualized@9.21.0:
     prop-types "^15.6.0"
     react-lifecycles-compat "^3.0.4"
 
+react-wait@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/react-wait/-/react-wait-0.3.0.tgz#0cdd4d919012451a5bc3ab0a16d00c6fd9a8c10b"
+  integrity sha512-kB5x/kMKWcn0uVr9gBdNz21/oGbQwEQnF3P9p6E9yLfJ9DRcKS0fagbgYMFI0YFOoyKDj+2q6Rwax0kTYJF37g==
+
 react-window@1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.7.1.tgz#c1db640415b97b85bc0a1c66eb82dadabca39b86"
@@ -14666,12 +14747,17 @@ redux-mock-store@1.5.3:
   dependencies:
     lodash.isplainobject "^4.0.6"
 
+redux-observable@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/redux-observable/-/redux-observable-1.1.0.tgz#323a8fe53e89fdb519be2807b55f08e21c13e6f1"
+  integrity sha512-G0nxgmTZwTK3Z3KoQIL8VQu9n0YCUwEP3wc3zxKQ8zAZm+iYkoZvBqAnBJfLi4EsD1E64KR4s4jFH/dFXpV9Og==
+
 redux-thunk@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
   integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
 
-redux@4.0.1:
+redux@4.0.1, redux@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
   integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
@@ -15207,6 +15293,13 @@ rsvp@^4.8.4:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz#b50e6b34583f3dd89329a2f23a8a2be072845911"
   integrity sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA==
 
+rtl-css-js@^1.9.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.11.0.tgz#a7151930ef9d54656607d754ebb172ddfc9ef836"
+  integrity sha512-YnZ6jWxZxlWlcQAGF9vOmiF9bEmoQmSHE+wsrsiILkdK9HqiRPAIll4SY/QDzbvEu2lB2h62+hfg3TYzjnldbA==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+
 run-async@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
@@ -15401,6 +15494,11 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
+screenfull@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-4.2.0.tgz#d5252a5a0f56504719abbed9ebbcd9208115da03"
+  integrity sha512-qpyI9XbwuMJElWRP5vTgxkFAl4k7HpyhIqBFOZEwX9QBXn0MAuRSpn7LOc6/4CeSwoz61oBu1VPV+2fbIWC+5Q==
+
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -15979,7 +16077,7 @@ source-map@^0.7.2, source-map@^0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-sourcemap-codec@^1.4.4:
+sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
   integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
@@ -16094,6 +16192,13 @@ stable@^0.1.8, stable@~0.1.3, stable@~0.1.5:
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
+stack-generator@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.3.tgz#bb74385c67ffc4ccf3c4dee5831832d4e509c8a0"
+  integrity sha512-kdzGoqrnqsMxOEuXsXyQTmvWXZmG0f3Ql2GDx5NtmZs59sT2Bt9Vdyq0XdtxUi58q/+nxtbF9KOQ9HkV1QznGg==
+  dependencies:
+    stackframe "^1.0.4"
+
 stack-parser@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/stack-parser/-/stack-parser-0.0.1.tgz#7d3b63a17887e9e2c2bf55dbd3318fe34a39d1e7"
@@ -16104,6 +16209,28 @@ stack-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
   integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
 
+stackframe@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
+  integrity sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==
+
+stacktrace-gps@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.2.tgz#33f8baa4467323ab2bd1816efa279942ba431ccc"
+  integrity sha512-9o+nWhiz5wFnrB3hBHs2PTyYrS60M1vvpSzHxwxnIbtY2q9Nt51hZvhrG1+2AxD374ecwyS+IUwfkHRE/2zuGg==
+  dependencies:
+    source-map "0.5.6"
+    stackframe "^1.0.4"
+
+stacktrace-js@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.0.tgz#776ca646a95bc6c6b2b90776536a7fc72c6ddb58"
+  integrity sha1-d2ymRqlbxsayuQd2U2p/xyxt21g=
+  dependencies:
+    error-stack-parser "^2.0.1"
+    stack-generator "^2.0.1"
+    stacktrace-gps "^3.0.1"
+
 staged-git-files@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b"
@@ -16411,6 +16538,11 @@ stylis-rule-sheet@^0.0.10:
   resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"
   integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw==
 
+stylis@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1"
+  integrity sha512-pP7yXN6dwMzAR29Q0mBrabPCe0/mNO1MSr93bhay+hcZondvMMTpeGyd8nbhYJdyperNT2DRxONQuUGcJr5iPw==
+
 stylis@^3.5.0:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe"
@@ -16666,6 +16798,11 @@ throat@^4.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
   integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
+throttle-debounce@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz#257e648f0a56bd9e54fe0f132c4ab8611df4e1d5"
+  integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg==
+
 throttleit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
@@ -16904,10 +17041,15 @@ tryor@~0.1.2:
   resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b"
   integrity sha1-gUXkynyv9ArN48z5Rui4u3W0Fys=
 
-ts-jest@24.0.1:
-  version "24.0.1"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.1.tgz#77258061cc354c3fa8616b8ac03baa0f8580f854"
-  integrity sha512-mgNZmYPuGBNgYpUzchI7vdSr6zATQI0TrSyzREnXHuPCvlW8T1DQ/fdscgx4ivS5vAMUGUaoxGdWIVHC5I8imw==
+ts-easing@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec"
+  integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==
+
+ts-jest@24.0.2:
+  version "24.0.2"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.2.tgz#8dde6cece97c31c03e80e474c749753ffd27194d"
+  integrity sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==
   dependencies:
     bs-logger "0.x"
     buffer-from "1.x"
@@ -16930,10 +17072,10 @@ ts-loader@5.3.3:
     micromatch "^3.1.4"
     semver "^5.0.1"
 
-ts-node@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.0.2.tgz#9ecdf8d782a0ca4c80d1d641cbb236af4ac1b756"
-  integrity sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==
+ts-node@8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.1.0.tgz#8c4b37036abd448577db22a061fd7a67d47e658e"
+  integrity sha512-34jpuOrxDuf+O6iW1JpgTRDFynUZ1iEqtYruBqh35gICNjN8x+LpVcPAcwzLPi9VU6mdA3ym+x233nZmZp445A==
   dependencies:
     arg "^4.1.0"
     diff "^3.1.0"
@@ -17571,10 +17713,10 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-bundle-analyzer@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz#2f19cbb87bb6d4f3cb4e59cb67c837bd9436e89d"
-  integrity sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==
+webpack-bundle-analyzer@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz#3da733a900f515914e729fcebcd4c40dde71fc6f"
+  integrity sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==
   dependencies:
     acorn "^6.0.7"
     acorn-walk "^6.1.1"