From eb54fbaef566f4b3b69a9f6a6686245bdcd4d5f4 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 23 Jun 2016 08:41:25 +0200 Subject: [PATCH 1/3] docs(changelog): add note about cli fix #5410 --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f911729cc1..eaff2e0bbc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,15 +12,16 @@ * **Scripts**: Use restart instead of start for deb package script, closes [#5282](https://github.com/grafana/grafana/pull/5282) * **Logging**: Moved to structured logging lib, and moved to component specific level filters via config file, closes [#4590](https://github.com/grafana/grafana/issues/4590) * **Search**: Add search limit query parameter, closes [#5292](https://github.com/grafana/grafana/pull/5292) -* **OpenTSDB**: Support nested template variables in tag_values function, closes [4398](https://github.com/grafana/grafana/issues/4398) -* **Datasource**: Pending data source requests are cancelled before new ones are issues (Graphite & Prometheus), closes [5321](https://github.com/grafana/grafana/issues/5321) +* **OpenTSDB**: Support nested template variables in tag_values function, closes [#4398](https://github.com/grafana/grafana/issues/4398) +* **Datasource**: Pending data source requests are cancelled before new ones are issues (Graphite & Prometheus), closes [#5321](https://github.com/grafana/grafana/issues/5321) ### Breaking changes * **Logging** : Changed default logging output format (now structured into message, and key value pairs, with logger key acting as component). You can also no change in config to json log ouput. -* **Graphite** : The Graph panel no longer have a Graphite PNG option. closes #[5367](https://github.com/grafana/grafana/issues/5367) +* **Graphite** : The Graph panel no longer have a Graphite PNG option. closes [#5367](https://github.com/grafana/grafana/issues/5367) ### Bug fixes -* **PNG rendering**: Fixed phantomjs rendering and y-axis label rotation. fixes #[5220](https://github.com/grafana/grafana/issues/5220) +* **PNG rendering**: Fixed phantomjs rendering and y-axis label rotation. fixes [#5220](https://github.com/grafana/grafana/issues/5220) +* **CLI**: The cli tool now supports reading plugin.json from dist/plugin.json. fixes [#5410](https://github.com/grafana/grafana/issues/5410) # 3.0.4 Patch release (2016-05-25) * **Panel**: Fixed blank dashboard issue when switching to other dashboard while in fullscreen edit mode, fixes [#5163](https://github.com/grafana/grafana/pull/5163) From 6487814007744b1f3f50004887fa14e07722d450 Mon Sep 17 00:00:00 2001 From: Emmanuel Quentin Date: Tue, 21 Jun 2016 16:13:31 +0200 Subject: [PATCH 2/3] Avoid to request influxdb when query is hidden --- public/app/plugins/datasource/influxdb/datasource.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 40c7ba16f53..9a5ebbef859 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -134,6 +134,8 @@ export default class InfluxDatasource { }; _seriesQuery(query) { + if (!query) { return this.$q.when({results: []}); } + return this._influxRequest('GET', '/query', {q: query, epoch: 'ms'}); } From 6af2d9986250371de33fed848a3ba971867a4fe1 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 23 Jun 2016 13:17:53 +0200 Subject: [PATCH 3/3] style(light-theme): make text-color-weak a little bit darker otherwise its not possible to see which queries are disabled in the query editor --- public/sass/_variables.light.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss index 90262a3134c..bb38579ce2d 100644 --- a/public/sass/_variables.light.scss +++ b/public/sass/_variables.light.scss @@ -60,7 +60,7 @@ $page-bg: $white; $body-color: $gray-1; $text-color: $gray-1; $text-color-strong: $white; -$text-color-weak: $gray-1; +$text-color-weak: $gray-2; $text-color-faint: $gray-3; $text-color-emphasis: $dark-5;