riemann-babbler 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47e44e9f1c82fd791b13b7b35777a6a68d044f5b
-  data.tar.gz: 2489844ce888395d409fb8578a82267e246cd388
+  metadata.gz: bd81f73671e68fb6dbfdf951ba4b4fc9d8b778b9
+  data.tar.gz: 7c62ce53e75ce8c970d76f145b84b6923bd6fb3e
 SHA512:
-  metadata.gz: f01b7008e9fd85179737c09abe79196a4955835721398aaba4a8ddf607cc80b19ad567be8239beb8fc27a345b1c722b2e4d5a2d42f9fbc854225466e41ac59e3
-  data.tar.gz: bf6822268d833abc3e09ad406973b1dca6501e7fd8bf614684086b5da1e5c4909b0d2512e0e49d3cfb56a03551cb74274f0eb74433c6178475e536b64ced5ffe
+  metadata.gz: 2e0b30296b22d557ea56a1bbbcee53d99857960e8d75475295116059e8e75a42fd3e64dfb644142d28422a82a07df57ad967fc857f07867297dfbdf7ec8fe1dd
+  data.tar.gz: c5c300d876b1dd15d0ff1191fda4cdc4911563d7e090d06124107447e2f2c605569ece18626d785734bfb623bc02659c04ce251de3084fe04c803491d331821a

data/Gemfile.lock

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

data/README.md

@@ -24,8 +24,8 @@ where [options] are:
                             --plugins-directory, -u <s>:   Directory for plugins (default: /usr/share/riemann-babbler/plugins)
                                         --tcp, --no-tcp:   Use TCP transport instead of UDP (improves reliability, slight overhead. (Default: true)
   --minimize-event-count, --no-minimize-event-count, -m:   Minimize count of sent messages (default: true)
-                          --responder-http-port, -r <i>:   Port to bind http responder (default: 55755)
-                           --responder-udp-port, -e <i>:   Port to bind tcp responder (default: 55955)
+                          --responder-bind-http, -r <s>:   Bind to http responder (default: 0.0.0.0:55755)
+                           --responder-bind-udp, -e <s>:   Bind to udp responder (default: 127.0.0.1:55955)
                                           --version, -v:   Print version and exit
                                                  --help:   Show this message
 ```

data/bin/riemann-babbler

@@ -32,8 +32,8 @@ where [options] are:
   opt :plugins_directory, 'Directory for plugins', :default => '/usr/share/riemann-babbler/plugins'
   opt :tcp, 'Use TCP transport instead of UDP (improves reliability, slight overhead.', :default => true
   opt :minimize_event_count, 'Minimize count of sent messages', :default => true
-  opt :responder_http_port, 'Port to bind http responder', :default => 55755
-  opt :responder_udp_port, 'Port to bind tcp responder', :default => 55955
+  opt :responder_bind_http, 'Bind to http responder', :default => '0.0.0.0:55755'
+  opt :responder_bind_udp, 'Bind to udp responder', :default => '127.0.0.1:55955'
 end
 
 # load current settings

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

@@ -13,7 +13,12 @@ class Riemann::Babbler::Plugin::CpuFan < Riemann::Babbler::Plugin
   end
 
   def collect
-    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'CPU Fan Speed' }
+    metric = shell(plugin.cmd).to_i
+    if metric == 0
+      { :service => plugin.service, :state => 'ok', :description => 'CPU Fan Speed' }
+    else
+      { :service => plugin.service, :metric => metric, :description => 'CPU Fan Speed' }
+    end
   end
 
 end

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

@@ -13,7 +13,12 @@ class Riemann::Babbler::Plugin::CpuTemp < Riemann::Babbler::Plugin
   end
 
   def collect
-    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'CPU Temperature' }
+    metric = shell(plugin.cmd).to_i
+    if metric == 0
+      { :service => plugin.service, :state => 'ok', :description => 'CPU Temperature' }
+    else
+      { :service => plugin.service, :metric => metric, :description => 'CPU Temperature' }
+    end
   end
 
 end

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

@@ -4,7 +4,9 @@ require 'json'
 class Riemann::Babbler::Plugin::ResponderHttp < Riemann::Babbler::Plugin
 
   def init
-    plugin.set_default(:port, opts.riemann.responder_http_port)
+    host, port = opts.riemann.responder_bind_http.split(':')
+    plugin.set_default(:port, port)
+    plugin.set_default(:host, host)
     plugin.set_default(:started_at, Time.now.to_i)
   end
 
@@ -23,8 +25,8 @@ class Riemann::Babbler::Plugin::ResponderHttp < Riemann::Babbler::Plugin
   end
 
   def run!
-    log :unknown, "Start responder 0.0.0.0:#{plugin.port}"
-    ::Net::HTTP::Server.run(:port => plugin.port) do |request, _|
+    log :unknown, "Start responder #{plugin.host}:#{plugin.port}"
+    ::Net::HTTP::Server.run(:port => plugin.port, :host => plugin.host) do |request, _|
       log :debug, "Responder request: #{request}"
       case
         when request[:uri][:path] == "/kill" #&& request[:method] == "POST"

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

@@ -3,8 +3,9 @@ require 'socket'
 class Riemann::Babbler::Plugin::ResponderUdp < Riemann::Babbler::Plugin
 
   def init
-    plugin.set_default(:port, opts.riemann.responder_udp_port)
-    plugin.set_default(:host, '127.0.0.1')
+    host, port = opts.riemann.responder_bind_udp.split(':')
+    plugin.set_default(:port, port)
+    plugin.set_default(:host, host)
   end
 
   def process(data, src)

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.1.2'
+    VERSION = '2.1.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Vasiliev Dmitry