added fping.conf and resize secondary fping charts

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 4b24ac050d717b81cc237acdb2291b75c8671876..c2ef258c9550f95118331ecb32f75742ffeb657a 100644 (file)
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -6,6 +6,7 @@ MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 dist_config_DATA = \
        apps_groups.conf \
        charts.d.conf \
+       fping.conf \
        node.d.conf \
        python.d.conf \
        health_alarm_notify.conf \

diff --git a/conf.d/fping.conf b/conf.d/fping.conf
new file mode 100644 (file)
index 0000000..3bf8047
--- /dev/null
+++ b/conf.d/fping.conf
@@ -0,0 +1,32 @@
+# This plugin requires a special version of fping.
+# Get it from https://github.com/ktsaou/fping
+# and build it, like this:
+#
+# cd /usr/src
+# git clone https://github.com/ktsaou/fping.git fping-netdata.git
+# cd fping-netdata.git
+# ./autogen.sh
+# ./configure --prefix=/usr/local
+# make
+# cp src/fping /usr/local/bin/
+# chown root:root /usr/local/bin/fping
+# chmod 4755 /usr/local/bin/fping
+#
+# -----------------------------------------------------------------------------
+# configuration options
+# can be overwritten at /etc/netdata/fping.conf
+
+# the fping binary to use
+# we need one that can output netdata friendly info
+fping="$(which fping || command -v fping)"
+
+# a space separated list of hosts to fping
+# it is best to put hostnames here
+hosts=""
+
+# the time in milliseconds (1 sec = 1000 ms)
+# to ping the hosts - by default 2 pings per iteration
+ping_every="$((update_every * 1000 / 2))"
+
+# how many retries to make if a host does not respond
+retries=1

diff --git a/web/dashboard_info.js b/web/dashboard_info.js
index 68df1eb9a8bc195d9b8934dff04a66b382b2a9e5..494593224293569dbcb1f09745c86e48e1133a4d 100644 (file)
--- a/web/dashboard_info.js
+++ b/web/dashboard_info.js
@@ -697,8 +697,9 @@ netdataDashboard.context = {
 \r
     // ------------------------------------------------------------------------\r
     // RETROSHARE\r
+\r
     'retroshare.bandwidth': {\r
-        info: 'Shows inbound and outbound traffic.',\r
+        info: 'RetroShare inbound and outbound traffic.',\r
         mainheads: [\r
             netdataDashboard.gaugeChart('Received', '12%', 'bandwidth_down_kb'),\r
             netdataDashboard.gaugeChart('Sent', '12%', 'bandwidth_up_kb')\r
@@ -706,7 +707,7 @@ netdataDashboard.context = {
     },\r
 \r
     'retroshare.peers': {\r
-        info: 'Shows the number of (connected) friends.',\r
+        info: 'Number of (connected) RetroShare friends.',\r
         mainheads: [\r
             function(id) {\r
                 return  '<div data-netdata="' + id + '"'\r
@@ -725,6 +726,19 @@ netdataDashboard.context = {
     },\r
 \r
     'retroshare.dht': {\r
-        info: 'Shows statistics about RetroShare\'s DHT. These values are estimated!'\r
+        info: 'Statistics about RetroShare\'s DHT. These values are estimated!'\r
+    },\r
+\r
+    // ------------------------------------------------------------------------\r
+    // fping\r
+\r
+    'fping.loss': {\r
+        colors: NETDATA.colors[1],\r
+        height: 0.5\r
+    },\r
+\r
+    'fping.packets': {\r
+        height: 0.5\r
     }\r
+\r
 };\r

diff --git a/web/index.html b/web/index.html
index de881d30f2230ef451bee86b74210b60efb25854..0f83ca1d74b4af5be486c47c2045df4e020d91ff 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -2482,7 +2482,7 @@
         });
 
         NETDATA.requiredJs.push({
-            url: NETDATA.serverDefault + 'dashboard_info.js?v20161002-1',
+            url: NETDATA.serverDefault + 'dashboard_info.js?v20161016-1',
             async: false,
             isAlreadyLoaded: function() { return false; }
         });