riemann-babbler 0.2.8 → 0.3.0

data/config.yml

@@ -7,7 +7,7 @@ logger:
 
 plugins:
 
-  babbler:
+  dummy:
     service: keep alive
     interval: 1
 

data/lib/riemann/babbler/plugin.rb

@@ -21,6 +21,7 @@ module Riemann
       @configatron = $configatron
       @storage = Hash.new
       init
+      self.send run
     end
 
     def log
@@ -103,7 +104,7 @@ module Riemann
 
     # Переодически вызываемое действие
     def tick
-      posted_hash = hash_to_post
+      posted_hash = collect
       posted_hash.each_key do |service|
         case service
         when Hash

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

@@ -1,11 +1,7 @@
 class Riemann::Babbler::Cpu
   include Riemann::Babbler
 
-  def plugin
-    options.plugins.cpu
-  end
-
-  def cpu
+  def collect
     cpu = File.read('/proc/stat')
     cpu[/cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/]
     u2, n2, s2, i2 = [$1, $2, $3, $4].map { |e| e.to_i }
@@ -18,18 +14,7 @@ class Riemann::Babbler::Cpu
     end
 
     @old_cpu = [u2, n2, s2, i2]
-    fraction
-  end
-
-  def tick
-    current_state = cpu
-    report({
-      :service => plugin.service,
-      :state => state(current_state),
-      :metric => current_state
-    })
+    {"cpu" => fraction}
   end
 
 end
-
-Riemann::Babbler::Cpu.run

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

@@ -0,0 +1,10 @@
+class Riemann::Babbler::Dummy
+  include Riemann::Babbler
+
+  def collect
+    {
+      :state => 'ok'
+    }
+  end
+
+end

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

@@ -1,24 +1,10 @@
 class Riemann::Babbler::La
   include Riemann::Babbler
 
-  def plugin
-    options.plugins.la
-  end
-
-  def la 
-    File.read('/proc/loadavg').split(/\s+/)[2].to_f
-  end
-
-  def tick
-    current_state = la
-    status = {
-      :service => plugin.service,
-      :state => state(current_state),
-      :metric => current_state
-    }
-    report status
+  def collect
+  { 
+    "la_1" => File.read('/proc/loadavg').split(/\s+/)[2].to_f
+  }
   end
 
 end
-
-Riemann::Babbler::La.run

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

@@ -1,10 +1,6 @@
 class Riemann::Babbler::Memory
   include Riemann::Babbler
 
-  def plugin
-    options.plugins.memory
-  end
-
   def memory
     m = File.read('/proc/meminfo').split(/\n/).inject({}) { |info, line|
       x = line.split(/:?\s+/)
@@ -38,5 +34,3 @@ class Riemann::Babbler::Memory
   end
 
 end
-
-Riemann::Babbler::Memory.run

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

@@ -2,30 +2,22 @@ class Riemann::Babbler::Net
   include Riemann::Babbler
 
   WORDS = ['rx bytes',
-           'rx packets',
-           'rx errs',
-           'rx drop',
-           'rx fifo',
-           'rx frame',
-           'rx compressed',
-           'rx multicast',
-           'tx bytes',
-           'tx packets',
-           'tx drops',
-           'tx fifo',
-           'tx colls',
-           'tx carrier',
-           'tx compressed']
+    'rx packets',
+    'rx errs',
+    'rx drop',
+    'rx fifo',
+    'rx frame',
+    'rx compressed',
+    'rx multicast',
+    'tx bytes',
+    'tx packets',
+    'tx drops',
+    'tx fifo',
+    'tx colls',
+    '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
     f.split("\n").each do |line|
@@ -43,18 +35,5 @@ class Riemann::Babbler::Net
     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
 
-Riemann::Babbler::Net.run

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '0.2.8'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -140,9 +140,9 @@ files:
 - config.yml
 - lib/deep_merge.rb
 - lib/riemann/babbler/plugin.rb
-- lib/riemann/babbler/plugins/babbler.rb
 - lib/riemann/babbler/plugins/cpu.rb
 - lib/riemann/babbler/plugins/disk.rb
+- lib/riemann/babbler/plugins/dummy.rb
 - lib/riemann/babbler/plugins/la.rb
 - lib/riemann/babbler/plugins/memory.rb
 - lib/riemann/babbler/plugins/net.rb

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

@@ -1,18 +0,0 @@
-class Riemann::Babbler::Dummy
-  include Riemann::Babbler
-
-  def plugin
-    options.plugins.babbler
-  end
-
-  def tick
-    status = {
-      :service => plugin.service,
-      :state => 'ok'
-    }
-    report status
-  end
-
-end
-
-Riemann::Babbler::Dummy.run