Merge remote-tracking branch 'origin/gsoc_2015' into gsoc_2015

Author: vidurangaw

sensu/handlers/sysopia.rb

@@ -27,7 +27,8 @@ class Sysopia < Sensu::Handler
     cpu_iowaiting: "cpu_wait",
     load_per_cpu_one_minute: "load_one",
     load_per_cpu_five_minutes: "load_five",
-    load_per_cpu_fifteen_minutes: "load_fifteen"
+    load_per_cpu_fifteen_minutes: "load_fifteen",
+    disk_usage: "disk_usage"
   }
   # override filters from Sensu::Handler. not appropriate for metric handlers
   def filter; end

sensu/plugins/metrics-sysopia.rb

@@ -38,6 +38,7 @@ def initialize
     @memstat = convert_floats(`free|tail -n2|head -n1`.split(' '))
     @cpunum =  `cat /proc/cpuinfo |grep processor|wc -l`.to_i
     @loadstat = `uptime`.strip.split(' ').map { |s| s.to_f }
+    @diskusage = `df -lPT |awk '$2 !~ /Type|tmp/ { print $6 }'| sed 's/%//'| sort -n|tail -n1`.to_i
   end
 
   def convert_floats(values)
@@ -89,7 +90,8 @@ def run
         one_minute: (@loadstat[-3]/@cpunum).round(2),
         five_minutes: (@loadstat[-2]/@cpunum).round(2),
         fifteen_minutes: (@loadstat[-1]/@cpunum).round(2)
-      }
+      },
+      disk: { usage: @diskusage }
     }
     metrics.each do |parent, children|
       children.each do |child, value|