flapjack 0.7.29 → 0.7.30

data/features/cli.feature

@@ -5,7 +5,7 @@ Feature: command line utility
   From the command line
 
   Background:
-    Given a file named "flapjack_cfg.yml" with:
+    Given a file named "flapjack_cfg.yaml" with:
 """
 test:
   redis:
@@ -15,7 +15,7 @@ test:
     logger:
       level: warn
 """
-    And a file named "flapjack_cfg_d.yml" with:
+    And a file named "flapjack_cfg_d.yaml" with:
 """
 test:
   pid_file: tmp/cucumber_cli/flapjack_d.pid
@@ -28,34 +28,49 @@ test:
       level: warn
 """
 
+  Scenario: Running with --help shows usage information
+    When I run `bin/flapjack --help`
+    Then the exit status should be 0
+    And  the output should contain "Usage: flapjack"
+    And  the output should contain " reload "
+    And  the output should contain "-c, --config"
+
+  Scenario: Getting status when stopped
+    When I run `bin/flapjack status --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    Then the exit status should not be 0
+    And  the output should contain "Flapjack is not running"
+
   Scenario: Starting flapjack
-    When I start flapjack with `flapjack start --config tmp/cucumber_cli/flapjack_cfg.yml`
+    When I start flapjack with `flapjack start --config tmp/cucumber_cli/flapjack_cfg.yaml`
     Then flapjack should start within 15 seconds
 
   Scenario: Stopping flapjack via SIGINT
-    When I start flapjack with `flapjack start --config tmp/cucumber_cli/flapjack_cfg.yml`
+    When I start flapjack with `flapjack start --config tmp/cucumber_cli/flapjack_cfg.yaml`
     Then flapjack should start within 15 seconds
     When I send a SIGINT to the flapjack process
     Then flapjack should stop within 15 seconds
 
-  Scenario: Starting and stopping flapjack, daemonized
-    When I start flapjack (daemonised) with `flapjack start -d --config tmp/cucumber_cli/flapjack_cfg_d.yml`
+  Scenario: Starting, status and stopping flapjack, daemonized
+    When I start flapjack (daemonised) with `flapjack start -d --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
     Then flapjack should start within 15 seconds
-    When I stop flapjack with `flapjack stop --config tmp/cucumber_cli/flapjack_cfg_d.yml`
+    When I run `bin/flapjack status --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    Then the exit status should be 0
+    And  the output should contain "Flapjack is running"
+    When I stop flapjack with `flapjack stop --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
     Then flapjack should stop within 15 seconds
 
   Scenario: Starting, restarting and stopping flapjack, daemonized
-    When I start flapjack (daemonised) with `flapjack start -d --config tmp/cucumber_cli/flapjack_cfg_d.yml`
+    When I start flapjack (daemonised) with `flapjack start -d --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
     Then flapjack should start within 15 seconds
-    When I restart flapjack with `flapjack restart -d --config tmp/cucumber_cli/flapjack_cfg_d.yml`
+    When I restart flapjack with `flapjack restart -d --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
     Then flapjack should restart within 15 seconds
-    When I stop flapjack with `flapjack stop --config tmp/cucumber_cli/flapjack_cfg_d.yml`
+    When I stop flapjack with `flapjack stop --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
     Then flapjack should stop within 15 seconds
 
   Scenario: Reloading flapjack configuration
-    When I start flapjack with `flapjack start --config tmp/cucumber_cli/flapjack_cfg.yml`
-    When I run `mv tmp/cucumber_cli/flapjack_cfg.yml tmp/cucumber_cli/flapjack_cfg.yml.bak`
-    Given a file named "flapjack_cfg.yml" with:
+    When I start flapjack with `flapjack start --config tmp/cucumber_cli/flapjack_cfg.yaml`
+    When I run `mv tmp/cucumber_cli/flapjack_cfg.yaml tmp/cucumber_cli/flapjack_cfg.yaml.bak`
+    Given a file named "flapjack_cfg.yaml" with:
 """
 test:
   redis:
@@ -67,3 +82,5 @@ test:
     # TODO how to test for config file change?
     When I send a SIGINT to the flapjack process
     Then flapjack should stop within 15 seconds
+
+

data/features/cli_flapjack-nagios-receiver.feature

@@ -0,0 +1,66 @@
+@process
+Feature: flapjack-nagios-receiver command line
+  As a systems administrator
+  I should be able to manage flapjack-nagios-receiver
+  From the command line
+
+  Background:
+    Given a fifo named "tmp/cucumber_cli/nagios_perfdata.fifo" exists
+    And   a file named "flapjack-nagios-receiver.yaml" with:
+"""
+test:
+  redis:
+    db: 14
+  nagios-receiver:
+    fifo: "tmp/cucumber_cli/nagios_perfdata.fifo"
+"""
+    And a file named "flapjack-nagios-receiver_d.yaml" with:
+"""
+test:
+  redis:
+    db: 14
+  nagios-receiver:
+    fifo: "tmp/cucumber_cli/nagios_perfdata.fifo"
+    pid_file: "tmp/cucumber_cli/flapjack-nagios-receiver_d.pid"
+    log_file: "tmp/cucumber_cli/flapjack-nagios-receiver_d.log"
+"""
+
+  Scenario: Running with --help shows usage information
+    When I run `bin/flapjack-nagios-receiver --help`
+    Then the exit status should be 0
+    And  the output should contain "Usage: flapjack-nagios-receiver"
+    And  the output should contain "-f, --fifo FIFO"
+
+  Scenario: Starting flapjack-nagios-receiver
+    When I start flapjack-nagios-receiver with `flapjack-nagios-receiver start --no-daemonize --config tmp/cucumber_cli/flapjack-nagios-receiver.yaml`
+    Then flapjack-nagios-receiver should start within 15 seconds
+
+  Scenario: Stopping flapjack-nagios-receiver via SIGINT
+    When I start flapjack-nagios-receiver with `flapjack-nagios-receiver start --no-daemonize --config tmp/cucumber_cli/flapjack-nagios-receiver.yaml`
+    Then flapjack-nagios-receiver should start within 15 seconds
+    When I send a SIGINT to the flapjack-nagios-receiver process
+    Then flapjack-nagios-receiver should stop within 15 seconds
+
+  Scenario: Starting, status, and stopping flapjack-nagios-receiver, daemonized
+    When I start flapjack-nagios-receiver (daemonised) with `flapjack-nagios-receiver start -d --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml`
+    Then flapjack-nagios-receiver should start within 15 seconds
+    When I run `bin/flapjack-nagios-receiver status --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml`
+    Then the exit status should be 0
+    And  the output should contain "flapjack-nagios-receiver is running"
+    When I stop flapjack-nagios-receiver with `flapjack-nagios-receiver stop --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml`
+    Then flapjack-nagios-receiver should stop within 15 seconds
+
+  Scenario: Starting, restarting and stopping flapjack-nagios-receiver, daemonized
+    When I start flapjack-nagios-receiver (daemonised) with `flapjack-nagios-receiver start -d --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml`
+    Then flapjack-nagios-receiver should start within 15 seconds
+    When I restart flapjack-nagios-receiver (daemonised) with `flapjack-nagios-receiver restart -d --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml`
+    Then flapjack-nagios-receiver should restart within 15 seconds
+    When I stop flapjack-nagios-receiver with `flapjack-nagios-receiver stop --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml`
+    Then flapjack-nagios-receiver should stop within 15 seconds
+
+  Scenario: Getting status when stopped
+    When I run `bin/flapjack-nagios-receiver status --config tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml`
+    Then the exit status should not be 0
+    And  the output should contain "flapjack-nagios-receiver is not running"
+
+

data/features/cli_flapjack-populator.feature

@@ -0,0 +1,80 @@
+@process
+Feature: flapjack-populator command line
+  As a systems administrator
+  I should be able to use flapjack-populator
+  From the command line
+
+  Background:
+    Given a file named "flapjack-populator.yaml" with:
+"""
+test:
+  redis:
+    db: 14
+"""
+    And  a file named "flapjack-populator-contacts.json" with:
+"""
+[
+  {
+    "id": "21",
+    "first_name": "Ada",
+    "last_name": "Lovelace",
+    "email": "ada@example.com",
+    "media": {
+      "sms": {
+        "address": "+61412345678",
+        "interval": "3600",
+        "rollup_threshold": "5"
+      },
+      "email": {
+        "address": "ada@example.com",
+        "interval": "7200",
+        "rollup_threshold": null
+      }
+    },
+    "tags": [
+      "legend",
+      "first computer programmer"
+    ]
+  }
+]
+"""
+    And  a file named "flapjack-populator-entities.json" with:
+"""
+[
+  {
+    "id": "10001",
+    "name": "clientx-app-01",
+    "contacts": [
+      "362",
+      "363",
+      "364"
+    ],
+    "tags": [
+      "source:titanium",
+      "foo"
+    ]
+  }
+]
+"""
+
+  Scenario: Running with --help shows usage information
+    When I run `bin/flapjack-populator --help`
+    Then the exit status should be 0
+    And  the output should contain "Usage: flapjack-populator"
+    And  the output should contain "import-contacts"
+    And  the output should contain "import-entities"
+    And  the output should contain "--config"
+
+  Scenario: Running flapjack-populator with no arguments exits uncleanly and shows usage
+    When I run `bin/flapjack-populator`
+    Then the exit status should not be 0
+    And  the output should contain "Usage: flapjack-populator"
+
+  Scenario: Importing contacts
+    When I run `bin/flapjack-populator import-contacts --from tmp/cucumber_cli/flapjack-populator-contacts.json --config tmp/cucumber_cli/flapjack-populator.yaml`
+    Then the exit status should be 0
+
+  Scenario: Importing entities
+    When I run `bin/flapjack-populator import-entities --from tmp/cucumber_cli/flapjack-populator-entities.json --config tmp/cucumber_cli/flapjack-populator.yaml`
+    Then the exit status should be 0
+

data/features/cli_flapper.feature

@@ -0,0 +1,45 @@
+@process
+Feature: Flapper command line
+  As a systems administrator
+  I should be able to manage flapper
+  From the command line
+
+  Scenario: Running with --help shows usage information
+    When I run `bin/flapper --help`
+    Then the exit status should be 0
+    And  the output should contain "Usage: flapper"
+    And  the output should contain "-b, --bind-ip"
+
+  Scenario: Starting flapper
+    When I start flapper with `flapper start --no-daemonize`
+    Then flapper should start within 15 seconds
+
+  Scenario: Stopping flapper via SIGINT
+    When I start flapper with `flapper start --no-daemonize`
+    Then flapper should start within 15 seconds
+    When I send a SIGINT to the flapper process
+    Then flapper should stop within 15 seconds
+
+  Scenario: Starting, status, and stopping flapper, daemonized
+    When I start flapper (daemonised) with `flapper start -d -p tmp/cucumber_cli/flapper_d.pid -l tmp/cucumber_cli/flapper_d.log`
+    Then flapper should start within 15 seconds
+    When I run `bin/flapper status -p tmp/cucumber_cli/flapper_d.pid`
+    Then the exit status should be 0
+    And  the output should contain "flapper is running"
+    When I stop flapper with `flapper stop -p tmp/cucumber_cli/flapper_d.pid`
+    Then flapper should stop within 15 seconds
+
+  Scenario: Starting, restarting and stopping flapper, daemonized
+    When I start flapper (daemonised) with `flapper start -d -p tmp/cucumber_cli/flapper_d.pid -l tmp/cucumber_cli/flapper_d.log`
+    Then flapper should start within 15 seconds
+    When I restart flapper (daemonised) with `flapper restart -d -p tmp/cucumber_cli/flapper_d.pid -l tmp/cucumber_cli/flapper_d.log`
+    Then flapper should restart within 15 seconds
+    When I stop flapper with `flapper stop -p tmp/cucumber_cli/flapper_d.pid`
+    Then flapper should stop within 15 seconds
+
+  Scenario: Getting status when stopped
+    When I run `bin/flapper status -p tmp/cucumber_cli/flapper_d.pid`
+    Then the exit status should not be 0
+    And  the output should contain "flapper is not running"
+
+

data/features/cli_receive-events.feature

@@ -0,0 +1,27 @@
+@process
+Feature: receive-events command line
+  As a systems administrator
+  I should be able to use receive-events
+  From the command line
+
+  Background:
+    Given a file named "receive-events.yaml" with:
+"""
+test:
+  redis:
+    db: 14
+"""
+
+  Scenario: Running with --help shows usage information
+    When I run `bin/receive-events --help`
+    Then the exit status should be 0
+    And  the output should contain "Usage: receive-events"
+    And  the output should contain "-s, --source URL"
+
+  Scenario: Running receive-events with no arguments exits uncleanly and shows usage
+    When I run `bin/receive-events`
+    Then the exit status should not be 0
+    And  the output should contain "Usage: receive-events"
+
+    #TODO: put some archived events into a separate redis db and then run receive-events to suck them up
+

data/features/cli_simulate-failed-check.feature

@@ -0,0 +1,31 @@
+@process
+Feature: simulate-failed-check command line
+  As a systems administrator
+  I should be able to use simulate-failed-check
+  From the command line
+
+  Background:
+    Given a file named "simulate-failed-check.yaml" with:
+"""
+test:
+  redis:
+    db: 14
+"""
+
+  Scenario: Running with --help shows usage information
+    When I run `bin/simulate-failed-check --help`
+    Then the exit status should be 0
+    And  the output should contain "Usage: simulate-failed-check"
+    And  the output should contain "-k, --check CHECK"
+
+  Scenario: Running simulate-failed-check with no arguments exits uncleanly and shows usage
+    When I run `bin/simulate-failed-check`
+    Then the exit status should not be 0
+    And  the output should contain "Usage: simulate-failed-check"
+
+  Scenario: Simulate a failed check
+    When I run `bin/simulate-failed-check fail -c tmp/cucumber_cli/simulate-failed-check.yaml -t 0 -i 0.1 -e 'test' -k 'PING'`
+    Then the exit status should be 0
+    And  the output should contain "sending failure event"
+    And  the output should contain "stopping"
+

data/features/events.feature

@@ -60,13 +60,13 @@ Feature: events
     Then  a notification should be generated
 
   @time
-  Scenario: Check critical and alerted to critical for 1 minute
+  Scenario: Check critical and alerted to critical for 40 seconds
     Given the check is in an ok state
     When  a critical event is received
     And   1 minute passes
     And   a critical event is received
     Then  a notification should be generated
-    When  1 minute passes
+    When  40 seconds passes
     And   a critical event is received
     Then  a notification should not be generated
 
@@ -234,10 +234,7 @@ Feature: events
     When  10 seconds passes
     And   an unknown event is received
     Then  a notification should not be generated
-    When  10 seconds passes
-    And   an unknown event is received
-    Then  a notification should not be generated
-    When  5 minutes passes
+    When  1 minutes passes
     And   an unknown event is received
     Then  a notification should be generated
     When  10 seconds passes

data/features/packaging-lintian.feature

@@ -4,12 +4,12 @@ Feature: Packagability
 
   Scenario: No rubygems references
     When I run `grep require lib/* bin/* -R |grep rubygems`
-    Then the exit value should be 1
+    Then the exit status should not be 0
     And I should see 0 lines of output
 
   Scenario: A shebang that works everywhere
     When I run `find lib/ -type 'f' -name '*.rb'`
-    Then the exit value should be 0
+    Then the exit status should be 0
     And every file in the output should start with "#!/usr/bin/env ruby"
 
 

data/features/rollup.feature

@@ -172,10 +172,8 @@ Feature: Rollup on a per contact, per media basis
     And   1 sms alerts should be queued for +61400000001
     When  4 hours passes
     And   a critical event is received for check 'ping' on entity 'foo'
-    And   1 minute passes
-    And   a critical event is received for check 'ping' on entity 'foo'
-    Then  1 sms alert of type problem and rollup problem should be queued for +61400000001
-    And   2 sms alerts should be queued for +61400000001
+    Then  2 sms alerts should be queued for +61400000001
+    And   1 sms alert of type problem and rollup problem should be queued for +61400000001
 
   @time
   Scenario: Contact ceases to be a contact on an entity that they were being alerted for

data/features/steps/cli_steps.rb

@@ -7,31 +7,48 @@ Given /^a file named "([^"]*)" with:$/ do |file_name, file_content|
   write_file(file_name, file_content)
 end
 
-When /^I ((?:re)?start|stop) flapjack( \(daemonised\))? with `(.+)`$/ do |start_stop_restart, daemonise, cmd|
+Given /^a fifo named "([^"]*)" exists$/ do |fifo_name|
+  create_fifo(fifo_name)
+end
+
+When /^I ((?:re)?start|stop) (\S+)( \(daemonised\))? with `(.+)`$/ do |start_stop_restart, exe, daemonise, cmd|
+  @daemons_output      ||= []
+  @daemons_exit_status ||= []
+
   @root = Pathname.new(File.dirname(__FILE__)).parent.parent.expand_path
   command = "#{@root.join('bin')}/#{cmd}"
 
+  # enable debugging output from spawn_process etc
+  #@debug = true
+
   case start_stop_restart
   when 'start'
     @process_h = spawn_process(command,
-                  :daemon_pidfile => (daemonise.nil? || daemonise.empty?) ? nil : 'tmp/cucumber_cli/flapjack_d.pid')
+                  :daemon_pidfile => (daemonise.nil? || daemonise.empty?) ? nil : "tmp/cucumber_cli/#{exe}_d.pid")
   when 'stop', 'restart'
-    `#{command}`
+    @daemons_output << `#{command}`
+    @daemons_exit_status << $?
   end
+  puts "output: #{@daemons_output.join(', ')}, exit statuses: #{@daemons_exit_status}" if @debug
 end
 
-When /^I send a SIG(\w+) to the flapjack process$/ do |signal|
+When /^I send a SIG(\w+) to the (?:\S+) process$/ do |signal|
   process = @process_h[:process]
   pid     = process ? process.pid : @process_h[:pid]
   Process.kill(signal, pid)
 end
 
-Then /^flapjack should ((?:re)?start|stop) within (\d+) seconds$/ do |start_stop_restart, seconds|
+Then /^(\S+) should ((?:re)?start|stop) within (\d+) seconds$/ do |exe, start_stop_restart, seconds|
   process = @process_h[:process]
   pid     = process ? process.pid : @process_h[:pid]
   running = nil
   attempts = 0
-  max_attempts = seconds.to_i * 200
+  max_attempts = seconds.to_i * 10
+
+  if @debug
+    puts "should #{start_stop_restart} within #{seconds} seconds..."
+    puts "pid:  #{pid}, max_attempts: #{max_attempts}"
+  end
 
   case start_stop_restart
   when 'start'
@@ -39,6 +56,7 @@ Then /^flapjack should ((?:re)?start|stop) within (\d+) seconds$/ do |start_stop
       Process.kill(0, pid)
       running = true
     rescue Errno::EINVAL, Errno::ESRCH, RangeError, Errno::EPERM => e
+      puts "rescued error from kill: #{e.class} - #{e.message}" if @debug
       attempts += 1; sleep 0.1; retry if attempts < max_attempts
       running = false
     end
@@ -70,7 +88,7 @@ Then /^flapjack should ((?:re)?start|stop) within (\d+) seconds$/ do |start_stop
   when 'restart'
     read_pid = nil
     while attempts < max_attempts
-      time_and_pid = time_and_pid_from_file('tmp/cucumber_cli/flapjack_d.pid')
+      time_and_pid = time_and_pid_from_file("tmp/cucumber_cli/#{exe}_d.pid")
       read_pid = time_and_pid.last
       break if read_pid != pid
       attempts += 1; sleep 0.1

data/features/steps/packaging-lintian_steps.rb

@@ -13,15 +13,21 @@ Then /^every file in the output should start with "([^\"]*)"$/ do |string|
 end
 
 When /^I run `([^"]*)`$/ do |cmd|
-  #bin_path = '/usr/bin'
-  #command = "#{bin_path}/#{cmd}"
-
-  #@output = `#{command}`
+  @cmd = cmd
   @output = `#{cmd} 2>&1`
   @exit_status = $?.exitstatus
+  puts "output: #{@output}" if @debug
+  puts "exit_status: #{@exit_status}" if @debug
 end
 
-Then /^the exit value should be (\d+)$/ do |number|
-  @exit_status.should == number.to_i
+Then /^the exit status should( not)? be (\d+)$/ do |negativity, number|
+  if negativity
+    @exit_status.should_not == number.to_i
+  else
+    @exit_status.should == number.to_i
+  end
 end
 
+Then /^the output should contain "([^"]*)"$/ do |matcher|
+  @output.should include(matcher)
+end

data/features/support/daemons.rb

@@ -23,6 +23,12 @@ def write_file(file_name, file_content)
   _create_file(file_name, file_content, false)
 end
 
+def create_fifo(fifo_name)
+  unless File.pipe?(fifo_name)
+    system("mkfifo #{fifo_name}")
+  end
+end
+
 def _create_file(file_name, file_content, check_presence)
   in_current_dir do
     raise "expected #{file_name} to be present" if check_presence && !File.file?(file_name)
@@ -74,6 +80,9 @@ def time_and_pid_from_file(pid_file, cutoff_time = nil)
 end
 
 def spawn_process(command, opts={})
+  @daemons_output ||= []
+  @daemons_exit_status ||= []
+
   puts yellow("Running: #{command}") if @debug
 
   process_h = nil
@@ -84,7 +93,8 @@ def spawn_process(command, opts={})
     time = Time.now
     attempts = 0
 
-    `#{command}`
+    @daemons_output << `#{command}`
+    @daemons_exit_status << $?
 
     while attempts < 50
       time_and_pid = time_and_pid_from_file(file, time)

data/features/support/env.rb

@@ -19,6 +19,8 @@ if ENV['COVERAGE']
   end
 end
 
+@debug = false
+
 ENV["FLAPJACK_ENV"] = 'test'
 FLAPJACK_ENV = 'test'
 
@@ -181,11 +183,21 @@ After('@time') do
 end
 
 After('@process') do
-  ['tmp/cucumber_cli/flapjack_cfg.yml',
-   'tmp/cucumber_cli/flapjack_cfg.yml.bak',
-   'tmp/cucumber_cli/flapjack_cfg_d.yml',
+  ['tmp/cucumber_cli/flapjack_cfg.yaml',
+   'tmp/cucumber_cli/flapjack_cfg.yaml.bak',
+   'tmp/cucumber_cli/flapjack_cfg_d.yaml',
    'tmp/cucumber_cli/flapjack_d.log',
-   'tmp/cucumber_cli/flapjack_d.pid'].each do |file|
+   'tmp/cucumber_cli/flapjack_d.pid',
+   'tmp/cucumber_cli/nagios_perfdata.fifo',
+   'tmp/cucumber_cli/flapjack-nagios-receiver_d.pid',
+   'tmp/cucumber_cli/flapjack-nagios-receiver_d.log',
+   'tmp/cucumber_cli/flapjack-nagios-receiver_d.yaml',
+   'tmp/cucumber_cli/flapjack-nagios-receiver.yaml',
+   'tmp/cucumber_cli/flapper_d.pid',
+   'tmp/cucumber_cli/flapper_d.log',
+   'tmp/cucumber_cli/flapjack-populator.yaml',
+   'tmp/cucumber_cli/flapjack-populator-contacts.json',
+  ].each do |file|
     next unless File.exists?(file)
     File.unlink(file)
   end

data/lib/flapjack/coordinator.rb

@@ -21,7 +21,7 @@ module Flapjack
       @redis_options = config.for_redis
       @pikelets = []
 
-      @logger = Flapjack::Logger.new("flapjack-coordinator")
+      @logger = Flapjack::Logger.new("flapjack-coordinator", @config.all['logger'])
     end
 
     def start(options = {})

data/lib/flapjack/filters/delays.rb

@@ -21,7 +21,7 @@ module Flapjack
 
       def block?(event, entity_check, previous_state)
         failure_delay = 30
-        resend_delay  = 300
+        resend_delay  = 60
 
         label = 'Filter: Delays:'
 

data/lib/flapjack/gateways/email/alert.html.erb

@@ -54,7 +54,7 @@
     <% if @alert.state_duration && @alert.state_duration > 40 %>
       <tr>
         <td><strong>Duration</strong></td>
-        <td><%= ChronicDuration.output(@alert.state_duration) %></td>
+        <td><%= ChronicDuration.output(@alert.state_duration, :keep_zero => true) || '0 secs' %></td>
       </tr>
     <% end %>
 

data/lib/flapjack/gateways/email/alert.text.erb

@@ -13,7 +13,7 @@ Details:          <%= @alert.details %>
 Time:             <%= Time.at(@alert.time.to_i).to_s %>
 <% end -%>
 <% if @alert.state_duration && @alert.state_duration > 40 -%>
-Duration:         <%= ChronicDuration.output(@alert.state_duration) %>
+Duration:         <%= ChronicDuration.output(@alert.state_duration, :keep_zero => true) || '0 secs' %>
 <% end -%>
 <% if @alert.last_state -%>
 Previous State:   <%= @alert.last_state_title_case %>

data/lib/flapjack/gateways/email/rollup.html.erb

@@ -26,7 +26,7 @@
 <%  @alert.rollup_alerts.sort_by {|entity_check, details| details['duration'] }.each do |rollup_alert| -%>
 <%    r_entity, r_check = rollup_alert[0].split(':', 2) -%>
 <%    state    = rollup_alert[1]['state'] -%>
-<%    duration = ChronicDuration.output(rollup_alert[1]['duration']) -%>
+<%    duration = (ChronicDuration.output(rollup_alert[1]['duration'], :keep_zero => true) || '0 secs') -%>
       <tr>
         <td><%= r_check %></td>
         <td><%= r_entity %></td>

data/lib/flapjack/gateways/email/rollup.text.erb

@@ -5,7 +5,7 @@ You have <%= @alert.rollup_alerts.length %> alerting check<%= @alert.rollup_aler
 <% @alert.rollup_alerts.sort_by {|entity_check, details| details['duration'] }.each do |rollup_alert| -%>
 <%   r_entity, r_check = rollup_alert[0].split(':', 2) -%>
 <%   state    = rollup_alert[1]['state'] -%>
-<%   duration = ChronicDuration.output(rollup_alert[1]['duration'] ) -%>
+<%   duration = (ChronicDuration.output(rollup_alert[1]['duration'], :keep_zero => true) || '0 secs') -%>
   * <%= r_check %> on <%= r_entity %> is <%= ['ok'].include?(state) ? state.upcase : state.titleize %> (<%= duration %>)
 <% end -%>
 

data/lib/flapjack/gateways/web/views/check.html.erb

@@ -109,7 +109,7 @@
                 <tr>
                 <td><%= h Time.at(start_time).to_s %></td>
                 <td><%= h Time.at(end_time).to_s %></td>
-                <td><%= h ChronicDuration.output(duration) %></td>
+                <td><%= h(ChronicDuration.output(duration, :keep_zero => true) || '0 secs') %></td>
                 <td><%= h summary %></td>
                 <td>
                   <% if end_time > current_time.to_i %>