From dca45f177fa50843800dfc40bf89b140e6288acd Mon Sep 17 00:00:00 2001 From: Alex Laverty Date: Thu, 9 Jul 2015 11:50:29 +1000 Subject: [PATCH 01/10] Fixed invalid json example, added missing comma --- docs/sources/reference/http_api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/reference/http_api.md b/docs/sources/reference/http_api.md index 90b7274cce6..fb9e7600ecf 100644 --- a/docs/sources/reference/http_api.md +++ b/docs/sources/reference/http_api.md @@ -53,7 +53,7 @@ Creates a new dashboard or updates an existing dashboard. "rows": [ { } - ] + ], "schemaVersion": 6, "version": 0 }, From 14e25100d4066caaa366ffed9aa0f9d87fa30c78 Mon Sep 17 00:00:00 2001 From: gmembre Date: Thu, 9 Jul 2015 22:17:12 +0200 Subject: [PATCH 02/10] Adding GOPATH --- docs/sources/project/building_from_source.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md index dc08f5a261a..b59d067eec4 100644 --- a/docs/sources/project/building_from_source.md +++ b/docs/sources/project/building_from_source.md @@ -17,6 +17,7 @@ dev environment. ## Get Code ``` +export GOPATH=``pwd` go get github.com/grafana/grafana ``` @@ -24,11 +25,11 @@ go get github.com/grafana/grafana ``` cd $GOPATH/src/github.com/grafana/grafana go run build.go setup (only needed once to install godep) -godep restore (will pull down all golang lib dependecies in your current GOPATH) +$GOPATH/bin/godep restore (will pull down all golang lib dependecies in your current GOPATH) go build . ``` -# Building on Windows +## Building on Windows The Grafana backend includes Sqlite3 which requires GCC to compile. So in order to compile Grafana on windows you need to install GCC. We recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download). From 3fa228dcbba4d0440ea2d4a4c8644bdec4ddc3d0 Mon Sep 17 00:00:00 2001 From: gmembre Date: Thu, 9 Jul 2015 22:49:27 +0200 Subject: [PATCH 03/10] Correcting typo --- docs/sources/project/building_from_source.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md index b59d067eec4..b0ae5cec724 100644 --- a/docs/sources/project/building_from_source.md +++ b/docs/sources/project/building_from_source.md @@ -17,7 +17,7 @@ dev environment. ## Get Code ``` -export GOPATH=``pwd` +export GOPATH=`pwd` go get github.com/grafana/grafana ``` From 244e682c2ba1cbdccc6cb1ee15c5785adbed5e8e Mon Sep 17 00:00:00 2001 From: Johannes Wienke Date: Fri, 10 Jul 2015 12:16:41 +0200 Subject: [PATCH 04/10] Series override option to hide legend entries Adds a series override option to hide certain series from the legend. * public/app/components/timeSeries.js: boolean flag to decide display in legend and application of override option for this flag * public/app/panels/graph/legend.js: exclude hidden series * public/app/panels/graph/seriesOverridesCtrl.js: add legend override option This fixes #2324 --- public/app/components/timeSeries.js | 2 ++ public/app/panels/graph/legend.js | 4 ++++ public/app/panels/graph/seriesOverridesCtrl.js | 1 + 3 files changed, 7 insertions(+) diff --git a/public/app/components/timeSeries.js b/public/app/components/timeSeries.js index 3c41378947e..74194e68ff9 100644 --- a/public/app/components/timeSeries.js +++ b/public/app/components/timeSeries.js @@ -13,6 +13,7 @@ function (_, kbn) { this.color = opts.color; this.valueFormater = kbn.valueFormats.none; this.stats = {}; + this.legend = true; } function matchSeriesOverride(aliasOrRegex, seriesAlias) { @@ -55,6 +56,7 @@ function (_, kbn) { if (override.fillBelowTo !== void 0) { this.fillBelowTo = override.fillBelowTo; } if (override.color !== void 0) { this.color = override.color; } if (override.transform !== void 0) { this.transform = override.transform; } + if (override.legend !== void 0) { this.legend = override.legend; } if (override.yaxis !== void 0) { this.yaxis = override.yaxis; diff --git a/public/app/panels/graph/legend.js b/public/app/panels/graph/legend.js index 1f016f2c3a3..beea27ec8b7 100644 --- a/public/app/panels/graph/legend.js +++ b/public/app/panels/graph/legend.js @@ -130,6 +130,10 @@ function (angular, app, _, kbn, $) { if (panel.legend.hideEmpty && series.allIsNull) { continue; } + // ignore series excluded via override + if (!series.legend) { + continue; + } var html = '
) will become Red, Orange, Green (). + + +### Spark Lines + +Spark lines are a great way of seeing the historical data associated with a single stat value, providing valuable context at a glance. Spark lines act differently than traditional graph panels and do not include x or y axis, coordinates, a legend, or ability to interact with the graph. + +![](/img/v1/Singlestat-Sparklines.png) + +1. `Show`: The show checkbox will toggle whether the spark line is shown in the panel. When unselected, only the value will appear. +2. `Background`: **ASK TORKEL.** +3. `Line Color`: This color selection applies to the color of the sparkline itself. +4. `Fill Color`: This color selection applies to the area below the sparkline.

***Pro-tip:*** Reduce the opacity on fill colors for nice looking panels. + + +### Value to text mapping + +Value to text mapping allows you to translate values into explcit text. The text will respect all styling, thresholds and customization defined for the value. + +![](/img/v1/Singlestat-ValueMapping.png) + +***Does this support regexes or anything other than a single value?*** + From 9f8eae908d86e6432ae284791245d4aa647ed382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 10 Jul 2015 15:34:54 +0200 Subject: [PATCH 07/10] Updated singlestat docs --- docs/sources/reference/singlestat.md | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/sources/reference/singlestat.md b/docs/sources/reference/singlestat.md index 67c5fb4d4a2..13e680c6e5c 100644 --- a/docs/sources/reference/singlestat.md +++ b/docs/sources/reference/singlestat.md @@ -13,47 +13,47 @@ provides thresholds to color that singlestat metric or the panel background. ### Big Value Configuration -The big value configuration allows you to both customize the look of your singlestat metric, as well as add additional labels to contexualize the metric. +The big value configuration allows you to both customize the look of your singlestat metric, as well as add additional labels to contexualize the metric. -![](/img/v1/Singlestat-BaseSettings.png) + -1. `Big Value`: Big Value refers to the collection of values displayed in the singlestat panel. -2. `Prefixes`: The Prefix fields let you define a custom label and font-size (as a %) to appear *before* the singlestat metric. -3. `Values`: The Value fields let you set the (min, max, average, current, total) and font-size (as a %) of the singlestat metric. -4. `Potsfixes`: The Postfix fields let you define a custom label and font-size (as a %) to appear *after* the singlestat metric. -5. `Units`: Units are appended to the the singlestat metric within the panel, and will respect the color and threshold settings for the Value. -6. `Decimals`: The Decimal field allows you to override automatic decimal precision, inceasing the digits displayed for your singlestat metric. +1. `Big Value`: Big Value refers to the collection of values displayed in the singlestat panel. +2. `Prefixes`: The Prefix fields let you define a custom label and font-size (as a %) to appear *before* the singlestat metric. +3. `Values`: The Value fields let you set the (min, max, average, current, total) and font-size (as a %) of the singlestat metric. +4. `Potsfixes`: The Postfix fields let you define a custom label and font-size (as a %) to appear *after* the singlestat metric. +5. `Units`: Units are appended to the the singlestat metric within the panel, and will respect the color and threshold settings for the Value. +6. `Decimals`: The Decimal field allows you to override automatic decimal precision, inceasing the digits displayed for your singlestat metric. ### Coloring -The coloring options of the singlestat config allow you to dynamically change the colors based on the displayed data. +The coloring options of the singlestat config allow you to dynamically change the colors based on the displayed data. -![](/img/v1/Singlestat-Coloring.png) + -1. `Background`: The Background checkbox applies the configured thresholds and colors to the entirity of the singlestat panel background. +1. `Background`: The Background checkbox applies the configured thresholds and colors to the entirity of the singlestat panel background. 2. `Value`: The Value checkbox applies the configured thresholds and colors to the value within the singlestat panel. 3. `Thresholds`: Thresholds allow you to change the background and value colors dyanmically within the panel. The threshold field accepts **3 comma-separated** values, corresponding to the three colors directly to the right. -4. `Colors`: The color picker allows you to select a color and opacity +4. `Colors`: The color picker allows you to select a color and opacity 5. `Invert order`: This link toggles the threshold color order.
For example: Green, Orange, Red () will become Red, Orange, Green (). ### Spark Lines -Spark lines are a great way of seeing the historical data associated with a single stat value, providing valuable context at a glance. Spark lines act differently than traditional graph panels and do not include x or y axis, coordinates, a legend, or ability to interact with the graph. +Spark lines are a great way of seeing the historical data associated with a single stat value, providing valuable context at a glance. Spark lines act differently than traditional graph panels and do not include x or y axis, coordinates, a legend, or ability to interact with the graph. -![](/img/v1/Singlestat-Sparklines.png) + 1. `Show`: The show checkbox will toggle whether the spark line is shown in the panel. When unselected, only the value will appear. 2. `Background`: **ASK TORKEL.** 3. `Line Color`: This color selection applies to the color of the sparkline itself. -4. `Fill Color`: This color selection applies to the area below the sparkline.

***Pro-tip:*** Reduce the opacity on fill colors for nice looking panels. +4. `Fill Color`: This color selection applies to the area below the sparkline. +> ***Pro-tip:*** Reduce the opacity on fill colors for nice looking panels. ### Value to text mapping -Value to text mapping allows you to translate values into explcit text. The text will respect all styling, thresholds and customization defined for the value. +Value to text mapping allows you to translate values into explcit text. The text will respect all styling, thresholds and customization defined for the value. -![](/img/v1/Singlestat-ValueMapping.png) + -***Does this support regexes or anything other than a single value?*** From ca1cd8919073794ebeb665276cf20ada6716c0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 10 Jul 2015 15:53:39 +0200 Subject: [PATCH 08/10] Updated singlestat docs again --- docs/sources/reference/singlestat.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/sources/reference/singlestat.md b/docs/sources/reference/singlestat.md index 13e680c6e5c..4e5a38544c5 100644 --- a/docs/sources/reference/singlestat.md +++ b/docs/sources/reference/singlestat.md @@ -34,8 +34,7 @@ The coloring options of the singlestat config allow you to dynamically change th 2. `Value`: The Value checkbox applies the configured thresholds and colors to the value within the singlestat panel. 3. `Thresholds`: Thresholds allow you to change the background and value colors dyanmically within the panel. The threshold field accepts **3 comma-separated** values, corresponding to the three colors directly to the right. 4. `Colors`: The color picker allows you to select a color and opacity -5. `Invert order`: This link toggles the threshold color order.
For example: Green, Orange, Red () will become Red, Orange, Green (). - +5. `Invert order`: This link toggles the threshold color order.
For example: Green, Orange, Red () will become Red, Orange, Green (). ### Spark Lines @@ -44,7 +43,7 @@ Spark lines are a great way of seeing the historical data associated with a sing 1. `Show`: The show checkbox will toggle whether the spark line is shown in the panel. When unselected, only the value will appear. -2. `Background`: **ASK TORKEL.** +2. `Background`: Check if you want the sparklines to take up the full panel width or uncheck if they should only be at the bottom. 3. `Line Color`: This color selection applies to the color of the sparkline itself. 4. `Fill Color`: This color selection applies to the area below the sparkline. From 9f6c9cd6ffbc03475f4908313f91fa63063beca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sun, 12 Jul 2015 18:18:04 +0200 Subject: [PATCH 09/10] fix(graphite): raw query mode (disable graphite query editor mode) is now persisted property on the query, Fixes #2328, Fixes #2307 --- .../graphite/partials/query.editor.html | 13 ++++++------- .../app/plugins/datasource/graphite/queryCtrl.js | 15 +++++++++++---- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/public/app/plugins/datasource/graphite/partials/query.editor.html b/public/app/plugins/datasource/graphite/partials/query.editor.html index dcbbdc69a8a..add85c26773 100755 --- a/public/app/plugins/datasource/graphite/partials/query.editor.html +++ b/public/app/plugins/datasource/graphite/partials/query.editor.html @@ -12,7 +12,7 @@
  • - +
    • @@ -65,15 +65,14 @@ - + ng-model-onblur ng-change="get_data()" + ng-show="target.textEditor" /> -