riemann-babbler 0.0.3 → 0.0.4

data/config.yml

@@ -43,4 +43,4 @@ plugins:
 
   net:
     service: net ussage
-    interval: 1
+    interval: 5

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

@@ -18,14 +18,11 @@ class Riemann::Babbler::Cpu
     end
 
     @old_cpu = [u2, n2, s2, i2]
-    log.error fraction
     fraction
   end
 
   def tick
     current_state = cpu
-    # при первом проходе у нас будет nil
-    next unless current_state
     report({
       :service => plugin.service,
       :state => state(current_state),

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

@@ -28,12 +28,12 @@ class Riemann::Babbler::Memory
     })
     # постим сообщение о свобоной памяти
     report({
-      :service => plugin.service,
+      :service => plugin.service + " free",
       :metric => current_state[:free]
     }) if plugin.report_free
     # постим сообение о том сколько у нас вообще памяти
     report({
-      :service => plugin.service,
+      :service => plugin.service + " total",
       :metric => current_state[:total]
     }) if plugin.report_total
   end

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

@@ -1,49 +1,51 @@
 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']
+
   def plugin
     options.plugins.net
   end
 
   def net
     f = File.read('/proc/net/dev')
-    net = f.split("\n").inject({}) do |s, line|
+    status = Hash.new
+    f.split("\n").inject({}) do |s, line|
       if line =~ /\s*(\w+?):\s*([\s\d]+)\s*/
         iface = $1
-
-        ['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'].map do |service|
+        WORDS.map do |service|
           "#{iface} #{service}"
         end.zip(
           $2.split(/\s+/).map { |str| str.to_i }
         ).each do |service, value|
-          s[service] = value
+          status.merge!({service => value})
         end
       end
-      
-      puts s
     end
+    return status
   end
 
   def tick
-    status = {
-      :service => plugin.service,
-      :state => 'ok'
-    }
-    report status
+    net.each do |service, value|
+    report({
+      :service => service,
+      :metric => value
+    })
+    end
   end
 
 end

data/lib/riemann/version.rb

@@ -1,3 +1,3 @@
 module Babbler
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -129,6 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4155966889077265892
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: