lib/riemann/babbler/plugins/cpu.rb in riemann-babbler-1.4.0 vs lib/riemann/babbler/plugins/cpu.rb in riemann-babbler-2.0.0pre1

@@ -1,20 +1,19 @@
 #encoding: utf-8
 
-class Riemann::Babbler::Cpu < Riemann::Babbler
+class Riemann::Babbler::Plugin::Cpu < Riemann::Babbler::Plugin
 
-  def desc
-    "#{shell('ps -eo pcpu,pid,cmd --sort -pcpu | head -3').chomp}"
-  end
-
   def init
     @old_cpu = Hash.new
+    plugin.set_default(:service, 'cpu usage')
+    plugin.set_default(:per_processor, false)
+    plugin.states.set_default(:warning, 70)
+    plugin.states.set_default(:critical, 85)
   end
 
   def collect
     array = Array.new
-    description = desc
     File.read('/proc/stat').split("\n").each do |cpu_line|
 
       # проверяем есть строчка /cpu\d+/ или /cpu / и сграбливаем это в переменную
       cpu_number = cpu_line.scan(/cpu(\d+|\s)\s+/)
       next if cpu_number.empty?
@@ -24,20 +23,24 @@
       cpu_line[/cpu(\d+|\s)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/]
       _, u2, n2, s2, i2 = [$1, $2, $3, $4, $5].map { |e| e.to_i }
 
       unless @old_cpu[cpu_number].nil?
         u1, n1, s1, i1 = @old_cpu[cpu_number]
-        used = (u2+n2+s2) - (u1+n1+s1)
-        total = used + i2-i1
-        fraction = used.to_f / total
+        used           = (u2+n2+s2) - (u1+n1+s1)
+        total          = used + i2-i1
+        fraction       = used.to_f / total
       end
 
       @old_cpu[cpu_number] = [u2, n2, s2, i2]
       # _total идет с трешхолдом, а все остальное без трешхолда
       if cpu_number == '_total'
-        array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} usage\n\n#{description}" } if fraction
+        array << {
+            :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} usage\n"
+        } if fraction
       else
-        array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} usage\n\n#{description}", :state => 'ok' } if fraction
+        array << {
+            :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} usage\n", :state => 'ok'
+        } if fraction && plugin.per_processor
       end
     end
     array
   end