plugins/df

@@ -4,19 +4,21 @@ graph_args --upper-limit 100 -l 0
 graph_vlabel %
 graph_category disk
 graph_info This graph shows disk usage on the machine."
-  df -PT | grep '^/' | grep -vwE "$DF_IGNORE_FILESYSTEM_REGEX" | while read dev type blocks used avail pct mp
+  for PART in $(df -PT | grep '^/' | grep -vwE "$DF_IGNORE_FILESYSTEM_REGEX" | sed '/\/[a-z0-9]*$/!d;s/.* \([a-z0-9\/]\{1,\}\)$/\1/g')
   do
-    PNAME=$(clean_fieldname "$mp")
-    echo "$PNAME.label $mp"
-    echo "$PNAME.info $dev -> $mp"
+    PINFO=$(df -P "$PART" | tail -1);
+    PNAME=$(clean_fieldname "$(echo "$PINFO" | cut -d " " -f 1)")
+    echo "$PNAME.label $PART"
+    echo "$PNAME.info $PNAME -> $PART"
     echo "$PNAME.warning 92"
     echo "$PNAME.critical 98"
   done
 }
 fetch_df() {
-  df -PT | grep '^/' | grep -vwE "$DF_IGNORE_FILESYSTEM_REGEX" | while read dev type blocks used avail pct mp
+  for PART in $(df -PT | grep '^/' | grep -vwE "$DF_IGNORE_FILESYSTEM_REGEX" | sed '/\/[a-z0-9]*$/!d;s/.* \([a-z0-9\/]\{1,\}\)$/\1/g')
   do
-    PNAME=$(clean_fieldname "$mp")
-    echo "$PNAME.value" "${pct%\%}"
+    PINFO=$(df -P "$PART" | tail -1);
+    PNAME=$(clean_fieldname "$(echo "$PINFO" | cut -d " " -f 1)")
+    echo "$PNAME.value" "$(echo "$PINFO" | sed -e 's/\%//g' -e 's/  */ /g' | cut -d " " -f 5)"
   done
 }

plugins/ntpdate

@@ -1,5 +1,5 @@
 config_ntpdate() {
-  echo "graph_title NTP offset and delay to peer $NTP_PEER"
+  echo "graph_title NTP offset and dealy to peer $NTP_PEER"
   echo "graph_args --base 1000 --vertical-label msec"
   echo "graph_category time"
   echo "offset.label Offset"
@@ -11,7 +11,7 @@ fetch_ntpdate() {
   OFFSET=0
   DELAY=0
   if [ -n "$NTP_PEER" ] && [ -x "$NTPDATE" ]; then
-    DATA=$("$NTPDATE" -q "$NTP_PEER" | awk '/^server.*offset/{gsub(/,/,""); printf "%s %s", ($6*1000), ($8*1000); exit;}')
+    DATA=$("$NTPDATE" -q "$NTP_PEER" | awk '/^server.*offset/{gsub(/,/,""); printf "%s %s", ($6*1000), ($8*1000);}')
     OFFSET=$(echo "$DATA" | cut -d " " -f 1)
     DELAY=$(echo "$DATA" | cut -d " " -f 2)
   fi