Skip to content

Commit

Permalink
Graph: Fix decimals and add legend params
Browse files Browse the repository at this point in the history 
Signed-off-by: Julien Pivotto <[email protected]>
  • Loading branch information
@roidelapluie
roidelapluie committed Nov 23, 2017
1 parent 712625e commit fade109
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 12 deletions.
21 changes: 14 additions & 7 deletions examples/jvm_compiled.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "-- Mixed --",
"decimals": 2,
"fill": 0,
"id": 2,
"legend": {
Expand Down Expand Up @@ -466,6 +465,7 @@
},
"yaxes": [
{
"decimals": 2,
"format": "bytes",
"label": null,
"logBase": 1,
Expand All @@ -474,6 +474,7 @@
"show": true
},
{
"decimals": 2,
"format": "bytes",
"label": null,
"logBase": 1,
Expand All @@ -489,7 +490,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "-- Mixed --",
"decimals": 2,
"fill": 0,
"id": 3,
"legend": {
Expand Down Expand Up @@ -558,6 +558,7 @@
},
"yaxes": [
{
"decimals": 2,
"format": "bytes",
"label": null,
"logBase": 1,
Expand All @@ -566,6 +567,7 @@
"show": true
},
{
"decimals": 2,
"format": "bytes",
"label": null,
"logBase": 1,
Expand Down Expand Up @@ -594,7 +596,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "-- Mixed --",
"decimals": 2,
"fill": 0,
"id": 25,
"legend": {
Expand Down Expand Up @@ -664,6 +665,7 @@
},
"yaxes": [
{
"decimals": 2,
"format": "bytes",
"label": null,
"logBase": 1,
Expand All @@ -672,6 +674,7 @@
"show": true
},
{
"decimals": 2,
"format": "bytes",
"label": null,
"logBase": 1,
Expand Down Expand Up @@ -700,7 +703,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "-- Mixed --",
"decimals": 2,
"fill": 0,
"id": 15,
"legend": {
Expand Down Expand Up @@ -756,6 +758,7 @@
},
"yaxes": [
{
"decimals": 2,
"format": "short",
"label": null,
"logBase": 1,
Expand All @@ -764,6 +767,7 @@
"show": true
},
{
"decimals": 2,
"format": "short",
"label": null,
"logBase": 1,
Expand All @@ -779,7 +783,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "-- Mixed --",
"decimals": 2,
"fill": 0,
"id": 16,
"legend": {
Expand Down Expand Up @@ -835,6 +838,7 @@
},
"yaxes": [
{
"decimals": 2,
"format": "s",
"label": null,
"logBase": 1,
Expand All @@ -843,6 +847,7 @@
"show": true
},
{
"decimals": 2,
"format": "s",
"label": null,
"logBase": 1,
Expand Down Expand Up @@ -871,7 +876,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "-- Mixed --",
"decimals": 2,
"fill": 0,
"id": 5,
"legend": {
Expand Down Expand Up @@ -955,6 +959,7 @@
},
"yaxes": [
{
"decimals": 2,
"format": "short",
"label": null,
"logBase": 1,
Expand All @@ -963,6 +968,7 @@
"show": true
},
{
"decimals": 2,
"format": "short",
"label": null,
"logBase": 1,
Expand All @@ -978,7 +984,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "-- Mixed --",
"decimals": 2,
"fill": 0,
"id": 6,
"legend": {
Expand Down Expand Up @@ -1034,6 +1039,7 @@
},
"yaxes": [
{
"decimals": 2,
"format": "short",
"label": null,
"logBase": 1,
Expand All @@ -1042,6 +1048,7 @@
"show": true
},
{
"decimals": 2,
"format": "short",
"label": null,
"logBase": 1,
Expand Down
13 changes: 9 additions & 4 deletions grafonnet/graph_panel.libsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,21 @@
legend_avg=false,
legend_alignAsTable=false,
legend_rightSide=false,
legend_hideEmpty=null,
legend_hideZero=null,
):: {
[if id != null then "id"]: id,
title: title,
span: span,
[if min_span != null then "minSpan"]: min_span,
[if decimals != null then "decimals"]: decimals,
type: "graph",
datasource: datasource,
targets: [
],
renderer: "flot",
yaxes: [
$.yaxe(format, min, max),
$.yaxe(format, min, max),
$.yaxe(format, min, max, decimals=decimals),
$.yaxe(format, min, max, decimals=decimals),
],
xaxis: {
show: true,
Expand Down Expand Up @@ -101,6 +102,8 @@
alignAsTable: legend_alignAsTable,
rightSide: legend_rightSide,
avg: legend_avg,
[if legend_hideEmpty != null then "legend_hideEmpty"]: legend_hideEmpty,
[if legend_hideEmpty != null then "legend_hideZero"]: legend_hideZero,
},
nullPointMode: "null",
steppedLine: false,
Expand All @@ -122,14 +125,16 @@
max=null,
label=null,
show=true,
logBase=1
logBase=1,
decimals=null,
):: {
label: label,
show: show,
logBase: logBase,
min: min,
max: max,
format: format,
[if decimals != null then "decimals"]: decimals,
},
addTarget(target):: {
targets+: [target],
Expand Down
2 changes: 2 additions & 0 deletions tests/graph_panel/test.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ local graphPanel = grafana.graphPanel;
legend_avg=true,
legend_alignAsTable=true,
legend_rightSide=true,
legend_hideEmpty=true,
legend_hideZero=true,
),
targets: graphPanel.new("with targets")
+ graphPanel.addTarget("foo")
Expand Down
5 changes: 4 additions & 1 deletion tests/graph_panel/test_compiled.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
"dashLength": 10,
"dashes": true,
"datasource": "$PROMETHEUS",
"decimals": 2,
"fill": 2,
"id": 2,
"legend": {
"alignAsTable": true,
"avg": true,
"current": true,
"legend_hideEmpty": true,
"legend_hideZero": true,
"max": true,
"min": true,
"rightSide": true,
Expand Down Expand Up @@ -53,6 +54,7 @@
},
"yaxes": [
{
"decimals": 2,
"format": "ms",
"label": null,
"logBase": 1,
Expand All @@ -61,6 +63,7 @@
"show": true
},
{
"decimals": 2,
"format": "ms",
"label": null,
"logBase": 1,
Expand Down

0 comments on commit fade109

Please sign in to comment.