Merge branch 'master' into sql-proxy

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,10 @@
-Please prefix your title with [Bug] or [Feature request]
-For question please check [Support Options](http://grafana.org/support/). **Do not** open a github issue
+Read before posting: 
+
+- Questions should be posted to https://community.grafana.com. Please search there and here on GitHub for similar issues before creating a new issue. 
+- Checkout FAQ: https://community.grafana.com/c/howto/faq
+- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50
+
+Please prefix your title with [Bug] or [Feature request]. 
 
 Please include this information:
 - What Grafana version are you using?
@@ -8,11 +13,6 @@ Please include this information:
 - What did you do?
 - What was the expected result?
 - What happened instead?
-
-**IMPORTANT** 
-If it relates to *metric data viz*:
-- An image or text representation of your metric query
-- The raw query and response for the network request (check this in chrome dev tools network tab, here you can see metric requests and other request, please include the request body and request response)
-
-If it relates to *alerting*
-- An image of the test execution data fully expanded.
+- If related to metric query / data viz:
+  - Include raw network request & response: get by opening Chrome Dev Tools (F12, Ctrl+Shift+I on windows, Cmd+Opt+I on Mac), go the network tab.
+ 

CHANGELOG.md

@@ -1,21 +1,86 @@
-# 4.2.0 (unreleased)
+# 4.3.0 (unreleased)
 
 ## Enhancements
-* **Alerting**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
+
+* **InfluxDB**: influxdb query builder support for ORDER BY and LIMIT (allows TOPN queries) [#6065](https://github.com/grafana/grafana/issues/6065) Support influxdb's SLIMIT Feature [#7232](https://github.com/grafana/grafana/issues/7232) thx [@thuck](https://github.com/thuck)
+* **InfluxDB**: Small fix for the "glow" when focus the field for LIMIT and SLIMIT [#7799](https://github.com/grafana/grafana/pull/7799) thx [@thuck](https://github.com/thuck)
+* **Panels**: Delay loading & Lazy load panels as they become visible (scrolled into view) [#5216](https://github.com/grafana/grafana/issues/5216) thx [@jifwin](https://github.com/jifwin)
+* **Graph**: Support auto grid min/max when using log scale [#3090](https://github.com/grafana/grafana/issues/3090), thx [@bigbenhur](https://github.com/bigbenhur)
+* **Elasticsearch**: Support histogram aggregations [#3164](https://github.com/grafana/grafana/issues/3164)
+
+## Minor Enchancements
+
+* **Prometheus**: Make Prometheus query field a textarea [#7663](https://github.com/grafana/grafana/issues/7663), thx [@hagen1778](https://github.com/hagen1778)
+* **Templating**: Should not be possible to create self-referencing (recursive) template variable definitions [#7614](https://github.com/grafana/grafana/issues/7614) thx [@thuck](https://github.com/thuck)
+* **Cloudwatch**: Correctly obtain IAM roles within ECS container tasks [#7892](https://github.com/grafana/grafana/issues/7892) thx [@gomlgs](https://github.com/gomlgs)
+* **Units**: New number format: Scientific notation [#7781](https://github.com/grafana/grafana/issues/7781) thx [@cadnce](https://github.com/cadnce)
+* **Oauth**: Add common type for oauth authorization errors [#6428](https://github.com/grafana/grafana/issues/6428) thx [@amenzhinsky](https://github.com/amenzhinsky)
+
+# 4.2.0 (2017-03-22)
+## Minor Enhancements
+* **Templates**: Prevent use of the prefix `__` for templates in web UI [#7678](https://github.com/grafana/grafana/issues/7678)
+* **Threema**: Add emoji to Threema alert notifications [#7676](https://github.com/grafana/grafana/pull/7676) thx [@dbrgn](https://github.com/dbrgn)
+* **Panels**: Support dm3 unit [#7695](https://github.com/grafana/grafana/issues/7695) thx [@mitjaziv](https://github.com/mitjaziv)
+* **Docs**: Added some details about Sessions in Postgres [#7694](https://github.com/grafana/grafana/pull/7694) thx [@rickard-von-essen](https://github.com/rickard-von-essen)
+* **Influxdb**: Allow commas in template variables [#7681](https://github.com/grafana/grafana/issues/7681) thx [@thuck](https://github.com/thuck)
+* **Cloudwatch**: stop using deprecated session.New() [#7736](https://github.com/grafana/grafana/issues/7736) thx [@mtanda](https://github.com/mtanda)
+* **OpenTSDB**: Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified [#7743](https://github.com/grafana/grafana/pull/7743) thx [@r4um](https://github.com/r4um)
+* **Templating**: support full resolution for $interval variable [#7696](https://github.com/grafana/grafana/pull/7696) thx [@mtanda](https://github.com/mtanda)
+* **Elasticsearch**: Unique Count on string fields in ElasticSearch [#3536](https://github.com/grafana/grafana/issues/3536), thx [@pyro2927](https://github.com/pyro2927)
+* **Templating**: Data source template variable that refers to other variable in regex filter [#6365](https://github.com/grafana/grafana/issues/6365) thx [@rlodge](https://github.com/rlodge)
+* **Admin**: Global User List: add search and pagination [#7469](https://github.com/grafana/grafana/issues/7469)
+* **User Management**: Invite UI is now disabled when login form is disabled [#7875](https://github.com/grafana/grafana/issues/7875)
+
+## Bugfixes
+* **Webhook**: Use proxy settings from environment variables [#7710](https://github.com/grafana/grafana/issues/7710)
+* **Panels**: Deleting a dashboard with unsaved changes raises an error message [#7591](https://github.com/grafana/grafana/issues/7591) thx [@thuck](https://github.com/thuck)
+* **Influxdb**: Query builder detects regex to easily for measurement [#7276](https://github.com/grafana/grafana/issues/7276) thx [@thuck](https://github.com/thuck)
+* **Docs**: router_logging not documented [#7723](https://github.com/grafana/grafana/issues/7723)
+* **Alerting**: Spelling mistake [#7739](https://github.com/grafana/grafana/pull/7739) thx [@woutersmit](https://github.com/woutersmit)
+* **Alerting**: Graph legend scrolls to top when an alias is toggled/clicked [#7680](https://github.com/grafana/grafana/issues/7680) thx [@p4ddy1](https://github.com/p4ddy1)
+* **Panels**: Fixed panel tooltip description after scrolling down [#7708](https://github.com/grafana/grafana/issues/7708) thx [@askomorokhov](https://github.com/askomorokhov)
+
+# 4.2.0-beta1 (2017-02-27)
+
+## Enhancements
+* **Telegram**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
 * **Templating**: Make $__interval and $__interval_ms global built in variables that can be used in by any datasource (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
 * **S3 Image Store**: External s3 image store (used in alert notifications) now support AWS IAM Roles, closes [#6985](https://github.com/grafana/grafana/issues/6985), [#7058](https://github.com/grafana/grafana/issues/7058) thx [@mtanda](https://github.com/mtanda)
-* **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)
-* **Browser History**: Browser back/forward now works time ranges / zoom, [#7259](https://github.com/grafana/grafana/issues/7259)
 * **SingleStat**: Implements diff aggregation method for singlestat [#7234](https://github.com/grafana/grafana/issues/7234), thx [@oliverpool](https://github.com/oliverpool)
 * **Dataproxy**: Added setting to enable more verbose logging in dataproxy [#7209](https://github.com/grafana/grafana/pull/7209), thx [@Ricky-N](https://github.com/Ricky-N)
 * **Alerting**: Better information about why an alert triggered [#7035](https://github.com/grafana/grafana/issues/7035)
-* **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [#huydx](https://github.com/huydx)
-* **Elasticsearch**: Support for Min Doc Count options in Terms aggregation [#7324](https://github.com/grafana/grafana/pull/7324), thx [#lpic10](https://github.com/lpic10)
-* **Elasticsearch**: Term aggregation limit can now be changed in template queries [#7112](https://github.com/grafana/grafana/issues/7112), thx [#FFalcon](https://github.com/FFalcon)
+* **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [@huydx](https://github.com/huydx)
+* **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
+* **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
+* **Alerting**: Uploading images for alert notifications is now optional [#7419](https://github.com/grafana/grafana/issues/7419)
+* **Dashboard**: Adds shortcut for collapsing/expanding all rows [#552](https://github.com/grafana/grafana/issues/552), thx [@mtanda](https://github.com/mtanda)
+* **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
+* **Orgs**: Sharing dashboards using Grafana share feature will now redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
+* **Pushover**: Add Pushover alert notifications [#7526](https://github.com/grafana/grafana/pull/7526) thx [@devkid](https://github.com/devkid)
+* **Threema**: Add Threema Gateway alert notification integration [#7482](https://github.com/grafana/grafana/pull/7482) thx [@dbrgn](https://github.com/dbrgn)
+
+## Minor Enhancements
+* **Optimzation**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)
+* **Browser History**: Browser back/forward now works time ranges / zoom, [#7259](https://github.com/grafana/grafana/issues/7259)
+* **Elasticsearch**: Support for Min Doc Count options in Terms aggregation [#7324](https://github.com/grafana/grafana/pull/7324), thx [@lpic10](https://github.com/lpic10)
+* **Elasticsearch**: Term aggregation limit can now be changed in template queries [#7112](https://github.com/grafana/grafana/issues/7112), thx [@FFalcon](https://github.com/FFalcon)
+* **Elasticsearch**: Ad-hoc filters now support all operators [#7612](https://github.com/grafana/grafana/issues/7612), thx [@tamayika](https://github.com/tamayika)
+* **Graph**: Add full series name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
+* **Table**: Add a message when queries returns no data. [#6109](https://github.com/grafana/grafana/issues/6109), thx [@xginn8](https://github.com/xginn8)
+* **Graph**: Set max width for series names in legend tables. [#2385](https://github.com/grafana/grafana/issues/2385), thx [@kolobaev](https://github.com/kolobaev)
+* **Database**: Allow max db connection pool configuration [#7427](https://github.com/grafana/grafana/issues/7427), thx [@huydx](https://github.com/huydx)
+* **Datasources** Delete datsource by name [#7476](https://github.com/grafana/grafana/issues/7476), thx [@huydx](https://github.com/huydx)
+* **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
+* **Snapshot**: Make timeout for snapshot creation configurable [#7449](https://github.com/grafana/grafana/pull/7449) thx [@ryu1-sakai](https://github.com/ryu1-sakai)
+* **Panels**: Add more physics units [#7554](https://github.com/grafana/grafana/pull/7554) thx [@ryantxu](https://github.com/ryantxu)
+* **Email**: Add sender's name on email [#2131](https://github.com/grafana/grafana/issues/2131) thx [@jacobbednarz](https://github.com/jacobbednarz)
+* **HTTPS**: Set tls 1.2 as lowest tls version. [#7347](https://github.com/grafana/grafana/pull/7347) thx [@roman-vynar](https://github.com/roman-vynar)
+* **Table**: Added suppressing of empty results to table plugin. [#7602](https://github.com/grafana/grafana/pull/7602) thx [@LLIyRiK](https://github.com/LLIyRiK)
 
 ## Tech
 
 * **Library Upgrade**: Upgraded angularjs from 1.5.8 to 1.6.1 [#7274](https://github.com/grafana/grafana/issues/7274)
+* **Backend**: Grafana is now built using golang 1.8
 
 ## Bugfixes
 * **Alerting**: Fixes missing support for no_data and execution error when testing alerts [#7149](https://github.com/grafana/grafana/issues/7149)
@@ -23,11 +88,18 @@
 * **Alertlist**: Only show scrollbar when required [#7269](https://github.com/grafana/grafana/issues/7269)
 * **SMTP**: Set LocalName to hostname [#7223](https://github.com/grafana/grafana/issues/7223)
 * **Sidemenu**: Disable sign out in sidemenu for AuthProxyEnabled [#7377](https://github.com/grafana/grafana/pull/7377), thx [@solugebefola](https://github.com/solugebefola)
+* **Prometheus**: Add support for basic auth in Prometheus tsdb package [#6799](https://github.com/grafana/grafana/issues/6799), thx [@hagen1778](https://github.com/hagen1778)
+* **OAuth**: Redirect to original page when logging in with OAuth [#7513](https://github.com/grafana/grafana/issues/7513)
+* **Annotations**: Wrap text in annotations tooltip [#7542](https://github.com/grafana/grafana/pull/7542), thx [@xginn8](https://github.com/xginn8)
+* **Templating**: Fixes error when using numeric sort on empty strings [#7382](https://github.com/grafana/grafana/issues/7382)
+* **Templating**: Fixed issue detecting template variable dependency [#7354](https://github.com/grafana/grafana/issues/7354)
 
-# 4.1.2 (unreleased)
+# 4.1.2 (2017-02-13)
 
 ### Bugfixes
 * **Table**: Fixes broken annotation rendering mode in the table panel [#7268](https://github.com/grafana/grafana/issues/7268)
+* **Data Sources**: Sorting for lists of data sources in UI is now case insensitive [#7491](https://github.com/grafana/grafana/issues/7491)
+* **Admin**: Support more then 1000 users in global users list [#7469](https://github.com/grafana/grafana/issues/7469)
 
 # 4.1.1 (2017-01-11)
 
@@ -730,7 +802,7 @@ Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated
 
 # 1.8.0 (2014-09-22)
 
-Read this [blog post](http://grafana.org/blog/2014/09/11/grafana-1-8-0-rc1-released.html) for an overview of all improvements.
+Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-released) for an overview of all improvements.
 
 **Fixes**
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource

Makefile

@@ -4,9 +4,9 @@ deps-go:
 	go run build.go setup
 
 deps-js:
-	yarn install --pure-lockfile
+	yarn install --pure-lockfile --no-progress
 
-deps: deps-go deps-js
+deps: deps-js
 
 build-go:
 	go run build.go build

README.md

@@ -1,16 +1,13 @@
-[Grafana](http://grafana.org) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) 
+[Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) 
 ================
-[Website](http://grafana.org) |
+[Website](https://grafana.com) |
 [Twitter](https://twitter.com/grafana) |
-[IRC](https://webchat.freenode.net/?channels=grafana) |
-[![Slack](https://brandfolder.com/api/favicon/icon?size=16&domain=www.slack.com)](http://slack.raintank.io)
-[Slack](http://slack.raintank.io) |
-[Email](mailto:contact@grafana.org)
+[Community & Forum](https://community.grafana.com)
 
 Grafana is an open source, feature rich metrics dashboard and graph editor for
 Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 
-![](http://grafana.org/assets/img/features/dashboard_ex1.png)
+![](http://docs.grafana.org/assets/img/features/dashboard_ex1.png)
 
 - [Install instructions](http://docs.grafana.org/installation/)
 - [What's New in Grafana 2.0](http://docs.grafana.org/guides/whats-new-in-v2/)
@@ -19,6 +16,7 @@ Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 - [What's New in Grafana 3.0](http://docs.grafana.org/guides/whats-new-in-v3/)
 - [What's New in Grafana 4.0](http://docs.grafana.org/guides/whats-new-in-v4/)
 - [What's New in Grafana 4.1](http://docs.grafana.org/guides/whats-new-in-v4-1/)
+- [What's New in Grafana 4.2](http://docs.grafana.org/guides/whats-new-in-v4-2/)
 
 ## Features
 ### Graphite Target Editor
@@ -66,7 +64,7 @@ There are no dependencies except an external time series data store. For dashboa
 database (sqlite3) or you can use an external SQL data base like MySQL or Postgres.
 
 ## Installation
-Head to [grafana.org](http://docs.grafana.org/installation/) and [download](http://grafana.org/download/)
+Head to [grafana.org](http://docs.grafana.org/installation/) and [download](https://grafana.com/get)
 the latest release.
 
 If you have any problems please read the [troubleshooting guide](http://docs.grafana.org/installation/troubleshooting/).
@@ -76,11 +74,11 @@ Be sure to read the [getting started guide](http://docs.grafana.org/guides/getti
 
 ## Run from master
 If you want to build a package yourself, or contribute. Here is a guide for how to do that. You can always find
-the latest master builds [here](http://grafana.org/builds)
+the latest master builds [here](https://grafana.com/grafana/download)
 
 ### Dependencies
 
-- Go 1.7.3
+- Go 1.8
 - NodeJS v4+
 
 ### Get Code
@@ -110,7 +108,7 @@ go run build.go build
 
 ### Building frontend assets
 
-To build less to css for the frontend you will need a recent version of **node (v4+)**,
+To build less to css for the frontend you will need a recent version of **node (v6+)**,
 npm (v2.5.0) and grunt (v0.4.5). Run the following:
 
 ```bash

appveyor.yml

@@ -7,13 +7,17 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
 environment:
   nodejs_version: "6"
   GOPATH: c:\gopath
+  GOVERSION: 1.8
 
 install:
+  - rmdir c:\go /s /q
   # install nodejs and npm
   - ps: Install-Product node $env:nodejs_version
-  - npm install -g yarn
-  - yarn install --pure-lockfile
+  - npm install -g yarn --silent
+  - yarn install --pure-lockfile --no-progress
   - npm install -g grunt-cli
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.zip
+  - 7z x go%GOVERSION%.windows-amd64.zip -y -oC:\ > NUL
   # install gcc (needed for sqlite3)
   - choco install -y --limit-output mingw
   - set PATH=C:\tools\mingw64\bin;%PATH%
@@ -21,18 +25,28 @@ install:
   - echo %GOPATH%
   - go version
   - go env
-  - go run build.go setup
+  # - go run build.go setup
 
 build_script:
   - go run build.go build
   - grunt release
-  - go run build.go sha1-dist
+  - go run build.go sha-dist
   - cp dist/* .
 
 artifacts:
   - path: grafana-*windows-*.*
     name: binzip
+    type: zip
 
 deploy:
   - provider: Environment
-    name: GrafanaBuildsS3
+    name: GrafanaReleaseMaster
+    on:
+      buildType: master
+
+  - provider: Environment
+    name: GrafanaReleaseRelease
+    on:
+      buildType: release
+
+

build.go

@@ -5,7 +5,7 @@ package main
 import (
 	"bytes"
 	"crypto/md5"
-	"crypto/sha1"
+	"crypto/sha256"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -14,6 +14,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 	"regexp"
 	"runtime"
@@ -38,10 +39,11 @@ var (
 	phjsToRelease         string
 	workingDir            string
 	includeBuildNumber    bool     = true
+	buildNumber           int      = 0
 	binaries              []string = []string{"grafana-server", "grafana-cli"}
 )
 
-const minGoVersion = 1.7
+const minGoVersion = 1.8
 
 func main() {
 	log.SetOutput(os.Stdout)
@@ -58,6 +60,7 @@ func main() {
 	flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
 	flag.BoolVar(&race, "race", race, "Use race detector")
 	flag.BoolVar(&includeBuildNumber, "includeBuildNumber", includeBuildNumber, "IncludeBuildNumber in package name")
+	flag.IntVar(&buildNumber, "buildNumber", 0, "Build number from CI system")
 	flag.Parse()
 
 	readVersionFromPackageJson()
@@ -102,8 +105,8 @@ func main() {
 			grunt(gruntBuildArg("release")...)
 			createDebPackages()
 
-		case "sha1-dist":
-			sha1FilesInDist()
+		case "sha-dist":
+			shaFilesInDist()
 
 		case "latest":
 			makeLatestDistCopies()
@@ -118,14 +121,24 @@ func main() {
 }
 
 func makeLatestDistCopies() {
-	rpmIteration := "-1"
-	if linuxPackageIteration != "" {
-		rpmIteration = linuxPackageIteration
+	files, err := ioutil.ReadDir("dist")
+	if err != nil {
+		log.Fatalf("failed to create latest copies. Cannot read from /dist")
+	}
+
+	latestMapping := map[string]string{
+		".deb":    "dist/grafana_latest_amd64.deb",
+		".rpm":    "dist/grafana-latest-1.x86_64.rpm",
+		".tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
 	}
 
-	runError("cp", fmt.Sprintf("dist/grafana_%v-%v_amd64.deb", linuxPackageVersion, linuxPackageIteration), "dist/grafana_latest_amd64.deb")
-	runError("cp", fmt.Sprintf("dist/grafana-%v-%v.x86_64.rpm", linuxPackageVersion, rpmIteration), "dist/grafana-latest-1.x86_64.rpm")
-	runError("cp", fmt.Sprintf("dist/grafana-%v-%v.linux-x64.tar.gz", linuxPackageVersion, linuxPackageIteration), "dist/grafana-latest.linux-x64.tar.gz")
+	for _, file := range files {
+		for extension, fullName := range latestMapping {
+			if strings.HasSuffix(file.Name(), extension) {
+				runError("cp", path.Join("dist", file.Name()), fullName)
+			}
+		}
+	}
 }
 
 func readVersionFromPackageJson() {
@@ -157,7 +170,11 @@ func readVersionFromPackageJson() {
 
 	// add timestamp to iteration
 	if includeBuildNumber {
-		linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration)
+		if buildNumber != 0 {
+			linuxPackageIteration = fmt.Sprintf("%d%s", buildNumber, linuxPackageIteration)
+		} else {
+			linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration)
+		}
 	}
 }
 
@@ -258,9 +275,9 @@ func createPackage(options linuxPackageOptions) {
 		"--description", "Grafana",
 		"-C", packageRoot,
 		"--vendor", "Grafana",
-		"--url", "http://grafana.org",
+		"--url", "https://grafana.com",
 		"--license", "\"Apache 2.0\"",
-		"--maintainer", "contact@grafana.org",
+		"--maintainer", "contact@grafana.com",
 		"--config-files", options.initdScriptFilePath,
 		"--config-files", options.etcDefaultFilePath,
 		"--config-files", options.systemdServiceFilePath,
@@ -270,6 +287,14 @@ func createPackage(options linuxPackageOptions) {
 		"-p", "./dist",
 	}
 
+	if options.packageType == "rpm" {
+		args = append(args, "--rpm-posttrans", "packaging/rpm/control/posttrans")
+	}
+
+	if options.packageType == "deb" {
+		args = append(args, "--deb-no-default-config-files")
+	}
+
 	if pkgArch != "" {
 		args = append(args, "-a", pkgArch)
 	}
@@ -328,7 +353,7 @@ func gruntBuildArg(task string) []string {
 	if includeBuildNumber {
 		args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
 	} else {
-		args = append(args, fmt.Sprintf("--pkgVer=%v", linuxPackageVersion))
+		args = append(args, fmt.Sprintf("--pkgVer=%v", version))
 	}
 	if pkgArch != "" {
 		args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
@@ -505,14 +530,14 @@ func md5File(file string) error {
 	return out.Close()
 }
 
-func sha1FilesInDist() {
+func shaFilesInDist() {
 	filepath.Walk("./dist", func(path string, f os.FileInfo, err error) error {
 		if path == "./dist" {
 			return nil
 		}
 
-		if strings.Contains(path, ".sha1") == false {
-			err := sha1File(path)
+		if strings.Contains(path, ".sha256") == false {
+			err := shaFile(path)
 			if err != nil {
 				log.Printf("Failed to create sha file. error: %v\n", err)
 			}
@@ -521,20 +546,20 @@ func sha1FilesInDist() {
 	})
 }
 
-func sha1File(file string) error {
+func shaFile(file string) error {
 	fd, err := os.Open(file)
 	if err != nil {
 		return err
 	}
 	defer fd.Close()
 
-	h := sha1.New()
+	h := sha256.New()
 	_, err = io.Copy(h, fd)
 	if err != nil {
 		return err
 	}
 
-	out, err := os.Create(file + ".sha1")
+	out, err := os.Create(file + ".sha256")
 	if err != nil {
 		return err
 	}

circle.yml

@@ -9,7 +9,7 @@ machine:
     GOPATH: "/home/ubuntu/.go_workspace"
     ORG_PATH: "github.com/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
-    GODIST: "go1.7.4.linux-amd64.tar.gz"
+    GODIST: "go1.8.linux-amd64.tar.gz"
   post:
     - mkdir -p ~/download
     - mkdir -p ~/docker
@@ -33,7 +33,7 @@ dependencies:
 
 test:
   override:
-     - bash scripts/circle-test.sh
+    - bash scripts/circle-test.sh
 
 deployment:
   gh_branch:
@@ -41,15 +41,17 @@ deployment:
     commands:
       - ./scripts/build/deploy.sh
       - ./scripts/build/sign_packages.sh
-      - go run build.go sha1-dist
+      - go run build.go sha-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/master
-      #- ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN}
+      - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master
+      - ./scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}
+      - go run ./scripts/build/publish.go -apiKey ${GRAFANA_COM_API_KEY}
   gh_tag:
     tag: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
     commands:
       - ./scripts/build/deploy.sh
       - ./scripts/build/sign_packages.sh
-      - go run build.go sha1-dist
+      - go run build.go sha-dist
       - aws s3 sync ./dist s3://$BUCKET_NAME/release
-      #- ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN}
-
+      - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} release
+      - ./scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} ${CIRCLE_TAG}

conf/defaults.ini

@@ -73,6 +73,10 @@ password =
 # Example: mysql://user:secret@host:port/database
 url =
 
+# Max conn setting default is 0 (mean not set)
+max_idle_conn =
+max_open_conn =
+
 # For "postgres", use either "disable", "require" or "verify-full"
 # For "mysql", use either "true", "false", or "skip-verify".
 ssl_mode = disable
@@ -127,11 +131,11 @@ logging = false
 # Change this option to false to disable reporting.
 reporting_enabled = true
 
-# Set to false to disable all checks to https://grafana.net
+# Set to false to disable all checks to https://grafana.com
 # for new vesions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
 # This option does not cause any auto updates, nor send any information
-# only a GET request to http://grafana.net to get latest versions
+# only a GET request to https://grafana.com to get latest versions
 check_for_updates = true
 
 # Google Analytics universal tracking code, only enabled if you specify an id here
@@ -201,6 +205,9 @@ default_theme = dark
 # Set to true to disable (hide) the login form, useful if you use OAuth
 disable_login_form = false
 
+# Set to true to disable the signout link in the side menu. useful if you use auth.proxy
+disable_signout_menu = false
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -238,7 +245,7 @@ api_url = https://www.googleapis.com/oauth2/v1/userinfo
 allowed_domains =
 hosted_domain =
 
-#################################### Grafana.net Auth ####################
+#################################### Grafana.com Auth ####################
 [auth.grafananet]
 enabled = false
 allow_sign_up = true
@@ -291,6 +298,7 @@ cert_file =
 key_file =
 skip_verify = false
 from_address = admin@grafana.localhost
+from_name = Grafana
 
 [emails]
 welcome_email_on_sign_up = false
@@ -420,7 +428,7 @@ address =
 prefix = prod.grafana.%(instance_name)s.
 
 [grafana_net]
-url = https://grafana.net
+url = https://grafana.com
 
 #################################### External Image Storage ##############
 [external_image_storage]

conf/sample.ini

@@ -82,6 +82,11 @@
 # For "sqlite3" only, path relative to data_path setting
 ;path = grafana.db
 
+# Max conn setting default is 0 (mean not set)
+;max_idle_conn =
+;max_open_conn =
+
+
 #################################### Session ####################################
 [session]
 # Either "memory", "file", "redis", "mysql", "postgres", default is "file"
@@ -123,7 +128,7 @@
 # for new vesions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
 # This option does not cause any auto updates, nor send any information
-# only a GET request to http://grafana.net to get latest versions
+# only a GET request to http://grafana.com to get latest versions
 ;check_for_updates = true
 
 # Google Analytics universal tracking code, only enabled if you specify an id here
@@ -187,6 +192,9 @@
 # Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
 ;disable_login_form = false
 
+# Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false
+;disable_signout_menu = false
+
 #################################### Anonymous Auth ##########################
 [auth.anonymous]
 # enable anonymous access
@@ -237,7 +245,7 @@
 ;team_ids =
 ;allowed_organizations =
 
-#################################### Grafana.net Auth ####################
+#################################### Grafana.com Auth ####################
 [auth.grafananet]
 ;enabled = false
 ;allow_sign_up = true
@@ -276,6 +284,7 @@
 ;key_file =
 ;skip_verify = false
 ;from_address = admin@grafana.localhost
+;from_name = Grafana
 
 [emails]
 ;welcome_email_on_sign_up = false
@@ -372,10 +381,10 @@
 ;address =
 ;prefix = prod.grafana.%(instance_name)s.
 
-#################################### Internal Grafana Metrics ##########################
-# Url used to to import dashboards directly from Grafana.net
+#################################### Grafana.com integration  ##########################
+# Url used to to import dashboards directly from Grafana.com
 [grafana_net]
-;url = https://grafana.net
+;url = https://grafana.com
 
 #################################### External image storage ##########################
 [external_image_storage]

docker/blocks/prometheus/fig

@@ -3,8 +3,6 @@ prometheus:
   net: host
   ports:
     - "9090:9090"
-  volumes:
-    - /var/docker/prometheus:/prometheus-data
 
 node_exporter:
   image: prom/node-exporter

docs/Dockerfile

@@ -3,10 +3,11 @@ FROM grafana/docs-base:latest
 # to get the git info for this repo
 # COPY config.toml /site
 
-RUN rm -rf /site/content/*
+# RUN rm -rf /site/content/*
 
-COPY ./sources /site/content/
+# COPY ./sources /site/content/docs/
 
+COPY config.toml /site
 COPY awsconfig /site
 
 VOLUME ["/site/content"]

docs/Makefile

@@ -1,50 +1,33 @@
 .PHONY: all default docs docs-build docs-shell shell test
-# to allow `make DOCSDIR=1 docs-shell` (to create a bind mount in docs)
-DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR):/docs/content/grafana/)
 
 # to allow `make DOCSPORT=9000 docs`
 DOCSPORT := 3004
 
-# Get the IP ADDRESS
-DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''")
-HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)")
-HUGO_BIND_IP=0.0.0.0
-
-GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
-GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
 DOCKER_DOCS_IMAGE := grafana/grafana-docs
 
-DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
 SOURCES_HOST_DIR := "$(shell pwd)/sources"
 
-# for some docs workarounds (see below in "docs-build" target)
-GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
+DOCS_MOUNT := -v $(SOURCES_HOST_DIR):/site/content
+
+DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e NOCACHE -p 3004:3004 -p 3005:3005
+
 
 default: docs
 
 docs: docs-build
-	$(DOCKER_RUN_DOCS) -p 3004:3004 -p 3005:3005 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt && grunt connect --port=3004"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004"
 
-docs-watch: docs-build
-	$(DOCKER_RUN_DOCS) -p 3004:3004 -p 3005:3005 -v $(SOURCES_HOST_DIR):/site/content -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
+test: docs-build
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "ls -la /site/content"
 
-docs-watch-mac: docs-build
-	$(DOCKER_RUN_DOCS) -p 3004:3004 -p 3005:3005 -v $(SOURCES_HOST_DIR):/site/content -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs-mac && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs-mac"
+docs-watch: docs-build
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
 
 publish: docs-build
-	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs v3.1"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs root"
 
 publish-prod: docs-build
-	$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root"
-
-docs-draft: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --buildDrafts="true" --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
-
-docs-shell: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
-
-test: docs-build
-	$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)"
+	$(DOCKER_RUN_DOCS) $(DOCS_MOUNT) -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root"
 
 docs-build:
-	docker build -t "$(DOCKER_DOCS_IMAGE)" .
+	docker build -t "$(DOCKER_DOCS_IMAGE)" --no-cache .

docs/README.md

@@ -6,14 +6,13 @@ and the [mkdocs](http://www.mkdocs.org/) tool.
 
 **Prepare the Docker Image**:
 
-Build the `grafana/docs-base:latest` image. Run these commands in the
-same directory this file is in. **Note** that you may require ``sudo``
+Git clone `grafana/grafana.org` repo. Run these commands in the root of that repo. **Note** that you may require ``sudo``
 when running ``make docs-build`` depending on how your system's docker
 service is configured):
 
 ```
-$ git clone https://github.com/grafana/docs-base
-$ cd docs-base
+$ git clone https://github.com/grafana/grafana.org
+$ cd grafana.org
 $ make docs-build
 ```
 
@@ -31,31 +30,6 @@ This command will not return control of the shell to the user. Instead
 the command is now running a new docker container built from the image
 we created in the previous step.
 
-Open [localhost:8180](http://localhost:8180) to view the docs.
+Open [localhost:3004](http://localhost:3004) to view the docs.
 
-**Note** that after running ``make docs`` you may notice a message
-like this in the console output
 
-> Running at: http://0.0.0.0:8000/
-
-This is misleading. That is **not** the port the documentation is
-served from. You must browse to port **8180** to view the new
-documentation.
-
-
-# Adding a New Page
-
-Adding a new page requires updating the ``mkdocs.yml`` file which is
-located in this directory.
-
-For example, if you are adding documentation for a new HTTP API called
-``preferences`` you would:
-
-1. Create the file ``docs/sources/http_api/preferences.md``
-1. Add a reference to it in ``docs/sources/http_api/overview.md``
-1. Update the list under the **pages** key in the ``docs/mkdocs.yml`` file with a reference to your new page:
-
-
-```yaml
-- ['http_api/preferences.md', 'API', 'Preferences API']
-```

docs/config.toml

@@ -1,70 +1,20 @@
+
 baseurl = "http://localhost:3002/"
 languageCode = "en-us"
-title = "Grafana Docs"
-canonifyurls = false
+title = "Grafana Documentation"
+canonifyurls = true
 relativeURLs = false
 verbose = true
 enableRobotsTXT = true
 disableSitemap = false
-disableRSS = true
-
-[[menu.top]]
-  name = "Docs"
-  url = ""
-  weight = 1
-
-[[menu.top]]
-  name = "Community"
-  url = "/community"
-  weight = 2
-
-[[menu.top]]
-  name = "Support"
-  url = "/support"
-  weight = 3
-
-[[menu.top]]
-  name = "Plugins"
-  url = "https://grafana.net/plugins"
-  weight = 4
-
-[[menu.top]]
-  name = "Dashboards"
-  url = "https://grafana.net/dashboards"
-  weight = 5
-
-[[menu.top]]
-  name = "Hosting"
-  url = "/hosting"
-  weight = 6
-
-[[menu.top]]
-  name = "Github"
-  url = "https://github.com/grafana/grafana"
-  weight = 7
-
-## Main
-[[menu.main]]
-  name = "Feature Gallery"
-  url = "/features"
-  weight = 1
-
-[[menu.main]]
-  name = "Live Demo"
-  url = "http://play.grafana.org"
-  weight = 2
-
-[[menu.main]]
-  name = "Download"
-  url = "/download"
-  weight = 3
-
-[[menu.main]]
-  name = "Blog"
-  url = "/blog"
-  weight = 4
-
-
+disableRSS = false
+preservetaxonomynames = true
+metaDataFormat = "yaml"
 
+[taxonomies]
+tag = "tags"
+category = "categories"
 
+[permalinks]
+  blog = ":year/:month/:day/:title/"
 

docs/sources/administration/cli.md

@@ -10,11 +10,13 @@ weight = 8
 
 # Grafana CLI
 
-Grafana cli is a small executable that is bundled with grafana server and is suppose to be executed on the same machine as grafana runs. 
+Grafana cli is a small executable that is bundled with grafana server and is suppose to be executed on the same machine as grafana runs.
 
 ## Plugins
 
-The CLI helps you install, upgrade and manage your plugins on the same machine it CLI is running. You can find more information about how to install and manage your plugins at the [plugin page] ({{< relref "/installation.md" >}})
+The CLI helps you install, upgrade and manage your plugins on the same machine it CLI is running.
+You can find more information about how to install and manage your plugins at the
+[plugin page]({{< relref "plugins/installation.md" >}}).
 
 ## Admin
 

docs/sources/alerting/metrics.md

@@ -13,7 +13,7 @@ weight = 2
 
 > Alerting is only available in Grafana v4.0 and above.
 
-The alert engine publish some internal metrics about itself. You can read more about how Grafana published [interal metrics](/installation/configuration/#metrics)
+The alert engine publishes some internal metrics about itself. You can read more about how Grafana published [internal metrics](/installation/configuration/#metrics).
 
 Description | Type | Metric name
 ---------- | ----------- | ----------

docs/sources/alerting/notifications.md

@@ -101,4 +101,9 @@ config file.
 
 This is an optional requirement, you can get slack and email notifications without setting this up.
 
+# Configure the link back to Grafana from alert notifications
+
+All alert notifications contains a link back to the triggered alert in the Grafana instance. 
+This url is based on the [domain](/installation/configuration/#domain) setting in Grafana. 
+
 

docs/sources/alerting/rules.md

@@ -33,7 +33,7 @@ of core Grafana. Only some data soures are supported right now. They include `Gr
 ### Clustering
 
 We have not implemented clustering yet. So if you run multiple instances of grafana-server
-you have to make sure [execute_alerts]({{< relref "/installation/configuration.md#alerting" >}})
+you have to make sure [execute_alerts]({{< relref "installation/configuration.md#alerting" >}})
 is true on only one instance or otherwise you will get duplicated notifications.
 
 <div class="clearfix"></div>

docs/sources/contribute/cla.md

@@ -0,0 +1,104 @@
++++
+title = "Contributor Licence Agreement (CLA)"
+description = "Contributer Licence Agreement (CLA)"
+type = "docs"
+aliases = ["/project/cla", "docs/contributing/cla.html"]
+[menu.docs]
+parent = "contribute"
+weight = 1
++++
+
+# Grafana Labs Contributor License Agreement
+
+Thank you for your interest in contributing to Grafana Labs ("We" or "Us").
+
+This contributor agreement ("Agreement") documents the rights granted by contributors to Us.
+To make this document effective, please sign it following the instructions at
+[cla-assistant](https://cla-assistant.io/grafana/grafana). This is a legally binding document,
+so please read it carefully before agreeing to it. The Agreement may cover more than
+one software project managed by Us.
+
+## 1. Definitions
+
+"You" (Individual) means the individual who Submits a Contribution to Us.
+
+"You" (Entity) means any Legal Entity on behalf of whom a Contribution has been received by Us. "Legal Entity" means an entity which is not a natural person. "Affiliates" means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity.
+
+"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, you must notify us at contact@grafana.com before Submitting  such a Contribution.
+
+"Copyright" means all rights protecting works of authorship owned or controlled by You [or Your Affiliates], including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You.
+
+"Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material.
+
+"Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+
+"Submission Date" means the date on which You Submit a Contribution to Us.
+
+"Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier.
+
+"Media" means any portion of a Contribution which is not software.
+
+## 2. Grant of Rights
+
+### 2.1 Copyright License
+
+(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement.
+
+(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3.
+
+### 2.2 Patent License
+
+For patent claims including, without limitation, method, process, and apparatus claims which You [or Your Affiliates] own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3.
+
+### 2.3 Outbound License
+
+As a condition on the grant of rights in Sections 2.1 and 2.2, We agree to license the Contribution only under the terms of the license or licenses which We are using on the Submission Date for the Material or any licenses which are approved by the Open Source Initiative on or after the Effective Date, including both permissive and copyleft licenses, whether or not such licenses are subsequently disapproved (including any right to adopt any future version of a license if permitted).
+
+In addition, We may use the following licenses for Media in the Contribution: GNU Free Documentation License v1.3, Creative Commons Attribution 3.0, or Creative Commons Attribution No Derivatives 3.0 (including any right to adopt any future version of a license if permitted).
+
+2.4 Moral Rights. If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect.
+
+2.5 Our Rights. You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate.
+
+2.6 Reservation of Rights. Any rights not expressly [assigned or] licensed under this section are expressly reserved by You.
+
+## 3. Agreement
+
+You confirm that:
+
+(a) You have the legal authority to enter into this Agreement.
+
+(b) You [or Your Affiliates] own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2.
+
+\(c)(Individual) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement.
+
+\(c)(Entity) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties.
+
+## 4. Disclaimer
+
+EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US [AND BY US TO YOU]. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW.
+
+## 5. Consequential Damage Waiver
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU [OR US] BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
+
+## 6. Miscellaneous
+
+6.1 This Agreement will be governed by and construed in accordance with the laws of New York State, United States excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
+
+6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.
+
+6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement.
+
+6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety.
+
+6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.
+
+### Sign using CLA-Assistant
+
+[https://cla-assistant.io/grafana/grafana](https://cla-assistant.io/grafana/grafana)
+
+<br>
+<br>
+<br>
+This CLA aggreement is based on the [Harmony Contributor Aggrement Template (combined)](http://www.harmonyagreements.org/agreements.html), [Creative Commons Attribution 3.0 Unported License](https://creativecommons.org/licenses/by/3.0/)

docs/sources/contribute/index.md

@@ -0,0 +1,12 @@
++++
+title = "Contribute"
+description = "Contribute"
+type = "docs"
+[menu.docs]
+name = "Contribute"
+identifier = "contribute"
+weight = 20
++++
+
+### Contribute info
+

docs/sources/features/datasources/cloudwatch.md

@@ -3,6 +3,7 @@ title = "AWS CloudWatch"
 description = "Guide for using CloudWatch in Grafana"
 keywords = ["grafana", "cloudwatch", "guide"]
 type = "docs"
+aliases = ["/datasources/cloudwatch"]
 [menu.docs]
 name = "AWS Cloudwatch"
 identifier = "cloudwatch"

docs/sources/features/datasources/elasticsearch.md

@@ -3,6 +3,7 @@ title = "Using Elasticsearch in Grafana"
 description = "Guide for using Elasticsearch in Grafana"
 keywords = ["grafana", "elasticsearch", "guide"]
 type = "docs"
+aliases = ["/datasources/elasticsearch"]
 [menu.docs]
 name = "Elasticsearch"
 parent = "datasources"

docs/sources/features/datasources/graphite.md

@@ -3,6 +3,7 @@ title = "Using Graphite in Grafana"
 description = "Guide for using graphite in Grafana"
 keywords = ["grafana", "graphite", "guide"]
 type = "docs"
+aliases = ["/datasources/graphite"]
 [menu.docs]
 name = "Graphite"
 identifier = "graphite"

docs/sources/features/datasources/index.md

@@ -9,13 +9,16 @@ weight = 5
 +++
 
 # Data Source Overview
+
 Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes.
 
 
 ## Querying
+
 The query language and capabilities of each Data Source are obviously very different. You can combine data from multiple Data Sources onto a single Dashboard, but each Panel is tied to a specific Data Source that belongs to a particular Organization.
 
 ## Supported Data Sources
+
 The following datasources are officially supported:
 
 * [Graphite]({{< relref "graphite.md" >}})
@@ -27,5 +30,5 @@ The following datasources are officially supported:
 
 ## Data source plugins
 
-Since grafana 3.0 you can install data sources as plugins. Checkout [Grafana.net](https://grafana.net/plugins) for more data sources.
+Since grafana 3.0 you can install data sources as plugins. Checkout [Grafana.net](https://grafana.com/plugins) for more data sources.
 

docs/sources/features/datasources/influxdb.md

@@ -3,6 +3,7 @@ title = "Using InfluxDB in Grafana"
 description = "Guide for using InfluxDB in Grafana"
 keywords = ["grafana", "influxdb", "guide"]
 type = "docs"
+aliases = ["/datasources/influxdb"]
 [menu.docs]
 name = "InfluxDB"
 parent = "datasources"
@@ -22,7 +23,6 @@ Grafana ships with very feature rich data source plugin for InfluxDB. Supporting
     > NOTE: If this link is missing in the side menu it means that your current user does not have the `Admin` role for the current organization.
 
 3. Click the `Add new` link in the top header.
-4. Select `InfluxDB 0.9.x` or `InfluxDB 0.8.x` from the dropdown.
 
 Name | Description
 ------------ | -------------

docs/sources/features/datasources/kairosdb.md

@@ -1,52 +0,0 @@
----
-page_title: KairosDB Guide
-page_description: KairosDB guide for Grafana
-page_keywords: grafana, kairosdb, documentation
----
-
-# KairosDB Guide
-Grafana v2.1 brings initial support for KairosDB Datasources. While the process of adding the datasource is similar to adding a Graphite or OpenTSDB datasource type, Kairos DB does have a few different options for building queries.
-
-## Adding the data source to Grafana
-![](/img/v2/add_KairosDB.jpg)
-
-1. Open the side menu by clicking the the Grafana icon in the top header.
-2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.
-
-    > NOTE: If this link is missing in the side menu it means that your current user does not have the `Admin` role for the current organization.
-
-3. Click the `Add new` link in the top header.
-4. Select `KairosDB` from the dropdown.
-
-
-
-Name | Description
------------- | -------------
-Name | The data source name, important that this is the same as in Grafana v1.x if you plan to import old dashboards.
-Default | Default data source means that it will be pre-selected for new panels.
-Url | The http protocol, ip and port of your kairosdb server (default port is usually 8080)
-Access | Proxy = access via Grafana backend, Direct = access directly from browser.
-
-## Query editor
-Open a graph in edit mode by click the title.
-
-![](/img/v2/kairos_query_editor.jpg)
-
-For details on KairosDB metric queries checkout the official.
-- [Query Metrics - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/QueryMetrics.html).
-
-## Templated queries
-KairosDB Datasource Plugin provides following functions in `Variables values query` field in Templating Editor to query `metric names`, `tag names`, and `tag values` to kairosdb server.
-
-Name | Description
-| ------- | --------|
-`metrics(query)`  | Returns a list of metric names matching `query`. If nothing is given, returns a list of all metric names.
-`tag_names(query)` | Returns a list of tag names matching `query`. If nothing is given, returns a list of all tag names.
-`tag_values(metric,tag)` | Returns a list of values for `tag` from the given `metric`.
-
-For details of `metric names`, `tag names`, and `tag values`, please refer to the KairosDB documentations.
-
-- [List Metric Names - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/ListMetricNames.html)
-- [List Tag Names - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/ListTagNames.html)
-- [List Tag Values - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/ListTagValues.html)
-- [Query Metrics - KairosDB 0.9.4 documentation](http://kairosdb.github.io/kairosdocs/restapi/QueryMetrics.html).

docs/sources/features/datasources/opentsdb.md

@@ -3,6 +3,7 @@ title = "Using OpenTSDB in Grafana"
 description = "Guide for using OpenTSDB in Grafana"
 keywords = ["grafana", "opentsdb", "guide"]
 type = "docs"
+aliases = ["/datasources/opentsdb",	"docs/features/opentsdb"]
 [menu.docs]
 name = "OpenTSDB"
 parent = "datasources"

docs/sources/features/datasources/plugin_api.md

@@ -1,34 +0,0 @@
-----
-page_title: Data source Plugin API
-page_description: Data Source Plugin Description
-page_keywords: grafana, data source, plugin, api, docs
----
-
-# Data source plugin API
-
-All data sources in Grafana are implemented as plugins.
-
-## Breaking change in 2.2
-
-In Grafana 2.2 a breaking change was introduced for how data source query editors
-are structured, defined and loaded. This was in order to support mixing multiple data sources
-in the same panel.
-
-In Grafana 2.2, the query editor is no longer defined using the partials section in
-`plugin.json`, but defined via an angular directive named using convention naming
-scheme like `metricQueryEditor<data source type name>`. For example
-
-Graphite defines a directive like this:
-
-```javascript
-module.directive('metricQueryEditorGraphite', function() {
-  return {controller: 'GraphiteQueryCtrl', templateUrl: 'app/plugins/datasource/graphite/partials/query.editor.html'};
-});
-```
-
-Even though the data source type name is with lowercase `g`, the directive uses capital `G` in `Graphite` because
-that is how angular directives needs to be named in order to match an element with name `<metric-query-editor-graphite />`.
-You also specify the query controller here instead of in the query.editor.html partial like before.
-
-
-

docs/sources/features/datasources/prometheus.md

@@ -3,6 +3,7 @@ title = "Using Prometheus in Grafana"
 description = "Guide for using Prometheus in Grafana"
 keywords = ["grafana", "prometheus", "guide"]
 type = "docs"
+aliases = ["/datasources/prometheus"]
 [menu.docs]
 name = "Prometheus"
 parent = "datasources"
@@ -15,7 +16,8 @@ weight = 2
 Grafana includes support for Prometheus Datasources. While the process of adding the datasource is similar to adding a Graphite or OpenTSDB datasource type, Prometheus does have a few different options for building queries.
 
 ## Adding the data source to Grafana
-![](/img/v2/add_Prometheus.png)
+
+![](/img/docs/v2/add_Prometheus.png)
 
 1. Open the side menu by clicking the the Grafana icon in the top header.
 2. In the side menu under the `Dashboards` link you should find a link named `Data Sources`.
@@ -48,6 +50,7 @@ For details on Prometheus metric queries check out the Prometheus documentation
 - [Query Metrics - Prometheus documentation](http://prometheus.io/docs/querying/basics/).
 
 ## Templated queries
+
 Prometheus Datasource Plugin provides the following functions in `Variables values query` field in Templating Editor to query `metric names` and `labels names` on the Prometheus server.
 
 Name | Description
@@ -64,8 +67,8 @@ For details of `metric names` & `label names`, and `label values`, please refer
 You can create a template variable in Grafana and have that variable filled with values from any Prometheus metric exploration query.
 You can then use this variable in your Prometheus metric queries.
 
-For example you can have a variable that contains all values for label `hostname` if you specify a query like this
-in the templating edit view.
+For example you can have a variable that contains all values for label `hostname` if you specify a query like this in the templating edit view.
+
 ```sql
 label_values(hostname)
 ```
@@ -74,7 +77,7 @@ You can also use raw queries & regular expressions to extract anything you might
 
 ### Using templated variables in queries
 
-When the `Include All` option or `Multi-Value` option is enabled, Grafana converts the labels from plain text to a regex compatible string. 
+When the `Include All` option or `Multi-Value` option is enabled, Grafana converts the labels from plain text to a regex compatible string.
 Which means you have to use `=~` instead of `=` in your Prometheus queries. For example `ALERTS{instance=~$instance}` instead of `ALERTS{instance=$instance}`.
 
-![](/img/v2/prometheus_templating.png)
+![](/img/docs/v2/prometheus_templating.png)

docs/sources/features/datasources/testdata.md

@@ -1,23 +1,23 @@
 +++
-title = "Grafana TestData"
+title = "TestData"
 keywords = ["grafana", "dashboard", "documentation", "panels", "testdata"]
 type = "docs"
 [menu.docs]
-name = "Grafana TestData"
+name = "TestData"
 parent = "datasources"
-weight = 2
+weight = 20
 +++
 
 
-# Grafana TestData 
+# Grafana TestData
 
-    > NOTE: This plugin is disable by default. 
+    > NOTE: This plugin is disable by default.
 
-The purpose of this data sources is to make it easier to create fake data for any panel. 
-Using `Grafana TestData` you can build your own time series and have any panel render it. 
-This make is much easier to verify functionally since the data can be shared very 
+The purpose of this data sources is to make it easier to create fake data for any panel.
+Using `Grafana TestData` you can build your own time series and have any panel render it.
+This make is much easier to verify functionally since the data can be shared very
 
-## Enable 
+## Enable
 
 `Grafana TestData` is not enabled by default. To enable it you have to go to `/plugins/testdata/edit` and click the enable button to enable it for each server.
 
@@ -33,8 +33,8 @@ You can now choose different scenario that you want rendered in the drop down me
 
 ## CSV
 
-The comma separated values scenario is the most powerful one since it lets you create any kind of graph you like. 
-Once you provided the numbers `Grafana TestData` will distribute them evenly based on the time range of your query. 
+The comma separated values scenario is the most powerful one since it lets you create any kind of graph you like.
+Once you provided the numbers `Grafana TestData` will distribute them evenly based on the time range of your query.
 
 ![](/img/docs/v41/test_data_csv_example.png)
 
@@ -45,10 +45,10 @@ Once you provided the numbers `Grafana TestData` will distribute them evenly bas
 
 ### Commit updates to the dashboards
 
-If you want to submit a change to one of the current dashboards bundled with `Grafana TestData` you have to update the revision property. 
+If you want to submit a change to one of the current dashboards bundled with `Grafana TestData` you have to update the revision property.
 Otherwise the dashboard will not be updated automatically for other Grafana users.
 
 ## Using test data in issues
 
-If you post an issue on github regarding time series data or rendering of time series data we strongly advice you to use this data source to replicate the data. 
-That makes it much easier for the developers to replicate and solve the issue you have. 
+If you post an issue on github regarding time series data or rendering of time series data we strongly advice you to use this data source to replicate the data.
+That makes it much easier for the developers to replicate and solve the issue you have.

docs/sources/guides/basic_concepts.md

@@ -14,13 +14,15 @@ parent = "guides"
 This document is a “bottom up” introduction to basic concepts in Grafana, and can be used as a starting point to get familiar with core features.
 
 ### Data Source
+
 Grafana supports many different storage backends for your time series data (Data Source). Each Data Source has a specific Query Editor that is customized for the features and capabilities that the particular Data Source exposes.
 
-The following datasources are officially supported: [Graphite](/datasources/graphite/), [InfluxDB](/datasources/influxdb/), [OpenTSDB](/datasources/opentsdb/), [Prometheus](/datasources/prometheus/), [Elasticsearch](/datasources/elasticsearch/), [CloudWatch](/datasources/cloudwatch/), and [KairosDB](/datasources/kairosdb)
+The following datasources are officially supported: [Graphite]({{< relref "features/datasources/graphite.md" >}}), [InfluxDB]({{< relref "features/datasources/influxdb.md" >}}), [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}}), [Prometheus]({{< relref "features/datasources/prometheus.md" >}}), [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}}), [CloudWatch]({{< relref "features/datasources/cloudwatch.md" >}}).
 
 The query language and capabilities of each Data Source are obviously very different. You can combine data from multiple Data Sources onto a single Dashboard, but each Panel is tied to a specific Data Source that belongs to a particular Organization.
 
 ### Organization
+
 Grafana supports multiple organizations in order to support a wide variety of deployment models, including using a single Grafana instance to provide service to multiple potentially untrusted Organizations.
 
 In many cases, Grafana will be deployed with a single Organization.
@@ -34,6 +36,7 @@ All Dashboards are owned by a particular Organization.
 For more details on the user model for Grafana, please refer to [Admin](/reference/admin/)
 
 ### User
+
 A User is a named account in Grafana. A user can belong to one or more Organizations, and can be assigned different levels of privileges through roles.
 
 Grafana supports a wide variety of internal and external ways for Users to authenticate themselves. These include from its own integrated database, from an external SQL server, or from an external LDAP server.

docs/sources/guides/getting_started.md

@@ -3,6 +3,7 @@ title = "Getting Started"
 description = "Getting started with Grafana guide"
 keywords = ["grafana", "intro", "guide", "started"]
 type = "docs"
+aliases = ["/guides/gettingstarted"]
 [menu.docs]
 name = "Getting Started"
 identifier = "getting_started_guide"
@@ -10,12 +11,15 @@ parent = "guides"
 +++
 
 # Getting started
-This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana server up and running and have added at least one [Data Source](/datasources/overview).
+
+This guide will help you get started and acquainted with Grafana. It assumes you have a working Grafana server up and running and have added at least one [Data Source](/features/datasources/).
 
 ## Beginner guides
+
 Watch the 10min [beginners guide to building dashboards](https://www.youtube.com/watch?v=sKNZMtoSHN4&index=7&list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2) to get a quick intro to setting up Dashboards and Panels.
 
 ## Basic Concepts
+
 Read the [Basic Concepts](/guides/basic_concepts) document to get a crash course in key Grafana concepts.
 
 ### Top header
@@ -34,7 +38,8 @@ The image above shows you the top header for a Dashboard.
 6. Settings: Manage Dashboard settings and features such as Templating and Annotations.
 
 ## Dashboards, Panels, Rows, the building blocks of Grafana...
-Dashboards are at the core of what Grafana is all about. Dashboards are composed of individual Panels arranged on a number of Rows. Grafana ships with a variety of Panels. Grafana makes it easy to construct the right queries, and customize the display properties so that you can create the perfect Dashboard for your need. Each Panel can interact with data from any configured Grafana Data Source (currently InfluxDB, Graphite, OpenTSDB, and KairosDB). The [Basic Concepts](/guides/basic_concepts) guide explores these key ideas in detail.
+
+Dashboards are at the core of what Grafana is all about. Dashboards are composed of individual Panels arranged on a number of Rows. Grafana ships with a variety of Panels. Grafana makes it easy to construct the right queries, and customize the display properties so that you can create the perfect Dashboard for your need. Each Panel can interact with data from any configured Grafana Data Source (currently InfluxDB, Graphite, OpenTSDB, Prometheus and Cloudwatch). The [Basic Concepts](/guides/basic_concepts) guide explores these key ideas in detail.
 
 
 ## Adding & Editing Graphs and Panels

docs/sources/guides/whats-new-in-v2-5.md

@@ -107,5 +107,5 @@ view the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG
 
 - - -
 
-### <a href="http://grafana.org/download">Download Grafana 2.5 now</a>
+### <a href="https://grafana.com/get">Download Grafana 2.5 now</a>
 

docs/sources/guides/whats-new-in-v3-1.md

@@ -26,7 +26,7 @@ select data source and optional metrix prefix options.
 <img src="/img/docs/v31/import_step1.png">
 
 The above screenshot shows the new import modal that gives you 3 options for how to import a dashboard.
-One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.net](https://grafana.net).
+One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.com](https://grafana.com).
 
 The next step in the import process:
 
@@ -37,9 +37,9 @@ shows a CollectD dashboard for Graphite that requires a metric prefix be specifi
 
 ## Discover Dashboards
 
-On [Grafana.net](https://grafana.net) you can now browse & search for dashboards. We have already added a few but
+On [Grafana.com](https://grafana.com) you can now browse & search for dashboards. We have already added a few but
 more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana,
-then Dashboard Search -> Import -> Paste Grafana.net Dashboard URL.
+then Dashboard Search -> Import -> Paste Grafana.com Dashboard URL.
 
 <img src="/img/docs/v31/gnet_dashboards_list.png">
 

docs/sources/guides/whats-new-in-v3.md

@@ -14,7 +14,7 @@ weight = 6
 
 ## Commercial Support
 
-Commercial Support subscriptions for Grafana are now [generally available](https://grafana.net/support/plans/).
+Commercial Support subscriptions for Grafana are now [generally available](https://grafana.com/support/plans/).
 
 Raintank is committed to a 100% open-source strategy for Grafana. We
 do not want to go down the “open core” route. If your organization
@@ -41,15 +41,15 @@ two new plugin types:
 Dashboards, and Grafana **Pages**. Apps are a great way to provide an
 entire experience right within Grafana.
 
-## Grafana.net
+## Grafana.com
 
 <img src="/img/docs/v3/grafana_net_tour.png">
 
-[Grafana.net](https://grafana.net) offers a central repository where the community can come together to discover, create and
+[Grafana.com](https://grafana.com) offers a central repository where the community can come together to discover, create and
 share plugins (data sources, panels, apps) and dashboards.
 
 We are also working on a hosted Graphite-compatible data source that will be optimized for use with Grafana.
-It’ll be easy to combine your existing data source(s) with this OpenSaaS option. Finally, Grafana.net can
+It’ll be easy to combine your existing data source(s) with this OpenSaaS option. Finally, Grafana.com can
 also be a hub to manage all your Grafana instances. You’ll be able to monitor their health and availability,
 perform dashboard backups, and more.
 
@@ -57,12 +57,12 @@ We are also working on a hosted Graphite-compatible Data Source that
 will be optimized for use with Grafana. It’ll be easy to combine your
 existing Data Source(s) with this OpenSaaS option.
 
-Finally, Grafana.net will also be a hub to manage all your Grafana
+Finally, Grafana.com will also be a hub to manage all your Grafana
 instances. You’ll be able to monitor their health and availability,
 perform Dashboard backups, and more.
 
 Grafana.net will officially launch along with the stable version of
-Grafana 3.0, but <a href=http://www.grafana.net>check out the preview
+Grafana 3.0, but go to <a href=https://grafana.com> and check out the preview
 and sign up for an account</a> in the meantime.
 
 
@@ -189,37 +189,37 @@ variable is interpolated.
 data source (or panel) they need to be updated as well.
 
 * InfluxDB 0.8: This data source is no longer included in releases,
-you can still install manually from [Grafana.net](http://grafana.net)
+you can still install manually from [Grafana.com](https://grafana.com)
 
 * KairosDB: This data source has also no longer shipped with Grafana,
-you can install it manually from [Grafana.net](http://grafana.net)
+you can install it manually from [Grafana.com](https://grafana.com)
 
 ## Plugin showcase
 
-Discovering and installing plugins is very quick and easy with Grafana 3.0 and [Grafana.net](https://grafana.net). Here
+Discovering and installing plugins is very quick and easy with Grafana 3.0 and [Grafana.com](https://grafana.com). Here
 are a couple that I incurage you try!
 
-#### [Clock Panel](https://grafana.net/plugins/grafana-clock-panel)
+#### [Clock Panel](https://grafana.com/plugins/grafana-clock-panel)
 Support's both current time and count down mode.
 <img src="/img/docs/v3/clock_panel.png">
 
-#### [Pie Chart Panel](https://grafana.net/plugins/grafana-piechart-panel)
+#### [Pie Chart Panel](https://grafana.com/plugins/grafana-piechart-panel)
 A simple pie chart panel is now available as an external plugin.
 <img src="/img/docs/v3/pie_chart_panel.png">
 
-#### [WorldPing App](https://grafana.net/plugins/raintank-worldping-app)
+#### [WorldPing App](https://grafana.com/plugins/raintank-worldping-app)
 This is full blown Grafana App that adds new panels, data sources and pages to give
 feature rich global performance monitoring directly from your on-prem Grafana.
 
 <img src="/img/docs/v3/wP-Screenshot-dash-web.png">
 
-#### [Zabbix App](https://grafana.net/plugins/alexanderzobnin-zabbix-app)
+#### [Zabbix App](https://grafana.com/plugins/alexanderzobnin-zabbix-app)
 This app contains the already very pouplar Zabbix data source plugin, 2 dashboards and a triggers panel. It is
 created and maintained by [Alexander Zobnin](https://github.com/alexanderzobnin/grafana-zabbix).
 
 <img src="/img/docs/v3/zabbix_app.png">
 
-Checkout the full list of plugins on [Grafana.net](https://grafana.net/plugins)
+Checkout the full list of plugins on [Grafana.com](https://grafana.com/plugins)
 
 ## CHANGELOG
 

docs/sources/guides/whats-new-in-v4-1.md

@@ -7,7 +7,7 @@ type = "docs"
 name = "Version 4.1"
 identifier = "v4.1"
 parent = "whatsnew"
-weight = -1
+weight = 3
 +++
 
 

docs/sources/guides/whats-new-in-v4-2.md

@@ -0,0 +1,88 @@
++++
+title = "What's New in Grafana v4.2"
+description = "Feature & improvement highlights for Grafana v4.2"
+keywords = ["grafana", "new", "documentation", "4.2.0"]
+type = "docs"
+[menu.docs]
+name = "Version 4.2"
+identifier = "v4.2"
+parent = "whatsnew"
+weight = -1
++++
+
+## Whats new in Grafana v4.2
+
+Grafana v4.2 Beta is now [available for download](/download/4_2_0/).
+Just like the last release this one contains lots bug fixes and minor improvements.
+We are very happy to say that 27 of 40 issues was closed by pull requests from the community.
+Big thumbs up!
+
+## Release Highlights
+
+- **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
+- **Telegram**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
+- **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [@huydx](https://github.com/huydx)
+- **Templating**: Make $__interval and $__interval_ms global built in variables that can be used in by any datasource (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
+- **Alerting**: Adds deduping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
+- **Alerting**: Better information about why an alert triggered [#7035](https://github.com/grafana/grafana/issues/7035)
+- **Orgs**: Sharing dashboards using Grafana share feature will now redirect to correct org. [#6948](https://github.com/grafana/grafana/issues/6948)
+- [Full changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
+
+### New alert notification channels
+
+This release adds **five** new alert notifications channels, all of them contributed by the community.
+
+* Hipchat
+* Telegram
+* LINE
+* Pushover
+* Threema
+
+### Templating
+
+We added two new global built in variables in grafana. `$__interval` and `$__interval_ms` are now reserved template names in grafana and can be used by any datasource.
+We might add more global built in variables in the future and if we do we will prefix them with `$__`. So please avoid using that in your template variables.
+
+### Dedupe alert notifications when running multiple servers
+
+In this release we will dedupe alert notificiations when you are running multiple servers.
+This makes it possible to run alerting on multiple servers and only get one notification.
+
+We currently solve this with sql transactions which puts some limitations for how many servers you can use to execute the same rules.
+3-5 servers should not be a problem but as always, it depends on how many alerts you have and how frequently they execute.
+
+Next up for a better HA situation is to add support for workload balancing between Grafana servers.
+
+### Alerting more info
+
+You can now see the reason why an alert triggered in the alert history. Its also easier to detect when an alert is set to `alerting` due to the `no_data` option.
+
+### Improved support for multi-org setup
+
+When loading dashboards we now set an query parameter called orgId. So we can detect from which org an user shared a dashboard.
+This makes it possible for users to share dashboards between orgs without changing org first.
+
+We aim to introduce [dashboard groups](https://github.com/grafana/grafana/issues/1611) sometime in the future which will introduce access control and user groups within one org.
+Making it possible to have users in multiple groups and have detailed access control.
+
+## Upgrade & Breaking changes
+
+If your using https in grafana we now force you to use tls 1.2 and the most secure ciphers.
+We think its better to be secure by default rather then making it configurable.
+If you want to run https with lower versions of tls we suggest you put a reserve proxy in front of grafana.
+
+If you have template variables name `$__interval` or `$__interval_ms` they will no longer work since these keywords
+are reserved as global built in variables. We might add more global built in variables in the future and if we do, we will prefix them with `$__`. So please avoid using that in your template variables.
+
+## Changelog
+
+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.
+
+## Download
+
+Head to [v4.2-beta download page](/download/4_2_0/) for download links & instructions.
+
+## Thanks
+
+A big thanks to all the Grafana users who contribute by submitting PRs, bug reports & feedback!

docs/sources/guides/whats-new-in-v4.md

@@ -27,7 +27,7 @@ notifications will be sent out when the rule conditions are met.
 
 This feature has been worked on for over a year with many iterations and rewrites
 just to make sure the foundations are really solid. We are really proud to finally release it!
-Since the alerting execution is processed in the backend all data source plugins are not supported.
+Since the alerting execution is processed in the backend not all data source plugins are supported.
 Right now Graphite, Prometheus, InfluxDB and OpenTSDB are supported. Elasticsearch is being worked
 on but will be not ready for v4 release.
 
@@ -70,8 +70,8 @@ to add graph comments in the form of annotations directly from within Grafana in
 
 {{< imgbox max-width="30%" img="/img/docs/v4/alert_list_panel.png" caption="Alert List Panel" >}}
 
-This new panel allows you to show alert rules or a history of alert rule state changes. You can filter based on states your
-interested in. Very useful panel for overview style dashboards.
+This new panel allows you to show alert rules or a history of alert rule state changes. You can filter based on states you are
+interested in. This panel is very useful for overview style dashboards.
 
 <div class="clearfix"></div>
 
@@ -79,8 +79,8 @@ interested in. Very useful panel for overview style dashboards.
 
 {{< imgbox max-width="30%" img="/img/docs/v4/adhoc_filters.gif" caption="Ad-hoc filters variable" >}}
 
-This is a new and very different type of template variable. It will allow you to create new key/value filters on the fly.
-With autocomplete for both key and values. The filter condition will be automatically applied to all
+This is a new and very different type of template variable. It will allow you to create new key/value filters on the fly
+with autocomplete for both key and values. The filter condition will be automatically applied to all
 queries that use that data source. This feature opens up more exploratory dashboards. In the gif animation to the right
 you have a dashboard for Elasticsearch log data. It uses one query variable that allow you to quickly change how the data
 is grouped, and an interval variable for controlling the granularity of the time buckets. What was missing
@@ -126,15 +126,15 @@ We always try to bring some UX/UI refinements & polish in every release.
 
 {{< imgbox max-width="50%" img="/img/docs/v4/add_panel.gif" caption="Add Panel flow" >}}
 
-We spent a lot of time improving the dashboard building experience. Trying to make it both
+We spent a lot of time improving the dashboard building experience to make it both
 more efficient and easier for beginners. After many good but not great experiments
 with a `build mode` we eventually decided to just improve the green row menu and
 continue work on a `build mode` for a future release.
 
 The new row menu automatically slides out when you mouse over the edge of the row. You no longer need
-to hover over the small green icon and the click it to expand the row menu.
+to hover over the small green icon and then click it to expand the row menu.
 
-There is some minor improvements to drag and drop behaviour. Now when dragging a panel from one row
+There are some minor improvements to drag and drop behaviour. Now when dragging a panel from one row
 to another you will insert the panel and Grafana will automatically make room for it.
 When you drag a panel within a row you will simply reorder the panels.
 
@@ -150,7 +150,7 @@ We plan to further improve dashboard building in the future with a more rich gri
 {{< imgbox max-width="40%" img="/img/docs/v4/shortcuts.png" caption="Shortcuts" >}}
 
 Grafana v4 introduces a number of really powerful keyboard shortcuts. You can now focus a panel
-by hovering over it with your mouse. With a panel focused you can simple hit `e` to toggle panel
+by hovering over it with your mouse. With a panel focused you can simply hit `e` to toggle panel
 edit mode, or `v` to toggle fullscreen mode. `p r` removes the panel. `p s` opens share
 modal.
 
@@ -164,10 +164,10 @@ Some nice navigation shortcuts are:
 
 ## Upgrade & Breaking changes
 
-There are no breaking changes. Old dashboards and features should work the same. Grafana-server will automatically upgrade it's db
+There are no breaking changes. Old dashboards and features should work the same. Grafana-server will automatically upgrade its db
 schema on restart. It's advisable to do a backup of Grafana's database before updating.
 
-If your are using plugins make sure to update your plugins as some might not work perfectly v4.
+If you are using plugins make sure to update your plugins as some might not work perfectly v4.
 
 You can update plugins using grafana-cli
 

docs/sources/http_api/admin.md

@@ -158,6 +158,7 @@ with Grafana admin permission.
         "cert_file":"",
         "enabled":"false",
         "from_address":"admin@grafana.localhost",
+        "from_name":"Grafana",
         "host":"localhost:25",
         "key_file":"",
         "password":"************",
@@ -292,4 +293,4 @@ Change password for specific user
     HTTP/1.1 200
     Content-Type: application/json
 
-    {state: "new state", message: "alerts pause/un paused", "alertsAffected": 100}    
+    {state: "new state", message: "alerts pause/un paused", "alertsAffected": 100}

docs/sources/http_api/alerting.md

@@ -87,7 +87,7 @@ This API can also be used to create, update and delete alert notifications.
 
     {
       "alertId": 1,
-      "paused: true
+      "paused": true
     }
 
 **Example Response**:

docs/sources/http_api/auth.md

@@ -30,7 +30,7 @@ curl example:
 
 Open the sidemenu and click the organization dropdown and select the `API Keys` option.
 
-![](/img/v2/orgdropdown_api_keys.png)
+![](/img/docs/v2/orgdropdown_api_keys.png)
 
 You use the token in all requests in the `Authorization` header, like this:
 

docs/sources/http_api/data_source.md

@@ -195,7 +195,7 @@ parent = "http_api"
 
     {"message":"Datasource updated", "id": 1, "name": "test_datasource"}
 
-## Delete an existing data source
+## Delete an existing data source by id
 
 `DELETE /api/datasources/:datasourceId`
 
@@ -213,6 +213,24 @@ parent = "http_api"
 
     {"message":"Data source deleted"}
 
+## Delete an existing data source by name
+
+`DELETE /api/datasources/name/:datasourceName`
+
+**Example Request**:
+
+    DELETE /api/datasources/name/test_datasource HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+**Example Response**:
+
+    HTTP/1.1 200
+    Content-Type: application/json
+
+    {"message":"Data source deleted"}
+
 ## Data source proxy calls
 
 `GET /api/datasources/proxy/:datasourceId/*`

docs/sources/http_api/user.md

@@ -13,7 +13,7 @@ parent = "http_api"
 
 ## Search Users
 
-`GET /api/users`
+`GET /api/users?perpage=10&page=1`
 
 **Example Request**:
 
@@ -22,6 +22,8 @@ parent = "http_api"
     Content-Type: application/json
     Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
+Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`.
+
 **Example Response**:
 
     HTTP/1.1 200
@@ -44,6 +46,45 @@ parent = "http_api"
       }
     ]
 
+## Search Users with Paging
+
+`GET /api/users/search?perpage=10&page=1&query=mygraf`
+
+**Example Request**:
+
+    GET /api/users/search?perpage=10&page=1&query=mygraf HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+
+Default value for the `perpage` parameter is `1000` and for the `page` parameter is `1`. The `totalCount` field in the response can be used for pagination of the user list E.g. if `totalCount` is equal to 100 users and the `perpage` parameter is set to 10 then there are 10 pages of users. The `query` parameter is optional and it will return results where the query value is contained in one of the `name`, `login` or `email` fields. Query values with spaces need to be url encoded e.g. `query=Jane%20Doe`.
+
+**Example Response**:
+
+    HTTP/1.1 200
+    Content-Type: application/json
+    {
+      "totalCount": 2,
+      "users": [
+        {
+          "id": 1,
+          "name": "Admin",
+          "login": "admin",
+          "email": "admin@mygraf.com",
+          "isAdmin": true
+        },
+        {
+          "id": 2,
+          "name": "User",
+          "login": "user",
+          "email": "user@mygraf.com",
+          "isAdmin": false
+        }
+      ],
+      "page": 1,
+      "perPage": 10
+    }
+
 ## Get single user by Id
 
 `GET /api/users/:id`
@@ -71,36 +112,35 @@ parent = "http_api"
 
 ## Get single user by Username(login) or Email
 
-    `GET /api/users/lookup`
+`GET /api/users/lookup?loginOrEmail=user@mygraf.com`
 
-    **Parameter:** `loginOrEmail`
+**Example Request using the email as option**:
 
-    **Example Request using the email as option**:
-
-        GET /api/users/lookup?loginOrEmail=user@mygraf.com HTTP/1.1
-        Accept: application/json
-        Content-Type: application/json
-        Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+    GET /api/users/lookup?loginOrEmail=user@mygraf.com HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
-    **Example Request using the username as option**:
-        GET /api/users/lookup?loginOrEmail=admin HTTP/1.1
-        Accept: application/json
-        Content-Type: application/json
-        Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
+**Example Request using the username as option**:
+    
+    GET /api/users/lookup?loginOrEmail=admin HTTP/1.1
+    Accept: application/json
+    Content-Type: application/json
+    Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
-    **Example Response**:
+**Example Response**:
 
-        HTTP/1.1 200
-        Content-Type: application/json
+    HTTP/1.1 200
+    Content-Type: application/json
 
-        {
-          "email": "user@mygraf.com"
-          "name": "admin",
-          "login": "admin",
-          "theme": "light",
-          "orgId": 1,
-          "isGrafanaAdmin": true
-        }
+    {
+      "email": "user@mygraf.com"
+      "name": "admin",
+      "login": "admin",
+      "theme": "light",
+      "orgId": 1,
+      "isGrafanaAdmin": true
+    }
 
 
 ## User Update

docs/sources/index.md

@@ -1,8 +1,9 @@
 +++
-title = "Grafana Documentation Site"
+title = "Docs Home"
 description = "Install guide for Grafana"
 keywords = ["grafana", "installation", "documentation"]
 type = "docs"
+aliases = ["v1.1", "guides/reference/admin"]
 [menu.docs]
 name = "Welcome to the Docs"
 identifier = "root"
@@ -22,7 +23,7 @@ other domains including industrial sensors, home automation, weather, and proces
 - [Installing on Windows](installation/windows)
 - [Installing on Docker](installation/docker)
 - [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](installation/provisioning)
-- [Nightly Builds](http://grafana.org/builds)
+- [Nightly Builds](https://grafana.com/grafana/download)
 
 For other platforms Read the [build from source]({{< relref "project/building_from_source.md" >}})
 instructions for more information.
@@ -30,21 +31,21 @@ instructions for more information.
 ## Configuring Grafana
 
 The back-end web server has a number of configuration options. Go the
-[Configuration](/installation/configuration) page for details on all
+[Configuration]({{< relref "installation/configuration.md" >}}) page for details on all
 those options.
 
 
 ## Getting started
 
-- [Getting Started](guides/getting_started)
-- [Basic Concepts](guides/basic_concepts)
-- [Screencasts](tutorials/screencasts)
+- [Getting Started]({{< relref "guides/getting_started.md" >}})
+- [Basic Concepts]({{< relref "guides/basic_concepts.md" >}})
+- [Screencasts]({{< relref "tutorials/screencasts.md" >}})
 
 ## Data sources guides
 
-- [Graphite](datasources/graphite)
-- [Elasticsearch](datasources/elasticsearch)
-- [InfluxDB](datasources/influxdb)
-- [OpenTSDB](datasources/opentsdb)
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [Elasticsearch]({{< relref "features/datasources/elasticsearch.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
 
 

docs/sources/installation/behind_proxy.md

@@ -23,16 +23,18 @@ domain = foo.bar
 To use sub *path* ex `http://foo.bar/grafana` make sure to include `/grafana` in the end of root_url.
 Otherwise Grafana will not behave correctly. See example below.
 
-# Examples
+## Examples
 Here are some example configurations for running Grafana behind a reverse proxy.
 
-## Grafana configuration (ex http://foo.bar.com)
+### Grafana configuration (ex http://foo.bar.com)
+
 ```
 [server]
 domain = foo.bar
 ```
 
-## Nginx configuration
+### Nginx configuration
+
 ```
 server {
   listen 80;
@@ -45,16 +47,16 @@ server {
 }
 ```
 
-# Examples with **sub path** (ex http://foo.bar.com/grafana)
+### Examples with **sub path** (ex http://foo.bar.com/grafana)
 
-## Grafana configuration with sub path
+#### Grafana configuration with sub path
 ```
 [server]
 domain = foo.bar
 root_url = %(protocol)s://%(domain)s:/grafana
 ```
 
-## Nginx configuration with sub path
+#### Nginx configuration with sub path
 ```
 server {
   listen 80;

docs/sources/installation/configuration.md

@@ -55,6 +55,7 @@ Then you can override them using:
 <hr />
 
 ## instance_name
+
 Set the name of the grafana-server instance. Used in logging and internal metrics and in
 clustering info. Defaults to: `${HOSTNAME}`, which will be replaced with
 environment variable `HOSTNAME`, if that is empty or does not exist Grafana will try to use
@@ -134,6 +135,10 @@ Path to the certificate file (if `protocol` is set to `https`).
 
 Path to the certificate key file (if `protocol` is set to `https`).
 
+### router_logging
+
+Set to true for Grafana to log all HTTP requests (not just errors). These are logged as Info level events
+to grafana log.
 <hr />
 
 <hr />
@@ -145,6 +150,7 @@ things). By default it is configured to use `sqlite3` which is an
 embedded database (included in the main Grafana binary).
 
 ### url
+
 Use either URL or or the other fields below to configure the database
 Example: `mysql://user:secret@host:port/database`
 
@@ -231,7 +237,7 @@ Default is `false`.
 
 Set to `false` to prohibit users from being able to sign up / create
 user accounts. Defaults to `true`.  The admin user can still create
-users from the [Grafana Admin Pages](../reference/admin.md)
+users from the [Grafana Admin Pages](../../reference/admin)
 
 ### allow_org_create
 
@@ -261,6 +267,10 @@ options are `Admin` and `Editor` and `Read Only Editor`. e.g. :
 
 Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false.
 
+### disable_signout_menu
+
+Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false.
+
 <hr>
 
 ## [auth.anonymous]
@@ -404,7 +414,7 @@ browser to access Grafana, but with the prefix path of `/login/generic_oauth`.
     allowed_domains = mycompany.com mycompany.org
     allow_sign_up = true
 
-Set api_url to the resource that returns basic user info.
+Set api_url to the resource that returns [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo) compatible information.
 
 <hr>
 
@@ -421,6 +431,11 @@ Set to `true` to enable LDAP integration (default: `false`)
 ### config_file
 Path to the LDAP specific configuration file (default: `/etc/grafana/ldap.toml`)
 
+### allow_sign_up
+
+Allow sign up should almost always be true (default) to allow new Grafana users to be created (if ldap authentication is ok). If set to
+false only pre-existing Grafana users will be able to login (if ldap authentication is ok).
+
 > For details on LDAP Configuration, go to the [LDAP Integration]({{< relref "ldap.md" >}}) page.
 
 <hr>
@@ -455,7 +470,7 @@ session provider you have configured.
 
 - **file:** session file path, e.g. `data/sessions`
 - **mysql:** go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
-- **postgres:** ex:  user=a password=b host=localhost port=5432 dbname=c sslmode=disable
+- **postgres:** ex:  user=a password=b host=localhost port=5432 dbname=c sslmode=require
 - **memcache:** ex:  127.0.0.1:11211
 - **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana`
 
@@ -471,6 +486,17 @@ Mysql Example:
         PRIMARY KEY (`key`)
     ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+Postgres Example:
+
+    CREATE TABLE session (
+        key       CHAR(16) NOT NULL,
+        data      BYTEA,
+        expiry    INTEGER NOT NULL,
+        PRIMARY KEY (key)
+    );
+
+Postgres valid `sslmode` are `disable`, `require` (default), `verify-ca`, and `verify-full`.
+
 ### cookie_name
 
 The name of the Grafana session cookie.
@@ -540,6 +566,9 @@ Verify SSL for smtp server? defaults to `false`
 ### from_address
 Address used when sending out emails, defaults to `admin@grafana.localhost`
 
+### from_name
+Name to be used when sending out emails, defaults to `Grafana`
+
 ## [log]
 
 ### mode
@@ -597,13 +626,18 @@ You can choose between (s3, webdav). If left empty Grafana will ignore the uploa
 ## [external_image_storage.s3]
 
 ### bucket_url
-bucket url for s3. ex http://grafana.s3.amazonaws.com/
+Bucket URL for S3. AWS region can be specified within URL or defaults to 'us-east-1', e.g.
+- http://grafana.s3.amazonaws.com/
+- https://grafana.s3-ap-southeast-2.amazonaws.com/
+- https://grafana.s3-cn-north-1.amazonaws.com.cn
 
 ### access_key
-access key. ex AAAAAAAAAAAAAAAAAAAA
+Access key. e.g. AAAAAAAAAAAAAAAAAAAA
+
+Access key requires permissions to the S3 bucket for the 's3:PutObject' and 's3:PutObjectAcl' actions.
 
 ### secret_key
-secret key. ex AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+Secret key. e.g. AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
 ## [external_image_storage.webdav]
 

docs/sources/installation/debian.md

@@ -15,14 +15,14 @@ weight = 1
 
 Description | Download
 ------------ | -------------
-Stable for Debian-based Linux | [4.1.1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.1-1484211277_amd64.deb)
+Stable for Debian-based Linux | [4.2.0 (x86-64 deb)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.2.0_amd64.deb)
 
 ## Install Stable
 
 ```
-$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.1-1484211277_amd64.deb
+$ wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.2.0_amd64.deb
 $ sudo apt-get install -y adduser libfontconfig
-$ sudo dpkg -i grafana_4.1.1-1484211277_amd64.deb
+$ sudo dpkg -i grafana_4.2.0_amd64.deb
 ```
 
 ## APT Repository
@@ -114,14 +114,14 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "datasources/prometheus.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
 
 ## Installing from binary tar file
 
-Download [the latest `.tar.gz` file](http://grafana.org/download) and
+Download [the latest `.tar.gz` file](https://grafana.com/get) and
 extract it.  This will extract into a folder named after the version you
 downloaded. This folder contains all files required to run Grafana.  There are
 no init scripts or install scripts in this package.

docs/sources/installation/index.md

@@ -3,7 +3,7 @@ title = "Installation"
 description = "Install guide for Grafana"
 keywords = ["grafana", "installation", "documentation"]
 type = "docs"
-aliases = ["installation/installation/"]
+aliases = ["installation/installation/", "v2.1/installation/install/"]
 [menu.docs]
 name = "Installation"
 identifier = "installation"
@@ -17,6 +17,6 @@ identifier = "installation"
 - [Installing on Windows](windows)
 - [Installing on Docker](docker)
 - [Installing using Provisioning (Chef, Puppet, Salt, Ansible, etc)](provisioning)
-- [Nightly Builds](http://grafana.org/builds)
+- [Nightly Builds](https://grafana.com/grafana/download)
 
 

docs/sources/installation/provisioning.md

@@ -3,6 +3,7 @@ title = "Installing via provisioning tools"
 description = "Guide to install Grafana via provisioning tools like puppet & chef"
 keywords = ["grafana", "provisioning", "documentation", "puppet", "chef", "ansible"]
 type = "docs"
+aliases = ["docs/provisioning"]
 [menu.docs]
 parent = "installation"
 weight = 8

docs/sources/installation/rpm.md

@@ -15,24 +15,25 @@ weight = 2
 
 Description | Download
 ------------ | -------------
-Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.1-1484211277.x86_64.rpm)
+Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.2.0 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0-1.x86_64.rpm)
 
 ## Install Stable
 
 You can install Grafana using Yum directly.
 
-    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.1-1484211277.x86_64.rpm
+    $ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0-1.x86_64.rpm
 
 Or install manually using `rpm`.
 
 #### On CentOS / Fedora / Redhat:
 
+    $ wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0-1.x86_64.rpm
     $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-4.1.1-1484211277.x86_64.rpm
+    $ sudo rpm -Uvh grafana-4.2.0-1.x86_64.rpm
 
 #### On OpenSuse:
 
-    $ sudo rpm -i --nodeps grafana-4.1.1-1484211277.x86_64.rpm
+    $ sudo rpm -i --nodeps grafana-4.2.0-1.x86_64.rpm
 
 ## Install via YUM Repository
 
@@ -121,10 +122,10 @@ those options.
 
 ### Adding data sources
 
-- [Graphite]({{< relref "datasources/graphite.md" >}})
-- [InfluxDB]({{< relref "datasources/influxdb.md" >}})
-- [OpenTSDB]({{< relref "datasources/opentsdb.md" >}})
-- [Prometheus]({{< relref "datasources/prometheus.md" >}})
+- [Graphite]({{< relref "features/datasources/graphite.md" >}})
+- [InfluxDB]({{< relref "features/datasources/influxdb.md" >}})
+- [OpenTSDB]({{< relref "features/datasources/opentsdb.md" >}})
+- [Prometheus]({{< relref "features/datasources/prometheus.md" >}})
 
 ### Server side image rendering
 
@@ -141,7 +142,7 @@ yum install urw-fonts
 
 ## Installing from binary tar file
 
-Download [the latest `.tar.gz` file](http://grafana.org/download) and
+Download [the latest `.tar.gz` file](https://grafana.com/get) and
 extract it.  This will extract into a folder named after the version you
 downloaded. This folder contains all files required to run Grafana.  There are
 no init scripts or install scripts in this package.

docs/sources/installation/windows.md

@@ -13,7 +13,7 @@ weight = 3
 
 Description | Download
 ------------ | -------------
-Latest stable package for Windows | [grafana.4.1.1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.1.windows-x64.zip)
+Latest stable package for Windows | [grafana.4.2.0.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0.windows-x64.zip)
 
 ## Configure
 

docs/sources/plugins/apps.md

@@ -1,24 +0,0 @@
----
-page_title: App plugin
-page_description: App plugin for Grafana
-page_keywords: grafana, plugins, documentation
----
-
-
-# Apps
-
-App plugins is a new kind of grafana plugin that can bundle datasource and panel plugins within one package. It also enable the plugin author to create custom pages within grafana. The custom pages enables the plugin author to include things like documentation, sign up forms or controlling other services using HTTP requests.
-
-Datasource and panel plugins will show up like normal plugins. The app pages will be available in the main menu.
-
-<img class="no-shadow" src="/img/v3/app-in-main-menu.png">
-
-## Enabling app plugins
-After installing an app it have to be enabled before it show up as an datasource or panel. You can do that on the app page in the config tab.
-
-### Develop your own App
-
-> Our goal is not to have a very extensive documentation but rather have actual
-> code that people can look at. An example implementation of an app can be found
-> in this [example app repo](https://github.com/grafana/example-app)
-

docs/sources/plugins/developing/apps.md

@@ -0,0 +1,63 @@
++++
+title = "Developing App Plugins"
+keywords = ["grafana", "plugins", "documentation"]
+type = "docs"
+[menu.docs]
+name = "Developing App Plugins"
+parent = "developing"
+weight = 6
++++
+
+# Grafana Apps
+
+App plugins are a new kind of grafana plugin that can bundle datasource and panel plugins within one package. It also enable the plugin author to create custom pages within grafana. The custom pages enable the plugin author to include things like documentation, sign up forms or controlling other services using HTTP requests.
+
+Datasource and panel plugins will show up like normal plugins. The app pages will be available in the main menu.
+
+{{< imgbox img="/img/docs/v3/app-in-main-menu.png" caption="App in Main Menu" >}}
+
+## Enabling app plugins
+
+After installing an app, it has to be enabled before it shows up as a datasource or panel. You can do that on the app page in the config tab.
+
+## Developing an App Plugin
+
+An App is a bundle of panels, dashboards and/or data source(s). There is nothing different about developing panels and data sources for an app.
+
+Apps have to be enabled in Grafana and should import any included dashboards when the user enables it. A ConfigCtrl class should be created and the dashboards imported in the postUpdate hook. See example below:
+
+```javascript
+export class ConfigCtrl {
+  /** @ngInject */
+  constructor($scope, $injector, $q) {
+    this.$q = $q;
+    this.enabled = false;
+    this.appEditCtrl.setPostUpdateHook(this.postUpdate.bind(this));
+  }
+
+  postUpdate() {
+    if (!this.appModel.enabled) {
+      return this.$q.resolve();
+    }
+    return this.appEditCtrl.importDashboards().then(() => {
+      this.enabled = true;
+      return {
+        url: "plugins/raintank-kubernetes-app/page/clusters",
+        message: "Kubernetes App enabled!"
+      };
+    });
+  }
+}
+ConfigCtrl.templateUrl = 'components/config/config.html';
+```
+
+If possible a link to a dashboard or custom page should be shown after enabling the app to guide the user to the appropriate place.
+
+{{< imgbox img="/img/docs/app_plugin_after_enable.png" caption="After enabling" >}}
+
+### Develop your own App
+
+> Our goal is not to have a very extensive documentation but rather have actual
+> code that people can look at. An example implementation of an app can be found
+> in this [example app repo](https://github.com/grafana/example-app)
+

docs/sources/plugins/developing/code-styleguide.md

@@ -0,0 +1,182 @@
++++
+title = "Plugin Code Styleguide"
+type = "docs"
+[menu.docs]
+name = "Plugin Code Styleguide"
+parent = "developing"
+weight = 2
++++
+
+# Grafana Plugin Code Styleguide
+
+This guide has two parts. The first part describes the metadata and the second part is a styleguide for HTML/CSS and JavaScript in Grafana plugins and applies if you are using ES6 in your plugin. If using TypeScript then the [Angular TypeScript styleguide](https://angular.io/styleguide) is recommended.
+
+## Metadata
+
+The plugin metadata consists of a plugin.json file and the README.md file. These two files are used by Grafana and Grafana.com.
+
+### Plugin.json (mandatory)
+
+The plugin.json file is the same concept as the package.json file for an npm package. When Grafana starts it will scan the plugin folders and mount every folder that contains a plugin.json file unless the folder contains a subfolder named `dist`. In that case grafana will mount the `dist` folder instead.
+
+The most important fields are the first three, especially the id. The convention for the plugin id is **[github username/org]-[plugin name]-[datasource|app|panel]** and it has to be unique.
+
+Examples:
+
+```
+raintank-worldping-app
+grafana-simple-json-datasource
+grafana-piechart-panel
+mtanda-histogram-panel
+```
+
+The full file format for plugin.json is described [here]({{< relref "plugin.json.md" >}}).
+
+Minimal plugin.json:
+
+```javascript
+{
+  "type": "panel",
+  "name": "Clock",
+  "id": "yourorg-clock-panel",
+
+  "info": {
+    "description": "Clock panel for grafana",
+    "author": {
+      "name": "Raintank Inc.",
+      "url": "http://raintank.io"
+    },
+    "keywords": ["clock", "panel"],
+    "version": "1.0.0",
+    "updated": "2015-03-24"
+  },
+
+  "dependencies": {
+    "grafanaVersion": "3.x.x",
+    "plugins": [ ]
+  }
+}
+```
+
+### README.md
+
+The README.md file is rendered both on Grafana.net and in the plugins section in Grafana. The only difference from how GitHub renders markdown is that html is not allowed.
+
+## File and Directory Structure Conventions
+
+Here is a typical directory structure for a plugin.
+
+```
+johnnyb-awesome-datasource
+|-- dist
+|-- spec
+|   |-- datasource_spec.js
+|   |-- query_ctrl_spec.js
+|   |-- test-main.js
+|-- src
+|   |-- img
+|   |   |-- logo.svg
+|   |-- partials
+|   |   |-- annotations.editor.html
+|   |   |-- config.html
+|   |   |-- query.editor.html
+|   |-- datasource.js
+|   |-- module.js
+|   |-- plugin.json
+|   |-- query_ctrl.js
+|-- Gruntfile.js
+|-- LICENSE
+|-- package.json
+|-- README.md
+```
+
+Most JavaScript projects have a build step and most Grafana plugins are built using Babel and ES6. The generated JavaScript should be placed in the `dist` directory and the source code in the `src` directory. We recommend that the plugin.json file be placed in the src directory and then copied over to the dist directory when building. The `README.md` can be placed in the root or in the dist directory.
+
+Directories:
+
+- `src/` contains plugin source files.
+- `src/partials` contains html templates.
+- `src/img` contains plugin logos and other images.
+- `spec/` contains tests (optional).
+- `dist/` contains built content.
+
+## HTML and CSS
+
+For the HTML on editor tabs, we recommend using the inbuilt Grafana styles rather than defining your own. This makes plugins feel like a more natural part of Grafana. If done correctly, the html will also be responsive and adapt to smaller screens. The `gf-form` css classes should be used for labels and inputs.
+
+Below is a minimal example of an editor row with one form group and two fields, a dropdown and a text input:
+
+```html
+<div class="editor-row">
+  <div class="section gf-form-group">
+    <h5 class="section-heading">My Plugin Options</h5>
+    <div class="gf-form">
+      <label class="gf-form-label width-10">Label1</label>
+      <div class="gf-form-select-wrapper max-width-10">
+        <select class="input-small gf-form-input" ng-model="ctrl.panel.mySelectProperty" ng-options="t for t in ['option1', 'option2', 'option3']" ng-change="ctrl.onSelectChange()"></select>
+      </div>
+      <div class="gf-form">
+        <label class="gf-form-label width-10">Label2</label>
+        <input type="text" class="input-small gf-form-input width-10" ng-model="ctrl.panel.myProperty" ng-change="ctrl.onFieldChange()" placeholder="suggestion for user" ng-model-onblur />
+      </div>
+    </div>
+  </div>
+</div>
+```
+
+Use the `width-x` and `max-width-x` classes to control the width of your labels and input fields. Try to get labels and input fields to line up neatly by having the same width for all the labels in a group and the same width for all inputs in a group if possible.
+
+## Build Scripts
+
+Our recommendation is to use whatever you usually use - Grunt, Gulp or npm scripts. Most plugins seems to use Grunt so that is probably the easiest to get started with if you do not have a preferred build system. The only requirement is that it supports systemjs which is required by Grafana to load plugins.
+
+## Linting
+
+We recommend that you use a linter for your JavaScript. For ES6, the standard linter is [eslint](http://eslint.org/). Rules for linting are described in an .eslintrc that is placed in the root directory. [Here is an example](https://github.com/grafana/worldmap-panel/blob/master/.eslintrc) of linting rules in a plugin.
+
+### ES6 features
+
+1. Use `const` if a variable is not going to be reassigned.
+2. Prefer to use `let` instead `var` ([Exploring ES6](http://exploringjs.com/es6/ch_core-features.html#_from-var-to-letconst))
+3. Use arrow functions, which don’t shadow `this` ([Exploring ES6](http://exploringjs.com/es6/ch_core-features.html#_from-function-expressions-to-arrow-functions)):
+
+    ```js
+    testDatasource() {
+      return this.getServerStatus()
+      .then(status => {
+        return this.doSomething(status);
+      })
+    }
+    ```
+
+    better than
+
+    ```js
+    testDatasource() {
+      var self = this;
+      return this.getServerStatus()
+      .then(function(status) {
+        return self.doSomething(status);
+      })
+    }
+    ```
+4. Use native _Promise_ object:
+
+    ```js
+    metricFindQuery(query) {
+      if (!query) {
+        return Promise.resolve([]);
+      }
+    }
+    ```
+
+    better than
+
+    ```js
+    metricFindQuery(query) {
+      if (!query) {
+        return this.$q.when([]);
+      }
+    }
+    ```
+5. If using Lodash, then be consequent and prefer that to the native ES6 array functions.

docs/sources/plugins/datasources.md → docs/sources/plugins/developing/datasources.md

@@ -1,3 +1,12 @@
++++
+title = "Developing Datasource Plugins"
+keywords = ["grafana", "plugins", "documentation"]
+type = "docs"
+[menu.docs]
+name = "Developing Datasource Plugins"
+parent = "developing"
+weight = 6
++++
 
 # Datasources
 
@@ -31,9 +40,11 @@ There are two datasource specific settings for the plugin.json
 These settings indicates what kind of data the plugin can deliver. At least one of them have to be true
 
 ## Datasource
+
 The javascript object that communicates with the database and transforms data to times series.
 
-The Datasource should contain the following functions.
+The Datasource should contain the following functions:
+
 ```
 query(options) //used by panels to get data
 testDatasource() //used by datasource configuration page to make sure the connection is working
@@ -41,9 +52,14 @@ annotationQuery(options) // used by dashboards to get annotations
 metricFindQuery(options) // used by query editor to get metric suggestions.
 ```
 
+### testDatasource
+
+When a user clicks on the *Save & Test* button when adding a new data source, the details are first saved to the database and then the `testDatasource` function that is defined in your data source plugin will be called. It is recommended that this function makes a query to the data source that will also test that the authentication details are correct. This is so the data source is correctly configured when the user tries to write a query in a new dashboard.
+
 ### Query
 
-Request object passed to datasource.query function
+Request object passed to datasource.query function:
+
 ```json
 {
   "range": { "from": "2015-12-22T03:06:13.851Z", "to": "2015-12-22T06:48:24.137Z" },
@@ -57,11 +73,12 @@ Request object passed to datasource.query function
 }
 ```
 
-There are two different kind of results for datasources.
-Time series and table. Time series is the most common format and is supported by all datasources and panels. Table format is only support by the Influxdb datasource and table panel. But we might see more of this in the future.
+There are two different kinds of results for datasources;
+time series and table. Time series is the most common format and is supported by all datasources and panels. Table format is only supported by the InfluxDB datasource and table panel. But we might see more of this in the future.
+
+Time series response from datasource.query.
+An array of:
 
-Time series response from datasource.query
-An array of
 ```json
 [
   {
@@ -81,8 +98,9 @@ An array of
 ]
 ```
 
-Table response from datasource.query
-An array of
+Table response from datasource.query.
+An array of:
+
 ```json
 [
   {
@@ -119,7 +137,8 @@ An array of
 
 ### Annotation Query
 
-Request object passed to datasource.annotationQuery function
+Request object passed to datasource.annotationQuery function:
+
 ```json
 {
   "range": { "from": "2016-03-04T04:07:55.144Z", "to": "2016-03-04T07:07:55.144Z" },
@@ -132,7 +151,8 @@ Request object passed to datasource.annotationQuery function
 }
 ```
 
-Expected result from datasource.annotationQuery
+Expected result from datasource.annotationQuery:
+
 ```json
 [
   {
@@ -152,24 +172,24 @@ Expected result from datasource.annotationQuery
 
 ## QueryCtrl
 
-A javascript class that will be instantiated and treated as an Angular controller when the user edits metrics in a panel. This class have to inherit from the app/plugins/sdk.QueryCtrl class.
+A JavaScript class that will be instantiated and treated as an Angular controller when the user edits metrics in a panel. This class has to inherit from the app/plugins/sdk.QueryCtrl class.
 
 Requires a static template or templateUrl variable which will be rendered as the view for this controller.
 
 ## ConfigCtrl
 
-A javascript class that will be instantiated and treated as an Angular controller when a user tries to edit or create a new datasource of this type.
+A JavaScript class that will be instantiated and treated as an Angular controller when a user tries to edit or create a new datasource of this type.
 
 Requires a static template or templateUrl variable which will be rendered as the view for this controller.
 
 ## QueryOptionsCtrl
 
-A javascript class that will be instantiated and treated as an Angular controller when the user edits metrics in a panel. This controller is responsible for handling panel wide settings for the datasource. Such as interval, rate and aggregations if needed.
+A JavaScript class that will be instantiated and treated as an Angular controller when the user edits metrics in a panel. This controller is responsible for handling panel wide settings for the datasource, such as interval, rate and aggregations if needed.
 
 Requires a static template or templateUrl variable which will be rendered as the view for this controller.
 
 ## AnnotationsQueryCtrl
 
-A javascript class that will be instantiated and treated as an Angular controller when the user choose this type of datasource in the templating menu in the dashboard.
+A JavaScript class that will be instantiated and treated as an Angular controller when the user choose this type of datasource in the templating menu in the dashboard.
 
-Requires a static template or templateUrl variable which will be rendered as the view for this controller. The fields that are bound to this controller is then sent to the Database objects annotationQuery function.
+Requires a static template or templateUrl variable which will be rendered as the view for this controller. The fields that are bound to this controller are then sent to the Database objects annotationQuery function.

docs/sources/plugins/developing/defaults-and-editor-mode.md

@@ -0,0 +1,128 @@
++++
+title = "Plugin Defaults and Editor Mode"
+type = "docs"
+[menu.docs]
+name = "Plugin Defaults and Editor Mode"
+parent = "developing"
+weight = 3
++++
+
+# Plugin Defaults and Editor Mode
+
+Most plugins allow users to customize the behavior by changing settings on an editor tab. These setting fields are saved in the dashboard json.
+
+## Defaults
+
+We define fields to be saved in Grafana by creating values on the panel object of the controller. You can see these values for any panel by choosing View JSON from the settings menu in Grafana. Here is an excerpt from the clock panel json (with some fields removed), the panel data is saved in the panels array:
+
+```json
+{
+  "id": 4,
+  "title": "Clock",
+...
+  "rows": [
+    {
+...
+      "panels": [
+        {
+          "bgColor": "rgb(132, 151, 130)",
+          "clockType": "24 hour",
+```
+
+You can define panel data by first creating a variable with default values for the fields and then setting them on the panel object:
+
+```javascript
+const panelDefaults = {
+  clockType: '24 hour',
+  fontSize: '60px',
+  fontWeight: 'normal',
+  bgColor: null
+};
+
+constructor($scope, $injector) {
+  super($scope, $injector);
+  _.defaults(this.panel, panelDefaults);
+
+  this.updateClock();
+}
+```
+
+The Lodash function [defaults](https://lodash.com/docs/4.17.4#defaults), which is called in the code above: `_.defaults`, sets a default value only if the value is not already set. This way values that have been changed by the user will not be overwritten.
+
+These panel fields can be used in the controller or module.html template:
+
+```html
+<h2 style="font-size: {{ctrl.panel.fontSize}};">{{ctrl.time}}</h2>
+```
+
+If you want your users to be able to change these panel values then you need to expose them in the Grafana editor.
+
+## Editor Mode
+
+Editor mode is when a user clicks Edit on a panel. Every panel has a general tab where you change the title and width and some panels have more inbuilt tabs like the Metrics tab or Time Range tab. A panel plugin can add its own tab(s) so that a user can customize the panel. 
+
+Grafana conventions mean all you need to do is to hook up an Angular template with input fields and Grafana will automatically save the values to the dashboard json and load them on dashboard load.
+
+## Using Events
+
+To add an editor tab you need to hook into the event model so that the tab is added when the *init-edit-mode* event is triggered. The following code should be added to the constructor of the plugin Ctrl class:
+
+```javascript
+this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
+```
+
+Then you need to create a handler function that is bound to the event. In the example above, the handler is called onInitEditMode. The tab is added by calling the controller function, *addEditorTab*. This function has three parameters; the tab name, the path to a html template for the new editor tab and the tab number. It can be a bit tricky to figure out the path, the path name will be based on the id that is specified in the plugin.json file - for example **grafana-clock-panel**. The code below hooks up an Angular template called editor.html that is located in the `src/partials` directory.
+
+```javascript
+onInitEditMode() {
+  this.addEditorTab('Options', 'public/plugins/grafana-clock-panel/editor.html', 2);
+}
+```
+
+## Editor HTML and CSS
+
+For editor tabs html, it is best to use Grafana css styles rather than custom styles. This is to preserve the look and feel of other tabs in Grafana.
+
+Most editor tabs should use the [gf-form css class](https://github.com/grafana/grafana/blob/master/public/sass/components/_gf-form.scss) from Grafana. The example below has one row with a couple of columns and each column is wrapped in a div like this:
+
+```html
+<div class="section gf-form-group">
+ ```
+
+Then each pair, label and field is wrapped in a div with a gf-form class.
+
+```html
+<div class="gf-form">
+  <label class="gf-form-label width-8">Font Size</label>
+  <input type="text" class="gf-form-input width-4" ng-model="ctrl.panel.fontSize" ng-change="ctrl.render()" ng-model-onblur>
+</div>
+```
+
+Note that there are some Angular attributes here. *ng-model* will update the panel data. *ng-change* will render the panel when you change the value. This change will occur on the onblur event due to the *ng-model-onblur* attribute. This means you can see the effect of your changes on the panel while editing.
+
+{{< imgbox img="/assets/img/blog/clock-panel-editor.png" caption="Panel Editor" >}}
+
+On the editor tab we use a drop down for 12/24 hour clock, an input field for font size and a color picker for the background color.
+
+The drop down/select has its own *gf-form-select-wrapper* css class and looks like this:
+
+```html
+<div class="gf-form">
+  <label class="gf-form-label width-9">12 or 24 hour</label>
+  <div class="gf-form-select-wrapper max-width-9">
+    <select class="input-small gf-form-input" ng-model="ctrl.panel.clockType" ng-options="t for t in ['12 hour', '24 hour', 'custom']" ng-change="ctrl.render()"></select>
+  </div>
+</div>
+```
+
+The color picker (or spectrum picker) is a component that already exists in Grafana. We use it like this for the background color:
+
+```html
+<spectrum-picker class="gf-form-input" ng-model="ctrl.panel.bgColor" ng-change="ctrl.render()" ></spectrum-picker>
+```
+
+## Editor Tab Finished
+
+To reiterate, this all ties together quite neatly. We specify properties and panel defaults in the constructor for the panel controller and these can then be changed in the editor. Grafana takes care of saving the changes.
+
+One thing to be aware of  is that panel defaults are used the first time a panel is created to set the initial values of the panel properties. After the panel is saved then the saved value will be used instead. So beware if you update panel defaults they will not automatically update the property in an existing panel. For example, if you set the default font size to 60px first and then in version 2 of the plugin change it to 50px, existing panels will still have 60px and only new panels will get the new 50px value.

docs/sources/plugins/developing/development.md

@@ -0,0 +1,120 @@
++++
+title = "Developer Guide"
+type = "docs"
+aliases = ["/plugins/development/", "/plugins/datasources/", "/plugins/apps/", "/plugins/panels/"]
+[menu.docs]
+name = "Developer Guide"
+parent = "developing"
+weight = 1
++++
+
+# Developer Guide
+
+From grafana 3.0 it's very easy to develop your own plugins and share them with other grafana users.
+
+There are two blog posts about authoring a plugin that might also be of interest to any plugin authors, [Timing is Everything. Writing the Clock Panel Plugin for Grafana 3.0- part 1](https://grafana.com/blog/2016/04/08/timing-is-everything.-writing-the-clock-panel-plugin-for-grafana-3.0/) and [Timing is Everything. Editor Mode in Grafana 3.0 for the Clock Panel Plugin](https://grafana.com/blog/2016/04/15/timing-is-everything.-editor-mode-in-grafana-3.0-for-the-clock-panel-plugin/).
+
+## Short version
+
+1. [Setup grafana](http://docs.grafana.org/project/building_from_source/)
+2. Clone an example plugin into ```/var/lib/grafana/plugins```  or `data/plugins` (relative to grafana git repo if your running development version from source dir)
+3. Code away!
+
+## What languages?
+
+Since everything turns into javascript it's up to you to choose which language you want. That said it's probably a good idea to choose es6 or typescript since we use es6 classes in Grafana. So it's easier to get inspiration from the Grafana repo is you choose one of those languages.
+
+## Buildscript
+
+You can use any build system you like that support systemjs. All the built content should end up in a folder named ```dist``` and committed to the repository.By committing the dist folder the person who installs your plugin does not have to run any buildscript.
+
+All our example plugins have build scripted configured.
+
+## Metadata
+
+See the [coding styleguide]({{< relref "code-styleguide.md" >}}) for details on the metadata.
+
+## module.(js|ts)
+
+This is the entry point for every plugin. This is the place where you should export
+your plugin implementation. Depending on what kind of plugin you are developing you
+will be expected to export different things. You can find what's expected for [datasource]({{< relref "datasources.md" >}}), [panels]({{< relref "panels.md" >}})
+and [apps]({{< relref "apps.md" >}}) plugins in the documentation.
+
+The Grafana SDK is quite small so far and can be found here:
+
+- [SDK file in Grafana](https://github.com/grafana/grafana/blob/master/public/app/plugins/sdk.ts)
+- [SDK Readme](https://github.com/grafana/grafana/blob/master/public/app/plugins/plugin_api.md)
+
+The SDK contains three different plugin classes: PanelCtrl, MetricsPanelCtrl and QueryCtrl. For plugins of the panel type, the module.js file should export one of these. There are some extra classes for [data sources]({{< relref "datasources.md" >}}).
+
+Example:
+
+```javascript
+import {ClockCtrl} from './clock_ctrl';
+
+export {
+  ClockCtrl as PanelCtrl
+};
+```
+
+The module class is also where css for the dark and light themes is imported:
+
+```javascript
+import {loadPluginCss} from 'app/plugins/sdk';
+import WorldmapCtrl from './worldmap_ctrl';
+
+loadPluginCss({
+  dark: 'plugins/grafana-worldmap-panel/css/worldmap.dark.css',
+  light: 'plugins/grafana-worldmap-panel/css/worldmap.light.css'
+});
+
+export {
+  WorldmapCtrl as PanelCtrl
+};
+```
+
+## Start developing your plugin
+
+There are three ways that you can start developing a Grafana plugin.
+
+1. Setup a Grafana development environment. [(described here)](http://docs.grafana.org/project/building_from_source/) and place your plugin in the ```data/plugins``` folder.
+2. Install Grafana and place your plugin in the plugins directory which is set in your [config file](/installation/configuration). By default this is `/var/lib/grafana/plugins` on Linux systems.
+3. Place your plugin directory anywhere you like and specify it grafana.ini.
+
+We encourage people to setup the full Grafana environment so that you can get inspiration from the rest of grafana code base.
+
+When Grafana starts it will scan the plugin folders and mount every folder that contains a plugin.json file unless
+the folder contains a subfolder named dist. In that case grafana will mount the dist folder instead.
+This makes it possible to have both built and src content in the same plugin git repo.
+
+## Grafana Events
+
+There are a number of Grafana events that a plugin can hook into:
+
+- `init-edit-mode` can be used to add tabs when editing a panel
+- `panel-teardown` can be used for clean up
+- `data-received` is an event in that is triggered on data refresh and can be hooked into
+- `data-snapshot-load` is an event triggered to load data when in snapshot mode.
+- `data-error` is used to handle errors on dashboard refresh.
+
+If a panel receives data and hooks into the `data-received` event then it should handle snapshot mode too. Otherwise the panel will not work if saved as a snapshot. [Getting Plugins to work in Snapshot Mode]({{< relref "snapshot-mode.md" >}}) describes how to add support for this.
+
+## Examples
+
+We currently have three different examples that you can fork/download to get started developing your grafana plugin.
+
+ - [simple-json-datasource](https://github.com/grafana/simple-json-datasource) (small datasource plugin for querying json data from backends)
+ - [example-app](https://github.com/grafana/example-app)
+ - [clock-panel](https://github.com/grafana/clock-panel)
+ - [singlestat-panel](https://github.com/grafana/grafana/blob/master/public/app/plugins/panel/singlestat/module.ts)
+ - [piechart-panel](https://github.com/grafana/piechart-panel)
+
+## Other Articles
+
+- [Getting Plugins to work in Snapshot Mode]({{< relref "snapshot-mode.md" >}})
+- [Plugin Defaults and Editor Mode]({{< relref "defaults-and-editor-mode.md" >}})
+- [Grafana Plugin Code Styleguide]({{< relref "code-styleguide.md" >}})
+- [Grafana Apps]({{< relref "apps.md" >}})
+- [Grafana Datasources]({{< relref "datasources.md" >}})
+- [plugin.json Schema]({{< relref "plugin.json.md" >}})

docs/sources/plugins/developing/index.md

@@ -0,0 +1,8 @@
++++
+title = "Developing Plugins"
+type = "docs"
+[menu.docs]
+parent = "plugins"
+identifier = "developing"
+weight = 3
++++

docs/sources/plugins/panels.md → docs/sources/plugins/developing/panels.md

@@ -9,7 +9,7 @@ page_keywords: grafana, plugins, documentation
 title = "Installing Plugins"
 type = "docs"
 [menu.docs]
-parent = "plugins"
+parent = "developing"
 weight = 1
 +++
 

docs/sources/plugins/developing/plugin.json.md

@@ -0,0 +1,28 @@
++++
+title = "plugin.json Schema"
+keywords = ["grafana", "plugins", "documentation"]
+type = "docs"
+[menu.docs]
+name = "plugin.json Schema"
+parent = "developing"
+weight = 6
++++
+
+# Plugin.json
+
+The plugin.json file is mandatory for all plugins. When Grafana starts it will scan the plugin folders and mount every folder that contains a plugin.json file unless the folder contains a subfolder named `dist`. In that case grafana will mount the `dist` folder instead.
+
+## Plugin JSON Schema
+
+| Property | Description |
+| ------------- |-------------|
+| id | unique name of the plugin - [conventions described in styleguide]({{< relref "code-styleguide.md" >}}) |
+| type | panel/datasource/app |
+| name | Human readable name of the plugin |
+| info.description | Description of plugin. Used for searching grafana.com plugins |
+| info.author | |
+| info.keywords | plugin keywords. Used for search on grafana net|
+| info.logos | link to project logos |
+| info.version | project version of this commit. Must be semver |
+| dependencies.grafanaVersion | Required grafana backend version for this plugin |
+| dependencies.plugins | required plugins for this plugin. |

docs/sources/plugins/developing/snapshot-mode.md

@@ -0,0 +1,79 @@
++++
+title = "Snapshot Mode"
+type = "docs"
+[menu.docs]
+name = "Snapshot Mode"
+parent = "developing"
+weight = 6
++++
+
+# Getting Plugins to work in Snapshot Mode
+
+{{< imgbox img="/img/docs/Grafana-snapshot-example.png" caption="A dashboard using snapshot data and not live data." >}}
+
+Grafana has this great feature where you can [save a snapshot of your dashboard](http://docs.grafana.org/reference/sharing/). Instead of sending a screenshot of a dashboard to someone, you can send them a working, interactive Grafana dashboard with the snapshot data embedded inside it. The snapshot can be saved on your Grafana server and is available to all your co-workers. Raintank also hosts a [snapshot server](http://snapshot.raintank.io/) if you want to send the snapshot to someone who does not have access to your Grafana server.
+
+{{< imgbox img="/img/docs/animated_gifs/snapshots.gif" caption="Selecting a snapshot" >}}
+
+This all works because Grafana saves a snapshot of the current data in the dashboard json instead of fetching the data from a data source. However, if you are building a custom panel plugin then this will not work straight out of the box. You will need to make some small (and easy!) changes first.
+
+## Enabling support for loading snapshot data
+
+Grafana automatically saves data from data sources in the dashboard json when the snapshot is created so we do not have to write any code for that. Enabling snapshot support for reading time series data is very simple. First in the constructor, we need to add an event handler for `data-snapshot-load`. This event is triggered by Grafana when the snapshot data is loaded from the dashboard json.
+
+```javascript
+constructor($scope, $injector, contextSrv) {
+    super($scope, $injector);
+    ...
+    this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
+    this.events.on('data-received', this.onDataReceived.bind(this));
+    this.events.on('panel-teardown', this.onPanelTeardown.bind(this));
+    this.events.on('data-snapshot-load', this.onDataSnapshotLoad.bind(this));
+```
+
+Then we need to create a simple event handler that just forwards the data on to our regular `data-received` handler:
+
+```javascript
+onDataSnapshotLoad(snapshotData) {
+  this.onDataReceived(snapshotData);
+}
+```
+
+This will cover most use cases for snapshot support. Sometimes you will want to save data that is not time series data from a Grafana data source and then you have to do a bit more work to get snapshot support.
+
+## Saving custom data for snapshots
+
+Data that is not time series data from a Grafana data source is not saved automatically by Grafana. Saving custom data for snapshot mode has to be done manually.
+
+{{< imgbox img="/img/docs/Grafana-save-snapshot.png" caption="Save snapshot" >}}
+
+Grafana gives us a chance to save data to the dashboard json when it is creating a snapshot. In the 'data-received' event handler, you can check the snapshot flag on the dashboard object. If this is true, then Grafana is creating a snapshot and you can manually save custom data to the panel json. In the example, a new field called snapshotLocationData in the panel json is initialized with a snapshot of the custom data.
+
+```javascript
+onDataReceived(dataList) {
+  if (!dataList) return;
+
+  if (this.dashboard.snapshot && this.locations) {
+    this.panel.snapshotLocationData = this.locations;
+  }
+```
+
+Now the location data is saved in the dashboard json but we will have to load it manually as well.
+
+## Loading custom data for snapshots
+
+The example below shows a function that loads the custom data. The data source for the custom data (an external api in this case) is not available in snapshot mode so a guard check is made to see if there is any snapshot data available first. If there is, then the snapshot data is used instead of trying to load the data from the external api.
+
+```javascript
+loadLocationDataFromFile(reload) {
+  if (this.map && !reload) return;
+
+  if (this.panel.snapshotLocationData) {
+    this.locations = this.panel.snapshotLocationData;
+    return;
+  }
+```
+
+It is really easy to forget to add this support but it enables a great feature and can be used to demo your panel.
+
+If there is a panel plugin that you would like to be installed on the Raintank Snapshot server then please contact us via [Slack](https://raintank.slack.com) or [GitHub](https://github.com/grafana/grafana).

docs/sources/plugins/development.md

@@ -1,60 +0,0 @@
-+++
-title = "Developer Guide"
-type = "docs"
-aliases = ["/plugins/datasources/", "/plugins/apps/", "/plugins/panels/"]
-[menu.docs]
-name = "Developer Guide"
-parent = "plugins"
-weight = 5
-+++
-
-# Developer Guide
-
-From grafana 3.0 it's very easy to develop your own plugins and share them with other grafana users.
-
-## Short version
-
-1. [Setup grafana](http://docs.grafana.org/project/building_from_source/)
-2. Clone an example plugin into ```/var/lib/grafana/plugins```  or `data/plugins` (relative to grafana git repo if your running development version from source dir)
-3. Code away!
-
-## What languages?
-
-Since everything turns into javascript it's up to you to choose which language you want. That said it's probably a good idea to choose es6 or typescript since we use es6 classes in Grafana. So it's easier to get inspiration from the Grafana repo is you choose one of those languages.
-
-## Buildscript
-
-You can use any build system you like that support systemjs. All the built content should end up in a folder named ```dist``` and committed to the repository.By committing the dist folder the person who installs your plugin does not have to run any buildscript.
-
-All our example plugins have build scripted configured.
-
-## module.(js|ts)
-
-This is the entry point for every plugin. This is the place where you should export
-your plugin implementation. Depending on what kind of plugin you are developing you
-will be expected to export different things. You can find what's expected for [datasource](./datasources.md), [panels](./panels.md)
-and [apps](./apps.md) plugins in the documentation.
-
-## Start developing your plugin
-
-There are three ways that you can start developing a Grafana plugin.
-
-1. Setup a Grafana development environment. [(described here)](http://docs.grafana.org/project/building_from_source/) and place your plugin in the ```data/plugins``` folder.
-2. Install Grafana and place your plugin in the plugins directory which is set in your [config file](../installation/configuration.md). By default this is `/var/lib/grafana/plugins` on Linux systems.
-3. Place your plugin directory anywhere you like and specify it grafana.ini.
-
-We encourage people to setup the full Grafana environment so that you can get inspiration from the rest of grafana code base.
-
-When Grafana starts it will scan the plugin folders and mount every folder that contains a plugin.json file unless
-the folder contains a subfolder named dist. In that case grafana will mount the dist folder instead.
-This makes it possible to have both built and src content in the same plugin git repo.
-
-## Examples
-
-We currently have three different examples that you can fork/download to get started developing your grafana plugin.
-
- - [simple-json-datasource](https://github.com/grafana/simple-json-datasource) (small datasource plugin for querying json data from backends)
- - [example-app](https://github.com/grafana/example-app)
- - [clock-panel](https://github.com/grafana/clock-panel)
- - [singlestat-panel](https://github.com/grafana/grafana/blob/master/public/app/plugins/panel/singlestat/module.ts)
- - [piechart-panel](https://github.com/grafana/piechart-panel)

docs/sources/plugins/index.md

@@ -1,5 +1,6 @@
 +++
 title = "Plugins"
+type = "docs"
 [menu.docs]
 name = "Plugins"
 identifier = "plugins"
@@ -9,16 +10,11 @@ weight = 8
 
 # Plugins
 
-From Grafana 3.0 not only datasource plugins are supported but also panel plugins and apps.
-Having panels as plugins make it easy to create and add any kind of panel, to show your data
-or improve your favorite dashboards. Apps is something new in Grafana that enables
-bundling of datasources, panels, dashboards and Grafana pages into a cohesive experience.
+Plugins make it easy to create and add any kind of panel, data source or complete
+application, to show your data or improve your favorite dashboards.
 
-Grafana already have a strong community of contributors and plugin developers.
+Grafana has a strong community of contributors and plugin developers.
 By making it easier to develop and install plugins we hope that the community
 can grow even stronger and develop new plugins that we would never think about.
 
-You can discover available plugins on [Grafana.net](https://grafana.net)
-
-
-
+You can discover available plugins on [Grafana.com](https://grafana.com/plugins)

docs/sources/plugins/installation.md

@@ -17,7 +17,7 @@ Grafana already have a strong community of contributors and plugin developers.
 By making it easier to develop and install plugins we hope that the community
 can grow even stronger and develop new plugins that we would never think about.
 
-To discover plugins checkout the official [Plugin Repository](https://grafana.net/plugins).
+To discover plugins checkout the official [Plugin Repository](https://grafana.com/plugins).
 
 # Installing plugins
 

docs/sources/plugins/plugin.json.md

@@ -1,10 +0,0 @@
----
-page_title: Plugin json file
-page_description: Plugin json for Grafana
-page_keywords: grafana, plugins, documentation
----
-
-# Plugin.json
-
-TODO
-

docs/sources/project/building_from_source.md

@@ -13,7 +13,7 @@ dev environment. Grafana ships with its own required backend server; also comple
 
 ## Dependencies
 
-- [Go 1.7.3](https://golang.org/dl/)
+- [Go 1.8](https://golang.org/dl/)
 - [NodeJS](https://nodejs.org/download/)
 
 ## Get Code

docs/sources/project/cla.md

@@ -1,85 +0,0 @@
----
-page_title: Grafana CLA
-page_description: Grafana Contributor License Agreement
-page_keywords: grafana, cla, contribute, documentation
----
-
-# Grafana Contributor License Agreement
-
-## Why is this agreement necessary?
-We very much appreciate your wanting to contribute to Grafana,
-but we need to add you to the contributors list first.
-
-
-Note that the following agreement is not a transfer of copyright ownership,
-this simply is a license agreement for contributions. You also do not change
-your rights to use your own contributions for any other purpose.
-
-
-For some background on why contributor license agreements are necessary,
-you can read FAQs from many other open source projects:
-
-- [Django's excellent CLA FAQ](https://www.djangoproject.com/foundation/cla/faq/)
-- [A well-written chapter from Karl Fogel's Producing Open Source Software on CLAs](http://producingoss.com/en/copyright-assignment.html)
-- [The Wikipedia article on CLAs](http://en.wikipedia.org/wiki/Contributor_license_agreement)
-
-This is part of the legal framework of the open-source ecosystem that adds some red tape,
-but protects both the contributor and the company / foundation behind the project.
-It also gives us the option to relicense the code with a more permissive license in the future.
-
-
-If you have more questions, shoot us an [email](mailto:torkel@grafana.org) or drop by #grafana on IRC (freenode).
-
-Many thanks to [RethinkDB](http://rethinkdb.com) for permission to re-use their CLA!
-
-## Terms of the Agreement
-
-<hr>
-
-This Contributor License Agreement (“Agreement”) is entered into between Coding Instinct AB,
-a Swedish corporation (“Grafana,” “we” or “us” etc.) and you (as defined and further identified below).
-Accordingly, you hereby agree to the following terms for your past, present and future contributions
-submitted to Grafana:
-
-
-**1. Definitions:**
-<strong>(a)</strong> "You" (or "your") shall mean the contribution copyright owner (whether an individual or organization) or legal entity authorized by the copyright owner that is making this Agreement with Grafana.
-
-
-<strong>(b)</strong> "Contribution(s)" shall mean the code, documentation or other original works of authorship, including any modifications or additions to an existing work, submitted by you to Grafana for inclusion in, or documentation of, any of the products or projects owned or managed by Grafana (the "work(s)"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Grafana or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Grafana for the purpose of discussing and/or improving the work, but excluding communication that is conspicuously marked or otherwise designated in writing by you as "Not a Contribution."
-
-**2. Grant of Copyright License.**
-You hereby grant to Grafana and to recipients of software distributed by Grafana a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute your contributions and such derivative works.
-
-
-**3. Grant of Patent License.**
-With respect to any patents you own, or that you can license without payment to any third party, you hereby grant Grafana a perpetual, irrevocable, non-exclusive, worldwide, no-charge, royalty-free license to: (i) make, have made, use, sell, offer to sell, import, and otherwise distribute and exploit your contributions in whole or in part, alone or in combination with or included in any product, work or materials arising out of or relating to the Works to which your contributions were submitted; and (ii) sublicense these same rights to third parties through multiple levels of sublicensees or other licensing arrangements.
-
-
-**4. Rights.**
-Except as set out above, you keep all right, title, and interest in your contribution. The rights that you grant to us under this agreement are effective on the date you first submitted a contribution to us, even if your submission took place before the date you entered this agreement.
-
-
-**5. You represent and warrant that:**
-<strong>(i)</strong> the contributions are an original work and that you can legally grant the rights set out in this agreement;
-
-
-<strong>(ii)</strong> the contributions and Grafana’s exercise of any license rights granted hereunder, does not and will not, infringe the rights of any third party;
-
-
-<strong>(iii)</strong> you are not aware of any pending or threatened claims, suits, actions, or charges pertaining to the contributions, including without limitation any claims or allegations that any or all of the contributions infringes, violates, or misappropriate the intellectual property rights of any third party (you further agree that you will notify Grafana immediately if you become aware of any such actual or potential claims, suits, actions, allegations or charges).
-
-
-**6. Employer Rights.**
-If your employer(s) has rights to intellectual property that you create that includes your contributions, you represent and warrant that your employer has waived such rights for your contributions to Grafana, or that you have received permission to make contributions on behalf of that employer and that you are authorized to execute this agreement on behalf of your employer.
-
-
-**7. Support.**
-You are not expected to provide support for your contributions, except to the extent you desire to provide support. You may provide support for free, for a fee, or not at all. Except as set forth herein, and unless required by applicable law or agreed to in writing, you provide your contributions on an "as is" basis, without warranties or conditions of any kind.
-
-
-**8. Enforcement.**
-The failure of either party to enforce its rights under this agreement for any period shall not be construed as a waiver of such rights. No changes or modifications or waivers to this Agreement will be effective unless in writing and signed by both parties. In the event that any provision of this agreement shall be determined to be illegal or unenforceable, that provision will be limited or eliminated to the minimum extent necessary so that this agreement shall otherwise remain in full force and effect and enforceable. This agreement shall be governed by and construed in accordance with the laws of the State of California in the United States without regard to the conflicts of laws provisions thereof. In any action or proceeding to enforce rights under this agreement, the prevailing party will be entitled to recover costs and attorneys’ fees.
-
-
-<iframe src="https://docs.google.com/forms/d/1iagLZBotC4IIrz7TXvEdPU5tCtFDk__C5Rs92afXpCE/viewform?embedded=true" width="800" height="820" frameborder="0" marginheight="0" marginwidth="0">Loading CLA...</iframe>

docs/sources/project/index.md

@@ -0,0 +1,8 @@
+++
+title = "Project"
+type = "docs"
+identifier = "project"
+weight = 6
++++
+
+# Welcome to the grafana project

docs/sources/reference/admin.md

@@ -27,7 +27,7 @@ modify Organization details and options.
 
 ## Grafana Administrators
 
-<img src="img/v2/admin_sidenav.png" class="right" style="margin-left: 15px">
+<img src="/img/v2/admin_sidenav.png" class="pull-right" style="margin-left: 15px">
 As a Grafana Administrator, you have complete access to any Organization or User in that instance of Grafana.
 When performing actions as a Grafana admin, the sidebar will change it's appearance as below to indicate you are performing global server administration.
 

docs/sources/reference/dashboard.md

@@ -66,11 +66,11 @@ Each field in the dashboard JSON is explained below with its usage:
 | **editable** | whether a dashboard is editable or not |
 | **hideControls** | whether row controls on the left in green are hidden or not |
 | **graphTooltip** | TODO |
-| **rows** | row metadata, see [rows section](/docs/sources/reference/dashboard.md/#rows) for details |
+| **rows** | row metadata, see [rows section](#rows) for details |
 | **time** | time range for dashboard, i.e. last 6 hours, last 7 days, etc |
-| **timepicker** | timepicker metadata, see [timepicker section](/docs/sources/reference/dashboard.md/#timepicker) for details |
-| **templating** | templating metadata, see [templating section](/docs/sources/reference/dashboard.md/#templating) for details |
-| **annotations** | annotations metadata, see [annotations section](/docs/sources/reference/dashboard.md/#annotations) for details |
+| **timepicker** | timepicker metadata, see [timepicker section](#timepicker) for details |
+| **templating** | templating metadata, see [templating section](#templating) for details |
+| **annotations** | annotations metadata, see [annotations section](#annotations) for details |
 | **schemaVersion** | TODO |
 | **version** | TODO |
 | **links** | TODO |
@@ -79,7 +79,7 @@ Each field in the dashboard JSON is explained below with its usage:
 
 `rows` field consists of an array of JSON object representing each row in a dashboard, such as shown below:
 
-```
+```json
  "rows": [
     {
       "collapse": false,
@@ -105,14 +105,14 @@ Usage of the fields is explained below:
 | **collapse** | whether row is collapsed or not |
 | **editable** | whether a row is editable or not |
 | **height** | height of the row in pixels |
-| **panels** | panels metadata, see [panels section](/docs/sources/reference/dashboard.md/#panels) for details |
+| **panels** | panels metadata, see [panels section](#panels) for details |
 | **title** | title of row |
 
 #### panels
 
 Panels are the building blocks a dashboard. It consists of datasource queries, type of graphs, aliases, etc. Panel JSON consists of an array of JSON objects, each representing a different panel in a row. Most of the fields are common for all panels but some fields depends on the panel type. Following is an example of panel JSON representing a `graph` panel type:
 
-```
+```json
 "panels": [
         {
           "aliasColors": {},
@@ -276,7 +276,7 @@ Usage of each field is explained below:
 
 Description: TODO
 
-```
+```json
 "timepicker": {
     "collapse": false,
     "enable": true,
@@ -330,7 +330,7 @@ Usage of the fields is explained below:
 
 `templating` fields contains array of template variables with their saved values along with some other metadata, for example:
 
-```
+```json
  "templating": {
     "enable": true,
     "list": [

docs/sources/reference/export_import.md

@@ -33,7 +33,7 @@ To import a dashboard open dashboard search and then hit the import button.
 
 <img src="/img/docs/v31/import_step1.png">
 
-From here you can upload a dashboard json file, paste a [Grafana.net](https://grafana.net) dashboard
+From here you can upload a dashboard json file, paste a [Grafana.com](https://grafana.com) dashboard
 url or paste dashboard json text directly into the text area.
 
 <img src="/img/docs/v31/import_step2.png">
@@ -41,15 +41,15 @@ url or paste dashboard json text directly into the text area.
 In step 2 of the import process Grafana will let you change the name of the dashboard, pick what
 data source you want the dashboard to use and specify any metric prefixes (if the dashboard use any).
 
-## Discover dashboards on Grafana.net
+## Discover dashboards on Grafana.com
 
-Find dashboards for common server applications at [Grafana.net/dashboards](https://grafana.net/dashboards).
+Find dashboards for common server applications at [Grafana.com/dashboards](https://grafana.com/dashboards).
 
 <img src="/img/docs/v31/gnet_dashboards_list.png">
 
 ## Import & Sharing with Grafana 2.x or 3.0
 
-Dashboards on Grafana.net use a new feature in Grafana 3.1 that allows the import process
+Dashboards on Grafana.com use a new feature in Grafana 3.1 that allows the import process
 to update each panel so that they are using a data source of your choosing. If you are running a
 Grafana version older than 3.1 then you might need to do some manual steps either
 before or after import in order for the dashboard to work properly.
@@ -99,10 +99,10 @@ These are then referenced in the dashboard panels like this:
 ```
 
 These inputs and their usage in data source properties are automatically added during export in Grafana 3.1.
-If you run an older version of Grafana and want to share a dashboard on Grafana.net you need to manually
+If you run an older version of Grafana and want to share a dashboard on Grafana.com you need to manually
 add the inputs and templatize the datasource properties like above.
 
-If you want to import a dashboard from Grafana.net into an older version of Grafana then you can either import
+If you want to import a dashboard from Grafana.com into an older version of Grafana then you can either import
 it as usual and then update the data source option in the metrics tab so that the panel is using the correct
 data source. Another alternative is to open the json file in a a text editor and update the data source properties
 to value that matches a name of your data source.

docs/sources/reference/index.md

@@ -0,0 +1,7 @@
+---
+title: Reference Index
+description: Grafana docs reference
+type: docs
+---
+
+# Documentation

docs/sources/reference/playlist.md

@@ -16,7 +16,7 @@ Since Grafana automatically scales Dashboards to any resolution they're perfect
 
 ## Creating a Playlist
 
-{{< docs-imagebox img="img/docs/v3/playlist.png" max-width="25rem" >}}
+{{< docs-imagebox img="/img/docs/v3/playlist.png" max-width="25rem" >}}
 
 The Playlist feature can be accessed from Grafana's sidemenu, in the Dashboard submenu.
 

docs/sources/tutorials/ha_setup.md

@@ -0,0 +1,40 @@
++++
+title = "Setup Grafana for High availability"
+type = "docs"
+keywords = ["grafana", "tutorials", "HA", "high availability"]
+[menu.docs]
+parent = "tutorials"
+weight = 10
++++
+
+# How to setup Grafana for high availability
+
+> Alerting does not support high availability yet.
+
+Setting up Grafana for high availability is fairly simple. It comes down to two things:
+
+  * Use a shared database for multiple grafana instances.
+  * Consider how user sessions are stored.
+
+## Configure multiple servers to use the same database
+
+First you need to do is to setup mysql or postgres on another server and configure Grafana to use that database.
+You can find the configuration for doing that in the [[database]]({{< relref "configuration.md" >}}#database) section in the grafana config.
+Grafana will now persist all long term data in the database. 
+It also worth considering how to setup the database for high availability but thats outside the scope of this guide.
+
+## User sessions
+
+The second thing to consider is how to deal with user sessions and how to balance the load between servers. 
+By default Grafana stores user sessions on disk which works fine if you use `sticky sessions` in your load balancer. 
+Grafana also supports storing the session data in the database, redis or memcache which makes it possible to use round robin in your load balancer. 
+If you use mysql/postgres for session storage you first need a table to store the session data in. More details about that in [[sessions]]({{< relref "configuration.md" >}}#session) 
+
+For Grafana itself it doesn't really matter if you store your sessions on disk or database/redis/memcache.
+But we suggest that you store the session in redis/memcache since it makes it easier to add/remote instances from the group. 
+
+## Alerting
+
+Currently alerting does not support high availability. But this is something that we will be working on in the future. 
+
+

docs/sources/tutorials/hubot_howto.md

@@ -22,15 +22,17 @@ take you to the graph.
 > is so Hipchat and Slack can show them reliably (they require the image to be publicly available).
 
 <div class="text-center">
-  <img src="/img/tutorials/hubot_grafana.png" class="center"></a>
+  <img src="/img/docs/tutorials/hubot_grafana.png" class="center"></a>
 </div>
 
 ## What is Hubot?
+
 [Hubot](https://hubot.github.com/) is an universal and extensible chat bot that can be used with many chat
 services and has a huge library of third party plugins that allow you to automate anything from your
 chat rooms.
 
 ## Install Hubot
+
 Hubot is very easy to install and host. If you do not already have a bot up and running please
 read the official [Getting Started With Hubot](https://hubot.github.com/docs/) guide.
 
@@ -63,6 +65,7 @@ The `hubot-grafana` plugin requires a number of environment variables to be set
     export HUBOT_GRAFANA_S3_REGION=us-standard
 
 ### Grafana server side rendering
+
 The hubot plugin will take advantage of the Grafana server side rendering feature that can
 render any panel on the server using phantomjs. Grafana ships with a phantomjs binary (linux only).
 
@@ -70,11 +73,13 @@ To verify that this feature works try the `Direct link to rendered image` link i
 If you do not get an image when opening this link verify that the required font packages are installed for phantomjs to work.
 
 ### Grafana API Key
-<img src="/img/v2/orgdropdown_api_keys.png" style="width: 150px" class="right"></img>
+
+<img src="/img/docs/v2/orgdropdown_api_keys.png" style="width: 150px" class="right"></img>
 You need to set the environment variable `HUBOT_GRAFANA_API_KEY` to a Grafana API Key.
 You can add these from the API Keys page which you find in the Organization dropdown.
 
 ### Amazon S3
+
 The `S3` options are optional but for the images to work properly in services like Slack and Hipchat they need
 to publicly available. By specifying the `S3` options the hubot-grafana script will publish the rendered
 panel to `S3` and it will use that URL when it posts to Slack or Hipchat.
@@ -99,6 +104,7 @@ panel to `S3` and it will use that URL when it posts to Slack or Hipchat.
     - Get a templated dashboard with the `$host` parameter set to `carbon-a`
 
 ## Aliases
+
 Some of the hubot commands above can lengthy and you might have to remember the dashboard slug (url id).
 If you have a few favorite graphs you want to be able check up on often (let's say from your mobile) you
 can create hubot command aliases with the hubot script `hubot-alias`.
@@ -115,7 +121,7 @@ Now you can add an alias like this:
 
 <div class="text-center">
   Using the alias:<br>
-  <img src="/img/tutorials/hubot_grafana2.png" class="center"></a>
+  <img src="/img/docs/tutorials/hubot_grafana2.png" class="center"></a>
 </div>
 
 ## Summary

package.json

@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "4.2.0-pre1",
+  "version": "4.3.0-pre1",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"

packaging/deb/systemd/grafana-server.service

@@ -3,6 +3,7 @@ Description=Grafana instance
 Documentation=http://docs.grafana.org
 Wants=network-online.target
 After=network-online.target
+After=postgresql.service mariadb.service mysql.service
 
 [Service]
 EnvironmentFile=/etc/default/grafana-server

packaging/publish/publish_both.sh

@@ -1,19 +1,18 @@
 #! /usr/bin/env bash
-deb_ver=4.1.0-1484127817
-rpm_ver=4.1.0-1484127817
+version=4.2.0
 
-wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${version}_amd64.deb
 
-package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb
-package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb
+package_cloud push grafana/stable/debian/jessie grafana_${version}_amd64.deb
+package_cloud push grafana/stable/debian/wheezy grafana_${version}_amd64.deb
 
-package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
-package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
+package_cloud push grafana/testing/debian/jessie grafana_${version}_amd64.deb
+package_cloud push grafana/testing/debian/wheezy grafana_${version}_amd64.deb
 
-wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}-1.x86_64.rpm
 
-package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
-package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
+package_cloud push grafana/testing/el/6 grafana-${version}-1.x86_64.rpm
+package_cloud push grafana/testing/el/7 grafana-${version}-1.x86_64.rpm
 
-package_cloud push grafana/stable/el/7 grafana-${rpm_ver}.x86_64.rpm
-package_cloud push grafana/stable/el/6 grafana-${rpm_ver}.x86_64.rpm
+package_cloud push grafana/stable/el/7 grafana-${version}-1.x86_64.rpm
+package_cloud push grafana/stable/el/6 grafana-${version}-1.x86_64.rpm

packaging/publish/publish_testing.sh

@@ -1,13 +1,13 @@
 #! /usr/bin/env bash
-deb_ver=4.1.0-1482230757beta1
-rpm_ver=4.1.0-1482230757beta1
+deb_ver=4.2.0-beta1
+rpm_ver=4.2.0-beta1
 
-wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${deb_ver}_amd64.deb
 
 package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
 package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
 
-wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${rpm_ver}.x86_64.rpm
 
 package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
 package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm

packaging/rpm/control/postinst

@@ -68,13 +68,6 @@ if [ $1 -eq 1 ] ; then
     echo " sudo service grafana-server start"
   fi
 elif [ $1 -ge 2 ] ; then
-  if [ -x /opt/grafana/ ]; then
-    echo "### Upgrading Notice ### "
-    echo "-- New grafana install home is /usr/share/grafana"
-    echo "-- Please move sqlite3 database to /var/lib/grafana/"
-    echo "-- Notice: service name && binary changed to grafana-server"
-  fi
-
   if [ "$RESTART_ON_UPGRADE" == "true" ]; then
     stopGrafana
     startGrafana

packaging/rpm/control/posttrans

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+echo "POSTTRANS: Running script"
+
+[ -f /etc/sysconfig/grafana-server ] && . /etc/sysconfig/grafana-server
+
+# copy config files if missing
+if [ ! -f /etc/grafana/grafana.ini ]; then
+  echo "POSTTRANS: Config file not found"
+
+  if [ -f /etc/grafana/grafana.ini.rpmsave ]; then
+    echo "POSTTRANS: /etc/grafana/grafana.ini.rpmsave config file found."
+    mv /etc/grafana/grafana.ini.rpmsave /etc/grafana/grafana.ini
+    echo "POSTTRANS: /etc/grafana/grafana.ini restored"
+
+    if [ -f /etc/grafana/ldap.toml.rpmsave ]; then
+      echo "POSTTRANS: /etc/grafana/ldap.toml.rpmsave found"
+      mv /etc/grafana/ldap.toml.rpmsave /etc/grafana/ldap.toml
+      echo "POSTTRANS: /etc/grafana/ldap.toml restored"
+    fi
+
+    echo "POSTTRANS: Restoring config file permissions"
+    chown -Rh root:$GRAFANA_GROUP /etc/grafana/*
+    chmod 755 /etc/grafana
+    find /etc/grafana -type f -exec chmod 640 {} ';'
+    find /etc/grafana -type d -exec chmod 755 {} ';'
+  fi
+fi
+
+

packaging/rpm/systemd/grafana-server.service

@@ -3,6 +3,7 @@ Description=Grafana instance
 Documentation=http://docs.grafana.org
 Wants=network-online.target
 After=network-online.target
+After=postgresql.service mariadb.service mysql.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/grafana-server

pkg/api/api.go

@@ -123,6 +123,7 @@ func (hs *HttpServer) registerRoutes() {
 		// users (admin permission required)
 		r.Group("/users", func() {
 			r.Get("/", wrap(SearchUsers))
+			r.Get("/search", wrap(SearchUsersWithPaging))
 			r.Get("/:id", wrap(GetUserById))
 			r.Get("/:id/orgs", wrap(GetUserOrgList))
 			// query parameters /users/lookup?loginOrEmail=admin@example.com
@@ -195,10 +196,11 @@ func (hs *HttpServer) registerRoutes() {
 
 		// Data sources
 		r.Group("/datasources", func() {
-			r.Get("/", GetDataSources)
+			r.Get("/", wrap(GetDataSources))
 			r.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource)
 			r.Put("/:id", bind(m.UpdateDataSourceCommand{}), wrap(UpdateDataSource))
-			r.Delete("/:id", DeleteDataSource)
+			r.Delete("/:id", DeleteDataSourceById)
+			r.Delete("/name/:name", DeleteDataSourceByName)
 			r.Get("/:id", wrap(GetDataSourceById))
 			r.Get("/name/:name", wrap(GetDataSourceByName))
 		}, reqOrgAdmin)

pkg/api/api_test.go

@@ -1,35 +0,0 @@
-package api
-
-import (
-	"testing"
-)
-
-func TestHttpApi(t *testing.T) {
-
-	// Convey("Given the grafana api", t, func() {
-	// 	ConveyApiScenario("Can sign up", func(c apiTestContext) {
-	// 		c.PostJson()
-	// 		So(c.Resp, ShouldEqualJsonApiResponse, "User created and logged in")
-	// 	})
-	//
-	// 	m := macaron.New()
-	// 	m.Use(middleware.GetContextHandler())
-	// 	m.Use(middleware.Sessioner(&session.Options{}))
-	// 	Register(m)
-	//
-	// 	var context *middleware.Context
-	// 	m.Get("/", func(c *middleware.Context) {
-	// 		context = c
-	// 	})
-	//
-	// 	resp := httptest.NewRecorder()
-	// 	req, err := http.NewRequest("GET", "/", nil)
-	// 	So(err, ShouldBeNil)
-	//
-	// 	m.ServeHTTP(resp, req)
-	//
-	// 	Convey("should red 200", func() {
-	// 		So(resp.Code, ShouldEqual, 200)
-	// 	})
-	// })
-}

pkg/api/cloudwatch/cloudwatch.go

@@ -3,7 +3,9 @@ package cloudwatch
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"io/ioutil"
+	"os"
 	"strings"
 	"sync"
 	"time"
@@ -12,6 +14,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
+	"github.com/aws/aws-sdk-go/aws/credentials/endpointcreds"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
@@ -114,19 +117,26 @@ func getCredentials(dsInfo *datasourceInfo) (*credentials.Credentials, error) {
 			DurationSeconds: aws.Int64(900),
 		}
 
-		stsSess := session.New()
+		stsSess, err := session.NewSession()
+		if err != nil {
+			return nil, err
+		}
 		stsCreds := credentials.NewChainCredentials(
 			[]credentials.Provider{
 				&credentials.EnvProvider{},
 				&credentials.SharedCredentialsProvider{Filename: "", Profile: dsInfo.Profile},
-				&ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(stsSess), ExpiryWindow: 5 * time.Minute},
+				remoteCredProvider(stsSess),
 			})
 		stsConfig := &aws.Config{
 			Region:      aws.String(dsInfo.Region),
 			Credentials: stsCreds,
 		}
 
-		svc := sts.New(session.New(stsConfig), stsConfig)
+		sess, err := session.NewSession(stsConfig)
+		if err != nil {
+			return nil, err
+		}
+		svc := sts.New(sess, stsConfig)
 		resp, err := svc.AssumeRole(params)
 		if err != nil {
 			return nil, err
@@ -139,7 +149,10 @@ func getCredentials(dsInfo *datasourceInfo) (*credentials.Credentials, error) {
 		}
 	}
 
-	sess := session.New()
+	sess, err := session.NewSession()
+	if err != nil {
+		return nil, err
+	}
 	creds := credentials.NewChainCredentials(
 		[]credentials.Provider{
 			&credentials.StaticProvider{Value: credentials.Value{
@@ -166,6 +179,30 @@ func getCredentials(dsInfo *datasourceInfo) (*credentials.Credentials, error) {
 	return creds, nil
 }
 
+func remoteCredProvider(sess *session.Session) credentials.Provider {
+	ecsCredURI := os.Getenv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI")
+
+	if len(ecsCredURI) > 0 {
+		return ecsCredProvider(sess, ecsCredURI)
+	}
+	return ec2RoleProvider(sess)
+}
+
+func ecsCredProvider(sess *session.Session, uri string) credentials.Provider {
+	const host = `169.254.170.2`
+
+	c := ec2metadata.New(sess)
+	return endpointcreds.NewProviderClient(
+		c.Client.Config,
+		c.Client.Handlers,
+		fmt.Sprintf("http://%s%s", host, uri),
+		func(p *endpointcreds.Provider) { p.ExpiryWindow = 5 * time.Minute })
+}
+
+func ec2RoleProvider(sess *session.Session) credentials.Provider {
+	return &ec2rolecreds.EC2RoleProvider{Client: ec2metadata.New(sess), ExpiryWindow: 5 * time.Minute}
+}
+
 func getAwsConfig(req *cwRequest) (*aws.Config, error) {
 	creds, err := getCredentials(req.GetDatasourceInfo())
 	if err != nil {
@@ -185,7 +222,12 @@ func handleGetMetricStatistics(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -232,7 +274,12 @@ func handleListMetrics(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -273,7 +320,12 @@ func handleDescribeAlarms(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -316,7 +368,12 @@ func handleDescribeAlarmsForMetric(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -360,7 +417,12 @@ func handleDescribeAlarmHistory(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {
@@ -396,7 +458,12 @@ func handleDescribeInstances(req *cwRequest, c *middleware.Context) {
 		c.JsonApiErr(500, "Unable to call AWS API", err)
 		return
 	}
-	svc := ec2.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		c.JsonApiErr(500, "Unable to call AWS API", err)
+		return
+	}
+	svc := ec2.New(sess, cfg)
 
 	reqParam := &struct {
 		Parameters struct {

pkg/api/cloudwatch/cloudwatch_test.go

@@ -0,0 +1,41 @@
+package cloudwatch
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
+	"github.com/aws/aws-sdk-go/aws/credentials/endpointcreds"
+	"github.com/aws/aws-sdk-go/aws/session"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestECSCredProvider(t *testing.T) {
+	Convey("Running in an ECS container task", t, func() {
+		defer os.Clearenv()
+		os.Setenv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI", "/abc/123")
+
+		provider := remoteCredProvider(&session.Session{})
+
+		So(provider, ShouldNotBeNil)
+
+		ecsProvider, ok := provider.(*endpointcreds.Provider)
+		So(ecsProvider, ShouldNotBeNil)
+		So(ok, ShouldBeTrue)
+
+		So(ecsProvider.Client.Endpoint, ShouldEqual, fmt.Sprintf("http://169.254.170.2/abc/123"))
+	})
+}
+
+func TestDefaultEC2RoleProvider(t *testing.T) {
+	Convey("Running outside an ECS container task", t, func() {
+		provider := remoteCredProvider(&session.Session{})
+
+		So(provider, ShouldNotBeNil)
+
+		ec2Provider, ok := provider.(*ec2rolecreds.EC2RoleProvider)
+		So(ec2Provider, ShouldNotBeNil)
+		So(ok, ShouldBeTrue)
+	})
+}

pkg/api/cloudwatch/metrics.go

@@ -81,7 +81,8 @@ func init() {
 		"AWS/Redshift":         {"CPUUtilization", "DatabaseConnections", "HealthStatus", "MaintenanceMode", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "PercentageDiskSpaceUsed", "ReadIOPS", "ReadLatency", "ReadThroughput", "WriteIOPS", "WriteLatency", "WriteThroughput"},
 		"AWS/RDS":              {"ActiveTransactions", "AuroraBinlogReplicaLag", "AuroraReplicaLag", "AuroraReplicaLagMaximum", "AuroraReplicaLagMinimum", "BinLogDiskUsage", "BlockedTransactions", "BufferCacheHitRatio", "CommitLatency", "CommitThroughput", "CPUCreditBalance", "CPUCreditUsage", "CPUUtilization", "DatabaseConnections", "DDLLatency", "DDLThroughput", "Deadlocks", "DiskQueueDepth", "DMLLatency", "DMLThroughput", "FailedSqlStatements", "FreeableMemory", "FreeStorageSpace", "LoginFailures", "NetworkReceiveThroughput", "NetworkTransmitThroughput", "ReadIOPS", "ReadLatency", "ReadThroughput", "ReplicaLag", "ResultSetCacheHitRatio", "SelectLatency", "SelectThroughput", "SwapUsage", "TotalConnections", "VolumeReadIOPS", "VolumeWriteIOPS", "WriteIOPS", "WriteLatency", "WriteThroughput"},
 		"AWS/Route53":          {"HealthCheckStatus", "HealthCheckPercentageHealthy", "ConnectionTime", "SSLHandshakeTime", "TimeToFirstByte"},
-		"AWS/S3":               {"BucketSizeBytes", "NumberOfObjects"},
+		"AWS/S3":               {"BucketSizeBytes", "NumberOfObjects", "AllRequests", "GetRequests", "PutRequests", "DeleteRequests", "HeadRequests", "PostRequests", "ListRequests", "BytesDownloaded", "BytesUploaded", "4xxErrors", "5xxErrors", "FirstByteLatency", "TotalRequestLatency"},
+		"AWS/SES":              {"Bounce", "Complaint", "Delivery", "Reject", "Send"},
 		"AWS/SNS":              {"NumberOfMessagesPublished", "PublishSize", "NumberOfNotificationsDelivered", "NumberOfNotificationsFailed"},
 		"AWS/SQS":              {"NumberOfMessagesSent", "SentMessageSize", "NumberOfMessagesReceived", "NumberOfEmptyReceives", "NumberOfMessagesDeleted", "ApproximateNumberOfMessagesDelayed", "ApproximateNumberOfMessagesVisible", "ApproximateNumberOfMessagesNotVisible"},
 		"AWS/StorageGateway": {"CacheHitPercent", "CachePercentUsed", "CachePercentDirty", "CloudBytesDownloaded", "CloudDownloadLatency", "CloudBytesUploaded", "UploadBufferFree", "UploadBufferPercentUsed", "UploadBufferUsed", "QueuedWrites", "ReadBytes", "ReadTime", "TotalCacheSize", "WriteBytes", "WriteTime", "TimeSinceLastRecoveryPoint", "WorkingStorageFree", "WorkingStoragePercentUsed", "WorkingStorageUsed",
@@ -122,7 +123,8 @@ func init() {
 		"AWS/Redshift":         {"NodeID", "ClusterIdentifier"},
 		"AWS/RDS":              {"DBInstanceIdentifier", "DBClusterIdentifier", "DatabaseClass", "EngineName"},
 		"AWS/Route53":          {"HealthCheckId"},
-		"AWS/S3":               {"BucketName", "StorageType"},
+		"AWS/S3":               {"BucketName", "StorageType", "FilterId"},
+		"AWS/SES":              {},
 		"AWS/SNS":              {"Application", "Platform", "TopicName"},
 		"AWS/SQS":              {"QueueName"},
 		"AWS/StorageGateway":   {"GatewayId", "GatewayName", "VolumeId"},
@@ -256,8 +258,11 @@ func getAllMetrics(cwData *datasourceInfo) (cloudwatch.ListMetricsOutput, error)
 		Region:      aws.String(cwData.Region),
 		Credentials: creds,
 	}
-
-	svc := cloudwatch.New(session.New(cfg), cfg)
+	sess, err := session.NewSession(cfg)
+	if err != nil {
+		return cloudwatch.ListMetricsOutput{}, err
+	}
+	svc := cloudwatch.New(sess, cfg)
 
 	params := &cloudwatch.ListMetricsInput{
 		Namespace: aws.String(cwData.Namespace),

pkg/api/dataproxy.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"net/url"
+	"strings"
 	"time"
 
 	"github.com/grafana/grafana/pkg/api/cloudwatch"
@@ -115,6 +116,13 @@ func ProxyDataSourceRequest(c *middleware.Context) {
 
 	proxyPath := c.Params("*")
 
+	if ds.Type == m.DS_PROMETHEUS {
+		if c.Req.Request.Method != http.MethodGet || !strings.HasPrefix(proxyPath, "api/") {
+			c.JsonApiErr(403, "GET is only allowed on proxied Prometheus datasource", nil)
+			return
+		}
+	}
+
 	if ds.Type == m.DS_ES {
 		if c.Req.Request.Method == "DELETE" {
 			c.JsonApiErr(403, "Deletes not allowed on proxied Elasticsearch datasource", nil)

pkg/api/datasources.go

@@ -11,12 +11,11 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )
 
-func GetDataSources(c *middleware.Context) {
+func GetDataSources(c *middleware.Context) Response {
 	query := m.GetDataSourcesQuery{OrgId: c.OrgId}
 
 	if err := bus.Dispatch(&query); err != nil {
-		c.JsonApiErr(500, "Failed to query datasources", err)
-		return
+		return ApiError(500, "Failed to query datasources", err)
 	}
 
 	result := make(dtos.DataSourceList, 0)
@@ -46,7 +45,8 @@ func GetDataSources(c *middleware.Context) {
 	}
 
 	sort.Sort(result)
-	c.JSON(200, result)
+
+	return Json(200, &result)
 }
 
 func GetDataSourceById(c *middleware.Context) Response {
@@ -68,7 +68,7 @@ func GetDataSourceById(c *middleware.Context) Response {
 	return Json(200, &dtos)
 }
 
-func DeleteDataSource(c *middleware.Context) {
+func DeleteDataSourceById(c *middleware.Context) {
 	id := c.ParamsInt64(":id")
 
 	if id <= 0 {
@@ -76,7 +76,26 @@ func DeleteDataSource(c *middleware.Context) {
 		return
 	}
 
-	cmd := &m.DeleteDataSourceCommand{Id: id, OrgId: c.OrgId}
+	cmd := &m.DeleteDataSourceByIdCommand{Id: id, OrgId: c.OrgId}
+
+	err := bus.Dispatch(cmd)
+	if err != nil {
+		c.JsonApiErr(500, "Failed to delete datasource", err)
+		return
+	}
+
+	c.JsonOK("Data source deleted")
+}
+
+func DeleteDataSourceByName(c *middleware.Context) {
+	name := c.Params(":name")
+
+	if name == "" {
+		c.JsonApiErr(400, "Missing valid datasource name", nil)
+		return
+	}
+
+	cmd := &m.DeleteDataSourceByNameCommand{Name: name, OrgId: c.OrgId}
 
 	err := bus.Dispatch(cmd)
 	if err != nil {

pkg/api/datasources_test.go

@@ -0,0 +1,132 @@
+package api
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"path/filepath"
+	"testing"
+
+	"github.com/grafana/grafana/pkg/models"
+	macaron "gopkg.in/macaron.v1"
+
+	"github.com/go-macaron/session"
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/middleware"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+const (
+	TestOrgID  = 1
+	TestUserID = 1
+)
+
+func TestDataSourcesProxy(t *testing.T) {
+	Convey("Given a user is logged in", t, func() {
+		loggedInUserScenario("When calling GET on", "/api/datasources/", func(sc *scenarioContext) {
+
+			// Stubs the database query
+			bus.AddHandler("test", func(query *models.GetDataSourcesQuery) error {
+				So(query.OrgId, ShouldEqual, TestOrgID)
+				query.Result = []*models.DataSource{
+					{Name: "mmm"},
+					{Name: "ZZZ"},
+					{Name: "BBB"},
+					{Name: "aaa"},
+				}
+				return nil
+			})
+
+			// handler func being tested
+			sc.handlerFunc = GetDataSources
+			sc.fakeReq("GET", "/api/datasources").exec()
+
+			respJSON := []map[string]interface{}{}
+			err := json.NewDecoder(sc.resp.Body).Decode(&respJSON)
+			So(err, ShouldBeNil)
+
+			Convey("should return list of datasources for org sorted alphabetically and case insensitively", func() {
+				So(respJSON[0]["name"], ShouldEqual, "aaa")
+				So(respJSON[1]["name"], ShouldEqual, "BBB")
+				So(respJSON[2]["name"], ShouldEqual, "mmm")
+				So(respJSON[3]["name"], ShouldEqual, "ZZZ")
+			})
+		})
+	})
+}
+
+func loggedInUserScenario(desc string, url string, fn scenarioFunc) {
+	Convey(desc+" "+url, func() {
+		defer bus.ClearBusHandlers()
+
+		sc := &scenarioContext{
+			url: url,
+		}
+		viewsPath, _ := filepath.Abs("../../public/views")
+
+		sc.m = macaron.New()
+		sc.m.Use(macaron.Renderer(macaron.RenderOptions{
+			Directory: viewsPath,
+			Delims:    macaron.Delims{Left: "[[", Right: "]]"},
+		}))
+
+		sc.m.Use(middleware.GetContextHandler())
+		sc.m.Use(middleware.Sessioner(&session.Options{}))
+
+		sc.defaultHandler = wrap(func(c *middleware.Context) Response {
+			sc.context = c
+			sc.context.UserId = TestUserID
+			sc.context.OrgId = TestOrgID
+			sc.context.OrgRole = models.ROLE_EDITOR
+			if sc.handlerFunc != nil {
+				return sc.handlerFunc(sc.context)
+			}
+
+			return nil
+		})
+
+		sc.m.Get(url, sc.defaultHandler)
+
+		fn(sc)
+	})
+}
+
+func (sc *scenarioContext) fakeReq(method, url string) *scenarioContext {
+	sc.resp = httptest.NewRecorder()
+	req, err := http.NewRequest(method, url, nil)
+	So(err, ShouldBeNil)
+	sc.req = req
+
+	return sc
+}
+
+func (sc *scenarioContext) fakeReqWithParams(method, url string, queryParams map[string]string) *scenarioContext {
+	sc.resp = httptest.NewRecorder()
+	req, err := http.NewRequest(method, url, nil)
+	q := req.URL.Query()
+	for k, v := range queryParams {
+		q.Add(k, v)
+	}
+	req.URL.RawQuery = q.Encode()
+	So(err, ShouldBeNil)
+	sc.req = req
+
+	return sc
+}
+
+type scenarioContext struct {
+	m              *macaron.Macaron
+	context        *middleware.Context
+	resp           *httptest.ResponseRecorder
+	handlerFunc    handlerFunc
+	defaultHandler macaron.Handler
+	req            *http.Request
+	url            string
+}
+
+func (sc *scenarioContext) exec() {
+	sc.m.ServeHTTP(sc.resp, sc.req)
+}
+
+type scenarioFunc func(c *scenarioContext)
+type handlerFunc func(c *middleware.Context) Response

pkg/api/dtos/models.go

@@ -91,7 +91,7 @@ func (slice DataSourceList) Len() int {
 }
 
 func (slice DataSourceList) Less(i, j int) bool {
-	return slice[i].Name < slice[j].Name
+	return strings.ToLower(slice[i].Name) < strings.ToLower(slice[j].Name)
 }
 
 func (slice DataSourceList) Swap(i, j int) {

pkg/api/frontendsettings.go

@@ -133,14 +133,17 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 	}
 
 	jsonObj := map[string]interface{}{
-		"defaultDatasource": defaultDatasource,
-		"datasources":       datasources,
-		"panels":            panels,
-		"appSubUrl":         setting.AppSubUrl,
-		"allowOrgCreate":    (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
-		"authProxyEnabled":  setting.AuthProxyEnabled,
-		"ldapEnabled":       setting.LdapEnabled,
-		"alertingEnabled":   setting.AlertingEnabled,
+		"defaultDatasource":  defaultDatasource,
+		"datasources":        datasources,
+		"panels":             panels,
+		"appSubUrl":          setting.AppSubUrl,
+		"allowOrgCreate":     (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
+		"authProxyEnabled":   setting.AuthProxyEnabled,
+		"ldapEnabled":        setting.LdapEnabled,
+		"alertingEnabled":    setting.AlertingEnabled,
+		"googleAnalyticsId":  setting.GoogleAnalyticsId,
+		"disableLoginForm":   setting.DisableLoginForm,
+		"disableSignoutMenu": setting.DisableSignoutMenu,
 		"buildInfo": map[string]interface{}{
 			"version":       setting.BuildVersion,
 			"commit":        setting.BuildCommit,

pkg/api/http_server.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"net/http"
@@ -24,6 +25,8 @@ type HttpServer struct {
 	macaron       *macaron.Macaron
 	context       context.Context
 	streamManager *live.StreamManager
+
+	httpSrv *http.Server
 }
 
 func NewHttpServer() *HttpServer {
@@ -45,11 +48,20 @@ func (hs *HttpServer) Start(ctx context.Context) error {
 	listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
 	hs.log.Info("Initializing HTTP Server", "address", listenAddr, "protocol", setting.Protocol, "subUrl", setting.AppSubUrl)
 
+	hs.httpSrv = &http.Server{Addr: listenAddr, Handler: hs.macaron}
 	switch setting.Protocol {
 	case setting.HTTP:
-		err = http.ListenAndServe(listenAddr, hs.macaron)
+		err = hs.httpSrv.ListenAndServe()
+		if err == http.ErrServerClosed {
+			hs.log.Debug("server was shutdown gracefully")
+			return nil
+		}
 	case setting.HTTPS:
-		err = hs.listenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile)
+		err = hs.httpSrv.ListenAndServeTLS(setting.CertFile, setting.KeyFile)
+		if err == http.ErrServerClosed {
+			hs.log.Debug("server was shutdown gracefully")
+			return nil
+		}
 	default:
 		hs.log.Error("Invalid protocol", "protocol", setting.Protocol)
 		err = errors.New("Invalid Protocol")
@@ -58,6 +70,12 @@ func (hs *HttpServer) Start(ctx context.Context) error {
 	return err
 }
 
+func (hs *HttpServer) Shutdown(ctx context.Context) error {
+	err := hs.httpSrv.Shutdown(ctx)
+	hs.log.Info("stopped http server")
+	return err
+}
+
 func (hs *HttpServer) listenAndServeTLS(listenAddr, certfile, keyfile string) error {
 	if certfile == "" {
 		return fmt.Errorf("cert_file cannot be empty when using HTTPS")
@@ -75,7 +93,32 @@ func (hs *HttpServer) listenAndServeTLS(listenAddr, certfile, keyfile string) er
 		return fmt.Errorf(`Cannot find SSL key_file at %v`, setting.KeyFile)
 	}
 
-	return http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, hs.macaron)
+	tlsCfg := &tls.Config{
+		MinVersion:               tls.VersionTLS12,
+		PreferServerCipherSuites: true,
+		CipherSuites: []uint16{
+			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+		},
+	}
+	srv := &http.Server{
+		Addr:         listenAddr,
+		Handler:      hs.macaron,
+		TLSConfig:    tlsCfg,
+		TLSNextProto: make(map[string]func(*http.Server, *tls.Conn, http.Handler), 0),
+	}
+
+	return srv.ListenAndServeTLS(setting.CertFile, setting.KeyFile)
 }
 
 func (hs *HttpServer) newMacaron() *macaron.Macaron {
@@ -107,6 +150,7 @@ func (hs *HttpServer) newMacaron() *macaron.Macaron {
 	m.Use(middleware.GetContextHandler())
 	m.Use(middleware.Sessioner(&setting.SessionOptions))
 	m.Use(middleware.RequestMetrics())
+	m.Use(middleware.OrgRedirect())
 
 	// needs to be after context handler
 	if setting.EnforceDomain {

pkg/api/login.go

@@ -35,6 +35,11 @@ func LoginView(c *middleware.Context) {
 	viewData.Settings["loginHint"] = setting.LoginHint
 	viewData.Settings["disableLoginForm"] = setting.DisableLoginForm
 
+	if loginError, ok := c.Session.Get("loginError").(string); ok {
+		c.Session.Delete("loginError")
+		viewData.Settings["loginError"] = loginError
+	}
+
 	if !tryLoginUsingRememberCookie(c) {
 		c.HTML(200, VIEW_INDEX, viewData)
 		return
@@ -94,6 +99,10 @@ func LoginApiPing(c *middleware.Context) {
 }
 
 func LoginPost(c *middleware.Context, cmd dtos.LoginCommand) Response {
+	if setting.DisableLoginForm {
+		return ApiError(401, "Login is disabled", nil)
+	}
+
 	authQuery := login.LoginUserQuery{
 		Username: cmd.User,
 		Password: cmd.Password,

pkg/api/login_oauth.go

@@ -10,6 +10,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/http"
+	"net/url"
 
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
@@ -22,6 +23,13 @@ import (
 	"github.com/grafana/grafana/pkg/social"
 )
 
+var (
+	ErrProviderDeniedRequest = errors.New("Login provider denied login request")
+	ErrEmailNotAllowed       = errors.New("Required email domain not fulfilled")
+	ErrSignUpNotAllowed      = errors.New("Signup is not allowed for this adapter")
+	ErrUsersQuotaReached     = errors.New("Users quota reached")
+)
+
 func GenStateString() string {
 	rnd := make([]byte, 32)
 	rand.Read(rnd)
@@ -44,8 +52,7 @@ func OAuthLogin(ctx *middleware.Context) {
 	error := ctx.Query("error")
 	if error != "" {
 		errorDesc := ctx.Query("error_description")
-		ctx.Logger.Info("OAuthLogin Failed", "error", error, "errorDesc", errorDesc)
-		ctx.Redirect(setting.AppSubUrl + "/login?failCode=1003")
+		redirectWithError(ctx, ErrProviderDeniedRequest, "error", error, "errorDesc", errorDesc)
 		return
 	}
 
@@ -117,10 +124,8 @@ func OAuthLogin(ctx *middleware.Context) {
 	// get user info
 	userInfo, err := connect.UserInfo(client)
 	if err != nil {
-		if err == social.ErrMissingTeamMembership {
-			ctx.Redirect(setting.AppSubUrl + "/login?failCode=1000")
-		} else if err == social.ErrMissingOrganizationMembership {
-			ctx.Redirect(setting.AppSubUrl + "/login?failCode=1001")
+		if sErr, ok := err.(*social.Error); ok {
+			redirectWithError(ctx, sErr)
 		} else {
 			ctx.Handle(500, fmt.Sprintf("login.OAuthLogin(get info from %s)", name), err)
 		}
@@ -131,8 +136,7 @@ func OAuthLogin(ctx *middleware.Context) {
 
 	// validate that the email is allowed to login to grafana
 	if !connect.IsEmailAllowed(userInfo.Email) {
-		ctx.Logger.Info("OAuth login attempt with unallowed email", "email", userInfo.Email)
-		ctx.Redirect(setting.AppSubUrl + "/login?failCode=1002")
+		redirectWithError(ctx, ErrEmailNotAllowed)
 		return
 	}
 
@@ -142,7 +146,7 @@ func OAuthLogin(ctx *middleware.Context) {
 	// create account if missing
 	if err == m.ErrUserNotFound {
 		if !connect.IsSignupAllowed() {
-			ctx.Redirect(setting.AppSubUrl + "/login")
+			redirectWithError(ctx, ErrSignUpNotAllowed)
 			return
 		}
 		limitReached, err := middleware.QuotaReached(ctx, "user")
@@ -151,7 +155,7 @@ func OAuthLogin(ctx *middleware.Context) {
 			return
 		}
 		if limitReached {
-			ctx.Redirect(setting.AppSubUrl + "/login")
+			redirectWithError(ctx, ErrUsersQuotaReached)
 			return
 		}
 		cmd := m.CreateUserCommand{
@@ -177,5 +181,18 @@ func OAuthLogin(ctx *middleware.Context) {
 
 	metrics.M_Api_Login_OAuth.Inc(1)
 
+	if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
+		ctx.SetCookie("redirect_to", "", -1, setting.AppSubUrl+"/")
+		ctx.Redirect(redirectTo)
+		return
+	}
+
 	ctx.Redirect(setting.AppSubUrl + "/")
 }
+
+func redirectWithError(ctx *middleware.Context, err error, v ...interface{}) {
+	ctx.Logger.Info(err.Error(), v...)
+	// TODO: we can use the flash storage here once it's implemented
+	ctx.Session.Set("loginError", err.Error())
+	ctx.Redirect(setting.AppSubUrl + "/login")
+}

pkg/api/metrics.go

@@ -33,7 +33,7 @@ func QueryMetrics(c *middleware.Context, reqDto dtos.MetricRequest) Response {
 		})
 	}
 
-	resp, err := tsdb.HandleRequest(context.TODO(), request)
+	resp, err := tsdb.HandleRequest(context.Background(), request)
 	if err != nil {
 		return ApiError(500, "Metric request error", err)
 	}

pkg/api/org_invite.go

@@ -38,6 +38,10 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
 		if err != m.ErrUserNotFound {
 			return ApiError(500, "Failed to query db for existing user check", err)
 		}
+
+		if setting.DisableLoginForm {
+			return ApiError(401, "User could not be found", nil)
+		}
 	} else {
 		return inviteExistingUserToOrg(c, userQuery.Result, &inviteDto)
 	}

pkg/api/user.go

@@ -210,14 +210,48 @@ func ChangeUserPassword(c *middleware.Context, cmd m.ChangeUserPasswordCommand)
 
 // GET /api/users
 func SearchUsers(c *middleware.Context) Response {
-	query := m.SearchUsersQuery{Query: "", Page: 0, Limit: 1000}
-	if err := bus.Dispatch(&query); err != nil {
+	query, err := searchUser(c)
+	if err != nil {
+		return ApiError(500, "Failed to fetch users", err)
+	}
+
+	return Json(200, query.Result.Users)
+}
+
+// GET /api/search
+func SearchUsersWithPaging(c *middleware.Context) Response {
+	query, err := searchUser(c)
+	if err != nil {
 		return ApiError(500, "Failed to fetch users", err)
 	}
 
 	return Json(200, query.Result)
 }
 
+func searchUser(c *middleware.Context) (*m.SearchUsersQuery, error) {
+	perPage := c.QueryInt("perpage")
+	if perPage <= 0 {
+		perPage = 1000
+	}
+	page := c.QueryInt("page")
+
+	if page < 1 {
+		page = 1
+	}
+
+	searchQuery := c.Query("query")
+
+	query := &m.SearchUsersQuery{Query: searchQuery, Page: page, Limit: perPage}
+	if err := bus.Dispatch(query); err != nil {
+		return nil, err
+	}
+
+	query.Result.Page = page
+	query.Result.PerPage = perPage
+
+	return query, nil
+}
+
 func SetHelpFlag(c *middleware.Context) Response {
 	flag := c.ParamsInt64(":id")
 

pkg/api/user_test.go

@@ -0,0 +1,109 @@
+package api
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana/pkg/models"
+
+	"github.com/grafana/grafana/pkg/bus"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestUserApiEndpoint(t *testing.T) {
+	Convey("Given a user is logged in", t, func() {
+		mockResult := models.SearchUserQueryResult{
+			Users: []*models.UserSearchHitDTO{
+				{Name: "user1"},
+				{Name: "user2"},
+			},
+			TotalCount: 2,
+		}
+
+		loggedInUserScenario("When calling GET on", "/api/users", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsers
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+			So(sentLimit, ShouldEqual, 1000)
+			So(sendPage, ShouldEqual, 1)
+
+			respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
+			So(err, ShouldBeNil)
+			So(len(respJSON.MustArray()), ShouldEqual, 2)
+		})
+
+		loggedInUserScenario("When calling GET with page and limit querystring parameters on", "/api/users", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsers
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
+
+			So(sentLimit, ShouldEqual, 10)
+			So(sendPage, ShouldEqual, 2)
+		})
+
+		loggedInUserScenario("When calling GET on", "/api/users/search", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsersWithPaging
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
+
+			So(sentLimit, ShouldEqual, 1000)
+			So(sendPage, ShouldEqual, 1)
+
+			respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
+			So(err, ShouldBeNil)
+
+			So(respJSON.Get("totalCount").MustInt(), ShouldEqual, 2)
+			So(len(respJSON.Get("users").MustArray()), ShouldEqual, 2)
+		})
+
+		loggedInUserScenario("When calling GET with page and perpage querystring parameters on", "/api/users/search", func(sc *scenarioContext) {
+			var sentLimit int
+			var sendPage int
+			bus.AddHandler("test", func(query *models.SearchUsersQuery) error {
+				query.Result = mockResult
+
+				sentLimit = query.Limit
+				sendPage = query.Page
+
+				return nil
+			})
+
+			sc.handlerFunc = SearchUsersWithPaging
+			sc.fakeReqWithParams("GET", sc.url, map[string]string{"perpage": "10", "page": "2"}).exec()
+
+			So(sentLimit, ShouldEqual, 10)
+			So(sendPage, ShouldEqual, 2)
+		})
+	})
+}

pkg/cmd/grafana-cli/main.go

@@ -35,7 +35,7 @@ func main() {
 		cli.StringFlag{
 			Name:   "repo",
 			Usage:  "url to the plugin repository",
-			Value:  "https://grafana.net/api/plugins",
+			Value:  "https://grafana.com/api/plugins",
 			EnvVar: "GF_PLUGIN_REPO",
 		},
 		cli.BoolFlag{