bin/riemann-health in riemann-tools-0.1.8 vs bin/riemann-health in riemann-tools-0.1.9

@@ -119,17 +119,17 @@
 
     @old_cpu = [u2, n2, s2, i2]
   end
 
   def linux_load
-    load = File.read('/proc/loadavg').split(/\s+/)[2].to_f / @cores
+    load = File.read('/proc/loadavg').split(/\s+/)[0].to_f / @cores
     if load > @limits[:load][:critical]
-      alert "load", :critical, load, "15-minute load average/core is #{load}"
+      alert "load", :critical, load, "1-minute load average/core is #{load}"
     elsif load > @limits[:load][:warning]
-      alert "load", :warning, load, "15-minute load average/core is #{load}"
+      alert "load", :warning, load, "1-minute load average/core is #{load}"
     else
-      alert "load", :ok, load, "15-minute load average/core is #{load}"
+      alert "load", :ok, load, "1-minute load average/core is #{load}"
     end
   end
 
   def linux_memory
     m = File.read('/proc/meminfo').split(/\n/).inject({}) { |info, line|
@@ -161,18 +161,18 @@
 
     @old_cpu = [u2, n2, s2, t2, i2]
   end
 
   def freebsd_load
-    m = `uptime`.split[-1].match(/^[0-9]*\.[0-9]*$/)
+    m = `uptime`.split[0].match(/^[0-9]*\.[0-9]*$/)
     load = m[0].to_f / @cores
     if load > @limits[:load][:critical]
-      alert "load", :critical, load, "15-minute load average/core is #{load}"
+      alert "load", :critical, load, "1-minute load average/core is #{load}"
     elsif load > @limits[:load][:warning]
-      alert "load", :warning, load, "15-minute load average/core is #{load}"
+      alert "load", :warning, load, "1-minute load average/core is #{load}"
     else
-      alert "load", :ok, load, "15-minute load average/core is #{load}"
+      alert "load", :ok, load, "1-minute load average/core is #{load}"
     end
   end
 
   def freebsd_memory
     meminfo = `sysctl -n vm.stats.vm.v_page_count vm.stats.vm.v_wire_count vm.stats.vm.v_active_count 2>/dev/null`.chomp.split
@@ -215,14 +215,14 @@
       alert 'load', :unknown, nil, "unable to get load ave from top"
       return false
     end
     metric = @topdata[:load] / @cores
     if metric > @limits[:load][:critical]
-      alert "load", :critical, metric, "15-minute load average per core is #{metric}"
+      alert "load", :critical, metric, "1-minute load average per core is #{metric}"
     elsif metric > @limits[:load][:warning]
-      alert "load", :warning, metric, "15-minute load average per core is #{metric}"
+      alert "load", :warning, metric, "1-minute load average per core is #{metric}"
     else
-      alert "load", :ok, metric, "15-minute load average per core is #{metric}"
+      alert "load", :ok, metric, "1-minute load average per core is #{metric}"
     end
   end
 
   def darwin_memory
     darwin_top unless (Time.now.to_i - @topdata[:stamp]) < opts[:interval]