flapjack 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ec94faddf6467adf887a6f66d074a4ac8d807ca
-  data.tar.gz: 53f73cc61036a9d014a0438e11fff8df0c549cf3
+  metadata.gz: a4e8b5d1bee24a164e37f5db62f177d02cb470cb
+  data.tar.gz: f7e916ff508251675628c89ff70a31a030ee31b2
 SHA512:
-  metadata.gz: c55a5f75ec5ee9b4121e625867d914180263727ad0009d5827fe45cbcb73ea63d115e83db68bd04b09ee8f47a8bd04da3d74983caf22834f31928c5822adefd2
-  data.tar.gz: dd45f9d97ab302029882dbdd3f3203c03e2c078188d16839c9e18b19ee98482a7fc9b821150c6ac5954cf4620cf54b3fdc292df3e8cb1d4729ad2c6c890f9bfd
+  metadata.gz: 4ea75824a365cf143acd0db2581a440799a8d9dda7b093fc55fb3325b05dc5bc4617e64d548bc7529a6bb64a3562f7c202daf9640c4b6c6e489f42119f6e84e0
+  data.tar.gz: 05ed36b6fe5ad8745b4e4d27e44f1bdbf7097c59d4ff1bf5a31edf92ab72e157087e904a44d5e2147584eab58fcd050806f59130b77cf69692945d6920e89f77

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Flapjack Changelog
 
+# 1.1.0 - 2014-09-10
+- Feature: Add autorefresh for the web GUI (Closes: #494) #607 (@Hobbsee)
+- Feature: twilio sms sending #633 (@jessereynolds)
+- Feature: Flapjack command for httpchecker check engine #631 (@michaelneale)
+- Feature: Purge historical check states cli #625 (@jessereynolds)
+- Chore: bump Dockerfile to trusty and flapjack 1.0 #630 (@jessereynolds)
+- Bug: Check freshness metrics appear to be broken #626 (@jessereynolds)
+- Bug: Fix CMD to start flapjack with new cli format (Dockerfile) #629 (@auxesis)
+- Bug: set key expiry properly for scheduled maintenance spanning current time #634 (@ali-graham)
+- Bug: GET /media/id works for sms_twilio now #638 (@jessereynolds)
+- Bug: expose newer media types in /edit_contacts #640 (@jessereynolds)
+
 # 1.0.0 - 2014-08-21
 - No changes
 

data/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-#Contributing to ![Flapjack](http:////flapjack.io/images/flapjack-2013-notext-transparent-50-50.png "Flapjack") Flapjack
+#Contributing to ![Flapjack](http://flapjack.io/images/flapjack-2013-notext-transparent-50-50.png "Flapjack") Flapjack
 
 [![Build Status](https://travis-ci.org/flapjack/flapjack.png)](https://travis-ci.org/flapjack/flapjack)
 

data/Dockerfile

@@ -1,8 +1,16 @@
-FROM ubuntu:12.04
+FROM stackbrew/ubuntu:trusty
 
-RUN echo deb http://packages.flapjack.io/deb precise main >> /etc/apt/sources.list
+RUN apt-get install -y gnupg
+
+RUN gpg --keyserver keys.gnupg.net --recv-keys 803709B6
+RUN gpg -a --export 803709B6 | apt-key add -
+
+RUN echo "deb http://packages.flapjack.io/deb/1.0 trusty main" | tee /etc/apt/sources.list.d/flapjack.list
 RUN apt-get update
-RUN apt-get install -y --force-yes flapjack
+RUN apt-cache policy flapjack
+RUN apt-get install -y flapjack
+
+EXPOSE 3080 3081 3071 6380
 
-CMD /etc/init.d/redis-flapjack start && /opt/flapjack/bin/flapjack start --no-daemonize
+CMD /etc/init.d/redis-flapjack start && /opt/flapjack/bin/flapjack server start --no-daemonize
 

data/README.md

@@ -37,37 +37,43 @@ Additional check engines can be supported by adding additional receiver processe
 
 **Ubuntu Precise 64 (12.04):**
 
+Tell apt to trust the Flapjack package signing key:
+
+```
+gpg --keyserver keys.gnupg.net --recv-keys 803709B6
+gpg -a --export 803709B6 | sudo apt-key add -
+```
+
 Add the Flapjack Debian repository to your Apt sources:
 
 ``` text
-echo 'deb http://packages.flapjack.io/deb precise main' > /tmp/flapjack.list
-sudo cp /tmp/flapjack.list /etc/apt/sources.list.d/flapjack.list
-sudo apt-get update
+echo "deb http://packages.flapjack.io/deb/1.0 precise main" | sudo tee /etc/apt/sources.list.d/flapjack.list
 ```
 
 Install the latest Flapjack package:
 
 ``` text
+sudo apt-get update
 sudo apt-get install flapjack
 ```
 
-Alternatively, [download the deb](http://packages.flapjack.io/deb/pool/main/f/flapjack/) and install using `sudo dpkg -i <filename>`
+Alternatively, [download the deb](http://packages.flapjack.io/deb/1.0/pool/main/f/flapjack/) and install using `sudo dpkg -i <filename>`
 
-The Flapjack package is an [Omnibus](https://github.com/opscode/omnibus-ruby) package and as such contains most dependencies under `/opt/flapjack`, including Redis.
+The Flapjack package is an [Omnibus](https://github.com/opscode/omnibus) package and as such contains most dependencies under `/opt/flapjack`, including Redis.
 
-Installing the package will start Redis and Flapjack. You should now be able to access the Flapjack Web UI at:
+Installing the package will start Redis (non standard port) and Flapjack. You should now be able to access the Flapjack Web UI at:
 
 [http://localhost:3080/](http://localhost:3080)
 
-And consume the REST API at:
+And consume the [REST API](http://flapjack.io/docs/1.0/jsonapi/) at:
 
 [http://localhost:3081/](http://localhost:3081)
 
-N.B. The Redis installed by Flapjack runs on a non-standard port, so it doesn't conflict with other Redis instances you may already have installed.
+N.B. The Redis installed by Flapjack runs on a non-standard port (6380), so it doesn't conflict with other Redis instances you may already have installed.
 
 **Other OSes:**
 
-Currently we only make a package for Ubuntu Precise (amd64). If you feel comfortable getting a ruby 1.9 or 2.0 environment going on your preferred OS, then you can also just install Flapjack from rubygems.org:
+Currently we only make a package for Ubuntu Precise (amd64). If you feel comfortable getting a ruby environment going on your preferred OS, then you can also just install Flapjack from rubygems.org:
 
 ```text
 gem install flapjack
@@ -81,10 +87,10 @@ You'll also need Redis >= 2.6.12.
 
 ## Configuring
 
-Have a look at the default config file and modify things as required. See the [Configuring Components](http://flapjack.io/docs/1.0/usage/USING#wiki-configuring_components) section on the wiki for more details.
+Have a look at the [default config file](https://github.com/flapjack/flapjack/blob/master/etc/flapjack_config.yaml.example) and modify things as required. The package installer copies this to `/etc/flapjack/flapjack_config.yaml` if it doesn't already exist.
 
 ``` bash
-# hack the config
+# edit the config
 sudo vi /etc/flapjack/flapjack_config.yaml
 
 # reload the config
@@ -101,10 +107,10 @@ First up, start Redis if it's not already started:
 
 ``` bash
 # status:
-sudo /etc/init.d/redis status
+sudo /etc/init.d/redis-flapjack status
 
 # start:
-sudo /etc/init.d/redis start
+sudo /etc/init.d/redis-flapjack start
 ```
 
 Operating Flapjack:
@@ -128,11 +134,11 @@ sudo /etc/init.d/flapjack start
 
 ## Using - Details
 
-For more information, including full specification of the configuration file and the data import formats, please refer to the [USING](http://flapjack.io/docs/1.0/usage/USING) section of the Flapjack wiki
+We are [updating](https://github.com/flapjack/flapjack/issues/624) this section of the docs.
 
 ## Developing Flapjack
 
-Information on developing more Flapjack components or contributing to core Flapjack development can be found in the [DEVELOPING](http://flapjack.io/docs/1.0/developing/DEVELOPING) section of the Flapjack wiki
+Information on developing more Flapjack components or contributing to core Flapjack development can be found in the [Developing](http://flapjack.io/docs/1.0/development/DEVELOPING/) section of [the docs](http://flapjack.io/docs/1.0/).
 
 ## Documentation Submodule
 
@@ -149,6 +155,7 @@ If you make changes to the documentation locally, here's how to publish them:
 * git add, commit and push from inside the doc subdir
 * Add, commit and push the doc dir from the root (this updates the pointer in the main git repo to the correct ref in the doc repo, we think...)
 
-## More on the wiki
+## RTFM
+
+All of [the documentation](http://flapjack.io/docs).
 
-[The Flapjack wiki](http://flapjack.io/docs/1.0/wiki/) has even more goodies

data/etc/flapjack_config.yaml.example

@@ -39,6 +39,7 @@ production:
     queue: notifications
     email_queue: email_notifications
     sms_queue: sms_notifications
+    sms_twilio_queue: sms_twilio_notifications
     sns_queue: sns_notifications
     jabber_queue: jabber_notifications
     pagerduty_queue: pagerduty_notifications
@@ -85,7 +86,7 @@ production:
       #  alert.text: '/etc/flapjack/templates/email/alert.text.erb'
       #  rollup.html: '/etc/flapjack/templates/email/rollup.html.erb'
       #  alert.html: '/etc/flapjack/templates/email/alert.html.erb'
-    # Generates sms notifications
+    # Sends SMS notifications via MessageNet (Australia only)
     sms:
       enabled: no
       # the redis queue this pikelet will look for notifications on
@@ -100,6 +101,21 @@ production:
       #templates:
       #  rollup.text: '/etc/flapjack/templates/sms/rollup.text.erb'
       #  alert.text: '/etc/flapjack/templates/sms/alert.text.erb'
+    # Sends SMS notifications via Twilio
+    sms_twilio:
+      enabled: no
+      queue: sms_twilio_notifications
+      account_sid: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+      auth_token: "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
+      from: "+1xxxxxxxxxx"
+      logger:
+        level: INFO
+        syslog_errors: yes
+      # location of custom alert templates
+      # location of custom alert templates
+      #templates:
+      #  rollup.text: '/etc/flapjack/templates/sms_twilio/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/sms_twilio/alert.text.erb'
     # Generates SNS notifications
     sns:
       enabled: no
@@ -150,6 +166,8 @@ production:
       enabled: yes
       port: 3080
       timeout: 300
+      # Seconds between auto_refresh of entities/checks pages.  Set to 0 to disable
+      auto_refresh: 120
       access_log: "/var/log/flapjack/web_access.log"
       api_url: "http://localhost:3081/"
       # Full path to location of logo file, e.g. /etc/flapjack/custom_logo.png
@@ -233,6 +251,7 @@ development:
     queue: notifications
     email_queue: email_notifications
     sms_queue: sms_notifications
+    sms_twilio_queue: sms_twilio_notifications
     jabber_queue: jabber_notifications
     pagerduty_queue: pagerduty_notifications
     notification_log_file: log/notification.log
@@ -293,6 +312,22 @@ development:
       #templates:
       #  rollup.text: '/etc/flapjack/templates/sms/rollup.text.erb'
       #  alert.text: '/etc/flapjack/templates/sms/alert.text.erb'
+    # Sends SMS messages via Twilio
+    sms_twilio:
+      enabled: no
+      queue: sms_twilio_notifications
+      account_sid: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+      auth_token: "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
+      from: "+1xxxxxxxxxx"
+      logger:
+        level: INFO
+        syslog_errors: yes
+      # location of custom alert templates
+      # location of custom alert templates
+      #templates:
+      #  rollup.text: '/etc/flapjack/templates/sms_twilio/rollup.text.erb'
+      #  alert.text: '/etc/flapjack/templates/sms_twilio/alert.text.erb'
+    # Generates SNS notifications
     # Connects to an XMPP (jabber) server, sends notifications (to rooms and individuals),
     # handles acknowledgements from jabber users and other commands.
     jabber:
@@ -335,6 +370,8 @@ development:
       enabled: yes
       port: 3080
       timeout: 300
+      # Seconds between auto_refresh of entities/checks pages.  Set to 0 to disable
+      auto_refresh: 120
       access_log: "log/web_access.log"
       api_url: "http://localhost:3081/"
       # Full path to location of logo file, e.g. /etc/flapjack/custom_logo.png

data/features/cli_purge.feature

@@ -0,0 +1,43 @@
+@process
+Feature: purge command line
+  As a systems administrator
+  I should be able to use purge
+  From the command line
+
+  Background:
+    Given a file named "purge.yaml" with:
+"""
+test:
+  redis:
+    db: 14
+    driver: ruby
+"""
+
+  Scenario: Running with --help shows usage information
+    When I run `bundle exec bin/flapjack purge --help`
+    Then the exit status should be 0
+    And  the output should contain "Purge data from Flapjack's database"
+    And  the output should contain "--check arg"
+
+  Scenario: Running purge with no arguments exits uncleanly and shows usage
+    When I run `bundle exec bin/flapjack purge`
+    Then the exit status should not be 0
+    And  the output should contain "Purge data from Flapjack's database"
+
+  #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`
+    Then the exit status should be 0
+
+  #flapjack purge check_history --days 2 --check "flapper.example:Flapper"
+  Scenario: keep only last two days of Flapper state changes
+
+  #flapjack purge check_history --state-changes +10
+  Scenario: purge all state changes except the newest 10 for all checks
+
+  #flapjack purge disabled_checks
+  Scenario: purge all data about disabled checks
+
+  #flapjack purge stale_checks --days 90
+  Scenario: purge all data about checks with no updates in the last 90 days
+

data/lib/flapjack/cli/flapper.rb

@@ -12,9 +12,13 @@ module Flapjack
         # turn off reverse DNS resolution temporarily
         orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true
 
-        UDPSocket.open do |s|
-          s.connect '64.233.187.99', 1
-          s.addr.last
+        begin
+          UDPSocket.open do |s|
+            s.connect '64.233.187.99', 1
+            s.addr.last
+          end
+        rescue Errno::ENETUNREACH => e
+          '127.0.0.1'
         end
       ensure
         Socket.do_not_reverse_lookup = orig
@@ -36,7 +40,7 @@ module Flapjack
         when !@options[:pidfile].nil?
           @options[:pidfile]
         when !@config_env['pid_dir'].nil?
-          @config_env['pid_dir'] + 'flapper.pid'
+          File.join(@config_env['pid_dir'], 'flapper.pid')
         else
           "/var/run/flapjack/flapper.pid"
         end
@@ -45,7 +49,7 @@ module Flapjack
         when !@options[:logfile].nil?
           @options[:logfile]
         when !@config_env['log_dir'].nil?
-          @config_env['log_dir'] + 'flapper.log'
+          File.join(@config_env['log_dir'], 'flapper.log')
         else
           "/var/run/flapjack/flapper.log"
         end
@@ -58,7 +62,7 @@ module Flapjack
           print "flapper starting..."
           print "\n" unless @options[:daemonize]
           runner.execute(:daemonize => @options[:daemonize]) do
-            main(@options['bind-ip'], @options['bind-port'].to_i, @options[:frequency])
+            main(@options['bind-ip'] || Flapjack::CLI::Flapper.local_ip, @options['bind-port'].to_i, @options[:frequency])
           end
           puts " done."
         end
@@ -184,8 +188,7 @@ command :flapper do |flapper|
 
     start.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
-    start.flag   [:b, 'bind-ip'],   :desc => 'ADDRESS (IPv4 or IPv6) for flapper to bind to',
-      :default_value => Flapjack::CLI::Flapper.local_ip
+    start.flag   [:b, 'bind-ip'],   :desc => 'Override ADDRESS (IPv4 or IPv6) for flapper to bind to'
 
     start.flag   [:P, 'bind-port'], :desc => 'PORT for flapper to bind to (default: 12345)',
       :default_value => '12345'
@@ -219,8 +222,7 @@ command :flapper do |flapper|
 
     restart.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
-    restart.flag   [:b, 'bind-ip'],   :desc => 'ADDRESS (IPv4 or IPv6) for flapper to bind to',
-      :default_value => Flapjack::CLI::Flapper.local_ip
+    restart.flag   [:b, 'bind-ip'],   :desc => 'Override ADDRESS (IPv4 or IPv6) for flapper to bind to'
 
     restart.flag   [:P, 'bind-port'], :desc => 'PORT for flapper to bind to (default: 12345)',
       :default_value => 12345

data/lib/flapjack/cli/purge.rb

@@ -0,0 +1,77 @@
+#!/usr/bin/env ruby
+
+require 'hiredis'
+require 'flapjack/configuration'
+
+module Flapjack
+  module CLI
+    class Purge
+
+      def initialize(global_options, options)
+        @global_options = global_options
+        @options = options
+
+        config = Flapjack::Configuration.new
+        config.load(global_options[:config])
+        @config_env = config.all
+
+        if @config_env.nil? || @config_env.empty?
+          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
+        end
+
+        @redis_options = config.for_redis
+      end
+
+      def check_history
+        # find all checks, or the check given
+        # purge old data for check
+        options = {}
+        if @options[:days]
+          options[:older_than] = @options[:days].to_i * 24 * 60 * 60
+          raise "days must be resolveable to an integer" unless @options[:days].to_i.to_s == @options[:days]
+        end
+        checks = if @options[:check]
+          [Flapjack::Data::EntityCheck.for_event_id(@options[:check], :redis => redis, :create_entity => true)]
+        else
+          Flapjack::Data::EntityCheck.all(:redis => redis, :create_entity => true)
+        end
+        purged = checks.map do |check|
+          p = check.purge_history(options)
+          p == 0 ? nil : p
+        end.compact
+
+        if purged.empty?
+          puts "Nothing to do"
+        else
+          puts "Purged #{purged.reduce(:+) || 0} historical check states over #{purged.length} checks."
+        end
+      end
+
+      private
+
+      def redis
+        @redis ||= Redis.new(@redis_options.merge(:driver => :ruby))
+      end
+
+    end
+  end
+end
+
+desc "Purge data from Flapjack's database"
+command :purge do |purge|
+
+  purge.desc 'Purge check history'
+  purge.command :check_history do |check_history|
+
+    check_history.flag [:d, 'days'], :desc => "purge check history older than DAYS days ago",
+      :default_value => 90
+
+    check_history.flag [:c, 'check'], :desc => "affect history of only the CHECK"
+
+    check_history.action do |global_options,options,args|
+      purge = Flapjack::CLI::Purge.new(global_options, options)
+      purge.check_history
+    end
+  end
+
+end

data/lib/flapjack/cli/receiver.rb

@@ -34,7 +34,7 @@ module Flapjack
         when !@options[:pidfile].nil?
           @options[:pidfile]
         when !@config_env['pid_dir'].nil?
-          @config_env['pid_dir'] + "#{@options[:type]}-receiver.pid"
+          File.join(@config_env['pid_dir'], "#{@options[:type]}-receiver.pid")
         else
           "/var/run/flapjack/#{@options[:type]}-receiver.pid"
         end
@@ -43,7 +43,7 @@ module Flapjack
         when !@options[:logfile].nil?
           @options[:logfile]
         when !@config_env['log_dir'].nil?
-          @config_env['log_dir'] + "#{@options[:type]}-receiver.log"
+          File.join(@config_env['log_dir'], "#{@options[:type]}-receiver.log")
         else
           "/var/run/flapjack/#{@options[:type]}-receiver.log"
         end
@@ -633,6 +633,19 @@ command :receiver do |receiver|
     end
   end
 
+  receiver.desc 'HTTP checker for availability checking of services'
+  receiver.command :httpchecker do |httpchecker|
+    httpchecker.passthrough = true
+    httpchecker.action do |global_options, options, args|
+      libexec = Pathname.new(__FILE__).parent.parent.parent.parent.join('libexec').expand_path
+      httpchecker  = libexec.join('httpchecker')
+      if httpchecker.exist?
+        Kernel.exec(httpchecker.to_s, *ARGV)
+      end
+    end
+  end
+
+
   receiver.desc 'HTTP API that caches and submits events'
   receiver.command :httpbroker do |httpbroker|
     httpbroker.passthrough = true

data/lib/flapjack/cli/server.rb

@@ -29,7 +29,7 @@ module Flapjack
         when !@options[:pidfile].nil?
           @options[:pidfile]
         when !@config_env['pid_dir'].nil?
-          @config_env['pid_dir'] + 'flapjack.pid'
+          File.join(@config_env['pid_dir'], 'flapjack.pid')
         else
           "/var/run/flapjack/flapjack.pid"
         end
@@ -38,7 +38,7 @@ module Flapjack
         when !@options[:logfile].nil?
           @options[:logfile]
         when !@config_env['log_dir'].nil?
-          @config_env['log_dir'] + 'flapjack.log'
+          File.join(@config_env['log_dir'], 'flapjack.log')
         else
           "/var/run/flapjack/flapjack.log"
         end

data/lib/flapjack/data/contact.rb

@@ -22,7 +22,7 @@ module Flapjack
         :media_intervals, :media_rollup_thresholds, :pagerduty_credentials
 
       TAG_PREFIX = 'contact_tag'
-      ALL_MEDIA  = ['email', 'sms', 'jabber', 'pagerduty', 'sns']
+      ALL_MEDIA  = ['email', 'sms', 'sms_twilio', 'jabber', 'pagerduty', 'sns']
 
       def self.all(options = {})
         raise "Redis connection not set" unless redis = options[:redis]

data/lib/flapjack/data/entity_check.rb

@@ -63,6 +63,14 @@ module Flapjack
         self.new(entity, check, :logger => logger, :redis => redis)
       end
 
+      def self.all(options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+        checks = redis.keys('check:*').map {|c| c.match(/^check:(.*)$/) ; $1}
+        checks.map {|ec|
+          self.for_entity_id(ec, options)
+        }
+      end
+
       def self.find_current_for_entity_name(entity_name, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
         redis.zrange("current_checks:#{entity_name}", 0, -1)
@@ -370,6 +378,7 @@ module Flapjack
       #
       def self.find_all_split_by_freshness(ages, options)
         raise "Redis connection not set" unless redis = options[:redis]
+        logger = options[:logger]
 
         raise "ages does not respond_to? :each and :each_with_index" unless ages.respond_to?(:each) && ages.respond_to?(:each_with_index)
         raise "age values must respond_to? :to_i" unless ages.all? {|age| age.respond_to?(:to_i) }
@@ -382,10 +391,11 @@ module Flapjack
         checks = []
         # get all the current checks, with last update time
         Flapjack::Data::Entity.all(:enabled => true, :redis => redis).each do |entity|
-          redis.zrange("current_checks:#{entity}", 0, -1, :withscores => true).each do |check, score|
-            checks << ["#{entity}:#{check}", score]
+          redis.zrange("current_checks:#{entity.name}", 0, -1, :withscores => true).each do |check, score|
+            checks << ["#{entity.name}:#{check}", score]
           end
         end
+        logger.debug("found #{checks.length} current checks on enabled entities") if logger
 
         skeleton = ages.inject({}) {|memo, age| memo[age] = [] ; memo }
         age_ranges = ages.reverse.each_cons(2)
@@ -512,8 +522,11 @@ module Flapjack
         # if multiple scheduled maintenances found, find the end_time furthest in the future
         most_futuristic = current_sched_ms.max {|sm| sm[:end_time] }
         start_time = most_futuristic[:start_time]
-        duration   = most_futuristic[:duration]
-        @redis.setex("#{@key}:scheduled_maintenance", duration.to_i, start_time)
+
+        duration = most_futuristic[:end_time] - current_time
+        if duration > 0
+          @redis.setex("#{@key}:scheduled_maintenance", duration.to_i, start_time)
+        end
       end
 
       # TODO allow summary to be changed as part of the termination
@@ -859,6 +872,39 @@ module Flapjack
         @ack_hash
       end
 
+      def purge_history(opts = {})
+        t = Time.now
+        older_than  = opts[:older_than]  # purge older than this number of seconds ago
+        raise ":older_than must be supplied" unless older_than
+
+        purge_stamps = historical_states(-1, t.to_i - older_than).map {|s| s[:timestamp]}
+        unless purge_stamps.empty?
+          @logger.info "purging #{purge_stamps.length} states from #{@key}" if @logger
+          deletees = []
+          purge_stamps.each do |timestamp|
+            deletees << "#{@key}:#{timestamp}:state"
+            deletees << "#{@key}:#{timestamp}:summary"
+            deletees << "#{@key}:#{timestamp}:count"
+            deletees << "#{@key}:#{timestamp}:check_latency"
+          end
+          @logger.info "  deleting a bunch of keys 100 at a time..." if @logger
+          deletees.each_slice(100) do |batch|
+            @redis.del(batch)
+          end
+          @logger.info "  removing a range of items from the #{@key}:sorted_state_timestamps sorted set" if @logger
+          @redis.zremrangebyscore("#{@key}:sorted_state_timestamps", '-inf', t.to_i - older_than)
+          @logger.info "  getting the #{@key}:states list" if @logger
+          states = @redis.lrange("#{@key}:states", 0, -1)
+          index = 0
+          while states[index].to_i < older_than do
+            index += 1
+          end
+          @logger.info "  trimming the #{@key}:states from #{index}, length #{states.length}" if @logger
+          @redis.ltrim("#{@key}:states", index, -1)
+        end
+        purge_stamps.length
+      end
+
       def to_jsonapi(opts = {})
         {
           "name"        => @check,

data/lib/flapjack/gateways/jabber.rb

@@ -302,9 +302,9 @@ module Flapjack
           end
 
         when /^(?:find )?checks(?:\s+matching\s+\/(.+)\/)?\s+on\s+(?:entities matching\s+\/(.+)\/|([a-z0-9\-\.]+))/im
-          check_pattern = $1 ? $1.chomp.strip : nil
-          entity_pattern = $2 ? $2.chomp.strip : nil
-          entity_name = $3
+          check_pattern  = $1 ? $1.strip : nil
+          entity_pattern = $2 ? $2.strip : nil
+          entity_name    = $3
 
           entity_names = if entity_name
             [entity_name]
@@ -355,7 +355,7 @@ module Flapjack
           end
 
         when /^(?:find )?entities matching\s+\/(.+)\//im
-          pattern = $1.chomp.strip
+          pattern = $1.strip
           entity_list = Flapjack::Data::Entity.find_all_name_matching(pattern, :redis => @redis)
 
           if entity_list
@@ -380,9 +380,9 @@ module Flapjack
           end
 
         when /^(?:ack )?entities\s+\/(.+)\/(?:\s*(.*?)(?:\s*duration:.*?(\w+.*))?)$/i
-          entity_pattern   = $1.chomp.strip
-          comment          = $2 ? $2.chomp.strip : nil
-          duration_str     = $3 ? $3.chomp.strip : '1 hour'
+          entity_pattern   = $1.strip
+          comment          = $2 ? $2.strip : nil
+          duration_str     = $3 ? $3.strip : '1 hour'
           duration         = ChronicDuration.parse(duration_str)
           entity_list      = Flapjack::Data::Entity.find_all_name_matching(entity_pattern, :redis => @redis)
 
@@ -424,7 +424,7 @@ module Flapjack
         end
 
         when /^(?:status )?entities\s+\/(.+)\/.*$/im
-          entity_pattern  = $1 ? $1.chomp.strip : nil
+          entity_pattern  = $1 ? $1.strip : nil
           entity_names    = Flapjack::Data::Entity.find_all_name_matching(entity_pattern, :redis => @redis)
 
           if entity_names
@@ -454,10 +454,10 @@ module Flapjack
           end
 
         when /^(?:ack )?checks\s+\/(.+)\/\s+on\s+\/(.+)\/(?:\s*(.*?)(?:\s*duration:.*?(\w+.*))?)$/i
-          check_pattern  = $1.chomp.strip
-          entity_pattern = $2.chomp.strip
-          comment        = $3 ? $3.chomp.strip : nil
-          duration_str   = $4 ? $4.chomp.strip : '1 hour'
+          check_pattern  = $1.strip
+          entity_pattern = $2.strip
+          comment        = $3 ? $3.strip : nil
+          duration_str   = $4 ? $4.strip : '1 hour'
           duration       = ChronicDuration.parse(duration_str)
           entity_list    = Flapjack::Data::Entity.find_all_name_matching(entity_pattern, :redis => @redis)
 
@@ -505,8 +505,8 @@ module Flapjack
         end
 
         when /^(?:status )checks\s+\/(.+?)\/(?:\s+on\s+)?(?:\/(.+)?\/)?/i
-          check_pattern  = $1 ? $1.chomp.strip : nil
-          entity_pattern = $2 ? $2.chomp.strip : '.*'
+          check_pattern  = $1 ? $1.strip : nil
+          entity_pattern = $2 ? $2.strip : '.*'
           entity_names   = Flapjack::Data::Entity.find_all_name_matching(entity_pattern, :redis => @redis)
 
           if entity_names

data/lib/flapjack/gateways/jsonapi/medium_methods.rb

@@ -36,8 +36,9 @@ module Flapjack
 
             contact_cache = {}
 
+            known_media_identifiers = Flapjack::Data::Contact::ALL_MEDIA.reject{|m| m == 'pagerduty'}.join('|')
             media_ids.split(',').uniq.collect do |m_id|
-              m_id =~ /\A(.+)_(email|sms|jabber)\z/
+              m_id =~ /\A(.+)_(#{known_media_identifiers})\z/
 
               contact_id = $1
               media_type = $2

data/lib/flapjack/gateways/sms_twilio.rb

@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby
+
+require 'em-synchrony'
+require 'em-synchrony/em-http'
+require 'active_support/inflector'
+
+require 'flapjack/data/alert'
+require 'flapjack/utility'
+
+module Flapjack
+  module Gateways
+    class SmsTwilio
+
+      # curl -X POST 'https://api.twilio.com/2010-04-01/Accounts/[AccountSid]/Messages.json' \
+      # --data-urlencode 'To=+61414123456'  \
+      # --data-urlencode 'From=+61414123456'  \
+      # --data-urlencode 'Body=Sausage' \
+      # -u [AccountSid]:[AuthToken]
+
+      class << self
+
+        include Flapjack::Utility
+
+        def start
+          @sent = 0
+        end
+
+        def perform(contents)
+          @logger.debug "Woo, got a notification to send out: #{contents.inspect}"
+          alert = Flapjack::Data::Alert.new(contents, :logger => @logger)
+
+          account_sid = @config["account_sid"]
+          auth_token  = @config["auth_token"]
+          from        = @config["from"]
+          endpoint    = @config["endpoint"] || "https://api.twilio.com/2010-04-01/Accounts/#{account_sid}/Messages.json"
+
+          address         = alert.address
+          notification_id = alert.notification_id
+          message_type    = alert.rollup ? 'rollup' : 'alert'
+
+          my_dir = File.dirname(__FILE__)
+          sms_template_path = case
+          when @config.has_key?('templates') && @config['templates']["#{message_type}.text"]
+            @config['templates']["#{message_type}.text"]
+          else
+            my_dir + "/sms_twilio/#{message_type}.text.erb"
+          end
+          sms_template = ERB.new(File.read(sms_template_path), nil, '-')
+
+          @alert  = alert
+          bnd     = binding
+
+          begin
+            message = sms_template.result(bnd).chomp
+          rescue => e
+            @logger.error "Error while excuting the ERB for an sms: " +
+              "ERB being executed: #{sms_template_path}"
+            raise
+          end
+
+          if @config.nil? || (@config.respond_to?(:empty?) && @config.empty?)
+            @logger.error "sms_twilio config is missing"
+            return
+          end
+
+          errors = []
+
+          safe_message = truncate(message, 159)
+
+          [[account_sid, "Twilio account_sid is missing"],
+           [auth_token, "Twilio auth_token is missing"],
+           [from,  "SMS from address is missing"],
+           [address,  "SMS address is missing"],
+           [notification_id, "Notification id is missing"]].each do |val_err|
+
+            next unless val_err.first.nil? || (val_err.first.respond_to?(:empty?) && val_err.first.empty?)
+            errors << val_err.last
+          end
+
+          unless errors.empty?
+            errors.each {|err| @logger.error err }
+            return
+          end
+
+          body_data = {'To'   => address,
+                   'From' => from,
+                   'Body' => safe_message}
+          @logger.debug "body_data: #{body_data.inspect}"
+          @logger.debug "authorization: [#{account_sid}, #{auth_token[0..2]}...#{auth_token[-3..-1]}]"
+
+          http = EM::HttpRequest.new(endpoint).post(:body => body_data, :head => {'authorization' => [account_sid, auth_token]})
+
+          @logger.debug "server response: #{http.response}"
+
+          status = (http.nil? || http.response_header.nil?) ? nil : http.response_header.status
+          if (status >= 200) && (status <= 206)
+            @sent += 1
+            alert.record_send_success!
+            @logger.debug "Sent SMS via Twilio, response status is #{status}, " +
+              "notification_id: #{notification_id}"
+          else
+            @logger.error "Failed to send SMS via Twilio, response status is #{status}, " +
+              "notification_id: #{notification_id}"
+          end
+        rescue => e
+          @logger.error "Error generating or delivering sms to #{contents['address']}: #{e.class}: #{e.message}"
+          @logger.error e.backtrace.join("\n")
+          raise
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,5 @@
+<%= @alert.type_sentence_case %>: '<%= @alert.check %>' on <%= @alert.entity -%>
+<% unless ['acknowledgement', 'test'].include?(@alert.notification_type) -%>
+ is <%= @alert.state_title_case -%>
+<% end -%>
+ at <%= Time.at(@alert.time).strftime('%-d %b %H:%M') %>, <%= @alert.summary -%>

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

@@ -0,0 +1,2 @@
+<%= @alert.type_sentence_case %>: <%= @alert.rollup_states_summary -%>
+ (<%= @alert.rollup_states_detail_text(:max_checks_per_state => 3) -%>)

data/lib/flapjack/gateways/web.rb

@@ -95,6 +95,8 @@ module Flapjack
               @logger.error "logo_image_path '#{logo_image_path}'' does not point to a valid file."
             end
           end
+
+          @auto_refresh = @config['auto_refresh'].respond_to?('to_i') && @config['auto_refresh'].to_i > 0 ? @config['auto_refresh'].to_i : false
         end
       end
 
@@ -133,6 +135,20 @@ module Flapjack
         @default_logo_url = self.class.instance_variable_get('@default_logo_url')
         @logo_image_file  = self.class.instance_variable_get('@logo_image_file')
         @logo_image_ext   = self.class.instance_variable_get('@logo_image_ext')
+        @auto_refresh     = self.class.instance_variable_get('@auto_refresh')
+
+        input = nil
+        query_string = (request.query_string.respond_to?(:length) &&
+                        request.query_string.length > 0) ? "?#{request.query_string}" : ""
+        if logger.debug?
+          input = env['rack.input'].read
+          logger.debug("#{request.request_method} #{request.path_info}#{query_string} #{input}")
+        elsif logger.info?
+          input = env['rack.input'].read
+          input_short = input.gsub(/\n/, '').gsub(/\s+/, ' ')
+          logger.info("#{request.request_method} #{request.path_info}#{query_string} #{input_short[0..80]}")
+        end
+        env['rack.input'].rewind unless input.nil?
       end
 
       get '/img/branding.*' do
@@ -181,8 +197,11 @@ module Flapjack
       end
 
       get '/self_stats' do
+        logger.debug "calculating self_stats"
         self_stats
+        logger.debug "calculating entity_stats"
         entity_stats
+        logger.debug "calculating check_stats"
         check_stats
 
         erb 'self_stats.html'.to_sym
@@ -464,7 +483,7 @@ module Flapjack
         end
         @event_counters = redis.hgetall('event_counters')
         @events_queued  = redis.llen('events')
-        @current_checks_ages = Flapjack::Data::EntityCheck.find_all_split_by_freshness([0, 60, 300, 900, 3600], {:redis => redis, :counts => true } )
+        @current_checks_ages = Flapjack::Data::EntityCheck.find_all_split_by_freshness([0, 60, 300, 900, 3600], {:redis => redis, :logger => logger, :counts => true } )
       end
 
       def entity_stats(entities = nil)

data/lib/flapjack/gateways/web/public/js/modules/contact.js

@@ -287,7 +287,7 @@
     initialize: function(options) {
       var context = this;
 
-      _.each(['email', 'sms', 'jabber'], function(type) {
+      _.each(['email', 'sms', 'sms_twilio', 'sns', 'jabber'], function(type) {
         var medium = context.collection.find(function(cm) {
           return cm.get('type') == type;
         });
@@ -338,9 +338,11 @@
     render: function() {
       var template_values = _.clone(this.model.attributes);
       template_values['labels'] = {
-        'email'  : 'Email',
-        'sms'    : 'SMS',
-        'jabber' : 'Jabber'
+        'email'      : 'Email',
+        'sms'        : 'SMS (MessageNet)',
+        'sms_twilio' : 'SMS (Twilio)',
+        'sns'        : 'SMS (Amazon SNS)',
+        'jabber'     : 'Jabber'
       };
       this.$el.html(this.template(template_values));
       return this;

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

@@ -1,3 +1,6 @@
+<% if @auto_refresh %>
+<meta http-equiv="refresh" content="<%= @auto_refresh %>" >
+<% end %>
 <% page_title "#{@adjective.capitalize} Checks" %>
 
 <div class="page-header">

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

@@ -1,3 +1,6 @@
+<% if @auto_refresh %>
+<meta http-equiv="refresh" content="<%= @auto_refresh %>" >
+<% end %>
 <% page_title "#{@adjective.capitalize} Entities" %>
 
 <div class="page-header">

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

@@ -1,3 +1,6 @@
+<% if @auto_refresh %>
+<meta http-equiv="refresh" content="<%= @auto_refresh %>" >
+<% end %>
 <% page_title "#{h(@entity)} (entity)" %>
 
 <div class="page-header">

data/lib/flapjack/notifier.rb

@@ -15,6 +15,7 @@ require 'flapjack/utility'
 
 require 'flapjack/gateways/email'
 require 'flapjack/gateways/sms_messagenet'
+require 'flapjack/gateways/sms_twilio'
 require 'flapjack/gateways/aws_sns'
 
 module Flapjack
@@ -159,12 +160,13 @@ module Flapjack
         contents_tags = contents['tags']
         contents['tags'] = contents_tags.is_a?(Set) ? contents_tags.to_a : contents_tags
 
+        # FIXME(@auxesis): change Resque jobs to use raw blpop
         case media_type.to_sym
         when :sms
-          # FIXME(@auxesis): change Resque jobs to use raw blpop
           Resque.enqueue_to(@queues['sms'], Flapjack::Gateways::SmsMessagenet, contents)
+        when :sms_twilio
+          Resque.enqueue_to(@queues['sms_twilio'], Flapjack::Gateways::SmsTwilio, contents)
         when :email
-          # FIXME(@auxesis): change Resque jobs to use raw blpop
           Resque.enqueue_to(@queues['email'], Flapjack::Gateways::Email, contents)
         when :sns
           Resque.enqueue_to(@queues['sns'], Flapjack::Gateways::AwsSns, contents)

data/lib/flapjack/pikelet.rb

@@ -25,6 +25,7 @@ require 'flapjack/gateways/oobetet'
 require 'flapjack/gateways/pagerduty'
 require 'flapjack/gateways/email'
 require 'flapjack/gateways/sms_messagenet'
+require 'flapjack/gateways/sms_twilio'
 require 'flapjack/gateways/aws_sns'
 require 'flapjack/gateways/web'
 require 'flapjack/logger'
@@ -156,9 +157,10 @@ module Flapjack
 
     class Resque < Flapjack::Pikelet::Base
 
-      PIKELET_TYPES = {'email' => Flapjack::Gateways::Email,
-                       'sms'   => Flapjack::Gateways::SmsMessagenet,
-                       'sns'   => Flapjack::Gateways::AwsSns}
+      PIKELET_TYPES = {'email'      => Flapjack::Gateways::Email,
+                       'sms'        => Flapjack::Gateways::SmsMessagenet,
+                       'sms_twilio' => Flapjack::Gateways::SmsTwilio,
+                       'sns'        => Flapjack::Gateways::AwsSns}
 
       def self.create(type, opts = {})
         self.new(type, PIKELET_TYPES[type], :config => opts[:config],

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end
 

data/spec/lib/flapjack/data/contact_spec.rb

@@ -27,8 +27,8 @@ describe Flapjack::Data::Contact, :redis => true do
      :tags               => Flapjack::Data::TagSet.new([]),
      :time_restrictions  => [],
      :unknown_media      => [],
-     :warning_media      => ['email', 'sms', 'jabber', 'pagerduty', 'sns'],
-     :critical_media     => ['email', 'sms', 'jabber', 'pagerduty', 'sns'],
+     :warning_media      => ['email', 'sms', 'sms_twilio', 'jabber', 'pagerduty', 'sns'],
+     :critical_media     => ['email', 'sms', 'sms_twilio', 'jabber', 'pagerduty', 'sns'],
      :unknown_blackhole  => false,
      :warning_blackhole  => false,
      :critical_blackhole => false}

data/spec/lib/flapjack/data/entity_check_spec.rb

@@ -272,7 +272,6 @@ describe Flapjack::Data::EntityCheck, :redis => true do
       expect(duration).to eq(half_an_hour)
     end
 
-    # TODO this should probably enforce that it starts in the future
     it "creates a scheduled maintenance period covering the current time" do
       t = Time.now.to_i
       ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
@@ -294,6 +293,11 @@ describe Flapjack::Data::EntityCheck, :redis => true do
       expect(duration).not_to be_nil
       expect(duration).to be_a(Float)
       expect(duration).to eq(2 * (60 * 60))
+
+      ttl = @redis.ttl("#{name}:#{check}:scheduled_maintenance")
+      expect(ttl).to be_within(20).of(60 * 60) # 20-second margin of error,
+      # should be large enough for a slow machine running the test -- duration
+      # is considered to start at the begininng of the period
     end
 
     it "creates an scheduled maintenance period from a human readable time" do

data/spec/lib/flapjack/gateways/sms_twilio_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+require 'flapjack/gateways/sms_twilio'
+
+describe Flapjack::Gateways::SmsTwilio, :logger => true do
+
+  let(:lock) { double(Monitor) }
+
+  let(:config) { {'account_sid'  => 'the_account_sid',
+                  'auth_token'   => 'the_auth_token',
+                  'from'         => 'the_from_address'
+                 }
+               }
+
+  let(:time) { Time.new(2013, 10, 31, 13, 45) }
+
+  let(:time_str) { Time.at(time).strftime('%-d %b %H:%M') }
+
+  let(:message) { {'notification_type'  => 'recovery',
+                   'contact_first_name' => 'John',
+                   'contact_last_name'  => 'Smith',
+                   'state'              => 'ok',
+                   'summary'            => 'smile',
+                   'last_state'         => 'problem',
+                   'last_summary'       => 'frown',
+                   'time'               => time.to_i,
+                   'address'            => '555-555555',
+                   'event_id'           => 'example.com:ping',
+                   'id'                 => '123456789',
+                   'duration'           => 55,
+                   'state_duration'     => 23
+                  }
+                }
+
+  it "sends an SMS message" do
+    req = stub_request(:post, "https://api.twilio.com/2010-04-01/Accounts/the_account_sid/Messages.json").
+      to_return(:status => 201)
+
+    EM.synchrony do
+      Flapjack::Gateways::SmsTwilio.instance_variable_set('@config', config)
+      Flapjack::Gateways::SmsTwilio.instance_variable_set('@logger', @logger)
+      Flapjack::Gateways::SmsTwilio.start
+      Flapjack::Gateways::SmsTwilio.perform(message)
+      EM.stop
+    end
+    expect(req).to have_been_requested
+  end
+
+  it "truncates a long message a" do
+    long_msg = message.merge('summary' => 'Four score and seven years ago our ' +
+      'fathers brought forth on this continent, a new nation, conceived in ' +
+      'Liberty, and dedicated to the proposition that all men are created equal.')
+
+    body = {
+      'To'   => '555-555555',
+      'From' => 'the_from_address',
+      'Body' => "Recovery: 'ping' on example.com is " +
+                "OK at #{time_str}, Four score and seven years ago " +
+                'our fathers brought forth on this continent, a new ' +
+                'nation, conceived i...'}
+    req = stub_request(:post, "https://api.twilio.com/2010-04-01/Accounts/the_account_sid/Messages.json").
+      with(:body  => body).
+      with(:headers => {'Authorization'=>['the_account_sid', 'the_auth_token']}).
+      to_return(:status => 200)
+
+    EM.synchrony do
+      Flapjack::Gateways::SmsTwilio.instance_variable_set('@config', config)
+      Flapjack::Gateways::SmsTwilio.instance_variable_set('@logger', @logger)
+      Flapjack::Gateways::SmsTwilio.start
+      Flapjack::Gateways::SmsTwilio.perform(long_msg)
+      EM.stop
+    end
+    expect(req).to have_been_requested
+  end
+
+  it "does not send an SMS message with an invalid config" do
+    EM.synchrony do
+      Flapjack::Gateways::SmsTwilio.instance_variable_set('@config', config.reject {|k, v| k == 'auth_token'})
+      Flapjack::Gateways::SmsTwilio.instance_variable_set('@logger', @logger)
+      Flapjack::Gateways::SmsTwilio.start
+      Flapjack::Gateways::SmsTwilio.perform(message)
+      EM.stop
+    end
+
+    expect(WebMock).not_to have_requested(:post,
+      "https://api.twilio.com/2010-04-01/Accounts/the_account_sid/Messages.json")
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -396,6 +396,7 @@ files:
 - features/cli_flapjack-nagios-receiver.feature
 - features/cli_flapjack-populator.feature
 - features/cli_flapper.feature
+- features/cli_purge.feature
 - features/cli_receive-events.feature
 - features/cli_simulate-failed-check.feature
 - features/events.feature
@@ -418,6 +419,7 @@ files:
 - lib/flapjack/cli/flapper.rb
 - lib/flapjack/cli/import.rb
 - lib/flapjack/cli/maintenance.rb
+- lib/flapjack/cli/purge.rb
 - lib/flapjack/cli/receiver.rb
 - lib/flapjack/cli/server.rb
 - lib/flapjack/cli/simulate.rb
@@ -470,6 +472,9 @@ files:
 - lib/flapjack/gateways/sms_messagenet.rb
 - lib/flapjack/gateways/sms_messagenet/alert.text.erb
 - lib/flapjack/gateways/sms_messagenet/rollup.text.erb
+- lib/flapjack/gateways/sms_twilio.rb
+- lib/flapjack/gateways/sms_twilio/alert.text.erb
+- lib/flapjack/gateways/sms_twilio/rollup.text.erb
 - lib/flapjack/gateways/web.rb
 - lib/flapjack/gateways/web/public/css/bootstrap.css
 - lib/flapjack/gateways/web/public/css/font-awesome.css
@@ -569,6 +574,7 @@ files:
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet_spec.rb
+- spec/lib/flapjack/gateways/sms_twilio_spec.rb
 - spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/index.html.erb_spec.rb
@@ -640,6 +646,7 @@ test_files:
 - features/cli_flapjack-nagios-receiver.feature
 - features/cli_flapjack-populator.feature
 - features/cli_flapper.feature
+- features/cli_purge.feature
 - features/cli_receive-events.feature
 - features/cli_simulate-failed-check.feature
 - features/events.feature
@@ -687,6 +694,7 @@ test_files:
 - spec/lib/flapjack/gateways/oobetet_spec.rb
 - spec/lib/flapjack/gateways/pagerduty_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet_spec.rb
+- spec/lib/flapjack/gateways/sms_twilio_spec.rb
 - spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb
 - spec/lib/flapjack/gateways/web/views/index.html.erb_spec.rb