allow setting the decimal digits per chart; fixes #788
Costa Tsaousis (ktsaou) committed
Oct 30, 2016 at 13:05 UTC
4f0dbaab9ac1e0fd3fd5987297151ed0e7465f18
9 files changed
+51
-14
web/dashboard.html
+1
-1
@@ -652,4 +652,4 @@ So, to avoid flashing the charts, we destroy and re-create the charts on each up
652
<!-- <script> netdataServer = "http://box:19999"; </script> -->
653
654
<!-- load the dashboard manager - it will do the rest -->
655
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
655
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
web/dashboard.js
+17
-4
@@ -146,8 +146,8 @@
146
dashboard_css: NETDATA.serverDefault + 'dashboard.slate.css?v20161002-1',
147
background: '#272b30',
148
foreground: '#C8C8C8',
149
- grid: '#35393e',
150
- axis: '#35393e',
149
+ grid: '#283236',
150
+ axis: '#283236',
151
/* colors: [ '#55bb33', '#ff2222', '#0099C6', '#faa11b', '#adbce0', '#DDDD00',
152
'#4178ba', '#f58122', '#a5cc39', '#f58667', '#f5ef89', '#cf93c0',
153
'#a5d18a', '#b8539d', '#3954a3', '#c8a9cf', '#c7de8a', '#fad20a',
@@ -1166,6 +1166,16 @@
1166
this.view_after = 0;
1167
this.view_before = 0;
1168
1169
+ this.value_decimal_detail = -1;
1170
+ {
1171
+ var d = self.data('decimal-digits');
1172
+ if(typeof d === 'number') {
1173
+ this.value_decimal_detail = 1;
1174
+ while(d-- > 0)
1175
+ this.value_decimal_detail *= 10;
1176
+ }
1177
+ }
1178
+
1179
this.auto = {
1180
name: 'auto',
1181
autorefresh: true,
@@ -2052,6 +2062,9 @@
2062
if(value === null || value === 'undefined') return '-';
2063
if(typeof value !== 'number') return value;
2064
2065
+ if(this.value_decimal_detail !== -1)
2066
+ return (Math.round(value * this.value_decimal_detail) / this.value_decimal_detail).toLocaleString();
2067
+
2068
var abs = Math.abs(value);
2069
if(abs >= 1000) return (Math.round(value)).toLocaleString();
2070
if(abs >= 100 ) return (Math.round(value * 10) / 10).toLocaleString();
@@ -4006,11 +4019,11 @@
4019
drawAxis: self.data('dygraph-drawaxis') || true,
4020
axisLabelFontSize: self.data('dygraph-axislabelfontsize') || 10,
4021
axisLineColor: self.data('dygraph-axislinecolor') || NETDATA.themes.current.axis,
4009
- axisLineWidth: self.data('dygraph-axislinewidth') || 0.3,
4022
+ axisLineWidth: self.data('dygraph-axislinewidth') || 1.0,
4023
4024
drawGrid: self.data('dygraph-drawgrid') || true,
4025
gridLinePattern: self.data('dygraph-gridlinepattern') || null,
4013
- gridLineWidth: self.data('dygraph-gridlinewidth') || 0.4,
4026
+ gridLineWidth: self.data('dygraph-gridlinewidth') || 1.0,
4027
gridLineColor: self.data('dygraph-gridlinecolor') || NETDATA.themes.current.grid,
4028
4029
maxNumberWidth: self.data('dygraph-maxnumberwidth') || 8,
web/demo.html
+1
-1
@@ -20,7 +20,7 @@
20
<meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
21
<meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
22
</head>
23
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
23
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
24
<body>
25
26
<div style="width: 100%; text-align: center;">
web/demo2.html
+1
-1
@@ -21,7 +21,7 @@
21
<meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
22
</head>
23
<script>var netdataTheme = 'slate';</script>
24
-<script type="text/javascript" src="http://my-netdata.io/dashboard.js?v20161011-1"></script>
24
+<script type="text/javascript" src="http://my-netdata.io/dashboard.js?v20161030-10"></script>
25
<body>
26
27
<div class="container" style="width: 90%; padding-top: 10px; text-align: center; color: #AAA">
web/demosites.html
+27
-3
@@ -52,26 +52,30 @@
52
and that you have chown it to be owned by netdata:netdata
53
-->
54
<!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
55
- <script type="text/javascript" src="dashboard.js?v20161011-1"></script>
55
+ <script type="text/javascript" src="dashboard.js?v20161030-10"></script>
56
57
<script>
58
// --- OPTIONS FOR THE CHARTS --
59
60
// destroy charts not shown (lowers memory on the browsers)
61
// set this to 'true' to destroy, 'false' to hide the charts
62
- NETDATA.options.current.destroy_on_hide = true;
62
+ NETDATA.options.current.destroy_on_hide = false;
63
64
// set this to false, to always show all dimensions
65
NETDATA.options.current.eliminate_zero_dimensions = true;
66
67
// set this to false, to lower the pressure on the browser
68
- NETDATA.options.current.concurrent_refreshes = false;
68
+ NETDATA.options.current.concurrent_refreshes = true;
69
70
// if you need to support slow mobile phones, set this to false
71
NETDATA.options.current.parallel_refresher = true;
72
73
// set this to false, to always update the charts, even if focus is lost
74
NETDATA.options.current.stop_updates_when_focus_is_lost = true;
75
+
76
+ // since we have many servers and limited sockets,
77
+ // abort ajax calls when we scroll
78
+ NETDATA.options.current.abort_ajax_on_scroll = true;
79
</script>
80
<style>
81
body {
@@ -194,6 +198,7 @@
198
data-host="//london.my-netdata.io"
199
data-title="EU - London"
200
data-chart-library="gauge"
201
+ data-decimal-digits="0"
202
data-width="100%"
203
data-after="-300"
204
data-points="300"
@@ -214,6 +219,7 @@
219
data-host="//atlanta.my-netdata.io"
220
data-title="US - Atlanta"
221
data-chart-library="gauge"
222
+ data-decimal-digits="0"
223
data-width="100%"
224
data-after="-300"
225
data-points="300"
@@ -234,6 +240,7 @@
240
data-host="//sanfrancisco.netdata.rocks"
241
data-title="US - California"
242
data-chart-library="gauge"
243
+ data-decimal-digits="0"
244
data-width="100%"
245
data-after="-300"
246
data-points="300"
@@ -254,6 +261,7 @@
261
data-host="//toronto.netdata.rocks"
262
data-title="Canada"
263
data-chart-library="gauge"
264
+ data-decimal-digits="0"
265
data-width="100%"
266
data-after="-300"
267
data-points="300"
@@ -275,6 +283,7 @@
283
data-host="//frankfurt.netdata.rocks"
284
data-title="EU - Germany"
285
data-chart-library="easypiechart"
286
+ data-decimal-digits="0"
287
data-width="75%"
288
data-after="-300"
289
data-points="300"
@@ -295,6 +304,7 @@
304
data-host="//newyork.netdata.rocks"
305
data-title="US - New York"
306
data-chart-library="easypiechart"
307
+ data-decimal-digits="0"
308
data-width="75%"
309
data-after="-300"
310
data-points="300"
@@ -315,6 +325,7 @@
325
data-host="//singapore.netdata.rocks"
326
data-title="Singapore"
327
data-chart-library="easypiechart"
328
+ data-decimal-digits="0"
329
data-width="75%"
330
data-after="-300"
331
data-points="300"
@@ -335,6 +346,7 @@
346
data-host="//bangalore.netdata.rocks"
347
data-title="India"
348
data-chart-library="easypiechart"
349
+ data-decimal-digits="0"
350
data-width="75%"
351
data-after="-300"
352
data-points="300"
@@ -396,6 +408,7 @@
408
<div data-netdata="nginx_local.requests"
409
data-dimensions="requests"
410
data-host="//london.my-netdata.io"
411
+ data-decimal-digits="0"
412
data-chart-library="dygraph"
413
data-dygraph-theme="sparkline"
414
data-dygraph-type="area"
@@ -416,6 +429,7 @@
429
<div data-netdata="nginx_local.requests"
430
data-dimensions="requests"
431
data-host="//atlanta.my-netdata.io"
432
+ data-decimal-digits="0"
433
data-chart-library="dygraph"
434
data-dygraph-theme="sparkline"
435
data-dygraph-type="area"
@@ -436,6 +450,7 @@
450
<div data-netdata="nginx_local.requests"
451
data-dimensions="requests"
452
data-host="//sanfrancisco.netdata.rocks"
453
+ data-decimal-digits="0"
454
data-chart-library="dygraph"
455
data-dygraph-theme="sparkline"
456
data-dygraph-type="area"
@@ -456,6 +471,7 @@
471
<div data-netdata="nginx_local.requests"
472
data-dimensions="requests"
473
data-host="//toronto.netdata.rocks"
474
+ data-decimal-digits="0"
475
data-chart-library="dygraph"
476
data-dygraph-theme="sparkline"
477
data-dygraph-type="area"
@@ -478,6 +494,7 @@
494
<div data-netdata="nginx_local.connections"
495
data-dimensions="active"
496
data-host="//london.my-netdata.io"
497
+ data-decimal-digits="0"
498
data-chart-library="dygraph"
499
data-dygraph-theme="sparkline"
500
data-dygraph-type="area"
@@ -498,6 +515,7 @@
515
<div data-netdata="nginx_local.connections"
516
data-dimensions="active"
517
data-host="//atlanta.my-netdata.io"
518
+ data-decimal-digits="0"
519
data-chart-library="dygraph"
520
data-dygraph-theme="sparkline"
521
data-dygraph-type="area"
@@ -518,6 +536,7 @@
536
<div data-netdata="nginx_local.connections"
537
data-dimensions="active"
538
data-host="//sanfrancisco.netdata.rocks"
539
+ data-decimal-digits="0"
540
data-chart-library="dygraph"
541
data-dygraph-theme="sparkline"
542
data-dygraph-type="area"
@@ -538,6 +557,7 @@
557
<div data-netdata="nginx_local.connections"
558
data-dimensions="active"
559
data-host="//toronto.netdata.rocks"
560
+ data-decimal-digits="0"
561
data-chart-library="dygraph"
562
data-dygraph-theme="sparkline"
563
data-dygraph-type="area"
@@ -688,6 +708,7 @@
708
<div data-netdata="netfilter.synproxy_syn_received"
709
data-dimensions="received"
710
data-host="//london.my-netdata.io"
711
+ data-decimal-digits="0"
712
data-chart-library="dygraph"
713
data-dygraph-theme="sparkline"
714
data-dygraph-type="area"
@@ -708,6 +729,7 @@
729
<div data-netdata="netfilter.synproxy_syn_received"
730
data-dimensions="received"
731
data-host="//atlanta.my-netdata.io"
732
+ data-decimal-digits="0"
733
data-chart-library="dygraph"
734
data-dygraph-theme="sparkline"
735
data-dygraph-type="area"
@@ -728,6 +750,7 @@
750
<div data-netdata="netfilter.synproxy_syn_received"
751
data-dimensions="received"
752
data-host="//sanfrancisco.netdata.rocks"
753
+ data-decimal-digits="0"
754
data-chart-library="dygraph"
755
data-dygraph-theme="sparkline"
756
data-dygraph-type="area"
@@ -748,6 +771,7 @@
771
<div data-netdata="netfilter.synproxy_syn_received"
772
data-dimensions="received"
773
data-host="//toronto.netdata.rocks"
774
+ data-decimal-digits="0"
775
data-chart-library="dygraph"
776
data-dygraph-theme="sparkline"
777
data-dygraph-type="area"
web/goto-host-from-alarm.html
+1
-1
@@ -18,7 +18,7 @@
18
var netdataTheme = 'slate';
19
var netdataShowHelp = true;
20
</script>
21
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
21
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
22
23
<script>
24
var urlOptions = {
web/index.html
+1
-1
@@ -3168,4 +3168,4 @@
3168
</div>
3169
</body>
3170
</html>
3171
-<script type="text/javascript" src="dashboard.js?v20161024-5"></script>
3171
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
web/registry.html
+1
-1
@@ -169,7 +169,7 @@ var netdataRegistryCallback = function(machines_array) {
169
and that you have chown it to be owned by netdata:netdata
170
-->
171
<!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
172
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
172
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
173
174
<script>
175
// Set options for TV operation
web/tv.html
+1
-1
@@ -50,7 +50,7 @@ var netdataTheme = 'slate'; // this is dark
50
and that you have chown it to be owned by netdata:netdata
51
-->
52
<!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
53
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
53
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
54
55
<script>
56
// Set options for TV operation