From c871212d6c324c14871d808e7934b1eed6dc6f47 Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 7 Dec 2016 15:58:03 +0100 Subject: [PATCH 1/4] docs(changelog): adds note about fixing avg() reducer bug --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d41b15f12c..f918779ebd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ ### Bugfixes * **Alerting**: Add alert message to webhook notifications [#6807](https://github.com/grafana/grafana/issues/6807) +* **Alerting**: Fixes a bug where avg() reducer treated null as zero. [6c9cf87](https://github.com/grafana/grafana/commit/6c9cf87080e52966846a48d04209d90c166ca42e) * **PNG Rendering**: Fix for server side rendering when using non default http addr bind and domain setting [#6813](https://github.com/grafana/grafana/issues/6813) * **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) From 8ee85626f21826a20264206f044ba7b4f83a3a25 Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 7 Dec 2016 18:09:17 +0100 Subject: [PATCH 2/4] fix(api): return correct json info after updating datasource closes #6869 --- pkg/api/api.go | 2 +- pkg/api/datasources.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 4fa28f799b0..0fc5acb958e 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -193,7 +193,7 @@ func Register(r *macaron.Macaron) { r.Group("/datasources", func() { r.Get("/", GetDataSources) r.Post("/", quota("data_source"), bind(m.AddDataSourceCommand{}), AddDataSource) - r.Put("/:id", bind(m.UpdateDataSourceCommand{}), UpdateDataSource) + r.Put("/:id", bind(m.UpdateDataSourceCommand{}), wrap(UpdateDataSource)) r.Delete("/:id", DeleteDataSource) r.Get("/:id", wrap(GetDataSourceById)) r.Get("/name/:name", wrap(GetDataSourceByName)) diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go index a7254eeec6c..f0c022c1622 100644 --- a/pkg/api/datasources.go +++ b/pkg/api/datasources.go @@ -117,7 +117,7 @@ func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Resp return ApiError(500, "Failed to update datasource", err) } - return Json(200, "Datasource updated") + return Json(200, util.DynMap{"message": "Datasource updated"}) } func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error { From c94805d4c2d3c128a13e97fd37d642045f8fcea3 Mon Sep 17 00:00:00 2001 From: Andrey Artemov Date: Thu, 8 Dec 2016 10:12:41 +0200 Subject: [PATCH 3/4] Fix typo in Singlestat page title --- docs/sources/reference/singlestat.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/reference/singlestat.md b/docs/sources/reference/singlestat.md index 1fb0c254c01..ed0a956b7eb 100644 --- a/docs/sources/reference/singlestat.md +++ b/docs/sources/reference/singlestat.md @@ -1,5 +1,5 @@ +++ -title = "Singletat Panel" +title = "Singlestat Panel" keywords = ["grafana", "dashboard", "documentation", "panels", "singlestat"] type = "docs" [menu.docs] From c97e95227abde9f5adb9871088f58e0f834bbd37 Mon Sep 17 00:00:00 2001 From: Andrey Artemov Date: Thu, 8 Dec 2016 10:14:58 +0200 Subject: [PATCH 4/4] Fix some typos in "Export & Import" reference --- docs/sources/reference/export_import.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/sources/reference/export_import.md b/docs/sources/reference/export_import.md index 7430f4891a6..bc05795c030 100644 --- a/docs/sources/reference/export_import.md +++ b/docs/sources/reference/export_import.md @@ -9,7 +9,7 @@ weight = 8 # Export and Import -Grafana Dashboads can easily be exported and imported, either from the UI or from the HTTP API. +Grafana Dashboards can easily be exported and imported, either from the UI or from the HTTP API. ## Exporting a dashboard @@ -22,9 +22,9 @@ The export feature is accessed from the share menu. ### Making a dashboard portable If you want to export a dashboard for others to use then it could be a good idea to -add template variables for things like a metric prefix (use contant variable) and server name. +add template variables for things like a metric prefix (use constant variable) and server name. -A template varible of the type `Constant` will automatically be hidden in +A template variable of the type `Constant` will automatically be hidden in the dashboard, and will also be added as an required input when the dashboard is imported. ## Importing a dashboard @@ -43,7 +43,7 @@ data source you want the dashboard to use and specify any metric prefixes (if th ## Discover dashboards on Grafana.net -Find dashboads for common server applications at [Grafana.net/dashboards](https://grafana.net/dashboards). +Find dashboards for common server applications at [Grafana.net/dashboards](https://grafana.net/dashboards).