From 21353f4ba5bb46b5de5cc720806f4ac916161cdb Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 6 Dec 2016 09:05:12 +0100 Subject: [PATCH 1/3] docs: adds note about closing #6779 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 151e0cbcbbd..5398481b198 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ * **PNG Rendering**: Fix for server side rendering when setting enforce_domain to true [#6769](https://github.com/grafana/grafana/issues/6769) * **Webhooks**: Add content type json to outgoing webhooks [#6822](https://github.com/grafana/grafana/issues/6822) * **Keyboard shortcut**: Fixed zoom out shortcut [#6837](https://github.com/grafana/grafana/issues/6837) +* **Webdav**: Adds basic auth headers to webdav uploader [#6779](https://github.com/grafana/grafana/issues/6779) # 4.0.1 (2016-12-02) From 8f1ed0727553d280753bf48ba620a36a3a905307 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 6 Dec 2016 09:08:03 +0100 Subject: [PATCH 2/3] metrics: 64bit fields should come first in structs https://golang.org/pkg/sync/atomic/#pkg-note-BUG --- pkg/metrics/gauge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/metrics/gauge.go b/pkg/metrics/gauge.go index cdae5ccff26..cca32da5622 100644 --- a/pkg/metrics/gauge.go +++ b/pkg/metrics/gauge.go @@ -32,8 +32,8 @@ func RegGauge(name string, tagStrings ...string) Gauge { // GaugeSnapshot is a read-only copy of another Gauge. type GaugeSnapshot struct { - *MetricMeta value int64 + *MetricMeta } // Snapshot returns the snapshot. From 464553a453c12d41a938aca7ce0beab6078cfedb Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 6 Dec 2016 09:48:56 +0100 Subject: [PATCH 3/3] docs: explains how to use comment chars in passwords --- conf/defaults.ini | 1 + conf/sample.ini | 1 + docs/sources/installation/configuration.md | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index bbd61c66c62..939a92bd007 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -67,6 +67,7 @@ type = sqlite3 host = 127.0.0.1:3306 name = grafana user = root +# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;""" password = # Use either URL or the previous fields to configure the database # Example: mysql://user:secret@host:port/database diff --git a/conf/sample.ini b/conf/sample.ini index d48c4a270c5..57f7415de44 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -69,6 +69,7 @@ ;host = 127.0.0.1:3306 ;name = grafana ;user = root +# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;""" ;password = # Use either URL or the previous fields to configure the database diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index f3b40b206bf..838be7f168e 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -170,7 +170,7 @@ The database user (not applicable for `sqlite3`). ### password -The database user's password (not applicable for `sqlite3`). +The database user's password (not applicable for `sqlite3`). If the password contains `#` or `;` you have to wrap it with trippel quotes. Ex `"""#password;"""` ### ssl_mode