flapjack 0.6.53 → 0.6.54

data/bin/flapjack

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
-require 'ostruct'
-
 # add lib to the default include path
 unless $:.include?(File.dirname(__FILE__) + '/../lib/')
   $: << File.dirname(__FILE__) + '/../lib'
 end
 
+require 'dante'
+require 'optparse'
+require 'ostruct'
+
 require 'flapjack/configuration'
 
 options = OpenStruct.new
@@ -15,7 +16,16 @@ options.config    = File.join('etc', 'flapjack_config.yaml')
 options.daemonize = nil
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: flapjack [options]"
+  opts.banner = "Usage: flapjack COMMAND [OPTIONS]"
+
+  opts.separator  ""
+  opts.separator  "Commands"
+  opts.separator  "     start #{" " * 25} start flapjack"
+  opts.separator  "     stop #{" " * 26} stop flapjack"
+  opts.separator  "     restart #{" " * 23} (re)start flapjack"
+  opts.separator  "     reload #{" " * 24} reload flapjack configuration"
+  opts.separator  ""
+  opts.separator  "Options"
 
   opts.on("-c", "--config [PATH]", String, "PATH to the config file to use") do |c|
     options.config = c
@@ -29,6 +39,10 @@ OptionParser.new do |opts|
     options.pidfile = p
   end
 
+  opts.on("-l", "--logfile [PATH]", String, "PATH to the logfile to write to") do |l|
+    options.log_path = l
+  end
+
 end.parse!(ARGV)
 
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
@@ -42,25 +56,95 @@ if config_env.nil? || config_env.empty?
   exit(false)
 end
 
-if options.pidfile.nil?
-  pid_file = (config_env['pid_file'] || 'tmp/pids/flapjack.pid')
-else
-  pid_file = options.pidfile
-end
+pidfile = options.pidfile.nil? ?
+           (config_env['pid_file'] || 'tmp/pids/flapjack.pid') :
+           options.pidfile
+
+logfile = options.logfile.nil? ?
+            (config_env['log_file'] || 'log/flapjack.log') :
+            options.logfile
 
-# TODO Flapjack falls over when Redis restarted -- trap errors and attempt reconnect
+daemonize = options.daemonize.nil? ?
+              !!config_env['daemonize'] :
+              options.daemonize
 
 require 'flapjack/coordinator'
 
-coordinator = Flapjack::Coordinator.new(config)
-coordinator.log_file = (config_env['log_file'] || 'log/flapjack.log')
-coordinator.pid_file = pid_file
+flapjack_coord = Proc.new {
+  coordinator = Flapjack::Coordinator.new(config)
+  coordinator.start(:signals => true)
+}
+
+case ARGV[0]
+when "start"
+  runner = Dante::Runner.new('flapjack', :pid_path => pidfile,
+    :log_path => logfile)
+
+  if runner.daemon_running?
+    puts "Flapjack is already running."
+  else
+    print "Flapjack starting..."
+    runner.execute(:daemonize => daemonize) {
+      flapjack_coord.call
+    }
+    puts " done."
+  end
+
+when "stop"
+  runner = Dante::Runner.new('flapjack', :pid_path => pidfile,
+    :log_path => logfile)
+
+  if runner.daemon_running?
+    print "Flapjack stopping..."
+    runner.execute(:kill => true)
+    puts " done."
+  else
+    puts "Flapjack is not running."
+  end
+
+when "restart"
+  runner = Dante::Runner.new('flapjack', :pid_path => pidfile,
+    :log_path => logfile)
+
+  print "Flapjack restarting..."
+  runner.execute(:daemonize => true, :restart => true) {
+    sleep 1 # get connection errors without this... -- might move this to
+    # be default behaviour when starting jabber gateway
+    flapjack_coord.call
+  }
+  puts " done."
+
+when "reload"
+  runner = Dante::Runner.new('flapjack', :pid_path => pidfile, :log_path => logfile)
+
+  if runner.daemon_running?
+    print "Reloading Flapjack configuration..."
+    begin
+      pid = IO.read(pidfile).chomp.to_i
+      Process.kill('HUP', pid)
+      puts " sent HUP to pid #{pid}."
+    rescue => e
+      puts " couldn't send HUP to pid '#{pid}'."
+    end
+  else
+    puts "Flapjack is not running daemonized."
+  end
+
+when "status"
+  runner = Dante::Runner.new('flapjack', :pid_path => pidfile, :log_path => logfile)
+
+  uptime = (runner.daemon_running?) ? Time.now - File.stat(pidfile).ctime : 0
+  if runner.daemon_running?
+    puts "Flapjack is running: #{uptime}"
+  else
+    puts "Flapjack is not runninng"
+  end
 
-if options.daemonize.nil?
-  daemonize = !!config_env['daemonize']
 else
-  daemonize = options.daemonize
-end
+  if ARGV.nil? || ARGV.empty?
+    puts "No command provided"
+  else
+    puts "Unknown command provided: '#{ARGV[0]}'"
+  end
 
-puts "Daemonising ... " if daemonize
-coordinator.start(:daemonize => daemonize, :signals => true)
+end

data/bin/flapjack-nagios-receiver

@@ -1,62 +1,27 @@
 #!/usr/bin/env ruby
 
+unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+  $: << File.dirname(__FILE__) + '/../lib'
+end
+
 require 'optparse'
 require 'ostruct'
 require 'redis'
 require 'yajl/json_gem'
-
-# add lib to the default include path
-unless $:.include?(File.dirname(__FILE__) + '/../lib/')
-  $: << File.dirname(__FILE__) + '/../lib'
-end
+require 'dante'
 
 require 'flapjack/configuration'
 
-options = OpenStruct.new
-options.config    = File.join('etc', 'flapjack_config.yaml')
-options.daemonize = nil
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: flapjack-nagios-receiver [options]"
-
-  opts.on("-c", "--config [PATH]", String, "PATH to the config file to use") do |c|
-    options.config = c
-  end
-
-  opts.on("-f", "--fifo FIFO", String, "Path to the nagios perfdata named pipe") do |f|
-    options.fifo = f
-  end
-
-end.parse!(ARGV)
-
-FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
-
-config = Flapjack::Configuration.new
-config.load(options.config)
-@config_env = config.all
-@redis_options = config.for_redis
-
-if @config_env.nil? || @config_env.empty?
-  puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
-  exit(false)
+def pike(message)
+  puts "piking out: #{message}"
+  exit 1
 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
-# fields match up
-# host_perfdata_file_template=[HOSTPERFDATA]\t$TIMET$\t$HOSTNAME$\tHOST\t$HOSTSTATE$\t$HOSTEXECUTIONTIME$\t$HOSTLATENCY$\t$HOSTOUTPUT$\t$HOSTPERFDATA$
-# service_perfdata_file_template=[SERVICEPERFDATA]\t$TIMET$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$
-
-def process_input(redis)
+def process_input(opts)
+  redis = opts[:redis]
+  fifo  = File.new(opts[:fifo])
   begin
-    while line = @fifo.gets
+    while line = fifo.gets
       skip unless line
       split_line = line.split("\t")
 
@@ -93,15 +58,164 @@ def process_input(redis)
   end
 end
 
-def main
-  redis = Redis.new(@redis_options)
-
+def main(opts)
+  fifo = opts[:fifo]
+  redis = Redis.new(opts[:redis_options])
   while true
-    process_input(redis)
+    process_input(:redis => redis, :fifo => fifo)
     puts "Whoops, restarting main loop in 10 seconds"
     sleep 10
   end
 end
 
-main
+options = OpenStruct.new
+options.config    = nil
+options.daemonize = nil
+
+exe = File.basename(__FILE__)
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{exe} COMMAND [OPTIONS]"
+
+  opts.separator  ""
+  opts.separator  "Commands"
+  opts.separator  "     start #{" " * 25} start #{exe}"
+  opts.separator  "     stop #{" " * 26} stop #{exe}"
+  opts.separator  "     restart #{" " * 23} (re)start #{exe}"
+  opts.separator  ""
+  opts.separator  "Options"
+
+  opts.on("-c", "--config [PATH]", String, "PATH to the config file to use") do |c|
+    options.config = c
+  end
+
+  opts.on("-f", "--fifo FIFO", String, "Path to the nagios perfdata named pipe") do |f|
+    options.fifo = f
+  end
+
+  opts.on("-d", "--[no-]daemonize", "Daemonize?") do |d|
+    options.daemonize = d
+  end
+
+  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |p|
+    options.pidfile = p
+  end
+
+  opts.on("-l", "--logfile [PATH]", String, "PATH to the logfile to write to") do |l|
+    options.log_path = l
+  end
+
+end.parse!(ARGV)
+
+FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
+
+#runner = Dante::Runner.new('flapjack-nagios-receiver',
+#                           :pid_path   => '/var/run/flapjack/flapjack-nagios-receiver.pid',
+#                           :log_path   => '/var/log/flapjack/flapjack-nagios-receiver.log')
+
+
+if options.config
+  config_file = options.config
+  pike "specified config file cannot be read" unless File.readable?(config_file)
+else
+  [ 'etc/flapjack_config.yaml',
+    File.dirname(__FILE__) + 'etc/flapjack_config.yaml',
+    '/etc/flapjack/flapjack_config.yaml' ].each do |candidate|
+    if File.readable?(candidate)
+      config_file = candidate
+      break
+    else
+      puts "not found and/or not readable: #{candidate}"
+    end
+  end
+  pike "no config file specified and none found in default locations" unless config_file
+end
+
+config = Flapjack::Configuration.new
+config.load(config_file)
+config_env = config.all
+redis_options = config.for_redis
+
+if config_env.nil? || config_env.empty?
+  puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
+  exit(false)
+end
+
+config_nr = config_env['nagios-receiver'] || {}
+
+pidfile = options.pidfile.nil? ?
+            (config_nr['pid_file'] || "/var/run/flapjack/#{exe}.pid") :
+            options.pidfile
+
+logfile = options.logfile.nil? ?
+            (config_nr['log_file'] || "/var/log/flapjack/#{exe}.log") :
+            options.logfile
+
+fifo = options.fifo.nil? ?
+         (config_nr['fifo'] || '/var/cache/nagios3/event_stream.fifo') :
+         options.fifo
+
+daemonize = options.daemonize.nil? ?
+              !!config_nr['daemonize'] :
+              options.daemonize
+
+
+  # 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
+  # fields match up
+  # host_perfdata_file_template=[HOSTPERFDATA]\t$TIMET$\t$HOSTNAME$\tHOST\t$HOSTSTATE$\t$HOSTEXECUTIONTIME$\t$HOSTLATENCY$\t$HOSTOUTPUT$\t$HOSTPERFDATA$
+  # service_perfdata_file_template=[SERVICEPERFDATA]\t$TIMET$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$
+
+
+runner = Dante::Runner.new(exe, :pid_path => pidfile, :log_path => logfile)
+case ARGV[0]
+when "start", "restart"
+  pike "You must specify a path to the nagios perfdata named pipe using the --fifo option" unless fifo
+end
+
+case ARGV[0]
+when "start"
+  if runner.daemon_running?
+    puts "#{exe} is already running."
+  else
+    print "#{exe} starting..."
+    runner.execute(:daemonize => daemonize) {
+      main(:redis_options => redis_options, :fifo => fifo)
+    }
+    puts " done."
+  end
+
+when "stop"
+  if runner.daemon_running?
+    print "#{exe} stopping..."
+    runner.execute(:kill => true)
+    puts " done."
+  else
+    puts "#{exe} is not running."
+  end
+
+when "restart"
+  print "#{exe} restarting..."
+  runner.execute(:daemonize => true, :restart => true) {
+    main(:redis_options => redis_options, :fifo => fifo)
+  }
+  puts " done."
+
+when "status"
+  uptime = (runner.daemon_running?) ? Time.now - File.stat(pidfile).ctime : 0
+  if runner.daemon_running?
+    puts "#{exe} is running: #{uptime}"
+  else
+    puts "#{exe} is not runninng"
+  end
+
+else
+  if ARGV.nil? || ARGV.empty?
+    puts "No command provided"
+  else
+    puts "Unknown command provided: '#{ARGV[0]}'"
+  end
+
+end
+
 

data/bin/flapper

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
+require 'ostruct'
 require 'eventmachine'
 require 'socket'
+require 'dante'
 
 module Flapper
-
   def receive_data data
     send_data ">>>you sent: #{data}"
     close_connection if data =~ /quit/i
   end
-
 end
 
 def local_ip
@@ -24,25 +25,113 @@ ensure
   Socket.do_not_reverse_lookup = orig
 end
 
-start_every = 120
-stop_after  = 60
-bind_ip     = local_ip
-bind_port   = 12345
-EM.run {
-
-  puts "#{Time.now}: starting server"
-  server_init = EM.start_server bind_ip, bind_port, Flapper
-  EM.add_timer(stop_after) do
-    puts "#{Time.now}: stopping server"
-    EM.stop_server(server_init)
-  end
+def main
+  start_every = 120
+  stop_after  = 60
+  bind_ip     = local_ip
+  bind_port   = 12345
+  EM.run {
 
-  EM.add_periodic_timer(start_every) do
     puts "#{Time.now}: starting server"
-    server = EM.start_server bind_ip, bind_port, Flapper
+    server_init = EM.start_server bind_ip, bind_port, Flapper
     EM.add_timer(stop_after) do
       puts "#{Time.now}: stopping server"
-      EM.stop_server(server)
+      EM.stop_server(server_init)
     end
+
+    EM.add_periodic_timer(start_every) do
+      puts "#{Time.now}: starting server"
+      server = EM.start_server bind_ip, bind_port, Flapper
+      EM.add_timer(stop_after) do
+        puts "#{Time.now}: stopping server"
+        EM.stop_server(server)
+      end
+    end
+  }
+end
+
+options = OpenStruct.new
+options.daemonize = nil
+
+exe = File.basename(__FILE__)
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{exe} COMMAND [OPTIONS]"
+
+  opts.separator  ""
+  opts.separator  "Commands"
+  opts.separator  "     start #{" " * 25} start #{exe}"
+  opts.separator  "     stop #{" " * 26} stop #{exe}"
+  opts.separator  "     restart #{" " * 23} (re)start #{exe}"
+  opts.separator  ""
+  opts.separator  "Options"
+
+  opts.on("-d", "--[no-]daemonize", "Daemonize?") do |d|
+    options.daemonize = d
+  end
+
+  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |p|
+    options.pidfile = p
+  end
+
+  opts.on("-l", "--logfile [PATH]", String, "PATH to the logfile to write to") do |l|
+    options.log_path = l
   end
-}
+end.parse!(ARGV)
+
+pidfile = options.pidfile.nil? ?
+            "/var/run/flapjack/#{exe}.pid" :
+            options.pidfile
+
+logfile = options.logfile.nil? ?
+            "/var/log/flapjack/#{exe}.log" :
+            options.logfile
+
+daemonize = options.daemonize.nil? ? true : options.daemonize
+
+runner = Dante::Runner.new(exe, :pid_path => pidfile, :log_path => logfile)
+
+case ARGV[0]
+when "start"
+  if runner.daemon_running?
+    puts "#{exe} is already running."
+  else
+    print "#{exe} starting..."
+    runner.execute(:daemonize => daemonize) {
+      main
+    }
+    puts " done."
+  end
+
+when "stop"
+  if runner.daemon_running?
+    print "#{exe} stopping..."
+    runner.execute(:kill => true)
+    puts " done."
+  else
+    puts "#{exe} is not running."
+  end
+
+when "restart"
+  print "#{exe} restarting..."
+  runner.execute(:daemonize => true, :restart => true) {
+    main
+  }
+  puts " done."
+
+when "status"
+  uptime = (runner.daemon_running?) ? Time.now - File.stat(pidfile).ctime : 0
+  if runner.daemon_running?
+    puts "#{exe} is running: #{uptime}"
+  else
+    puts "#{exe} is not runninng"
+  end
+
+else
+  if ARGV.nil? || ARGV.empty?
+    puts "No command provided"
+  else
+    puts "Unknown command provided: '#{ARGV[0]}'"
+  end
+
+end