Merge pull request #912 from sehraf/master

[netdata.git] / web / index.html

diff --git a/web/index.html b/web/index.html
index 055e8dd47ffb1b94b8ee7f2387b1b560da86be39..3ea587b52976f0ec3cbd837fe9215ac431d86cb9 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -1635,6 +1635,12 @@ var menuData = {
         info: undefined
     },
 
+    'retroshare': {
+        title: 'RetroShare',
+        icon: '<i class="fa fa-share-alt" aria-hidden="true"></i>',
+        info: undefined
+    },
+
     'ipfs': {
         title: 'IPFS',
         icon: '<i class="fa fa-folder-open" aria-hidden="true"></i>',
@@ -1774,11 +1780,11 @@ var chartData = {
     },
 
     'system.processes': {
-        info: 'System processes, read from <code>/proc/stat</code>. <b>Blocked</b> are processes that are willing to execute but they cannot, e.g. because they wait for disk activity.'
+        info: 'System processes, read from <code>/proc/stat</code>. <b>Running</b> are the processes in the CPU. <b>Blocked</b> are processes that are willing to enter the CPU, but they cannot, e.g. because they wait for disk activity.'
     },
 
     'system.active_processes': {
-        info: 'All system active processes, read from <code>/proc/loadavg</code>.'
+        info: 'All system processes, read from <code>/proc/loadavg</code>.'
     },
 
     'system.ctxt': {
@@ -2107,6 +2113,39 @@ var chartData = {
 
     'netdata.response_time': {
         info: 'The netdata API response time measures the time netdata needed to serve requests. This time includes everything, from the reception of the first byte of a request, to the dispatch of the last byte of its reply, therefore it includes all network latencies involved (i.e. a client over a slow network will influence these metrics).'
+    },
+
+    // ------------------------------------------------------------------------
+    // RETROSHARE
+    'retroshare.bandwidth': {
+        info: 'Shows inbound and outbound traffic.',
+        mainheads: [
+            gaugeChart('Received', '12%', 'bandwidth_down_kb'),
+            gaugeChart('Sent', '12%', 'bandwidth_up_kb')
+        ]
+    },
+
+    'retroshare.peers': {
+        info: 'Shows the number of (connected) friends.',
+        mainheads: [
+            function(id) {
+                return  '<div data-netdata="' + id + '"'
+                    + ' data-dimensions="peers_connected"'
+                    + ' data-append-options="friends"'
+                    + ' data-chart-library="easypiechart"'
+                    + ' data-title="connected friends"'
+                    + ' data-units=""'
+                    + ' data-width="8%"'
+                    + ' data-before="0"'
+                    + ' data-after="-CHART_DURATION"'
+                    + ' data-points="CHART_DURATION"'
+                    + ' role="application"></div>';
+            }
+        ]
+    },
+
+    'retroshare.dht': {
+        info: 'Shows statistics about RetroShare\'s DHT. These values are estimated!'
     }
 };
 
@@ -2211,6 +2250,7 @@ function enrichChartData(chart) {
         case 'phpfpm':
         case 'postfix':
         case 'redis':
+        case 'retroshare':
         case 'ipfs':
         case 'smawebbox':
         case 'squid':
@@ -2786,7 +2826,12 @@ function alarmsUpdateModal() {
             if(len > 50) len = 50;
             while(i < len) {
                 var time = new Date(data[i].when * 1000);
-                log += '<tr><td>' + time.toLocaleDateString() + ' ' + time.toLocaleTimeString() + '</td><td>' + data[i].chart + '</td><td>' + data[i].name + '</td><td>' + data[i].status + '</td></tr>';
+                log += '<tr><td>'
+                        + time.toLocaleDateString() + ' '
+                        + time.toLocaleTimeString() + '</td><td>'
+                        + data[i].chart.toString() + '</td><td>'
+                        + data[i].name.toString() + ' = ' + ((data[i].value !== null)?Math.floor(data[i].value):'NaN').toString() + ' ' + data[i].units.toString() + '</td><td>'
+                        + data[i].status.toString() + '</td></tr>';
                 i++;
             }
             log += "</table>";