flapjack 0.6.33 → 0.6.34

data/README.md

@@ -132,20 +132,16 @@ flapjack-nagios-receiver
 
 There is a control script that uses [Daemons](http://daemons.rubyforge.org/) to start, stop, restart, show status etc of the flapjack-nagios-receiver process. Options after -- are passed through to flapjack-nagios-receiver. Run it like so:
 
-    flapjack-nagios-receiver-control start -- --config /etc/flapjack/flapjack-config.yaml /path/to/nagios/perfdata.fifo
+    flapjack-nagios-receiver-control start -- --config /etc/flapjack/flapjack-config.yaml --fifo /path/to/nagios/perfdata.fifo
     flapjack-nagios-receiver-control status
-    flapjack-nagios-receiver-control restart -- --config /etc/flapjack/flapjack-config.yaml /path/to/nagios/perfdata.fifo
+    flapjack-nagios-receiver-control restart -- --config /etc/flapjack/flapjack-config.yaml --fifo /path/to/nagios/perfdata.fifo
     flapjack-nagios-receiver-control stop
 
 * Bypassing daemons control script: *
 
-This process needs to be started with the nagios perfdata named pipe attached to its STDIN like so:
+Specify the path to the nagios named pipe (fifo):
 
-    flapjack-nagios-receiver < /var/cache/nagios3/event_stream.fifo
-
-Or the path to the fifo can just be given as an argument, thanks to the magical powers of ARGV:
-
-    flapjack-nagios-receiver /var/cache/nagios3/event_stream.fifo
+    flapjack-nagios-receiver --fifo /var/cache/nagios3/event_stream.fifo
 
 Now as nagios feeds check execution results into the perfdata named pipe, flapjack-nagios-receiver will convert them to JSON encoded ruby objects and insert them into the *events* queue.
 

data/bin/flapjack-nagios-receiver

@@ -18,8 +18,8 @@ OptionParser.new do |opts|
     options.config = c
   end
 
-  opts.on("-f", "--fifo [PATH]", String, "PATH to the nagios perfdata named pipe") do |f|
-    options.fifo_path = f
+  opts.on("-f", "--fifo FIFO", String, "Path to the nagios perfdata named pipe") do |f|
+    options.fifo = f
   end
 
 end.parse!(ARGV)
@@ -42,10 +42,12 @@ if config_env.nil? || config_env.empty?
   exit(false)
 end
 
-# add lib to the default include path
-#unless $:.include?(File.dirname(__FILE__) + '/../lib/')
-#  $: << File.dirname(__FILE__) + '/../lib'
-#end
+if !options.fifo
+  puts "You must specify a path to the nagios perfdata named pipe using the --fifo option"
+  exit(false)
+end
+
+@fifo = File.new(options.fifo)
 
 # nagios.cfg contains the following templates for host and service data (modified from the default
 # to include hoststate / servicestate, and a fake service 'HOST' for hostperfdata, so that the
@@ -71,11 +73,10 @@ def process_input
     redis = Redis.new(:db => @redis_db, :host => @redis_host, :port => @redis_port)
   end
 
-  puts "ARGV after option processing looks like this: [#{ARGV.inspect}]"
-
   begin
-    while line = ARGF.readline.split("\t")
-      object_type, timestamp, entity, check, state, check_time, check_latency, check_output, check_perfdata = line
+    while line = @fifo.gets
+      skip unless line
+      object_type, timestamp, entity, check, state, check_time, check_latency, check_output, check_perfdata = line.split("\t")
       puts "#{object_type}, #{timestamp}, #{entity}, #{check}, #{state}, #{check_output}"
       next unless line.length == 9
       next unless timestamp =~ /^\d+$/

data/dist/etc/init.d/flapjack-nagios-receiver

@@ -28,9 +28,8 @@ fi
 
 # Evaluate command
 
-#/bin/bash -c "source /etc/profile.d/rbenv.sh && rbenv shell 1.9.3-p125 && flapjack-nagios-receiver-control $1 -- --config /etc/flapjack/flapjack-config.yaml ${NAGIOS_PERFDATA_FIFO}"
-rbenv shell 1.9.3-p125 && flapjack-nagios-receiver-control $1 -- --config /etc/flapjack/flapjack-config.yaml ${NAGIOS_PERFDATA_FIFO}
-RETVAL=$?
+rbenv shell 1.9.3-p125 && flapjack-nagios-receiver-control $1 -- --config /etc/flapjack/flapjack-config.yaml --fifo ${NAGIOS_PERFDATA_FIFO}
 
+RETVAL=$?
 exit $RETVAL
 

data/lib/flapjack/coordinator.rb

@@ -227,12 +227,8 @@ module Flapjack
     end
 
     def build_redis_connection_pool(options = {})
-      redis_em_options = @redis_options.dup
-      redis_db = redis_em_options.delete(:db)
       EventMachine::Synchrony::ConnectionPool.new(:size => options[:size] || 5) do
-        redis = EM::Protocols::Redis.connect(redis_em_options)
-        redis.select(redis_db)
-        redis
+        ::Redis.new(@redis_options)
       end
     end
 

data/lib/flapjack/pikelet.rb

@@ -27,15 +27,9 @@ module Flapjack
     def build_redis_connection_pool(options = {})
       return unless @bootstrapped
       if defined?(EventMachine) && defined?(EventMachine::Synchrony)
-
-        redis_em_options = @redis_config.dup
-        redis_db = redis_em_options.delete(:db)
         EventMachine::Synchrony::ConnectionPool.new(:size => options[:size] || 5) do
-          r = EM::Protocols::Redis.connect(redis_em_options)
-          r.select(redis_db)
-          r
+          ::Redis.new(@redis_config)
         end
-
       else
         ::Redis.new(@redis_config)
       end

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.6.33"
+  VERSION = "0.6.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.33
+  version: 0.6.34
   prerelease: 
 platform: ruby
 authors: