flapjack 0.9.6 → 1.0.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a77bb89c8999f6a11d0931654c29d4a6208a7d1
-  data.tar.gz: c9521efb2b1aa33e615efdecc288c51f90b887b6
+  metadata.gz: e16bef3e8503fd14954e5bdf4b843e9d92e598a6
+  data.tar.gz: b85df2a0ca05163744d236b6c6237c63ad1b2520
 SHA512:
-  metadata.gz: eb0351065fe36a2e797fac51f027fcc9e2582d773da07c0c961f21e0903a263ce2e903dcb7aee73e6ed7dd9a92328d7ac038f51c5a2ab8b39116a3adb71c3f21
-  data.tar.gz: 350d40dd04d845138c71bc08fec42b2633f871b145db7acd10f9a083f9aaae32ee73e8d5073bb577a8ca690fcbb1a516941e370a903a04af3a5e2f2589fded05
+  metadata.gz: c0daf6b0e65f5810b695de85af843dfab1cafcda10d0e750c5e93adf6f4f0b9bf8506f19341cd0e29c5b06db47382a1016248d1f356fc335f47207187f8da9ce
+  data.tar.gz: 71fe02a6300726b86393640e1d919c43537b6f07a90d95e3a22ba366f05836dea16966227d11643530b1acf1e9dc0407464bbd73c23b54689ed70f413734183a

data/.gitignore

@@ -25,5 +25,7 @@ tmp/spec*
 tmp/profiles
 flapjack-*.gem
 _site/*
+.rbenv-version
+.ruby-version
 .rvmrc
 artifacts/*

data/.rspec

@@ -2,3 +2,9 @@
 --format Fuubar
 --format html
 --out tmp/spec.html
+--require ./spec/support/uncolored_doc_formatter.rb
+--format UncoloredDocFormatter
+--out tmp/spec_doc.txt
+--require ./spec/support/profile_all_formatter.rb
+--format ProfileAllFormatter
+--out tmp/spec_profile.txt

data/.travis.yml

@@ -1,20 +1,24 @@
 language: ruby
-matrix:
-  include:
-    - rvm: 1.9.3
-      gemfile: Gemfile-ruby1.9
-      script:  "bundle exec rspec spec && bundle exec cucumber features"
-      env: BUNDLE_GEMFILE=Gemfile-ruby1.9
-    - rvm: '2.0'
-      gemfile: Gemfile
-      script: "bundle exec rspec spec && bundle exec cucumber features"
-    - rvm: '2.1'
-      gemfile: Gemfile
-      script: "bundle exec rspec spec && bundle exec cucumber features"
+rvm:
+- 1.9.3
+- '2.0'
+- '2.1'
+gemfile:
+- Gemfile
 services:
-  - redis-server
+- redis-server
 before_script:
-  - mkdir -p ./log
+- mkdir -p ./log
 before_install:
-  - git submodule update --init --recursive
-  - gem install bundler
+- git submodule update --init --recursive
+- gem install bundler
+script: bundle exec rspec spec && bundle exec cucumber features
+notifications:
+  irc: 'irc.freenode.net#flapjack'
+  hipchat:
+    template:
+    - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}
+      (<a href="%{build_url}">Details</a>/<a href="%{compare_url}">Change view</a>)'
+    format: html
+    rooms:
+      secure: ajMolTKDuprYJ9Fadcjb3evh80MyJSgjW4hl4OWnEHyrjQLnsO0hbAvSrKRFUzorMoi58L8XZXd01gMgRqRxMvwqfoHLv4njw8px4X9+F/hySPZj3aMAFM1HuoTmHqeP+Rl+1Ssg+Kss6N4JkgNS81s+tkRnnoHG1n/EhfH6PkE=

data/CHANGELOG.md

@@ -1,34 +1,20 @@
 ## Flapjack Changelog
 
-# 0.9.6 - 2014-10-21
-- Feature: make 0.9 compatible with new event mirroring logic in 1.2 (fixes #687) #688 (@ali-graham, @jessereynolds)
-
-# 0.9.5 - 2014-10-08
-- Bug: fix api_url handling in the web ui (@jessereynolds)
-
-# 0.9.4 - 2014-09-21
-- Bug: crash in pagerduty gateway when failing entities have no id #593 (@jessereynolds)
-- Bug: bugfix for updating rule data without contact_ids (no-issue) (@ali-graham)
-- Bug: set key expiry properly for scheduled maintenance spanning current time #634 (@ali-graham)
-
-# 0.9.3 - 2014-07-28
-- Bug: fix outage reports in jsonapi c8e09f7 (@ali-graham)
-- Bug: fix maintenance reports in jsonapi 234ce48 (@ali-graham)
-- Bug: simplify checks reports in jsonapi 3eda22e (@ali-graham)
-
-# 0.9.2 - 2014-07-17
-- Feature: Add ability to disable check via JSON API #529 (@ali-graham)
-- Feature: Jabber - Resource in JID should be supported in the config #557 (@jessereynolds)
-- Feature: Jabber - add an 'identifiers' list to the config #558 (@jessereynolds)
-- Feature: Jabber - handle HipChat style status updates as per XEP-0085 #559 (@jessereynolds)
-
-# 0.9.1 - 2014-06-27
+# 1.0.0rc1 - 2014-06-25
+- Feature: Allow ncsm to be skipped using a configured whitelist #485 (@StephenWeber)
+- Feature: GLI the CLI (one command to rule them all) #478 (@auxesis, @ali-graham)
+- Feature: Remove the original HTTP API #526 (@ali-graham)
+- Feature: connecting to an password protected redis server is a good idea #533 (@mattdelves)
+- Feature: Add option to pass tags to simulate-failed-check command. #537 (@jwoods)
+- Feature: Dockerfile that runs flapjack #541 (@michaelneale)
+- Feature: allow customistion of email from reply to #543 (@ferrisoxide)
+- Feature: Allow custom Flapjack branding. #544 (@ferrisoxide)
+- Feature: Add base_url functionality to the web gateway. #539 (@pieterlange)
 - Bug: PATCHing blackhole properties for notification rule changes other blackholes - further fixes #504 (@ali-graham)
 - Bug: JSONAPI get all entities/contacts with empty db e3725fc (@ali-graham)
-- Bug: Decommission Check button returning a 404 #538 (@ali-graham)
-- Bug: Weekday number 7 is accepted by the jsonapi but causes Flapjack to crash #549 (@ali-graham)
 
 # 0.9.0 - 2014-05-23
+- Feature: create 0.9.x series - the last to contain the original API
 - Chore: split reports data from entities and checks in jsonapi #525 (@ali-graham)
 
 # 0.8.12 - 2014-05-21

data/Dockerfile

@@ -0,0 +1,8 @@
+FROM ubuntu:12.04
+
+RUN echo deb http://packages.flapjack.io/deb precise main >> /etc/apt/sources.list
+RUN apt-get update
+RUN apt-get install -y --force-yes flapjack
+
+CMD /etc/init.d/redis-flapjack start && /opt/flapjack/bin/flapjack start --no-daemonize
+

data/Gemfile

@@ -20,9 +20,6 @@ group :test do
   gem 'guard-cucumber'
   gem 'fuubar'
   gem 'simplecov', :require => false
-
- if RUBY_VERSION.split('.')[0] == '1' && RUBY_VERSION.split('.')[1] == '9'
-    gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools.rb
-    gem 'perftools.rb'
-  end
+  gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools
+  gem 'perftools.rb'
 end

data/bin/flapjack

@@ -1,229 +1,40 @@
 #!/usr/bin/env ruby
 
-# add lib to the default include path
-unless $:.include?(File.dirname(__FILE__) + '/../lib/')
-  $: << File.dirname(__FILE__) + '/../lib'
-end
-
-require 'dante'
-
-module Dante
-  class Runner
-
-    def start
-      # skip signal traps
-      @startup_command.call(self.options) if @startup_command
-    end
-  end
-end
-
-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    = Flapjack::Configuration::DEFAULT_CONFIG_PATH
-options.daemonize = nil
-
-@exe = File.basename(__FILE__)
-
-optparse = OptionParser.new do |opts|
-  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  "     status #{" " * 24} see if flapjack is running"
-  opts.separator  "     version #{" " * 23} display flapjack version and exit"
-  opts.separator  "     help #{" " * 26} display this usage info"
-  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("-n", "--environment [ENV]", String, "Environment to boot") do |e|
-    options.environment = e
-  end
-
-  opts.on("-d", "--[no-]daemonize", "Daemonize?") do |d|
-    options.daemonize = d
-  end
-
-  opts.on('-r', '--rbtrace', 'Enable rbtrace profiling') do
-    require 'rbtrace'
-  end
+require 'gli'
 
-  opts.on("-p", "--pidfile [PATH]", String, "PATH to the pidfile to write to") do |pid|
-    options.pidfile = pid
-  end
+include GLI::App
+subcommand_option_handling :normal
+sort_help :manually
+commands_from 'flapjack/cli'
 
-  opts.on("-l", "--logfile [PATH]", String, "PATH to the logfile to write to") do |l|
-    options.log_path = l
-  end
+program_desc 'Flexible monitoring notification routing system'
 
-  opts.on("-v", "--version", "display flapjack version") do |v|
-    options.version = v
-  end
+version Flapjack::VERSION
 
-end
-optparse.parse!(ARGV)
-
-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 = options.environment || ENV['FLAPJACK_ENV'] || 'production'
-
-config = Flapjack::Configuration.new
-config.load(options.config)
-config_env = config.all
-
-if config_env.nil? || config_env.empty?
-  puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{options.config}'"
-  exit(false)
-end
-
-pidfile = options.pidfile.nil? ?
-           (config_env['pid_file'] || 'tmp/pids/flapjack.pid') :
-           options.pidfile
+desc 'Configuration file to use'
+default_value '/etc/flapjack/flapjack.yaml'
+arg_name '/path/to/flapjack.yaml'
+flag [:c,:config]
 
-logfile = options.logfile.nil? ?
-            (config_env['log_file'] || 'log/flapjack.log') :
-            options.logfile
+desc 'Environment to boot'
+default_value 'production'
+arg_name '<environment>'
+flag [:n, :env, :environment]
 
-daemonize = options.daemonize.nil? ?
-              !!config_env['daemonize'] :
-              options.daemonize
-
-flapjack_coord = Proc.new {
-  require 'flapjack/coordinator'
-  coordinator = Flapjack::Coordinator.new(config)
-  coordinator.start(:signals => true)
-}
-
-@runner_opts = { :pid_path => pidfile, :log_path => logfile }
-def get_runner
-  Dante::Runner.new(@exe, @runner_opts)
+accept Array do |value|
+  value.split(/,/).map(&:strip)
 end
 
-def process_exists(pid)
-  return unless pid
-  begin
-    Process.kill(0, pid)
-    return true
-  rescue Errno::ESRCH
-    return false
-  end
+pre do |global,command,options,args|
+  FLAPJACK_ENV = ENV["FLAPJACK_ENV"] || global[:environment]
+  true
 end
 
-# wait until the specified pid no longer exists, or until a timeout is reached
-def wait_pid_gone(pid, timeout = 30)
-  print "waiting for a max of #{timeout} seconds for process #{pid} to exit" if process_exists(pid)
-  started_at = Time.now.to_i
-  while process_exists(pid)
-    break unless (Time.now.to_i - started_at < timeout)
-    print '.'
-    sleep 1
-  end
-  puts ''
-  return !process_exists(pid)
+post do |global,command,options,args|
 end
 
-begin
-  pid = IO.read(pidfile).chomp.to_i
-rescue StandardError
-  pid = nil
+on_error do |exception|
+  true
 end
 
-case ARGV[0]
-when "start"
-  runner = get_runner
-  if runner.daemon_running?
-    puts "Flapjack is already running."
-  else
-    print "Flapjack starting..."
-    print "\n" unless daemonize
-    return_value = nil
-    runner.execute(:daemonize => daemonize) {
-      return_value = flapjack_coord.call
-    }
-    puts " done."
-    exit(return_value) unless return_value.nil?
-  end
-
-when "stop"
-  runner = get_runner
-  if runner.daemon_running?
-    print "Flapjack stopping..."
-    runner.execute(:kill => true)
-    puts " done."
-  else
-    puts "Flapjack is not running."
-  end
-  exit 1 unless wait_pid_gone(pid)
-
-when "restart"
-  runner = get_runner
-  if runner.daemon_running?
-    print "Flapjack stopping..."
-    runner.execute(:kill => true)
-    puts " done."
-  end
-  exit 1 unless wait_pid_gone(pid)
-
-  runner = get_runner
-  print "Flapjack starting..."
-  runner.execute(:daemonize => daemonize) {
-    flapjack_coord.call
-  }
-  puts " done."
-
-when "reload"
-  runner = get_runner
-  if runner.daemon_running?
-    print "Reloading Flapjack configuration..."
-    begin
-      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."
-    exit 1
-  end
-
-when "status"
-  runner = get_runner
-  uptime = (runner.daemon_running?) ? Time.now - File.stat(pidfile).ctime : 0
-  if runner.daemon_running?
-    puts "Flapjack is running: pid #{pid}, uptime #{uptime}"
-  else
-    puts "Flapjack is not running"
-    exit 3
-  end
-end
+exit run(ARGV)

data/etc/flapjack_config.yaml.example

@@ -18,6 +18,8 @@ production:
     archive_events: true
     events_archive_maxage: 10800
     new_check_scheduled_maintenance_duration: 100 years
+    new_check_scheduled_maintenance_ignore_tags:
+      - bypass_ncsm
     logger:
       level: INFO
       syslog_errors: yes
@@ -49,7 +51,8 @@ production:
         level: INFO
         syslog_errors: yes
       smtp_config:
-        #from: "flapjack@noreply.example"
+        # from: "Flapjack Example <flapjack@noreply.example>"
+        # reply_to: "flapjack@support.example"
         host: 127.0.0.1
         # 1025 is the default port for http://mailcatcher.me
         port: 1025
@@ -87,8 +90,6 @@ production:
       jabberid: "flapjack@jabber.example.com"
       password: "good-password"
       alias: "flapjack"
-      identifiers:
-        - "@flapjack"
       rooms:
         - "gimp@conference.jabber.example.com"
         - "log@conference.jabber.example.com"
@@ -114,6 +115,7 @@ production:
       timeout: 300
       access_log: "/var/log/flapjack/web_access.log"
       api_url: "http://localhost:3081/"
+      #logo_image_path: "/etc/flapjack/web/custom_logo/flapjack-2013-notext-transparent-300-300.png"
       logger:
         level: INFO
         syslog_errors: yes
@@ -126,14 +128,6 @@ production:
       logger:
         level: INFO
         syslog_errors: yes
-    api:
-      enabled: yes
-      port: 3071
-      timeout: 300
-      access_log: "/var/log/flapjack/api_access.log"
-      logger:
-        level: INFO
-        syslog_errors: yes
     oobetet:
       enabled: no
       server: "jabber.example.com"
@@ -171,6 +165,7 @@ development:
     archive_events: true
     events_archive_maxage: 10800
     new_check_scheduled_maintenance_duration: 100 years
+    new_check_scheduled_maintenance_ignore: onetime
     logger:
       level: DEBUG
       syslog_errors: yes
@@ -261,25 +256,6 @@ development:
       port: 4080
       timeout: 300
       access_log: "log/web_access.log"
-      api_url: "http://localhost:4082/"
-      base_url: "/"
-      logger:
-        level: INFO
-        syslog_errors: yes
-    api:
-      enabled: yes
-      port: 4081
-      timeout: 300
-      access_log: "log/api_access.log"
-      logger:
-        level: INFO
-        syslog_errors: yes
-    jsonapi:
-      enabled: yes
-      port: 4082
-      timeout: 300
-      access_log: "log/jsonapi_access.log"
-      base_url: "http://localhost:4082/"
       logger:
         level: INFO
         syslog_errors: yes

data/features/cli.feature

@@ -8,6 +8,8 @@ Feature: command line utility
     Given a file named "flapjack_cfg.yaml" with:
 """
 test:
+  pid_file: tmp/cucumber_cli/flapjack_d.pid
+  log_file: tmp/cucumber_cli/flapjack_d.log
   redis:
     db: 14
   processor:
@@ -29,46 +31,46 @@ test:
 """
 
   Scenario: Running with --help shows usage information
-    When I run `bin/flapjack --help`
+    When I run `bundle exec bin/flapjack server --help`
     Then the exit status should be 0
-    And  the output should contain "Usage: flapjack"
+    And  the output should contain "Server for running components"
     And  the output should contain " reload "
-    And  the output should contain "-c, --config"
+    And  the output should contain "[-d|--daemonize]"
 
   Scenario: Getting status when stopped
-    When I run `bin/flapjack status --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    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"
 
   Scenario: Starting flapjack
-    When I start flapjack with `flapjack start --config tmp/cucumber_cli/flapjack_cfg.yaml`
+    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
 
   Scenario: Stopping flapjack via SIGINT
-    When I start flapjack with `flapjack start --config tmp/cucumber_cli/flapjack_cfg.yaml`
+    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) with `flapjack start -d --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    When I start flapjack (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server start -d`
     Then flapjack should start within 15 seconds
-    When I run `bin/flapjack status --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    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 with `flapjack stop --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    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) with `flapjack start -d --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    When I start flapjack (daemonised) (via bundle exec) with `flapjack -n test --config tmp/cucumber_cli/flapjack_cfg_d.yaml server start -d`
     Then flapjack should start within 15 seconds
-    When I restart flapjack with `flapjack restart -d --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    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 with `flapjack stop --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    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 with `flapjack start --config tmp/cucumber_cli/flapjack_cfg.yaml`
+    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:
@@ -81,7 +83,7 @@ test:
 """
     When I send a SIGHUP to the flapjack process
     # TODO how to test for config file change?
-    When I stop flapjack with `flapjack stop --config tmp/cucumber_cli/flapjack_cfg_d.yaml`
+    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

@@ -10,19 +10,18 @@ Feature: flapjack-feed-events command line
 test:
   redis:
     db: 14
+    driver: ruby
 """
 
   Scenario: Running with --help shows usage information
-    When I run `bin/flapjack-feed-events --help`
+    When I run `bundle exec bin/flapjack -n test receiver json --help`
     Then the exit status should be 0
-    And  the output should contain "Usage: flapjack-feed-events"
-    And  the output should contain "-c, --config"
-    And  the output should contain "-f, --from"
+    And  the output should contain "JSON receiver"
+    And  the output should contain "-f, --from=arg"
 
   Scenario: Running flapjack-feed-events with no arguments and no STDIN fails with a warning
-    When I run `bin/flapjack-feed-events -c tmp/cucumber_cli/flapjack-feed-events.yaml`
+    When I run `bundle exec bin/flapjack -n test -c tmp/cucumber_cli/flapjack-feed-events.yaml receiver json`
     And  the output should contain "No file provided, and STDIN is from terminal! Exiting..."
-    And  the output should contain "Usage: flapjack-feed-events"
     Then the exit status should be 1
 
 
@@ -37,14 +36,14 @@ test:
   "summary": "testing"
 }
 """
-    When I run `cat tmp/cucumber_cli/single-event.json | bin/flapjack-feed-events -c tmp/cucumber_cli/flapjack-feed-events.yaml`
+    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`
     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 `bin/flapjack-feed-events -c tmp/cucumber_cli/flapjack-feed-events.yaml -f tmp/cucumber_cli/single-event.json`
+    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`
     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, "
@@ -62,7 +61,7 @@ test:
   "testing"
   }
 """
-    When I run `cat tmp/cucumber_cli/multiple-events.json | bin/flapjack-feed-events -c tmp/cucumber_cli/flapjack-feed-events.yaml`
+    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`
     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, "
@@ -70,7 +69,7 @@ test:
     And  the output should contain "client1-localhost-test-2"
     And  the output should contain "Done."
 
-    When I run `bin/flapjack-feed-events -c tmp/cucumber_cli/flapjack-feed-events.yaml -f tmp/cucumber_cli/multiple-events.json`
+    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`
     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, "
@@ -84,7 +83,7 @@ test:
 {"entity": "client1-localhost-test-1"}
 {"entity": "client1-localhost-test-2", "check": "bar"}
 """
-    When I run `cat tmp/cucumber_cli/invalid-events.json | bin/flapjack-feed-events -c tmp/cucumber_cli/flapjack-feed-events.yaml`
+    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`
     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"
@@ -98,7 +97,7 @@ test:
 {"entity": "client1-localhost-test-1"
 {"entity": "client1-localhost-test-2", "check": "bar"}
 """
-    When I run `cat tmp/cucumber_cli/invalid-json.json | bin/flapjack-feed-events -c tmp/cucumber_cli/flapjack-feed-events.yaml`
+    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`
     Then the exit status should be 1
     And  the output should not contain "Enqueued event data, "
-    And  the output should contain "(Oj::ParseError)"
+    And  the output should contain "expected comma at line 2"