From a503c1d39c98d78af580672002527a7fccf37eab Mon Sep 17 00:00:00 2001 From: Sven Klemm <31455525+svenklemm@users.noreply.github.com> Date: Tue, 31 Oct 2017 13:55:32 +0100 Subject: [PATCH 1/7] change default sslmode for postgres to verify-full (#9736) --- docs/sources/installation/configuration.md | 4 ++-- pkg/tsdb/postgres/postgres.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 627a76a963e..5da485144c8 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -551,7 +551,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=require +- **postgres:** ex: user=a password=b host=localhost port=5432 dbname=c sslmode=verify-full - **memcache:** ex: 127.0.0.1:11211 - **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 diff --git a/pkg/tsdb/postgres/postgres.go b/pkg/tsdb/postgres/postgres.go index 6fc9c89e7be..f6fe7797bcf 100644 --- a/pkg/tsdb/postgres/postgres.go +++ b/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) } From 7336a98bb164f562ccba8cfdaea89fab4cf98c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 31 Oct 2017 13:56:00 +0100 Subject: [PATCH 2/7] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 751fe2d3feb..b4846d9db44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ # 4.6.1 (unreleased) * **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) # 4.6.0 (2017-10-26) From afd4f37f39e6640f8ed85998ccfe1f293433cbc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Tue, 31 Oct 2017 13:58:01 +0100 Subject: [PATCH 3/7] Update codecov.yml --- codecov.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/codecov.yml b/codecov.yml index 3d764c1a5b1..82a86e0232b 100644 --- a/codecov.yml +++ b/codecov.yml @@ -7,5 +7,7 @@ coverage: project: yes patch: yes changes: no - -comment: false + +comment: + layout: "diff" + behavior: "once" From c3a9a04daddf83e8d9659e8f34e3af60e3e67678 Mon Sep 17 00:00:00 2001 From: Patrick O'Carroll Date: Tue, 31 Oct 2017 13:58:38 +0100 Subject: [PATCH 4/7] converted confirm_click.js to .ts (#9674) * converted confirm_click.js to .ts * deleted confirm_click.ts * removed import of confirm_click --- public/app/core/core.ts | 1 - public/app/core/directives/confirm_click.js | 23 --------------------- 2 files changed, 24 deletions(-) delete mode 100644 public/app/core/directives/confirm_click.js diff --git a/public/app/core/core.ts b/public/app/core/core.ts index 9630fdac9c0..fb92fd81d19 100644 --- a/public/app/core/core.ts +++ b/public/app/core/core.ts @@ -1,5 +1,4 @@ import "./directives/dash_class"; -import "./directives/confirm_click"; import "./directives/dash_edit_link"; import "./directives/dropdown_typeahead"; import "./directives/metric_segment"; diff --git a/public/app/core/directives/confirm_click.js b/public/app/core/directives/confirm_click.js deleted file mode 100644 index 95b60347e10..00000000000 --- a/public/app/core/directives/confirm_click.js +++ /dev/null @@ -1,23 +0,0 @@ -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)); - } - } - }); - }, - }; - }); -}); From 3c572aece61431f0c263d002d4f2b51c16e39a1a Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 31 Oct 2017 12:56:06 +0100 Subject: [PATCH 5/7] changelog: adds note about closing #9713 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4846d9db44..0f9c70c540d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ * **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) From ae5b3fd4b5042062dfa91918f28ec57a9542b806 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 31 Oct 2017 14:14:50 +0100 Subject: [PATCH 6/7] github: dont require bug/fr in title --- .github/ISSUE_TEMPLATE.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 57fca7f44cb..082482fcb74 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,8 +4,6 @@ Read before posting: - 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? - What datasource are you using? From 1206ce261cbd7d8e47c9306c781919efa9d4171c Mon Sep 17 00:00:00 2001 From: Patrick O'Carroll Date: Tue, 31 Oct 2017 14:29:10 +0100 Subject: [PATCH 7/7] fix for dashboard tag link bug, fixes #9737 (#9739) --- public/app/features/dashlinks/editor.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html index ae77dd988fc..11dfdf74c1f 100644 --- a/public/app/features/dashlinks/editor.html +++ b/public/app/features/dashlinks/editor.html @@ -13,7 +13,7 @@
With tags - +