Merge remote-tracking branch 'upstream/master' into master-keystone

Pulls in the latest upstream grafana work

Author: Ryan Bak

CHANGELOG.md

@@ -9,8 +9,9 @@
 * **Elasticsearch**: Support to set Precision Threshold for Unique Count metric, closes [#4689](https://github.com/grafana/grafana/issues/4689)
 * **Navigation**: Add search to org swithcer, closes [#2609](https://github.com/grafana/grafana/issues/2609)
 * **Database**: Allow database config using one propertie, closes [#5456](https://github.com/grafana/grafana/pull/5456)
-* **Graphite**: Add support for groupByNode, closes [#5613](https://github.com/grafana/grafana/pull/5613)
+* **Graphite**: Add support for groupByNodes, closes [#5613](https://github.com/grafana/grafana/pull/5613)
 * **Influxdb**: Add support for elapsed(), closes [#5827](https://github.com/grafana/grafana/pull/5827)
+* **OpenTSDB**: Add support for explicitTags for OpenTSDB>=2.3, closes [#6360](https://github.com/grafana/grafana/pull/6361)
 * **OAuth**: Add support for generic oauth, closes [#4718](https://github.com/grafana/grafana/pull/4718)
 * **Cloudwatch**: Add support to expand multi select template variable, closes [#5003](https://github.com/grafana/grafana/pull/5003)
 * **Graph Panel**: Now supports flexible lower/upper bounds on Y-Max and Y-Min, PR [#5720](https://github.com/grafana/grafana/pull/5720)
@@ -27,7 +28,9 @@
 * **Graph panel**: Fixed problem with auto decimals on y axis when datamin=datamax, fixes [#6070](https://github.com/grafana/grafana/pull/6070)
 * **Snapshot**: Can view embedded panels/png rendered panels in snapshots without login, fixes [#3769](https://github.com/grafana/grafana/pull/3769)
 * **Elasticsearch**: Fix for query template variable when looking up terms without query, no longer relies on elasticsearch default field, fixes [#3887](https://github.com/grafana/grafana/pull/3887)
+* **Elasticsearch**: Fix for displaying IP address used in terms aggregations, fixes [#4393](https://github.com/grafana/grafana/pull/4393)
 * **PNG Rendering**: Fix for server side rendering when using auth proxy, fixes [#5906](https://github.com/grafana/grafana/pull/5906)
+* **OpenTSDB**: Fixed multi-value nested templating for opentsdb, fixes [#6455](https://github.com/grafana/grafana/pull/6455)
 
 # 3.1.2 (unreleased)
 * **Templating**: Fixed issue when combining row & panel repeats, fixes [#5790](https://github.com/grafana/grafana/issues/5790)

Gruntfile.js

@@ -12,12 +12,16 @@ module.exports = function (grunt) {
     platform: process.platform.replace('win32', 'windows'),
   };
 
-  if (process.platform.match(/^win/)) {
-    config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86';
+  if (grunt.option('arch')) {
+    config.arch = grunt.option('arch');
+  } else {
+    config.arch = os.arch();
+
+    if (process.platform.match(/^win/)) {
+      config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86';
+    }
   }
 
-  config.arch = grunt.option('arch') || os.arch();
-
   config.phjs = grunt.option('phjsToRelease');
 
   config.pkg.version = grunt.option('pkgVer') || config.pkg.version;

Makefile

@@ -1,16 +1,28 @@
 all: deps build
 
-deps:
+deps-go:
 	go run build.go setup
+
+deps-js:
 	npm install
 
-build:
+deps: deps-go deps-js
+
+build-go:
 	go run build.go build
+
+build-js:
 	npm run build
 
-test:
+build: build-go build-js
+
+test-go:
 	go test -v ./pkg/...
+
+test-js:
 	npm test
 
+test: test-go test-js
+
 run:
 	./bin/grafana-server

README.md

@@ -74,7 +74,7 @@ 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/download/builds)
+the latest master builds [here](http://grafana.org/builds)
 
 ### Dependencies
 
@@ -87,11 +87,11 @@ the latest master builds [here](http://grafana.org/download/builds)
 go get github.com/grafana/grafana
 ```
 
-Since imports of dependencies use the absolute path github.com/grafana/grafana within the $GOPATH,
-you will need to put your version of the code in $GOPATH/src/github.com/grafana/grafana to be able
+Since imports of dependencies use the absolute path `github.com/grafana/grafana` within the `$GOPATH`,
+you will need to put your version of the code in `$GOPATH/src/github.com/grafana/grafana` to be able
 to develop and build grafana on a cloned repository. To do so, you can clone your forked repository
-directly to $GOPATH/src/github.com/grafana or you can create a symbolic link from your version
-of the code to $GOPATH/src/github.com/grafana/grafana. The last options makes it possible to change
+directly to `$GOPATH/src/github.com/grafana` or you can create a symbolic link from your version
+of the code to `$GOPATH/src/github.com/grafana/grafana`. The last options makes it possible to change
 easily the grafana repository you want to build.
 ```bash
 go get github.com/*your_account*/grafana
@@ -108,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 of **node (v4+)**,
+To build less to css for the frontend you will need a recent version of **node (v4+)**,
 npm (v2.5.0) and grunt (v0.4.5). Run the following:
 
 ```bash
@@ -135,7 +135,7 @@ bra run
 ./bin/grafana-server
 ```
 
-Open grafana in your browser (default http://localhost:3000) and login with admin user (default user/pass = admin/admin).
+Open grafana in your browser (default: `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).
 
 ### Dev config
 
@@ -147,7 +147,7 @@ You only need to add the options you want to override. Config files are applied
 3. custom.ini
 
 ## Create a pull request
-Before or after you create a pull request, sign the [contributor license agreement](http://grafana.org/docs/contributing/cla.html).
+Before or after you create a pull request, sign the [contributor license agreement](http://docs.grafana.org/project/cla/).
 
 ## Contribute
 If you have any idea for an improvement or found a bug do not hesitate to open an issue.

appveyor.yml

@@ -25,7 +25,13 @@ install:
 build_script:
   - go run build.go build
   - grunt release
+  - go run build.go sha1-dist
+  - cp dist/* .
 
 artifacts:
-  - path: dist/*
+  - path: grafana-*windows-*.*
     name: binzip
+
+deploy:
+  - provider: Environment
+    name: GrafanaBuildsS3

build.go

@@ -98,6 +98,9 @@ func main() {
 			createDebPackages()
 			sha1FilesInDist()
 
+    case "sha1-dist":
+      sha1FilesInDist()
+
 		case "latest":
 			makeLatestDistCopies()
 			sha1FilesInDist()

circle.yml

@@ -28,3 +28,4 @@ deployment:
     owner: grafana
     commands:
       - ./scripts/trigger_grafana_packer.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}
+      - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN}

conf/defaults.ini

@@ -229,6 +229,7 @@ auth_url = https://accounts.google.com/o/oauth2/auth
 token_url = https://accounts.google.com/o/oauth2/token
 api_url = https://www.googleapis.com/oauth2/v1/userinfo
 allowed_domains =
+hosted_domain = 
 
 #################################### Grafana.net Auth ####################
 [auth.grafananet]

docker/blocks/influxdb/config.toml

@@ -1,11 +1,12 @@
 influxdb:
-  #image: influxdb/influxdb:1.0-alpine
   image: influxdb:latest
   container_name: influxdb
   ports:
     - "2004:2004"
     - "8083:8083"
     - "8086:8086"
+  volumes:
+    - ./blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf
 
 fake-influxdb-data:
   image: grafana/fake-data-gen