flapjack 0.7.29 → 0.7.30

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Flapjack Changelog
 
+# 0.7.30 - 2013-11-06
+- Feature: Make logging more configurable gh-27 (@ali-graham)
+- Bug: 5 min default notification interval interferes with granularity of user set notification interval gh-156 (@jessereynolds)
+- Bug: NoMethodError at /checks_all gh-330 (@ali-graham)
+- Bug: Web UI assumes nil means 0 for rollup threshold gh-357 (@ali-graham)
+- Chore: Update init scripts gh-350 (@ali-graham)
+- Chore: Scripts in bin/ need to be better tested gh-305 (@jessereynolds)
+
 # 0.7.29 - 2013-11-01
 - Feature: Per contact media rollup complete gh-291 (@jessereynolds)
 - Feature: Rollup - show alerting checks and rollup status for each media on contact page gh-326 (@jessereynolds)

data/bin/flapjack-nagios-receiver

@@ -1,5 +1,14 @@
 #!/usr/bin/env ruby
 
+# nagios.cfg must contain the following perfdata 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$
+#
+
 unless $:.include?(File.dirname(__FILE__) + '/../lib/')
   $: << File.dirname(__FILE__) + '/../lib'
 end
@@ -16,11 +25,6 @@ require 'dante'
 require 'flapjack/configuration'
 require 'flapjack/data/event'
 
-def pike(message)
-  puts "piking out: #{message}"
-  exit 1
-end
-
 def process_input(opts)
   redis = opts[:redis]
   fifo  = File.new(opts[:fifo])
@@ -109,7 +113,7 @@ optparse = OptionParser.new do |opts|
   end
 
   opts.on("-l", "--logfile [PATH]", String, "PATH to the logfile to write to") do |l|
-    options.log_path = l
+    options.logfile = l
   end
 
 end
@@ -146,17 +150,18 @@ daemonize = options.daemonize.nil? ?
               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
+  unless File.exist?(fifo)
+    raise "No fifo (named pipe) file found at #{fifo}"
+  end
+  unless File.pipe?(fifo)
+    raise "The file at #{fifo} is not a named pipe, try using mkfifo to make one"
+  end
+  unless File.readable?(fifo)
+    raise "The fifo (named pipe) at #{fifo} is unreadable"
+  end
 end
 
 case ARGV[0]
@@ -194,7 +199,7 @@ when "status"
   if runner.daemon_running?
     puts "#{exe} is running: #{uptime}"
   else
-    puts "#{exe} is not runninng"
+    puts "#{exe} is not running"
     exit 3
   end
 

data/bin/flapjack-populator

@@ -19,20 +19,20 @@ require 'flapjack/data/entity'
 require 'flapjack/data/event'
 
 options = OpenStruct.new
-options.config    = Flapjack::Configuration::DEFAULT_CONFIG_PATH
-options.daemonize = nil
+options.config = Flapjack::Configuration::DEFAULT_CONFIG_PATH
 
-command = ARGV.shift
+exe = File.basename(__FILE__)
 
-banner  = "Usage: flapjack-populator command [options]\n"
-banner += "\n"
-banner += "  commands:\n"
-banner += "    - import-entities\n"
-banner += "    - import-contacts\n"
-banner += "    - purge-events (purge queued monitoring events)\n"
+optparse = OptionParser.new do |opts|
+  opts.banner = "Usage: #{exe} COMMAND [OPTIONS]"
 
-OptionParser.new do |opts|
-  opts.banner = "Usage: flapjack-populator command [options]"
+  opts.separator  ""
+  opts.separator  "Commands:"
+  opts.separator  "     import-entities"
+  opts.separator  "     import-contacts"
+  opts.separator  "     purge-events    purge queued monitoring events"
+  opts.separator  ""
+  opts.separator  "Options"
 
   opts.on("-c", "--config [PATH]", String, "PATH to the config file to use") do |c|
     options.config = c
@@ -42,7 +42,24 @@ OptionParser.new do |opts|
     options.from = f
   end
 
-end.parse!(ARGV)
+end
+optparse.parse!(ARGV)
+
+if options.help
+  puts optparse
+  exit
+elsif options.version
+  puts Flapjack::VERSION
+  exit
+elsif !["import-contacts", "import-entities", "purge-events"].include?(ARGV[0])
+  if ARGV.nil? || ARGV.empty?
+    puts "No command provided"
+  else
+    puts "Unknown command provided: '#{ARGV[0]}'"
+  end
+  puts "\n#{optparse}"
+  exit 1
+end
 
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
 
@@ -61,7 +78,7 @@ if options.from
   file     = File.new(filename)
 end
 
-case command
+case ARGV[0]
 when "import-contacts"
   contacts = Oj.load(file)
 

data/bin/flapper

@@ -126,7 +126,7 @@ when "status"
   if runner.daemon_running?
     puts "#{exe} is running: #{uptime}"
   else
-    puts "#{exe} is not runninng"
+    puts "#{exe} is not running"
     exit 3
   end
 

data/bin/receive-events

@@ -141,16 +141,7 @@ 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
-
-unless options.source
-  puts "--source URL is required"
-  exit 1
-end
-
-unless options.follow || options.all
-  puts "one or both of --follow or --all is required"
+  puts "\n#{optparse}"
   exit 1
 end
 
@@ -166,6 +157,18 @@ else
   end
 end
 
+unless options.source
+  puts "--source URL is required"
+  puts "\n#{optparse}"
+  exit 1
+end
+
+unless options.follow || options.all
+  puts "one or both of --follow or --all is required"
+  puts "\n#{optparse}"
+  exit 1
+end
+
 receive(:follow => options.follow,
         :all => options.all,
         :source => options.source,

data/bin/simulate-failed-check

@@ -52,7 +52,7 @@ def fail(opts)
       EM.stop
     end
 
-    EM.add_periodic_timer(10) do
+    EM.add_periodic_timer(opts[:interval]) do
       puts "#{Time.now}: sending failure event (#{state}) for #{key}"
       send_event(failure.merge('time' => Time.now.to_i), :redis => redis)
     end
@@ -86,6 +86,10 @@ optparse = OptionParser.new do |opts|
     options.minutes = t
   end
 
+  opts.on("-i", "--interval SECONDS", String, "SECONDS between events, can be decimal eg 0.1 (10)") do |i|
+    options.interval = i.to_f
+  end
+
   opts.on("-e", "--entity ENTITY", String, "ENTITY to generate failure events for ('foo-app-01')") do |e|
     options.entity = e
   end
@@ -101,6 +105,10 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!(ARGV)
 
+unless options.interval.to_f > 0
+  options.interval = 10.0
+end
+
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
 
 config = Flapjack::Configuration.new
@@ -110,11 +118,13 @@ 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)
+  puts "\n#{optparse}"
+  exit 1
 end
 
 options = {:redis_options => redis_options, :minutes => options.minutes,
-           :entity => options.entity, :check => options.check, :state => options.state}
+           :entity => options.entity, :check => options.check, :state => options.state,
+           :interval => options.interval}
 case ARGV[0]
 when "fail-and-recover"
   fail(options.merge(:recover => true))

data/dist/etc/init.d/flapjack

@@ -1,22 +1,12 @@
 #!/bin/bash
 #
-# Copyright (c) 2009-2012 Lindsay Holmwood <lindsay@holmwood.id.au>
+# Copyright (c) 2009-2013 Lindsay Holmwood <lindsay@holmwood.id.au>
 #
 # flapjack
-# Boots flapjack (coordinator, flapjack-executive, notification workers, ...)
+# Boots flapjack (coordinator, processor, notifier, gateways...)
 #
 
-PATH=$PATH:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local:/usr/local/sbin:/usr/local/bin:/usr/lib/flapjack/bin
-
-# load global rbenv environment if present
-if [ -x /etc/profile.d/rbenv.sh ] ; then
-  source /etc/profile.d/rbenv.sh
-fi
-
-# Default return value
-RETVAL=0
-
-export FLAPJACK_ENV="production"
+PATH=/opt/flapjack/bin:$PATH
 
 if [ ! $(which flapjack) ]; then
   echo "Error: flapjack isn't in PATH."
@@ -24,35 +14,8 @@ if [ ! $(which flapjack) ]; then
   exit 1
 fi
 
-rbenv shell 1.9.3-p125
-
 # Evaluate command
-case "$1" in
-  start)
-    flapjack start --config /etc/flapjack/flapjack-config.yaml --daemonize
-    RETVAL=$?
-  ;;
-  stop)
-    flapjack stop --config /etc/flapjack/flapjack-config.yaml
-    RETVAL=$?
-  ;;
-  restart)
-    flapjack restart --config /etc/flapjack/flapjack-config.yaml
-    RETVAL=$?
-  ;;
-  reload)
-    flapjack reload --config /etc/flapjack/flapjack-config.yaml
-    RETVAL=$?
-  ;;
-  status)
-    flapjack status --config /etc/flapjack/flapjack-config.yaml
-    RETVAL=$?
-  ;;
-  *)
-    echo "Usage: flapjack {start|stop|restart|reload|status}"
-    RETVAL=1
-  ;;
-esac
+flapjack $1
 
+RETVAL=$?
 exit $RETVAL
-

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

@@ -1,24 +1,12 @@
 #!/bin/bash
 #
-# Copyright (c) 2009-2012 Lindsay Holmwood <lindsay@holmwood.id.au>
+# Copyright (c) 2009-2013 Lindsay Holmwood <lindsay@holmwood.id.au>
 #
 # flapjack-nagios-receiver
 # reads from a nagios perfdata named-pipe and submits each event to the events queue in redis
 #
 
-PATH=$PATH:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local:/usr/local/sbin:/usr/local/bin:/usr/lib/flapjack/bin
-
-# load global rbenv environment if present
-if [ -x /etc/profile.d/rbenv.sh ] ; then
-  source /etc/profile.d/rbenv.sh
-fi
-
-# Default return value
-RETVAL=0
-
-export FLAPJACK_ENV="production"
-
-NAGIOS_PERFDATA_FIFO="/var/cache/nagios3/event_stream.fifo"
+PATH=/opt/flapjack/bin:$PATH
 
 if [ ! $(which flapjack-nagios-receiver) ]; then
   echo "Error: flapjack-nagios-receiver isn't in PATH."
@@ -27,9 +15,7 @@ if [ ! $(which flapjack-nagios-receiver) ]; then
 fi
 
 # Evaluate command
-
-rbenv shell 1.9.3-p125 && flapjack-nagios-receiver $1 --config /etc/flapjack/flapjack-config.yaml --fifo ${NAGIOS_PERFDATA_FIFO} --daemonize
+flapjack-nagios-receiver $1
 
 RETVAL=$?
 exit $RETVAL
-

data/dist/etc/init.d/flapper

@@ -3,15 +3,7 @@
 # flapper
 #
 
-PATH=$PATH:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local:/usr/local/sbin:/usr/local/bin:/usr/lib/flapjack/bin
-
-# load global rbenv environment if present
-if [ -x /etc/profile.d/rbenv.sh ] ; then
-  source /etc/profile.d/rbenv.sh
-fi
-
-# Default return value
-RETVAL=0
+PATH=/opt/flapjack/bin:$PATH
 
 if [ ! $(which flapper) ]; then
   echo "Error: flapper isn't in PATH."
@@ -20,8 +12,7 @@ if [ ! $(which flapper) ]; then
 fi
 
 # Evaluate command
-rbenv shell 1.9.3-p125 && flapper $1
-RETVAL=$?
+flapper $1
 
+RETVAL=$?
 exit $RETVAL
-

data/etc/flapjack_config.yaml.example

@@ -4,6 +4,9 @@ production:
   pid_file: /var/run/flapjack/flapjack.pid
   log_file: /var/log/flapjack/flapjack.log
   daemonize: yes
+  logger:
+    level: INFO
+    syslog_errors: yes
   redis:
     host: 127.0.0.1
     port: 6379
@@ -17,6 +20,7 @@ production:
     new_check_scheduled_maintenance_duration: 100 years
     logger:
       level: INFO
+      syslog_errors: yes
   notifier:
     enabled: yes
     queue: notifications
@@ -28,12 +32,18 @@ production:
     default_contact_timezone: UTC
     logger:
       level: INFO
+      syslog_errors: yes
+  nagios-receiver:
+    fifo: "/var/cache/nagios3/event_stream.fifo"
+    pid_file: "/var/run/flapjack/flapjack-nagios-receiver.pid"
+    log_file: "/var/log/flapjack/flapjack-nagios-receiver.log"
   gateways:
     email:
       enabled: no
       queue: email_notifications
       logger:
         level: INFO
+        syslog_errors: yes
       smtp_config:
         # port 1025 is the default port for http://mailcatcher.me
         host: 127.0.0.1
@@ -51,41 +61,27 @@ production:
       password: "xxxx"
       logger:
         level: INFO
+        syslog_errors: yes
     jabber:
       enabled: no
       queue: jabber_notifications
-      server: "jabber.domain.tld"
+      server: "jabber.example.com"
       port: 5222
-      jabberid: "flapjack@jabber.domain.tld"
+      jabberid: "flapjack@jabber.example.com"
       password: "good-password"
       alias: "flapjack"
       rooms:
-        - "gimp@conference.jabber.domain.tld"
-        - "log@conference.jabber.domain.tld"
-      logger:
-        level: INFO
-    oobetet:
-      enabled: no
-      server: "jabber.domain.tld"
-      port: 5222
-      jabberid: "flapjacktest@jabber.domain.tld"
-      password: "nuther-good-password"
-      alias: "flapjacktest"
-      watched_check: "PING"
-      watched_entity: "foo.bar.net"
-      max_latency: 300
-      pagerduty_contact: "11111111111111111111111111111111"
-      rooms:
-        - "flapjacktest@conference.jabber.domain.tld"
-        - "gimp@conference.jabber.domain.tld"
-        - "log@conference.jabber.domain.tld"
+        - "gimp@conference.jabber.example.com"
+        - "log@conference.jabber.example.com"
       logger:
         level: INFO
+        syslog_errors: yes
     pagerduty:
       enabled: no
       queue: pagerduty_notifications
       logger:
         level: INFO
+        syslog_errors: yes
     web:
       enabled: yes
       port: 3080
@@ -93,6 +89,7 @@ production:
       access_log: "/var/log/flapjack/web_access.log"
       logger:
         level: INFO
+        syslog_errors: yes
     api:
       enabled: yes
       port: 3081
@@ -100,11 +97,33 @@ production:
       access_log: "/var/log/flapjack/api_access.log"
       logger:
         level: INFO
+        syslog_errors: yes
+    oobetet:
+      enabled: no
+      server: "jabber.example.com"
+      port: 5222
+      jabberid: "flapjacktest@jabber.example.com"
+      password: "nuther-good-password"
+      alias: "flapjacktest"
+      watched_check: "PING"
+      watched_entity: "foo.example.com"
+      max_latency: 300
+      pagerduty_contact: "11111111111111111111111111111111"
+      rooms:
+        - "flapjacktest@conference.jabber.example.com"
+        - "gimp@conference.jabber.example.com"
+        - "log@conference.jabber.example.com"
+      logger:
+        level: INFO
+        syslog_errors: yes
 
 development:
   pid_file: tmp/pids/flapjack.pid
   log_file: log/flapjack.log
   daemonize: yes
+  logger:
+    level: INFO
+    syslog_errors: yes
   redis:
     host: 127.0.0.1
     port: 6379
@@ -118,6 +137,7 @@ development:
     new_check_scheduled_maintenance_duration: 100 years
     logger:
       level: DEBUG
+      syslog_errors: yes
   notifier:
     enabled: yes
     queue: notifications
@@ -129,12 +149,18 @@ development:
     default_contact_timezone: UTC
     logger:
       level: DEBUG
+      syslog_errors: yes
+  nagios-receiver:
+    fifo: "/usr/local/var/lib/nagios/event_stream.fifo"
+    pid_file: "tmp/pids/flapjack-nagios-receiver.pid"
+    log_file: "log/flapjack-nagios-receiver.log"
   gateways:
     email:
-      enabled: no
+      enabled: yes
       queue: email_notifications
       logger:
         level: INFO
+        syslog_errors: yes
       smtp_config:
         # port 1025 is the default port for http://mailcatcher.me
         host: 127.0.0.1
@@ -145,48 +171,36 @@ development:
         #  username:
         #  password:
     sms:
-      enabled: no
+      enabled: yes
       queue: sms_notifications
-      endpoint: 'https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage'
-      username: "ermahgerd"
+      # if you run up something like 200ok locally you can then view the
+      # sms messages being emitted
+      endpoint: 'http://localhost:9292/FakeMessagenetAPI.aspx'
+      username: "gretta"
       password: "xxxx"
       logger:
         level: INFO
+        syslog_errors: yes
     jabber:
       enabled: no
       queue: jabber_notifications
-      server: "jabber.domain.tld"
+      server: "jabber.example.com"
       port: 5222
-      jabberid: "flapjack@jabber.domain.tld"
-      password: "good-password"
+      jabberid: "flapjack@jabber.example.com"
+      password: "xxxx"
       alias: "flapjack"
       rooms:
-        - "gimp@conference.jabber.domain.tld"
-        - "log@conference.jabber.domain.tld"
-      logger:
-        level: INFO
-    oobetet:
-      enabled: no
-      server: "jabber.domain.tld"
-      port: 5222
-      jabberid: "flapjacktest@jabber.domain.tld"
-      password: "nuther-good-password"
-      alias: "flapjacktest"
-      watched_check: "PING"
-      watched_entity: "foo.bar.net"
-      max_latency: 300
-      pagerduty_contact: "11111111111111111111111111111111"
-      rooms:
-        - "flapjacktest@conference.jabber.domain.tld"
-        - "gimp@conference.jabber.domain.tld"
-        - "log@conference.jabber.domain.tld"
+        - "gimp@conference.jabber.example.com"
+        - "log@conference.jabber.example.com"
       logger:
         level: INFO
+        syslog_errors: yes
     pagerduty:
       enabled: no
       queue: pagerduty_notifications
       logger:
         level: INFO
+        syslog_errors: yes
     web:
       enabled: yes
       port: 4080
@@ -194,6 +208,7 @@ development:
       access_log: "log/web_access.log"
       logger:
         level: INFO
+        syslog_errors: yes
     api:
       enabled: yes
       port: 4081
@@ -201,13 +216,27 @@ development:
       access_log: "log/api_access.log"
       logger:
         level: INFO
-
+        syslog_errors: yes
+    oobetet:
+      enabled: no
+      server: "jabber.example.com"
+      port: 5222
+      jabberid: "flapjacktest@jabber.example.com"
+      password: "nuther-good-password"
+      alias: "flapjacktest"
+      watched_check: "PING"
+      watched_entity: "foo.example.com"
+      max_latency: 300
+      pagerduty_contact: "11111111111111111111111111111111"
+      rooms:
+        - "flapjacktest@conference.jabber.example.com"
+        - "gimp@conference.jabber.example.com"
+        - "log@conference.jabber.example.com"
+      logger:
+        level: INFO
+        syslog_errors: yes
 
 test:
   redis:
     database: 14
 
-staging:
-  redis:
-    database: 15
-