riemann-babbler 0.4.1 → 0.4.2

data/lib/riemann/babbler/plugin.rb

@@ -28,11 +28,25 @@ module Riemann
       run
     end
 
+    # Доступ к конфигу определенного плагина
+    def plugin
+      plugin_name = self.class.name.split( "::" ).last.gsub( /(\p{Lower})(\p{Upper})/, "\\1_\\2" ).downcase
+      options.plugins.send plugin_name
+    end
+
     def options
       @configatron
     end
     alias :opts :options
 
+    def riemann
+      @riemann ||= Riemann::Client.new(
+        :host => options.riemann.host,
+        :port => options.riemann.port
+      )
+    end
+    alias :r :riemann
+
     def report(event)
       report_with_diff(event) and return if event[:as_diff]
       event[:state] = state(event[:metric]) unless plugin.states.critical.nil?
@@ -66,26 +80,16 @@ module Riemann
       true
     end
 
-    # http rest 
-    def rest_get(url)
-      begin
-        RestClient.get url
-      rescue
-        report({
-          :service => plugin.service,
-          :state => 'critical',
-          :description => "Response from #{url}"
-        })
-      end
+    # Переодически вызываемое действие
+    def tick
+      posted_array = collect
+      posted_array = posted_array.class == Array ? posted_array : [ posted_array ]
+      posted_array.each { |event| report event }
     end
 
-    def riemann
-      @riemann ||= Riemann::Client.new(
-        :host => options.riemann.host,
-        :port => options.riemann.port
-      )
+    # Plugin init
+    def init
     end
-    alias :r :riemann
 
     def run
       # выйти если run_plugin не равен true
@@ -102,21 +106,20 @@ module Riemann
       end
     end
 
-    # Переодически вызываемое действие
-    def tick
-      posted_array = collect
-      posted_array = posted_array.class == Array ? posted_array : [ posted_array ]
-      posted_array.each { |event| report event }
-    end
-
-    # Доступ к конфигу определенного плагина
-    def plugin
-      plugin_name = self.class.name.split( "::" ).last.gsub( /(\p{Lower})(\p{Upper})/, "\\1_\\2" ).downcase
-      options.plugins.send plugin_name
-    end
-
-    # Plugin init
-    def init
+    # хелпер, описание статуса
+    def state(my_state)
+      unless plugin.states.warning.nil?
+        case
+        when my_state.between?(plugin.states.warning, plugin.states.critical)
+          'warning'
+        when my_state > plugin.states.warning
+          'critical'
+        else
+          'ok'
+        end
+      else
+        my_state >= plugin.states.critical ? 'critical' : 'ok'
+      end
     end
 
     # хэлпер для парса stdout+stderr и exit status
@@ -142,19 +145,16 @@ module Riemann
       end
     end
 
-    # хелпер, описание статуса
-    def state(my_state)
-      unless plugin.states.warning.nil?
-        case
-        when my_state.between?(plugin.states.warning, plugin.states.critical)
-          'warning'
-        when my_state > plugin.states.warning
-          'critical'
-        else
-          'ok'
-        end
-      else
-        my_state >= plugin.states.critical ? 'critical' : 'ok'
+    # http rest 
+    def rest_get(url)
+      begin
+        RestClient.get url
+      rescue
+        report({
+          :service => plugin.service,
+          :state => 'critical',
+          :description => "Response from #{url}"
+        })
       end
     end
 

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

@@ -24,10 +24,10 @@ class Riemann::Babbler::Disk < Riemann::Babbler
     disk = Array.new
     monit_points.each do |point|
       point_stat = Filesystem.stat point
-      human_point = point == "/" ? "/root" : point
+      human_point = point == "/" ? " /root" : " " + point
       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 }
+      disk << { :service => plugin.service + human_point + " block", :metric => 1 - point_stat.blocks_available.to_f/point_stat.blocks }
+      disk << { :service => plugin.service + human_point + " inode", :metric => 1 - point_stat.files_available.to_f/point_stat.files }
     end
     disk
   end

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -886395468252800895
+      hash: 2894994163189052610
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: