riemann-babbler 0.3.3 → 0.3.4

data/config.yml

@@ -12,7 +12,7 @@ plugins:
     interval: 1
 
   la:
-    service: la la_1
+    service: la
     interval: 1
     states:
       warning: 4

data/lib/riemann/babbler/plugin.rb

@@ -33,10 +33,8 @@ module Riemann
     alias :opts :options
 
     def report(event)
-      case event[:metric]
-        when Hash
-          report_with_diff(event) and return
-      end
+      report_with_diff(event) and return if event[:is_diff]
+      event[:state] = state(event[:metric]) unless plugin.states.critical.nil?
       event[:tags] = options.riemann.tags unless options.riemann.tags.nil?
       event[:host] =  host
       logger.debug "Report status: #{event.inspect}"
@@ -44,11 +42,10 @@ module Riemann
     end
 
     def report_with_diff(event)
-      current_metric = event[:metric][:value]
-      event[:metric][:value] = current_metric - @storage[ event[:service] ] if @storage.has_key? event[:service]
+      current_metric = event[:metric]
+      event[:metric] = current_metric - @storage[ event[:service] ] if @storage.has_key? event[:service]
       @storage[ event[:service] ] = current_metric
-      event[:state] = state(current_metric) unless plugin.states.critical.nil?
-      event[:metric] = event[:metric][:value]
+      event.delete(:is_diff)
       report(event)
     end
 
@@ -93,8 +90,7 @@ module Riemann
         begin
           tick
         rescue => e
-          #report({:service => plugin.service, :status => 'critical'})
-          $stderr.puts "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
+          logger.error "Plugin #{self.class.name} : #{e.class} #{e}\n#{e.backtrace.join "\n"}"
         end
 
         sleep(plugin.interval - ((Time.now - t0) % plugin.interval))
@@ -103,13 +99,9 @@ module Riemann
 
     # Переодически вызываемое действие
     def tick
-      posted_hash = collect
-      posted_hash.each_key do |service|
-        report({
-          :service => service,
-          :metric => posted_hash[service][:metric]
-        })
-      end
+      posted_array = collect
+      posted_array = posted_array.class == Array ? posted_array : [ posted_array ]
+      posted_array.each { |event| report event }
     end
 
     # Доступ к конфигу определенного плагина

data/lib/riemann/babbler/plugins/cpu.rb

@@ -13,7 +13,7 @@ class Riemann::Babbler::Cpu < Riemann::Babbler
     end
 
     @old_cpu = [u2, n2, s2, i2]
-    {"cpu" => fraction}
+    {:service => plugin.service, :metric => fraction}
   end
 
 end

data/lib/riemann/babbler/plugins/disk.rb

@@ -12,11 +12,7 @@ class Riemann::Babbler::Disk < Riemann::Babbler
     'devtmpfs'
   ]
 
-  def plugin
-    options.plugins.disk
-  end
-
-  def disk
+  def collect
     # собираем только необходимые для мониторинга маунт-поинты
     # точнее выбираем из mounts только те, у которых fstype не попадает
     # в NOT_MONITORING_FS
@@ -25,26 +21,15 @@ class Riemann::Babbler::Disk < Riemann::Babbler
       mtab = line.split(/\s+/)
       monit_points << mtab[1] unless NOT_MONITORING_FS.include? mtab[2] 
     end
-    disk = Hash.new
+    disk = Array.new
     monit_points.each do |point|
       point_stat = Filesystem.stat point
       human_point = point == "/" ? "/root" : point
-      human_point.gsub!(/^\//, "")
-      human_point.gsub!(/\//, "_")
-      disk.merge!({human_point + " block" => 1 - point_stat.blocks_available.to_f/point_stat.blocks})
-      disk.merge!({human_point + " inode" => 1 - point_stat.files_available.to_f/point_stat.files})
+      human_point.gsub!(/^\//, "").gsub!(/\//, "_")
+      disk << { :service => human_point + " block", :metric => 1 - point_stat.blocks_available.to_f/point_stat.blocks }
+      disk << { :service => human_point + " inode", :metric => 1 - point_stat.files_available.to_f/point_stat.files }
     end
     disk
   end
 
-  def tick
-    disk.each do |point, free|
-      report({
-        :service => plugin.service + " #{point}",
-        :state => state(free),
-        :metric => free
-      })
-    end
-  end
-
 end

data/lib/riemann/babbler/plugins/dummy.rb

@@ -1,10 +1,7 @@
 class Riemann::Babbler::Dummy < Riemann::Babbler
 
   def collect
-    {
-      :service => plugin.service,
-      :state => 'ok'
-    }
+    { :service => plugin.service , :state => 'ok'  }
   end
 
 end

data/lib/riemann/babbler/plugins/la.rb

@@ -1,9 +1,7 @@
 class Riemann::Babbler::La < Riemann::Babbler
 
   def collect
-  { 
-    "la_1" => File.read('/proc/loadavg').split(/\s+/)[2].to_f
-  }
+    { :service => plugin.service + "la_1", :metric => File.read('/proc/loadavg').split(/\s+/)[2].to_f }
   end
 
 end

data/lib/riemann/babbler/plugins/memory.rb

@@ -1,6 +1,6 @@
 class Riemann::Babbler::Memory < Riemann::Babbler
 
-  def memory
+  def collect
     m = File.read('/proc/meminfo').split(/\n/).inject({}) { |info, line|
       x = line.split(/:?\s+/)
       info[x[0]] = x[1].to_i
@@ -9,27 +9,12 @@ class Riemann::Babbler::Memory < Riemann::Babbler
     free = m['MemFree'].to_i + m['Buffers'].to_i + m['Cached'].to_i
     total = m['MemTotal'].to_i
     fraction = 1 - (free.to_f / total)
-    return {:free => (free.to_f/1024), :fraction => fraction, :total => (total.to_f/1024)}
-  end
 
-  def tick
-    current_state = memory
-    # соотношение свободной/занятой
-    report({
-      :service => plugin.service,
-      :state => state(current_state[:fraction]),
-      :metric => current_state[:fraction]
-    })
-    # постим сообщение о свобоной памяти
-    report({
-      :service => plugin.service + " free",
-      :metric => current_state[:free]
-    }) if plugin.report_free
-    # постим сообение о том сколько у нас вообще памяти
-    report({
-      :service => plugin.service + " total",
-      :metric => current_state[:total]
-    }) if plugin.report_total
+    [
+      { :service => plugin.service, :metric => fraction },
+      { :service => plugin.service + " free", :metric => free.to_f },
+      { :service => plugin.service + " total", :metric => total.to_f}
+    ]
   end
 
 end

data/lib/riemann/babbler/plugins/net.rb

@@ -16,17 +16,9 @@ class Riemann::Babbler::Net < Riemann::Babbler
            'tx carrier',
            'tx compressed']
 
-  def plugin
-    options.plugins.net
-  end
-
-  def init
-    @old_status = Hash.new
-  end
-
-  def net
+  def collect
     f = File.read('/proc/net/dev')
-    status = Hash.new
+    status = Array.new
     f.split("\n").each do |line|
       iface = line.split(":")[0].strip
       iface.gsub!(/\./,"_")
@@ -36,22 +28,10 @@ class Riemann::Babbler::Net < Riemann::Babbler
       end.zip(
         $2.split(/\s+/).map { |str| str.to_i }
       ).each do |service, value|
-        status.merge!({service => value})
+        status << { :service => service, :metric => value, :is_diff => true }
       end
     end
     status
   end
 
-  def tick
-    status = net
-    status.each_key do |service|
-      #next if status[service] == 0
-      report({
-        :service => service,
-        :metric => status[service],
-        :is_diff => true
-      })
-    end
-  end
-
 end

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1972461691726905926
+      hash: -3405522857868572871
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: