riemann-babbler 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4677c8824ebbc34110e6263a0c644f111cf7b5dc
-  data.tar.gz: a55aa349f17744679daa78e9131fb015b2fcb885
+  metadata.gz: 358f2b609f9881faf6872b9bc68ef17aafbfa1ee
+  data.tar.gz: 7d977dfb982b94cd5105666cb6245fa9e25e423b
 SHA512:
-  metadata.gz: 20fe6195976cf79a64d3719feb248ab0dd8da95f7fa5600060f44b0dee3fe923a9e2b6dd47d0170bd88fba92bace5e89281e4e62b77fd6d6685f739cf9ed13ac
-  data.tar.gz: 574fd36d484e8b0eccaa72019ba9fa9c418af71721c2590aa345eee7682c64f262bfc4309f16345421c7be192f6b91015594e3d822adb35c6ccbf172a0d636e0
+  metadata.gz: 0d2898ffcb6410af9260f75804e7241eef9b2d5ea8f0ecc5269b6b28369101e98333f437e3fbcbdacf2f72d11ee54a800b3941279c8f9938462d96ac90d7ac2f
+  data.tar.gz: eb5291cf6f44c2333ecd5ec0c786eb75d323c7b609f334ab90de21d9be7fa4661db2332b142170f6768b527ed234252a0cf1cc542626f61ec614141da6c009c7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riemann-babbler (2.0.0)
+    riemann-babbler (2.0.1)
       configatron
       docile
       file-tail

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

@@ -36,11 +36,11 @@ class Riemann::Babbler::Plugin::DiskStat < Riemann::Babbler::Plugin
         next if !!(dev.match /\d+$/ || !(dev.match =~ /^xvd/))
         # читаем все фильтры
         plugin.filter.each do |filter|
-          status << { :service => "#{plugin.service} #{dev} #{filter}", :metric => values[WORDS.index(filter)], :as_diff => true }
+          status << { :service => "#{plugin.service} #{dev} #{filter}", :metric => values[WORDS.index(filter)].to_f/plugin.interval, :as_diff => true }
         end
         # добавляем iops
         iops = values[WORDS.index('reads reqs')].to_i + values[WORDS.index('writes reqs')].to_i
-        status << { :service => "#{plugin.service} #{dev} iops", :metric => iops, :as_diff => true }
+        status << { :service => "#{plugin.service} #{dev} iops", :metric => iops.to_f/plugin.interval, :as_diff => true }
       end
     end
     status

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

@@ -36,7 +36,7 @@ class Riemann::Babbler::Plugin::Net < Riemann::Babbler::Plugin
           $2.split(/\s+/).map { |str| str.to_i }
       ).each do |service, value|
         next unless plugin.filter.include? service
-        status << { :service => "#{plugin.service} #{iface} #{service}", :metric => value, :as_diff => true }
+        status << { :service => "#{plugin.service} #{iface} #{service}", :metric => value.to_f/plugin.interval, :as_diff => true }
       end
     end
     status

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

@@ -18,7 +18,7 @@ class Riemann::Babbler::Plugin::Nginx < Riemann::Babbler::Plugin
     status = Array.new
     lines  = rest_get(plugin.status_url).split("\n")
     lines[2].scan(/\d+/).each_with_index do |value, index|
-      status << { :service => plugin.service + " #{NGINX_STATUS_1[index]}", :metric => value.to_i, :as_diff => true }
+      status << { :service => plugin.service + " #{NGINX_STATUS_1[index]}", :metric => value.to_f/plugin.interval, :as_diff => true }
     end
     # line[0]: Active connections: XXXX
     status << { :service => plugin.service + ' active', :metric => lines[0].split(':')[1].strip.to_i }

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client