]> 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: 17b0aa7)
allow functions to be given for easypiechart barColor; fixes #1089; fixes #958
authorCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Sun, 9 Oct 2016 08:42:41 +0000 (11:42 +0300)
committerCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Sun, 9 Oct 2016 08:42:41 +0000 (11:42 +0300)
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 214304aad113eacfb5a98faf13acd066c169b171..c645acf08a4e5be5bc5ddee07d4d4060e70ed994 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?v20161008-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
diff --git a/web/dashboard.js b/web/dashboard.js
index d2122ce8272f35636a131f29a67fa689f8471532..4fa431d5792087f953533679e9eac65ff9f14bf6 100644 (file)
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -4997,8 +4997,18 @@
         state.easyPieChartUnits.style.top = unittop.toString() + 'px';
         state.element_chart.appendChild(state.easyPieChartUnits);
 
+        var barColor = self.data('easypiechart-barcolor');
+        if(typeof barColor === 'undefined' || barColor === null)
+            barColor = state.chartColors()[0];
+        else {
+            // <div ... data-easypiechart-barcolor="(function(percent){return(percent < 50 ? '#5cb85c' : percent < 85 ? '#f0ad4e' : '#cb3935');})" ...></div>
+            var tmp = eval(barColor);
+            if(typeof tmp === 'function')
+                barColor = tmp;
+        }
+
         chart.easyPieChart({
-            barColor: self.data('easypiechart-barcolor') || state.chartColors()[0], //'#ef1e25',
+            barColor: barColor,
             trackColor: self.data('easypiechart-trackcolor') || NETDATA.themes.current.easypiechart_track,
             scaleColor: self.data('easypiechart-scalecolor') || NETDATA.themes.current.easypiechart_scale,
             scaleLength: self.data('easypiechart-scalelength') || 5,
diff --git a/web/demo.html b/web/demo.html
index f5e40c008b3b01faa0afd5726891e93fe23f18a3..aa03776523648161f5f806999ab16645e2b58937 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?v20161008-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
 <body>
 
 <div style="width: 100%; text-align: center;">
diff --git a/web/demo2.html b/web/demo2.html
index e0af3890a2354c8ca6ad92a81f0e13ea7409ef3a..c55827cc7aba8ee4891a08fe04f8f2380c0dff10 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?v20161008-1"></script>
+<script type="text/javascript" src="http://my-netdata.io/dashboard.js?v20161009-1"></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 019ca926e0346f53b99af4af3ac6c1d9dada7f89..367aeda63cf162f0c79982ac213b92e4f71a1177 100644 (file)
--- a/web/demosites.html
+++ b/web/demosites.html
@@ -52,7 +52,7 @@
         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?v20161008-1"></script>
+    <script type="text/javascript" src="dashboard.js?v20161009-1"></script>
 
     <script>
     // --- OPTIONS FOR THE CHARTS --
diff --git a/web/goto-host-from-alarm.html b/web/goto-host-from-alarm.html
index 411cdb066562c8a77d9c07d031fc4e8be93933f0..2a0eb7e3fb9e7ad8cfbcd1cba7ef830ce45a5273 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?v20161008-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
 
 <script>
 var urlOptions = {
diff --git a/web/index.html b/web/index.html
index 7802bd872d18fe28c9762441e97a709b3ea8dea3..0847ff1f7b40209fcc649e52ef1b9ce4706be107 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -3083,4 +3083,4 @@
     </div>
 </body>
 </html>
-<script type="text/javascript" src="dashboard.js?v20161008-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
diff --git a/web/registry.html b/web/registry.html
index 767d97aea235e591a85f7318b322091e3891054d..099867649b9dd38b7fe2b51f518a31bf7dcadf25 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?v20161008-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
 
 <script>
 // Set options for TV operation
diff --git a/web/tv.html b/web/tv.html
index 24ccc02175a8fd3c660f9b5d59b4166045adbe64..91781fd1bfb19ccc71154cd16f0993479000e18d 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?v20161008-1"></script>
+<script type="text/javascript" src="dashboard.js?v20161009-1"></script>
 
 <script>
 // Set options for TV operation
NetData