Merge branch 'master' of github.com:grafana/grafana

.github/ISSUE_TEMPLATE.md

@@ -4,8 +4,6 @@ Read before posting:
 - Checkout FAQ: https://community.grafana.com/c/howto/faq
 - 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
 - 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:
 Please include this information:
 - What Grafana version are you using?
 - What Grafana version are you using?
 - What datasource are you using?
 - What datasource are you using?

CHANGELOG.md

@@ -28,6 +28,8 @@
 # 4.6.1 (unreleased)
 # 4.6.1 (unreleased)
 
 
 * **Singlestat**: Lost thresholds when using save dashboard as [#9681](https://github.com/grafana/grafana/issues/9681)
 * **Singlestat**: Lost thresholds when using save dashboard as [#9681](https://github.com/grafana/grafana/issues/9681)
+* **Graph**: Fix for series override color picker [#9715](https://github.com/grafana/grafana/issues/9715)
+* **Go**: build using golang 1.9.2 [#9713](https://github.com/grafana/grafana/issues/9713)
 
 
 # 4.6.0 (2017-10-26)
 # 4.6.0 (2017-10-26)
 
 

codecov.yml

@@ -7,5 +7,7 @@ coverage:
     project: yes
     project: yes
     patch: yes
     patch: yes
     changes: no
     changes: no
-    
-comment: false
+
+comment:
+  layout: "diff"
+  behavior: "once"

docs/sources/installation/configuration.md

@@ -551,7 +551,7 @@ session provider you have configured.
 
 
 - **file:** session file path, e.g. `data/sessions`
 - **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`
 - **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=require
+- **postgres:** ex:  user=a password=b host=localhost port=5432 dbname=c sslmode=verify-full
 - **memcache:** ex:  127.0.0.1:11211
 - **memcache:** ex:  127.0.0.1:11211
 - **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana`
 - **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana`
 
 
@@ -580,7 +580,7 @@ CREATE TABLE session (
 );
 );
 ```
 ```
 
 
-Postgres valid `sslmode` are `disable`, `require` (default), `verify-ca`, and `verify-full`.
+Postgres valid `sslmode` are `disable`, `require`, `verify-ca`, and `verify-full` (default).
 
 
 ### cookie_name
 ### cookie_name
 
 

pkg/tsdb/postgres/postgres.go

@@ -51,7 +51,7 @@ func generateConnectionString(datasource *models.DataSource) string {
 		}
 		}
 	}
 	}
 
 
-	sslmode := datasource.JsonData.Get("sslmode").MustString("require")
+	sslmode := datasource.JsonData.Get("sslmode").MustString("verify-full")
 	return fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", datasource.User, password, datasource.Url, datasource.Database, sslmode)
 	return fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", datasource.User, password, datasource.Url, datasource.Database, sslmode)
 }
 }
 
 

public/app/core/core.ts

 import "./directives/dash_class";
 import "./directives/dash_class";
-import "./directives/confirm_click";
 import "./directives/dash_edit_link";
 import "./directives/dash_edit_link";
 import "./directives/dropdown_typeahead";
 import "./directives/dropdown_typeahead";
 import "./directives/metric_segment";
 import "./directives/metric_segment";

public/app/core/directives/confirm_click.js

-define([
-  '../core_module',
-],
-function (coreModule) {
-  'use strict';
-
-  coreModule.default.directive('confirmClick', function() {
-    return {
-      restrict: 'A',
-      link: function(scope, elem, attrs) {
-        elem.bind('click', function() {
-          var message = attrs.confirmation || "Are you sure you want to do that?";
-          if (window.confirm(message)) {
-            var action = attrs.confirmClick;
-            if (action) {
-              scope.$apply(scope.$eval(action));
-            }
-          }
-        });
-      },
-    };
-  });
-});

public/app/features/dashlinks/editor.html

@@ -13,7 +13,7 @@
 				</div>
 				</div>
 				<div class="gf-form" ng-show="link.type === 'dashboards'">
 				<div class="gf-form" ng-show="link.type === 'dashboards'">
 					<span class="gf-form-label width-8">With tags</span>
 					<span class="gf-form-label width-8">With tags</span>
-					<bootstrap-tagsinput ng-model="link.tags" class="width-10" tagclass="label label-tag" placeholder="add tags" style="margin-right: .25rem"></bootstrap-tagsinput>
+					<bootstrap-tagsinput ng-model="link.tags" tagclass="label label-tag" placeholder="add tags" style="margin-right: .25rem"></bootstrap-tagsinput>
 				</div>
 				</div>
 				<gf-form-switch ng-show="link.type === 'dashboards'" class="gf-form" label="As dropdown" checked="link.asDropdown" switch-class="max-width-4" label-class="width-8" on-change="updated()"></gf-form-switch>
 				<gf-form-switch ng-show="link.type === 'dashboards'" class="gf-form" label="As dropdown" checked="link.asDropdown" switch-class="max-width-4" label-class="width-8" on-change="updated()"></gf-form-switch>
 				<div class="gf-form" ng-show="link.type === 'dashboards' && link.asDropdown">
 				<div class="gf-form" ng-show="link.type === 'dashboards' && link.asDropdown">