flapjack 0.7.27 → 0.7.28

data/.gitignore

@@ -19,6 +19,7 @@ vendor
 .bundle
 etc/*.yaml
 coverage
+tmp/cucumber_cli
 tmp/pids/*
 tmp/spec*
 tmp/profiles

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Flapjack Changelog
 
+# 0.7.28 - 2013-10-21
+- Feature: Per contact media rollup (summary) notifications - foundation (data, api, web UI etc) gh-291 (@jessereynolds)
+- Feature: flapper takes an IP to bind to gh-98 (@ali-graham)
+- Feature: tests for bin scripts gh-289 (@ali-graham)
+- Feature: Entity / check query function via jabber gh-77 (@ali-graham)
+- Chore: Make production the default environment gh-331 (@jessereynolds)
+- Chore: Look in /etc/flapjack/flapjack_config.yaml for config by default gh-332 (@jessereynolds)
+- Bug: --version should not depend on a config file being found gh-316 (@ali-graham)
+
 # 0.7.27 - 2013-09-19
 - Feature: Treat UNKNOWN separately to CRITICAL in notification rules gh-295 (@jessereynolds)
 - Bug: License missing from gemspec gh-313 (@jessereynolds)

data/bin/flapjack

@@ -21,13 +21,15 @@ require 'optparse'
 require 'ostruct'
 
 require 'oj'
+Oj.mimic_JSON
 Oj.default_options = { :indent => 0, :mode => :strict }
+require 'active_support/json'
 
 require 'flapjack/configuration'
 require 'flapjack/version'
 
 options = OpenStruct.new
-options.config    = File.join('etc', 'flapjack_config.yaml')
+options.config    = Flapjack::Configuration::DEFAULT_CONFIG_PATH
 options.daemonize = nil
 
 @exe = File.basename(__FILE__)
@@ -55,8 +57,8 @@ optparse = OptionParser.new do |opts|
     options.daemonize = d
   end
 
-  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |p|
-    options.pidfile = p
+  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |pid|
+    options.pidfile = pid
   end
 
   opts.on("-l", "--logfile [PATH]", String, "PATH to the logfile to write to") do |l|
@@ -67,11 +69,26 @@ optparse = OptionParser.new do |opts|
     options.version = v
   end
 
-
 end
 optparse.parse!(ARGV)
 
-FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
+if options.help
+  puts optparse
+  exit
+elsif options.version
+  puts Flapjack::VERSION
+  exit
+elsif !["start", "stop", "restart", "reload", "status"].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'
 
 config = Flapjack::Configuration.new
 config.load(options.config)
@@ -94,11 +111,6 @@ daemonize = options.daemonize.nil? ?
               !!config_env['daemonize'] :
               options.daemonize
 
-if options.version
-  puts Flapjack::VERSION
-  exit
-end
-
 flapjack_coord = Proc.new {
   require 'flapjack/coordinator'
   coordinator = Flapjack::Coordinator.new(config)
@@ -205,22 +217,4 @@ when "status"
     puts "Flapjack is not running"
     exit 3
   end
-
-when "help"
-  puts optparse
-  exit
-
-when "version"
-  puts Flapjack::VERSION
-  exit
-
-else
-  if ARGV.nil? || ARGV.empty?
-    puts "No command provided"
-  else
-    puts "Unknown command provided: '#{ARGV[0]}'"
-  end
-  puts "\n#{optparse}"
-  exit 1
-
 end

data/bin/flapjack-nagios-receiver

@@ -75,7 +75,7 @@ def main(opts)
 end
 
 options = OpenStruct.new
-options.config    = nil
+options.config    = Flapjack::Configuration::DEFAULT_CONFIG_PATH
 options.daemonize = nil
 
 exe = File.basename(__FILE__)
@@ -104,8 +104,8 @@ optparse = OptionParser.new do |opts|
     options.daemonize = d
   end
 
-  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |p|
-    options.pidfile = p
+  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |pid|
+    options.pidfile = pid
   end
 
   opts.on("-l", "--logfile [PATH]", String, "PATH to the logfile to write to") do |l|
@@ -115,32 +115,10 @@ optparse = OptionParser.new do |opts|
 end
 optparse.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
+FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
 
 config = Flapjack::Configuration.new
-config.load(config_file)
+config.load(options.config)
 config_env = config.all
 redis_options = config.for_redis
 

data/bin/flapjack-populator

@@ -19,7 +19,7 @@ require 'flapjack/data/entity'
 require 'flapjack/data/event'
 
 options = OpenStruct.new
-options.config    = File.join('etc', 'flapjack_config.yaml')
+options.config    = Flapjack::Configuration::DEFAULT_CONFIG_PATH
 options.daemonize = nil
 
 command = ARGV.shift
@@ -44,7 +44,7 @@ OptionParser.new do |opts|
 
 end.parse!(ARGV)
 
-FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
+FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
 
 config = Flapjack::Configuration.new
 config.load(options.config)

data/bin/flapper

@@ -25,10 +25,9 @@ ensure
   Socket.do_not_reverse_lookup = orig
 end
 
-def main
+def main(bind_ip)
   start_every = 120
   stop_after  = 60
-  bind_ip     = local_ip
   bind_port   = 12345
   EM.run {
 
@@ -71,24 +70,24 @@ OptionParser.new do |opts|
     options.daemonize = d
   end
 
-  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |p|
-    options.pidfile = p
+  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |pid|
+    options.pidfile = pid
   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
+  opts.on("-b", "--bind-ip [ADDRESS]", String, "ADDRESS (IPv4 or IPv6) for flapper to bind to") do |b|
+    options.bind_ip = b
+  end
 
-logfile = options.logfile.nil? ?
-            "/var/log/flapjack/#{exe}.log" :
-            options.logfile
+end.parse!(ARGV)
 
+pidfile = options.pidfile  || "/var/run/flapjack/#{exe}.pid"
+logfile = options.log_path || "/var/log/flapjack/#{exe}.log"
 daemonize = options.daemonize.nil? ? true : options.daemonize
+bind_ip = options.bind_ip  || local_ip
 
 runner = Dante::Runner.new(exe, :pid_path => pidfile, :log_path => logfile)
 
@@ -100,7 +99,7 @@ when "start"
   else
     print "#{exe} starting..."
     runner.execute(:daemonize => daemonize) {
-      main
+      main(bind_ip)
     }
     puts " done."
   end
@@ -118,12 +117,12 @@ when "stop"
 when "restart"
   print "#{exe} restarting..."
   runner.execute(:daemonize => true, :restart => true) {
-    main
+    main(bind_ip)
   }
   puts " done."
 
 when "status"
-  uptime = (runner.daemon_running?) ? Time.now - File.stat(pidfile).ctime : 0
+  uptime = (runner.daemon_running?) ? (Time.now - File.stat(pidfile).ctime) : 0
   if runner.daemon_running?
     puts "#{exe} is running: #{uptime}"
   else

data/bin/receive-events

@@ -91,7 +91,7 @@ def get_archive_keys_stats(source_redis)
 end
 
 options = OpenStruct.new
-options.config    = nil
+options.config    = Flapjack::Configuration::DEFAULT_CONFIG_PATH
 options.daemonize = nil
 
 exe = File.basename(__FILE__)
@@ -132,27 +132,10 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!(ARGV)
 
-FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
-
-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
+FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
 
 config = Flapjack::Configuration.new
-config.load(config_file)
+config.load(options.config)
 config_env = config.all
 redis_options = config.for_redis
 

data/bin/simulate-failed-check

@@ -63,7 +63,7 @@ end
 
 
 options = OpenStruct.new
-options.config    = nil
+options.config    = Flapjack::Configuration::DEFAULT_CONFIG_PATH
 options.daemonize = nil
 
 exe = File.basename(__FILE__)
@@ -101,27 +101,10 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!(ARGV)
 
-FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
-
-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
+FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
 
 config = Flapjack::Configuration.new
-config.load(config_file)
+config.load(options.config)
 config_env = config.all
 redis_options = config.for_redis
 

data/etc/flapjack_config.yaml.example

@@ -1,70 +1,58 @@
 ---
 
-development:
-  pid_file: tmp/pids/flapjack.pid
-  log_file: log/flapjack.log
-  daemonize: no
+production:
+  pid_file: /var/run/flapjack/flapjack.pid
+  log_file: /var/log/flapjack/flapjack.log
+  daemonize: yes
   redis:
     host: 127.0.0.1
     port: 6379
-    db: 13
+    db: 0
   processor:
-    enabled: no
+    enabled: yes
     queue: events
     notifier_queue: notifications
     archive_events: true
     events_archive_maxage: 10800
-    new_check_scheduled_maintenance_duration: 1 month
+    new_check_scheduled_maintenance_duration: 100 years
     logger:
       level: INFO
   notifier:
-    enabled: no
-    queue: notifications
-    email_queue: email_notifications
-    sms_queue: sms_notifications
-    jabber_queue: jabber_notifications
-    pagerduty_queue: pagerduty_notifications
-    notification_log_file: log/notification.log
-    default_contact_timezone: Australia/Broken_Hill
-    logger:
-      level: INFO
-  executive:
     enabled: yes
+    queue: notifications
     email_queue: email_notifications
     sms_queue: sms_notifications
     jabber_queue: jabber_notifications
     pagerduty_queue: pagerduty_notifications
-    notification_log_file: log/notification.log
-    default_contact_timezone: Australia/Broken_Hill
-    archive_events: true
-    events_archive_maxage: 10800
-    new_check_scheduled_maintenance_duration: 1 month
+    notification_log_file: /var/log/flapjack/notification.log
+    default_contact_timezone: UTC
     logger:
       level: INFO
   gateways:
     email:
-      enabled: yes
+      enabled: no
       queue: email_notifications
       logger:
         level: INFO
       smtp_config:
-        port: 2525
-        # address: "localhost"
-        # port: 25
-        # domain: 'localhost.localdomain'
-        # user_name: nil
-        # password: nil
-        # authentication: nil
-        # enable_starttls_auto: true
+        # port 1025 is the default port for http://mailcatcher.me
+        host: 127.0.0.1
+        port: 1025
+        starttls: false
+        #auth:
+        #  type:
+        #  username:
+        #  password:
     sms:
-      enabled: yes
+      enabled: no
       queue: sms_notifications
+      endpoint: 'https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage'
       username: "ermahgerd"
       password: "xxxx"
       logger:
         level: INFO
     jabber:
-      enabled: yes
+      enabled: no
       queue: jabber_notifications
       server: "jabber.domain.tld"
       port: 5222
@@ -77,7 +65,7 @@ development:
       logger:
         level: INFO
     oobetet:
-      enabled: yes
+      enabled: no
       server: "jabber.domain.tld"
       port: 5222
       jabberid: "flapjacktest@jabber.domain.tld"
@@ -94,78 +82,78 @@ development:
       logger:
         level: INFO
     pagerduty:
-      enabled: yes
+      enabled: no
       queue: pagerduty_notifications
       logger:
         level: INFO
     web:
       enabled: yes
-      port: 5080
+      port: 3080
       timeout: 300
-      access_log: "log/web_access.log"
+      access_log: "/var/log/flapjack/web_access.log"
       logger:
         level: INFO
     api:
       enabled: yes
-      port: 5081
+      port: 3081
       timeout: 300
-      access_log: "log/api_access.log"
+      access_log: "/var/log/flapjack/api_access.log"
       logger:
         level: INFO
 
-test:
-  redis:
-    database: 14
-  gateways:
-    email:
-      instances: 1
-    sms:
-      instances: 1
-      username: "ermahgerd"
-      password: "xxxx"
-    web:
-      instances: 1
-
-staging:
-  redis:
-    database: 15
-  gateways:
-    email:
-      instances: 1
-    sms:
-      instances: 1
-      username: "ermahgerd"
-      password: "xxxx"
-    web:
-      instances: 1
-
-production:
-  redis:
-    database: 12
-  gateways:
-    email:
-      instances: 1
-    sms:
-      instances: 1
-      username: "ermahgerd"
-      password: "xxxx"
-    web:
-      instances: 1
-
-profile:
+development:
+  pid_file: tmp/pids/flapjack.pid
+  log_file: log/flapjack.log
+  daemonize: yes
   redis:
     host: 127.0.0.1
     port: 6379
-    db: 14
-  executive:
+    db: 13
+  processor:
+    enabled: yes
+    queue: events
+    notifier_queue: notifications
+    archive_events: true
+    events_archive_maxage: 10800
+    new_check_scheduled_maintenance_duration: 100 years
+    logger:
+      level: DEBUG
+  notifier:
     enabled: yes
-    notification_log_file: log/flapjack-notification.log
+    queue: notifications
+    email_queue: email_notifications
+    sms_queue: sms_notifications
+    jabber_queue: jabber_notifications
+    pagerduty_queue: pagerduty_notifications
+    notification_log_file: log/notification.log
+    default_contact_timezone: UTC
+    logger:
+      level: DEBUG
   gateways:
     email:
       enabled: no
       queue: email_notifications
+      logger:
+        level: INFO
+      smtp_config:
+        # port 1025 is the default port for http://mailcatcher.me
+        host: 127.0.0.1
+        port: 1025
+        starttls: false
+        #auth:
+        #  type:
+        #  username:
+        #  password:
+    sms:
+      enabled: no
+      queue: sms_notifications
+      endpoint: 'https://www.messagenet.com.au/dotnet/Lodge.asmx/LodgeSMSMessage'
+      username: "ermahgerd"
+      password: "xxxx"
+      logger:
+        level: INFO
     jabber:
-      enabled: yes
+      enabled: no
       queue: jabber_notifications
       server: "jabber.domain.tld"
       port: 5222
@@ -175,6 +163,51 @@ profile:
       rooms:
         - "gimp@conference.jabber.domain.tld"
         - "log@conference.jabber.domain.tld"
-    web:
+      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"
+      logger:
+        level: INFO
+    pagerduty:
       enabled: no
-      port: 5080
+      queue: pagerduty_notifications
+      logger:
+        level: INFO
+    web:
+      enabled: yes
+      port: 4080
+      timeout: 300
+      access_log: "log/web_access.log"
+      logger:
+        level: INFO
+    api:
+      enabled: yes
+      port: 4081
+      timeout: 300
+      access_log: "log/api_access.log"
+      logger:
+        level: INFO
+
+
+test:
+  redis:
+    database: 14
+
+staging:
+  redis:
+    database: 15
+