flapjack 1.6.0 → 2.0.0b1

data/features/ack_after_sched_maint.feature

@@ -2,26 +2,26 @@
 Feature: Multiple acknowledgements after scheduled maintenance
 
   Background:
-    Given the following users exist:
-      | id  | first_name | last_name | email             | sms          | timezone         |
-      | 1   | Malak      | Al-Musawi | malak@example.com | +61400000001 | Asia/Baghdad     |
+    Given the following contacts exist:
+      | id                                   | name            | timezone     |
+      | 7f96a216-76aa-45fc-a88e-7431cd6d7aac | Malak Al-Musawi | Asia/Baghdad |
 
-    And the following entities exist:
-      | id  | name           | contacts |
-      | 1   | foo            | 1        |
+    And the following media exist:
+      | id                                   | contact_id                           | transport | address           | interval | rollup_threshold |
+      | 28032dbf-388d-4f52-91b2-dc5e5be2becc | 7f96a216-76aa-45fc-a88e-7431cd6d7aac | email     | malak@example.com | 15       | 3                |
+      | 73e2803f-948e-467a-a707-37b9f53ee21a | 7f96a216-76aa-45fc-a88e-7431cd6d7aac | sms       | +61400000001      | 15       | 3                |
 
-    And user 1 has the following notification intervals:
-      | email | sms |
-      | 15    | 15  |
-
-    And user 1 has the following notification rollup thresholds:
-      | email | sms |
-      | 3     | 3   |
-
-    And user 1 has the following notification rules:
-      | entities | unknown_media | warning_media | critical_media   |
-      |          |               | email         | sms,email        |
+    And the following checks exist:
+      | id                                   | name     | tags     |
+      | 56c13ce2-f246-4bc6-adfa-2206789c3ced | foo:ping | foo,ping |
+      | d1a39575-0480-4f65-a7f7-64c90db93731 | baz:ping | baz,ping |
 
+    And the following rules exist:
+      | id                                   | contact_id                           | blackhole | strategy | tags     | condition | time_restriction | media_ids                                                                 |
+      | b0c8deb9-b8c8-4fdd-acc4-72493852ca15 | 7f96a216-76aa-45fc-a88e-7431cd6d7aac | false     | all_tags | foo,ping | critical  |                   | 28032dbf-388d-4f52-91b2-dc5e5be2becc,73e2803f-948e-467a-a707-37b9f53ee21a |
+      | b18e9f48-59e7-4c25-b94c-d4ebd4a6559a | 7f96a216-76aa-45fc-a88e-7431cd6d7aac | false     | all_tags | foo,ping | warning   |                   | 28032dbf-388d-4f52-91b2-dc5e5be2becc                                      |
+      | 2df6bbc4-d6a4-4f23-b6e5-5c4a07c6e686 | 7f96a216-76aa-45fc-a88e-7431cd6d7aac | false     | all_tags | baz,ping | critical  |                   | 28032dbf-388d-4f52-91b2-dc5e5be2becc,73e2803f-948e-467a-a707-37b9f53ee21a |
+      | f163bf33-b53e-4138-ab27-1dd89f2d6fdd | 7f96a216-76aa-45fc-a88e-7431cd6d7aac | false     | all_tags | baz,ping | warning   |                   | 28032dbf-388d-4f52-91b2-dc5e5be2becc                                      |
   @time
   Scenario: Multiple acks after sched maint ends
     Given the check is check 'ping' on entity 'foo'
@@ -33,12 +33,9 @@ Feature: Multiple acknowledgements after scheduled maintenance
     When  60 minutes passes
     And   a critical event is received
     Then  1 email alert of type problem should be queued for malak@example.com
-    And   the check should appear in unacknowledged_failing
     When  1 minute passes
     And   an acknowledgement event is received
     Then  1 email alert of type acknowledgement should be queued for malak@example.com
-    And   the check should not appear in unacknowledged_failing
     When  1 minute passes
     And   an acknowledgement event is received
-    Then  2 email alert of type acknowledgement should be queued for malak@example.com
-
+    Then  1 email alert of type acknowledgement should be queued for malak@example.com

data/features/cli.feature

@@ -5,85 +5,25 @@ Feature: command line utility
   From the command line
 
   Background:
-    Given a file named "flapjack_cfg.yaml" with:
+    Given a file named "flapjack_cfg.toml" with:
 """
-test:
-  pid_dir: tmp/cucumber_cli/
-  log_dir: tmp/cucumber_cli/
-  redis:
-    db: 14
-  processor:
-    enabled: yes
-    logger:
-      level: warn
-"""
-    And a file named "flapjack_cfg_d.yaml" with:
-"""
-test:
-  pid_dir: tmp/cucumber_cli/
-  log_dir: tmp/cucumber_cli/
-  redis:
-    db: 14
-  processor:
-    enabled: yes
-    logger:
-      level: debug
+pid_dir = "tmp/cucumber_cli/"
+log_dir = "tmp/cucumber_cli/"
+[redis]
+  db = 14
+[processor]
+  enabled = true
+  [processor.logger]
+    level = "warn"
 """
 
   Scenario: Running with --help shows usage information
     When I run `bundle exec bin/flapjack server --help`
     Then the exit status should be 0
     And  the output should contain "Server for running components"
-    And  the output should contain " reload "
-    And  the output should contain "[-d|--daemonize]"
-
-  Scenario: Getting status when stopped
-    When I run `bundle exec bin/flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server status`
-    Then the exit status should not be 0
-    And  the output should contain "Flapjack is not running"
+    And  the output should contain "flapjack [global options] server"
 
   Scenario: Starting flapjack
-    When I start flapjack (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg.yaml server start`
+    When I start flapjack (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.toml server`
     Then flapjack should start within 15 seconds
 
-  Scenario: Stopping flapjack via SIGINT
-    When I start flapjack (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg.yaml server start`
-    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, status and stopping flapjack, daemonized
-    When I start flapjack (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server start`
-    Then flapjack should start within 15 seconds
-    When I run `bundle exec bin/flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server status`
-    Then the exit status should be 0
-    And  the output should contain "Flapjack is running"
-    When I stop flapjack (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server stop`
-    Then flapjack should stop within 15 seconds
-
-  Scenario: Starting, restarting and stopping flapjack, daemonized
-    When I start flapjack (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server start`
-    Then flapjack should start within 15 seconds
-    When I restart flapjack (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server restart`
-    Then flapjack should restart within 15 seconds
-    When I stop flapjack (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server stop`
-    Then flapjack should stop within 15 seconds
-
-  Scenario: Reloading flapjack configuration
-    When I start flapjack (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg.yaml server start`
-    Then flapjack should start within 15 seconds
-    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:
-  pid_dir: tmp/cucumber_cli/
-  log_dir: tmp/cucumber_cli/
-  redis:
-    db: 14
-  processor:
-    enabled: no
-"""
-    When I send a SIGHUP to the flapjack process
-    # TODO how to test for config file change?
-    When I stop flapjack (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server stop`
-    Then flapjack should stop within 15 seconds

data/features/cli_flapjack-feed-events.feature

@@ -5,26 +5,25 @@ Feature: flapjack-feed-events command line
   From the command line
 
   Background:
-    Given a file named "flapjack-feed-events.yaml" with:
+    Given a file named "flapjack-feed-events.toml" with:
 """
-test:
-  redis:
-    db: 14
-    driver: ruby
+[redis]
+  db = 14
+  driver = "ruby"
 """
 
   Scenario: Running with --help shows usage information
-    When I run `bundle exec bin/flapjack -n test receiver json --help`
+    When I run `bundle exec bin/flapjack receiver json --help`
     Then the exit status should be 0
     And  the output should contain "JSON receiver"
     And  the output should contain "-f, --from=arg"
 
+  @not_jruby
   Scenario: Running flapjack-feed-events with no arguments and no STDIN fails with a warning
-    When I run `bundle exec bin/flapjack -n test -c tmp/cucumber_cli/flapjack-feed-events.yaml receiver json`
+    When I run `bundle exec bin/flapjack -c tmp/cucumber_cli/flapjack-feed-events.toml receiver json`
     And  the output should contain "No file provided, and STDIN is from terminal! Exiting..."
     Then the exit status should be 1
 
-
   Scenario: Feed a single event into the events queue
     Given a file named "single-event.json" with:
 """
@@ -36,14 +35,14 @@ test:
   "summary": "testing"
 }
 """
-    When I run `cat tmp/cucumber_cli/single-event.json | bundle exec bin/flapjack -n test -c tmp/cucumber_cli/flapjack-feed-events.yaml receiver json`
+    When I run `cat tmp/cucumber_cli/single-event.json | bundle exec bin/flapjack -c tmp/cucumber_cli/flapjack-feed-events.toml receiver json`
     Then the exit status should be 0
     And  the output should not contain "Invalid event data received"
     And  the output should contain "Enqueued event data, "
     And  the output should contain "client1-localhost-test-1"
     And  the output should contain "Done."
 
-    When I run `bundle exec bin/flapjack -n test -c tmp/cucumber_cli/flapjack-feed-events.yaml receiver json -f tmp/cucumber_cli/single-event.json`
+    When I run `bundle exec bin/flapjack -c tmp/cucumber_cli/flapjack-feed-events.toml receiver json -f tmp/cucumber_cli/single-event.json`
     Then the exit status should be 0
     And  the output should not contain "Invalid event data received"
     And  the output should contain "Enqueued event data, "
@@ -61,7 +60,7 @@ test:
   "testing"
   }
 """
-    When I run `cat tmp/cucumber_cli/multiple-events.json | bundle exec bin/flapjack -n test -c tmp/cucumber_cli/flapjack-feed-events.yaml receiver json`
+    When I run `cat tmp/cucumber_cli/multiple-events.json | bundle exec bin/flapjack -c tmp/cucumber_cli/flapjack-feed-events.toml receiver json`
     Then the exit status should be 0
     And  the output should not contain "Invalid event data received"
     And  the output should contain "Enqueued event data, "
@@ -69,7 +68,7 @@ test:
     And  the output should contain "client1-localhost-test-2"
     And  the output should contain "Done."
 
-    When I run `bundle exec bin/flapjack -n test -c tmp/cucumber_cli/flapjack-feed-events.yaml receiver json -f tmp/cucumber_cli/multiple-events.json`
+    When I run `bundle exec bin/flapjack -c tmp/cucumber_cli/flapjack-feed-events.toml receiver json -f tmp/cucumber_cli/multiple-events.json`
     Then the exit status should be 0
     And  the output should not contain "Invalid event data received"
     And  the output should contain "Enqueued event data, "
@@ -83,7 +82,7 @@ test:
 {"entity": "client1-localhost-test-1"}
 {"entity": "client1-localhost-test-2", "check": "bar"}
 """
-    When I run `cat tmp/cucumber_cli/invalid-events.json | bundle exec bin/flapjack -n test -c tmp/cucumber_cli/flapjack-feed-events.yaml receiver json`
+    When I run `cat tmp/cucumber_cli/invalid-events.json | bundle exec bin/flapjack -c tmp/cucumber_cli/flapjack-feed-events.toml receiver json`
     Then the exit status should be 0
     And  the output should not contain "Enqueued event data, "
     And  the output should contain "Invalid event data received"
@@ -97,7 +96,7 @@ test:
 {"entity": "client1-localhost-test-1"
 {"entity": "client1-localhost-test-2", "check": "bar"}
 """
-    When I run `cat tmp/cucumber_cli/invalid-json.json | bundle exec bin/flapjack -n test -c tmp/cucumber_cli/flapjack-feed-events.yaml receiver json`
+    When I run `cat tmp/cucumber_cli/invalid-json.json | bundle exec bin/flapjack -c tmp/cucumber_cli/flapjack-feed-events.toml receiver json`
     Then the exit status should be 1
     And  the output should not contain "Enqueued event data, "
-    And  the output should contain "expected comma at line 2"
+    And  the output should contain "Expected comma or object or array close: char 38"

data/features/cli_flapjack-nagios-receiver.feature

@@ -6,53 +6,24 @@ Feature: nagios-receiver command line
 
   Background:
     Given a fifo named "tmp/cucumber_cli/nagios_perfdata.fifo" exists
-    And   a file named "nagios-receiver.yaml" with:
+    And   a file named "nagios-receiver.toml" with:
 """
-test:
-  pid_dir: "tmp/cucumber_cli/"
-  log_dir: "tmp/cucumber_cli/"
-  redis:
-    db: 14
-  nagios-receiver:
-    fifo: "tmp/cucumber_cli/nagios_perfdata.fifo"
-    pid_dir: "tmp/cucumber_cli/"
-    log_dir: "tmp/cucumber_cli/"
+pid_dir = "tmp/cucumber_cli/"
+log_dir = "tmp/cucumber_cli/"
+[redis]
+  db = 14
+[nagios-receiver]
+  fifo = "tmp/cucumber_cli/nagios_perfdata.fifo"
+  pid_dir = "tmp/cucumber_cli/"
+  log_dir = "tmp/cucumber_cli/"
 """
 
   Scenario: Running with --help shows usage information
     When I run `bundle exec bin/flapjack receiver nagios --help`
     Then the exit status should be 0
-    And  the output should contain "[-f arg|--fifo arg]"
-    And  the output should contain "receiver nagios start [-d|--daemonize]"
+    And  the output should contain "receiver nagios"
+    And  the output should contain "-f, --fifo=arg"
 
   Scenario: Starting nagios-receiver
-    When I start nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver start --no-daemonize`
+    When I start nagios-receiver (via bundle exec) with `flapjack --config tmp/cucumber_cli/nagios-receiver.toml receiver nagios`
     Then nagios-receiver should start within 15 seconds
-
-  Scenario: Stopping nagios-receiver via SIGINT
-    When I start nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios start --no-daemonize`
-    Then nagios-receiver should start within 15 seconds
-    When I send a SIGINT to the nagios-receiver process
-    Then nagios-receiver should stop within 15 seconds
-
-  Scenario: Starting, status, and stopping nagios-receiver, daemonized
-    When I start nagios-receiver (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios start -d`
-    Then nagios-receiver should start within 15 seconds
-    When I run `bundle exec bin/flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios status`
-    Then the exit status should be 0
-    And  the output should contain "nagios-receiver is running"
-    When I stop nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios stop`
-    Then nagios-receiver should stop within 15 seconds
-
-  Scenario: Starting, restarting and stopping nagios-receiver, daemonized
-    When I start nagios-receiver (daemonised) (via bundle exec) with `flapjack  -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios start -d`
-    Then nagios-receiver should start within 15 seconds
-    When I restart nagios-receiver (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios restart`
-    Then nagios-receiver should restart within 15 seconds
-    When I stop nagios-receiver (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios stop`
-    Then nagios-receiver should stop within 15 seconds
-
-  Scenario: Getting status when stopped
-    When I run `bundle exec bin/flapjack -n test --config tmp/cucumber_cli/nagios-receiver.yaml receiver nagios status`
-    Then the exit status should not be 0
-    And  the output should contain "nagios-receiver is not running"

data/features/cli_flapper.feature

@@ -5,53 +5,24 @@ Feature: Flapper command line
   From the command line
 
   Background:
-    Given a file named "flapjack_cfg.yaml" with:
+    Given a file named "flapjack_cfg.toml" with:
 """
-test:
-  pid_dir: tmp/cucumber_cli/
-  log_dir: tmp/cucumber_cli/
-  redis:
-    db: 14
-  processor:
-    enabled: yes
-    logger:
-      level: warn
+pid_dir = "tmp/cucumber_cli/"
+log_dir = "tmp/cucumber_cli/"
+[redis]
+  db = 14
+[processor]
+  enabled = true
+  [processor.logger]
+    level = "warn"
 """
 
   Scenario: Running with --help shows usage information
-    When I run `bundle exec bin/flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper --help`
+    When I run `bundle exec bin/flapjack --config tmp/cucumber_cli/flapjack_cfg.toml flapper --help`
     Then the exit status should be 0
     And  the output should contain "Artificial service that oscillates up and down"
-    And  the output should contain "[-b arg|--bind-ip arg]"
+    And  the output should contain "-b, --bind-ip=arg"
 
   Scenario: Starting flapper
-    When I start flapper (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper start --no-daemonize`
+    When I start flapper (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.toml flapper`
     Then flapper should start within 15 seconds
-
-  Scenario: Stopping flapper via SIGINT
-    When I start flapper (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml 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) (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper start -d -p tmp/cucumber_cli/flapper.pid -l tmp/cucumber_cli/flapper.log`
-    Then flapper should start within 15 seconds
-    When I run `bundle exec bin/flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper status -p tmp/cucumber_cli/flapper.pid`
-    Then the exit status should be 0
-    And  the output should contain "flapper is running"
-    When I stop flapper (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper stop -p tmp/cucumber_cli/flapper.pid`
-    Then flapper should stop within 15 seconds
-
-  Scenario: Starting, restarting and stopping flapper, daemonized
-    When I start flapper (daemonised) (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper start -d -p tmp/cucumber_cli/flapper.pid -l tmp/cucumber_cli/flapper.log`
-    Then flapper should start within 15 seconds
-    When I restart flapper (daemonised) (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper restart -p tmp/cucumber_cli/flapper.pid -l tmp/cucumber_cli/flapper.log`
-    Then flapper should restart within 15 seconds
-    When I stop flapper (via bundle exec) with `flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper stop -p tmp/cucumber_cli/flapper.pid`
-    Then flapper should stop within 15 seconds
-
-  Scenario: Getting status when stopped
-    When I run `bundle exec bin/flapjack --config tmp/cucumber_cli/flapjack_cfg.yaml flapper status -p tmp/cucumber_cli/flapper.pid`
-    Then the exit status should not be 0
-    And  the output should contain "flapper is not running"

data/features/cli_purge.feature

@@ -5,12 +5,11 @@ Feature: purge command line
   From the command line
 
   Background:
-    Given a file named "purge.yaml" with:
+    Given a file named "purge.toml" with:
 """
-test:
-  redis:
-    db: 14
-    driver: ruby
+[redis]
+  db = 14
+  driver = "ruby"
 """
 
   Scenario: Running with --help shows usage information
@@ -26,7 +25,7 @@ test:
 
   #flapjack purge check_history --days 90
   Scenario: Purge check data older than 90 days
-    When I run `bundle exec bin/flapjack -n test -c tmp/cucumber_cli/purge.yaml purge check_history --days 90`
+    When I run `bundle exec bin/flapjack -c tmp/cucumber_cli/purge.toml purge check_history --days 90`
     Then the exit status should be 0
 
   #flapjack purge check_history --days 2 --check "flapper.example:Flapper"

data/features/cli_receive-events.feature

@@ -5,22 +5,21 @@ Feature: receive-events command line
   From the command line
 
   Background:
-    Given a file named "receive-events.yaml" with:
+    Given a file named "receive-events.toml" with:
 """
-test:
-  redis:
-    db: 14
-    driver: ruby
+[redis]
+  db = 14
+  driver = "ruby"
 """
 
   Scenario: Running with --help shows usage information
-    When I run `bundle exec bin/flapjack -n test receiver mirror --help`
+    When I run `bundle exec bin/flapjack receiver mirror --help`
     Then the exit status should be 0
     And  the output should contain "replay the last COUNT events from the source"
     And  the output should contain "-s, --source=arg"
 
   Scenario: Running receive-events with no arguments exits uncleanly and shows usage
-    When I run `bundle exec bin/flapjack -n test receiver mirror`
+    When I run `bundle exec bin/flapjack receiver mirror`
     Then the exit status should not be 0
     And  the output should contain "error: s is required"
 

data/features/cli_simulate-failed-check.feature

@@ -5,12 +5,11 @@ Feature: simulate-failed-check command line
   From the command line
 
   Background:
-    Given a file named "simulate-failed-check.yaml" with:
+    Given a file named "simulate-failed-check.toml" with:
 """
-test:
-  redis:
-    db: 14
-    driver: ruby
+[redis]
+  db = 14
+  driver = "ruby"
 """
 
   Scenario: Running with --help shows usage information
@@ -25,7 +24,7 @@ test:
     And  the output should contain "Simulates a check by creating a stream of events for Flapjack"
 
   Scenario: Simulate a failed check
-    When I run `bundle exec bin/flapjack -n test -c tmp/cucumber_cli/simulate-failed-check.yaml simulate fail -t 0 -i 0.1 -e 'test' -k 'PING'`
+    When I run `bundle exec bin/flapjack -c tmp/cucumber_cli/simulate-failed-check.toml simulate fail -t 0.05 -i 0.05 -k 'test:PING'`
     Then the exit status should be 0
     And  the output should contain "sending failure event"
     And  the output should contain "stopping"