]> arthur.barton.de Git - netdata.git/commitdiff
projects / netdata.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ea221c3)
allow setting the decimal digits per chart; fixes #788
authorCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Sun, 30 Oct 2016 11:05:07 +0000 (13:05 +0200)
committerCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Sun, 30 Oct 2016 11:05:07 +0000 (13:05 +0200)
web/dashboard.html patch | blob | history
web/dashboard.js patch | blob | history
web/demo.html patch | blob | history
web/demo2.html patch | blob | history
web/demosites.html patch | blob | history
web/goto-host-from-alarm.html patch | blob | history
web/index.html patch | blob | history
web/registry.html patch | blob | history
web/tv.html patch | blob | history

diff --git a/web/dashboard.html b/web/dashboard.html
index 379094070760cb46cabf41596b11b1510466cdf1..1e5767bbd1f7a2f68058b1257417701f1ba3f598 100644 (file)
--- a/web/dashboard.html
+++ b/web/dashboard.html
@@ -652,4 +652,4 @@ So, to avoid flashing the charts, we destroy and re-create the charts on each up
 <!-- <script> netdataServer = "http://box:19999"; </script> -->
 
 <!-- load the dashboard manager - it will do the rest -->
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
diff --git a/web/dashboard.js b/web/dashboard.js
index 4b812e09d7ffc67745fbfc36007ed65d6731a2eb..b7ef9a3ce72b87793b3dc5aaa4ef6e0be5aecac6 100644 (file)
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -146,8 +146,8 @@
             dashboard_css: NETDATA.serverDefault + 'dashboard.slate.css?v20161002-1',
             background: '#272b30',
             foreground: '#C8C8C8',
-            grid: '#35393e',
-            axis: '#35393e',
+            grid: '#283236',
+            axis: '#283236',
 /*          colors: [   '#55bb33', '#ff2222',   '#0099C6', '#faa11b',   '#adbce0', '#DDDD00',
                         '#4178ba', '#f58122',   '#a5cc39', '#f58667',   '#f5ef89', '#cf93c0',
                         '#a5d18a', '#b8539d',   '#3954a3', '#c8a9cf',   '#c7de8a', '#fad20a',
@@ -1166,6 +1166,16 @@
         this.view_after = 0;
         this.view_before = 0;
 
+        this.value_decimal_detail = -1;
+        {
+            var d = self.data('decimal-digits');
+            if(typeof d === 'number') {
+                this.value_decimal_detail = 1;
+                while(d-- > 0)
+                    this.value_decimal_detail *= 10;
+            }
+        }
+
         this.auto = {
             name: 'auto',
             autorefresh: true,
@@ -2052,6 +2062,9 @@
             if(value === null || value === 'undefined') return '-';
             if(typeof value !== 'number') return value;
 
+            if(this.value_decimal_detail !== -1)
+                return (Math.round(value * this.value_decimal_detail) / this.value_decimal_detail).toLocaleString();
+
             var abs = Math.abs(value);
             if(abs >= 1000) return (Math.round(value)).toLocaleString();
             if(abs >= 100 ) return (Math.round(value * 10) / 10).toLocaleString();
@@ -4006,11 +4019,11 @@
             drawAxis: self.data('dygraph-drawaxis') || true,
             axisLabelFontSize: self.data('dygraph-axislabelfontsize') || 10,
             axisLineColor: self.data('dygraph-axislinecolor') || NETDATA.themes.current.axis,
-            axisLineWidth: self.data('dygraph-axislinewidth') || 0.3,
+            axisLineWidth: self.data('dygraph-axislinewidth') || 1.0,
 
             drawGrid: self.data('dygraph-drawgrid') || true,
             gridLinePattern: self.data('dygraph-gridlinepattern') || null,
-            gridLineWidth: self.data('dygraph-gridlinewidth') || 0.4,
+            gridLineWidth: self.data('dygraph-gridlinewidth') || 1.0,
             gridLineColor: self.data('dygraph-gridlinecolor') || NETDATA.themes.current.grid,
 
             maxNumberWidth: self.data('dygraph-maxnumberwidth') || 8,
diff --git a/web/demo.html b/web/demo.html
index 12b7241e5e2c6d0609ed6bb99c9869eb3f4def7e..7beadc9041c2d472e51271f5f4ab8cac85715719 100644 (file)
--- a/web/demo.html
+++ b/web/demo.html
@@ -20,7 +20,7 @@
     <meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
     <meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
 </head>
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
 <body>
 
 <div style="width: 100%; text-align: center;">
diff --git a/web/demo2.html b/web/demo2.html
index 3903fb6eb45c5bb61027f391ac2bc17a1a04fcf6..53ae3383c6faa956505ed1e550df3997d0f1966e 100644 (file)
--- a/web/demo2.html
+++ b/web/demo2.html
@@ -21,7 +21,7 @@
     <meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
 </head>
 <script>var netdataTheme = 'slate';</script>
-<script type="text/javascript" src="http://my-netdata.io/dashboard.js?v20161011-1"></script>
+<script type="text/javascript" src="http://my-netdata.io/dashboard.js?v20161030-10"></script>
 <body>
 
 <div class="container" style="width: 90%; padding-top: 10px; text-align: center; color: #AAA">
diff --git a/web/demosites.html b/web/demosites.html
index 3d05389121f9e6adbb409004b6d07cc416d55719..04e84e2b87fb866f5194019f0daa7693d15b377b 100644 (file)
--- a/web/demosites.html
+++ b/web/demosites.html
@@ -52,26 +52,30 @@
         and that you have chown it to be owned by netdata:netdata
     -->
     <!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
-    <script type="text/javascript" src="dashboard.js?v20161011-1"></script>
+    <script type="text/javascript" src="dashboard.js?v20161030-10"></script>
 
     <script>
     // --- OPTIONS FOR THE CHARTS --
 
     // destroy charts not shown (lowers memory on the browsers)
     // set this to 'true' to destroy, 'false' to hide the charts
-    NETDATA.options.current.destroy_on_hide = true;
+    NETDATA.options.current.destroy_on_hide = false;
     
     // set this to false, to always show all dimensions
     NETDATA.options.current.eliminate_zero_dimensions = true;
     
     // set this to false, to lower the pressure on the browser
-    NETDATA.options.current.concurrent_refreshes = false;
+    NETDATA.options.current.concurrent_refreshes = true;
 
     // if you need to support slow mobile phones, set this to false
     NETDATA.options.current.parallel_refresher = true;
 
     // set this to false, to always update the charts, even if focus is lost
     NETDATA.options.current.stop_updates_when_focus_is_lost = true;
+
+    // since we have many servers and limited sockets,
+    // abort ajax calls when we scroll
+    NETDATA.options.current.abort_ajax_on_scroll = true;
 </script>
 <style>
     body {
@@ -194,6 +198,7 @@
                             data-host="//london.my-netdata.io"
                             data-title="EU - London"
                             data-chart-library="gauge"
+                            data-decimal-digits="0"
                             data-width="100%"
                             data-after="-300"
                             data-points="300"
@@ -214,6 +219,7 @@
                             data-host="//atlanta.my-netdata.io"
                             data-title="US - Atlanta"
                             data-chart-library="gauge"
+                            data-decimal-digits="0"
                             data-width="100%"
                             data-after="-300"
                             data-points="300"
@@ -234,6 +240,7 @@
                             data-host="//sanfrancisco.netdata.rocks"
                             data-title="US - California"
                             data-chart-library="gauge"
+                            data-decimal-digits="0"
                             data-width="100%"
                             data-after="-300"
                             data-points="300"
@@ -254,6 +261,7 @@
                             data-host="//toronto.netdata.rocks"
                             data-title="Canada"
                             data-chart-library="gauge"
+                            data-decimal-digits="0"
                             data-width="100%"
                             data-after="-300"
                             data-points="300"
@@ -275,6 +283,7 @@
                             data-host="//frankfurt.netdata.rocks"
                             data-title="EU - Germany"
                             data-chart-library="easypiechart"
+                            data-decimal-digits="0"
                             data-width="75%"
                             data-after="-300"
                             data-points="300"
@@ -295,6 +304,7 @@
                             data-host="//newyork.netdata.rocks"
                             data-title="US - New York"
                             data-chart-library="easypiechart"
+                            data-decimal-digits="0"
                             data-width="75%"
                             data-after="-300"
                             data-points="300"
@@ -315,6 +325,7 @@
                             data-host="//singapore.netdata.rocks"
                             data-title="Singapore"
                             data-chart-library="easypiechart"
+                            data-decimal-digits="0"
                             data-width="75%"
                             data-after="-300"
                             data-points="300"
@@ -335,6 +346,7 @@
                             data-host="//bangalore.netdata.rocks"
                             data-title="India"
                             data-chart-library="easypiechart"
+                            data-decimal-digits="0"
                             data-width="75%"
                             data-after="-300"
                             data-points="300"
@@ -396,6 +408,7 @@
                 <div data-netdata="nginx_local.requests"
                         data-dimensions="requests"
                         data-host="//london.my-netdata.io"
+                        data-decimal-digits="0"
                         data-chart-library="dygraph"
                         data-dygraph-theme="sparkline"
                         data-dygraph-type="area"
@@ -416,6 +429,7 @@
                 <div data-netdata="nginx_local.requests"
                         data-dimensions="requests"
                         data-host="//atlanta.my-netdata.io"
+                        data-decimal-digits="0"
                         data-chart-library="dygraph"
                         data-dygraph-theme="sparkline"
                         data-dygraph-type="area"
@@ -436,6 +450,7 @@
                 <div data-netdata="nginx_local.requests"
                         data-dimensions="requests"
                         data-host="//sanfrancisco.netdata.rocks"
+                        data-decimal-digits="0"
                         data-chart-library="dygraph"
                         data-dygraph-theme="sparkline"
                         data-dygraph-type="area"
@@ -456,6 +471,7 @@
                 <div data-netdata="nginx_local.requests"
                         data-dimensions="requests"
                         data-host="//toronto.netdata.rocks"
+                        data-decimal-digits="0"
                         data-chart-library="dygraph"
                         data-dygraph-theme="sparkline"
                         data-dygraph-type="area"
@@ -478,6 +494,7 @@
                 <div data-netdata="nginx_local.connections"
                         data-dimensions="active"
                         data-host="//london.my-netdata.io"
+                        data-decimal-digits="0"
                         data-chart-library="dygraph"
                         data-dygraph-theme="sparkline"
                         data-dygraph-type="area"
@@ -498,6 +515,7 @@
                 <div data-netdata="nginx_local.connections"
                         data-dimensions="active"
                         data-host="//atlanta.my-netdata.io"
+                        data-decimal-digits="0"
                         data-chart-library="dygraph"
                         data-dygraph-theme="sparkline"
                         data-dygraph-type="area"
@@ -518,6 +536,7 @@
                 <div data-netdata="nginx_local.connections"
                         data-dimensions="active"
                         data-host="//sanfrancisco.netdata.rocks"
+                        data-decimal-digits="0"
                         data-chart-library="dygraph"
                         data-dygraph-theme="sparkline"
                         data-dygraph-type="area"
@@ -538,6 +557,7 @@
                 <div data-netdata="nginx_local.connections"
                         data-dimensions="active"
                         data-host="//toronto.netdata.rocks"
+                        data-decimal-digits="0"
                         data-chart-library="dygraph"
                         data-dygraph-theme="sparkline"
                         data-dygraph-type="area"
@@ -688,6 +708,7 @@
             <div data-netdata="netfilter.synproxy_syn_received"
                     data-dimensions="received"
                     data-host="//london.my-netdata.io"
+                    data-decimal-digits="0"
                     data-chart-library="dygraph"
                     data-dygraph-theme="sparkline"
                     data-dygraph-type="area"
@@ -708,6 +729,7 @@
             <div data-netdata="netfilter.synproxy_syn_received"
                     data-dimensions="received"
                     data-host="//atlanta.my-netdata.io"
+                    data-decimal-digits="0"
                     data-chart-library="dygraph"
                     data-dygraph-theme="sparkline"
                     data-dygraph-type="area"
@@ -728,6 +750,7 @@
             <div data-netdata="netfilter.synproxy_syn_received"
                     data-dimensions="received"
                     data-host="//sanfrancisco.netdata.rocks"
+                    data-decimal-digits="0"
                     data-chart-library="dygraph"
                     data-dygraph-theme="sparkline"
                     data-dygraph-type="area"
@@ -748,6 +771,7 @@
             <div data-netdata="netfilter.synproxy_syn_received"
                     data-dimensions="received"
                     data-host="//toronto.netdata.rocks"
+                    data-decimal-digits="0"
                     data-chart-library="dygraph"
                     data-dygraph-theme="sparkline"
                     data-dygraph-type="area"
diff --git a/web/goto-host-from-alarm.html b/web/goto-host-from-alarm.html
index 9f6d54b4008a37dab6d41eb748b0781f624d5983..9eb78b9625f8df95aef5c61b6bc1ffa2c59566f8 100644 (file)
--- a/web/goto-host-from-alarm.html
+++ b/web/goto-host-from-alarm.html
@@ -18,7 +18,7 @@
     var netdataTheme = 'slate';
     var netdataShowHelp = true;
 </script>
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
 
 <script>
 var urlOptions = {
diff --git a/web/index.html b/web/index.html
index 412434eec34ab0c8a3785931349b03b8c68aac34..226f873fc741d2208754103f68dc3431885831fc 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -3168,4 +3168,4 @@
     </div>
 </body>
 </html>
-<script type="text/javascript" src="dashboard.js?v20161024-5"></script>
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
diff --git a/web/registry.html b/web/registry.html
index 8aa5fd3b25ed3073ffc802315b1b7fdd40e61353..f6696d9ebe947acb75a7301bb3e7896c1bb26ed7 100644 (file)
--- a/web/registry.html
+++ b/web/registry.html
@@ -169,7 +169,7 @@ var netdataRegistryCallback = function(machines_array) {
     and that you have chown it to be owned by netdata:netdata
 -->
 <!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
 
 <script>
 // Set options for TV operation
diff --git a/web/tv.html b/web/tv.html
index 8ce0caa49e1718756d67b7b0b9facc8cc503aa71..fd6c7dff37eed77bb370944005a5f10ebb2fcbb5 100644 (file)
--- a/web/tv.html
+++ b/web/tv.html
@@ -50,7 +50,7 @@ var netdataTheme = 'slate'; // this is dark
     and that you have chown it to be owned by netdata:netdata
 -->
 <!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
-<script type="text/javascript" src="dashboard.js?v20161011-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161030-10"></script>
 
 <script>
 // Set options for TV operation
NetData