use our fork of fping until it is stabilized

diff --git a/conf.d/fping.conf b/conf.d/fping.conf
index b2d4f3ac81af473771fcfd2bf5065383a7274ab6..82ee2332a74995e25d9eb22119c3a5e11f88b9d6 100644 (file)
--- a/conf.d/fping.conf
+++ b/conf.d/fping.conf
@@ -37,8 +37,8 @@ hosts=""
 # other fping options - defaults:
 # -R      = send packets with random data
 # -b 56   = the number of bytes per packet
-# -i 1    = 1ms when sending packets to others hosts (switching hosts)
+# -i 1    = 1 ms when sending packets to others hosts (switching hosts)
 # -r 0    = never retry packets
-# -t 5000 = per packet timeout at 5000ms
+# -t 5000 = per packet timeout at 5000 ms
 
 #fping_opts="-R -b 56 -i 1 -r 0 -t 5000"

diff --git a/plugins.d/fping.plugin b/plugins.d/fping.plugin
index 97bd9442979ac8607ab8ebf6a65f9f03a10b8591..3a61ab338005f966d4d596eb67031470317db014 100755 (executable)
--- a/plugins.d/fping.plugin
+++ b/plugins.d/fping.plugin
@@ -27,13 +27,13 @@ if [ "${1}" = "install" ]
 
     run cd /usr/src
 
-    if [ -d fping.git ]
+    if [ -d fping-ktsaou.git ]
         then
-        run cd fping.git
+        run cd fping-ktsaou.git
         run git pull
     else
-        run git clone https://github.com/schweikert/fping.git fping.git
-        run cd fping.git
+        run git clone https://github.com/ktsaou/fping.git fping-ktsaou.git
+        run cd fping-ktsaou.git
     fi
 
     run ./autogen.sh
@@ -50,9 +50,18 @@ if [ "${1}" = "install" ]
     echo >&2
     echo >&2 "All done, you have a compatible fping now at /usr/local/bin/fping."
     echo >&2
-    echo >&2 "If you have another fping installed, please set:"
-    echo >&2 "  fping=\"/usr/local/bin/fping\""
-    echo >&2 "at /etc/netdata/fping.conf"
+
+    fping="$(which fping  2>/dev/null || command -v fping 2>/dev/null)"
+    if [ "${fping}" != "/usr/local/bin/fping" ]
+        then
+        echo >&2 "You have another fping installed at: ${fping}."
+        echo >&2 "Please set:"
+        echo >&2
+        echo >&2 "  fping=\"/usr/local/bin/fping\""
+        echo >&2
+        echo >&2 "at /etc/netdata/fping.conf"
+        echo >&2
+    fi
     exit 0
 fi
 
@@ -152,7 +161,7 @@ if [ ${ping_every} -lt 20 ]
 fi
 
 # the fping options we will use
-options=( -N -l -Q ${update_every} -p ${ping_every} ${other_opts} ${hosts} )
+options=( -N -l -Q ${update_every} -p ${ping_every} ${fping_opts} ${hosts} )
 
 # execute fping
 exec "${fping}" "${options[@]}"

diff --git a/web/dashboard_info.js b/web/dashboard_info.js
index 610a0957c502a2b0ccd3e62aaa4e064d1fc573fc..9ee84fb970abb4abad6909125017265e93350044 100644 (file)
--- a/web/dashboard_info.js
+++ b/web/dashboard_info.js
@@ -746,7 +746,7 @@ netdataDashboard.context = {
     // fping
 
     'fping.quality': {
-        colors: NETDATA.colors[5],
+        colors: NETDATA.colors[10],
         height: 0.5
     },
 

diff --git a/web/index.html b/web/index.html
index 164733812eaacdb34488a84ef60fe40273baf9a5..70bdbe0d516cd86d9dc1e0084ab2867edeed3d95 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -2555,7 +2555,7 @@
         });
 
         NETDATA.requiredJs.push({
-            url: NETDATA.serverDefault + 'dashboard_info.js?v20161101-1',
+            url: NETDATA.serverDefault + 'dashboard_info.js?v20161101-6',
             async: false,
             isAlreadyLoaded: function() { return false; }
         });