flapjack 1.6.0 → 2.0.0b1

data/tasks/events.rake

@@ -7,16 +7,16 @@ namespace :events do
     $: << File.dirname(__FILE__) + '/../lib'
   end
 
+  require 'flapjack'
   require 'flapjack/configuration'
   require 'flapjack/data/event'
-  require 'flapjack/data/entity_check'
 
   # FIXME: add arguments, make more flexible
   desc "send events to trigger some notifications"
   task :test_notification do
 
     FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'development'
-    config_file = File.join('etc', 'flapjack_config.yaml')
+    config_file = File.join('etc', 'flapjack_config.toml')
 
     config = Flapjack::Configuration.new
     config.load( config_file )
@@ -25,17 +25,17 @@ namespace :events do
     @redis_config = config.for_redis
 
     if @config_env.nil? || @config_env.empty?
-      puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{config_file}'"
+      puts "No config data found in '#{config_file}'"
       exit(false)
     end
 
-    redis = Redis.new(@redis_config)
+    Flapjack.redis = Redis.new(@redis_config)
 
     Flapjack::Data::Event.add({'entity'  => 'clientx-app-01',
                                'check'   => 'ping',
                                'type'    => 'service',
                                'state'   => 'ok',
-                               'summary' => 'testing'}, :redis => redis)
+                               'summary' => 'testing'})
 
     sleep(8)
 
@@ -43,7 +43,7 @@ namespace :events do
                                'check'   => 'ping',
                                'type'    => 'service',
                                'state'   => 'critical',
-                               'summary' => 'testing'}, :redis => redis)
+                               'summary' => 'testing'})
 
     sleep(8)
 
@@ -51,7 +51,7 @@ namespace :events do
                                'check'   => 'ping',
                                'type'    => 'service',
                                'state'   => 'ok',
-                               'summary' => 'testing'}, :redis => redis)
+                               'summary' => 'testing'})
 
   end
 

data/tasks/support/flapjack_config_benchmark.toml

@@ -0,0 +1,28 @@
+pid_file = "tmp/pids/flapjack_test.pid"
+log_file = "log/flapjack_test.log"
+daemonize = false
+[redis]
+  host = "127.0.0.1"
+  port = 6379
+  db = 14
+[processor]
+  enabled = true
+  queue = "events"
+  notifier_queue = "notifications"
+  archive_events = "false"
+  events_archive_maxage = 10800
+  new_check_scheduled_maintenance_duration = "1 month"
+  exit_on_queue_empty = true
+  [logger]
+    level = "WARN"
+[notifier]
+  enabled = true
+  queue = "notifications"
+  email_queue = "email_notifications"
+  sms_queue = "sms_notifications"
+  jabber_queue = "jabber_notifications"
+  pagerduty_queue = "pagerduty_notifications"
+  notification_log_file = "log/notification_test.log"
+  default_contact_timezone = "Australia/Broken_Hill"
+  [logger]
+    level = "WARN"

data/tasks/support/flapjack_config_benchmark.yaml

@@ -21,10 +21,8 @@ test:
     queue: notifications
     email_queue: email_notifications
     sms_queue: sms_notifications
-    sms_nexmo_queue: sms_nexmo_notifications
     jabber_queue: jabber_notifications
     pagerduty_queue: pagerduty_notifications
-    notification_log_file: log/notification_test.log
     default_contact_timezone: Australia/Broken_Hill
     logger:
       level: WARN

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.0b1
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,80 +11,38 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dante
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: oj
+  name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.0
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.6
-- !ruby/object:Gem::Dependency
-  name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
-  name: em-hiredis
+  name: json-stream
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,21 +56,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-synchrony
+  name: zermelo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,7 +84,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: swagger-blocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,7 +98,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-fiber_pool
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -154,47 +112,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.1
-- !ruby/object:Gem::Dependency
-  name: mail
+  name: xmpp4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
-  name: blather
+  name: nexmo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +168,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -238,7 +182,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: ice_cube
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -252,7 +196,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ice_cube
+  name: icalendar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -294,7 +238,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rbtrace
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.13.1
+- !ruby/object:Gem::Dependency
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -308,7 +266,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: toml-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -322,47 +280,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: flapjack-diner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2.1
+        version: 2.0.0b1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.2.1
+        version: 2.0.0b1
 - !ruby/object:Gem::Dependency
-  name: nexmo
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 description: Flapjack is a distributed monitoring notification system that provides
   a scalable method for processing streams of events from Nagios and deciding who
   should be notified
@@ -381,18 +339,16 @@ files:
 - CONTRIBUTING.md
 - Dockerfile
 - Gemfile
-- Guardfile
 - LICENCE
 - README.md
 - Rakefile
 - bin/flapjack
 - build.sh
-- etc/flapjack_config.yaml.example
+- etc/flapjack_config.toml.example
 - features/ack_after_sched_maint.feature
 - features/cli.feature
 - features/cli_flapjack-feed-events.feature
 - features/cli_flapjack-nagios-receiver.feature
-- features/cli_flapjack-populator.feature
 - features/cli_flapper.feature
 - features/cli_purge.feature
 - features/cli_receive-events.feature
@@ -411,29 +367,37 @@ files:
 - features/steps/time_travel_steps.rb
 - features/support/daemons.rb
 - features/support/env.rb
-- features/support/silent_system.rb
 - flapjack.gemspec
 - lib/flapjack.rb
 - lib/flapjack/cli/flapper.rb
-- lib/flapjack/cli/import.rb
 - lib/flapjack/cli/maintenance.rb
+- lib/flapjack/cli/migrate.rb
 - lib/flapjack/cli/purge.rb
 - lib/flapjack/cli/receiver.rb
 - lib/flapjack/cli/server.rb
 - lib/flapjack/cli/simulate.rb
 - lib/flapjack/configuration.rb
 - lib/flapjack/coordinator.rb
+- lib/flapjack/data/acknowledgement.rb
 - lib/flapjack/data/alert.rb
+- lib/flapjack/data/check.rb
+- lib/flapjack/data/condition.rb
 - lib/flapjack/data/contact.rb
-- lib/flapjack/data/entity.rb
-- lib/flapjack/data/entity_check.rb
 - lib/flapjack/data/event.rb
-- lib/flapjack/data/message.rb
-- lib/flapjack/data/migration.rb
+- lib/flapjack/data/extensions/associations.rb
+- lib/flapjack/data/extensions/short_name.rb
+- lib/flapjack/data/medium.rb
+- lib/flapjack/data/metrics.rb
 - lib/flapjack/data/notification.rb
-- lib/flapjack/data/notification_rule.rb
-- lib/flapjack/data/semaphore.rb
-- lib/flapjack/data/tagged.rb
+- lib/flapjack/data/rule.rb
+- lib/flapjack/data/scheduled_maintenance.rb
+- lib/flapjack/data/state.rb
+- lib/flapjack/data/statistic.rb
+- lib/flapjack/data/tag.rb
+- lib/flapjack/data/test_notification.rb
+- lib/flapjack/data/unscheduled_maintenance.rb
+- lib/flapjack/data/validators/id_validator.rb
+- lib/flapjack/exceptions.rb
 - lib/flapjack/filters/acknowledgement.rb
 - lib/flapjack/filters/base.rb
 - lib/flapjack/filters/delays.rb
@@ -456,22 +420,34 @@ files:
 - lib/flapjack/gateways/jabber/alert.text.erb
 - lib/flapjack/gateways/jabber/rollup.text.erb
 - lib/flapjack/gateways/jsonapi.rb
-- lib/flapjack/gateways/jsonapi/check_methods.rb
-- lib/flapjack/gateways/jsonapi/check_presenter.rb
-- lib/flapjack/gateways/jsonapi/contact_methods.rb
-- lib/flapjack/gateways/jsonapi/entity_methods.rb
-- lib/flapjack/gateways/jsonapi/medium_methods.rb
-- lib/flapjack/gateways/jsonapi/metrics_methods.rb
-- lib/flapjack/gateways/jsonapi/notification_rule_methods.rb
-- lib/flapjack/gateways/jsonapi/pagerduty_credential_methods.rb
-- lib/flapjack/gateways/jsonapi/rack/json_params_parser.rb
-- lib/flapjack/gateways/jsonapi/report_methods.rb
+- lib/flapjack/gateways/jsonapi/data/join_descriptor.rb
+- lib/flapjack/gateways/jsonapi/data/method_descriptor.rb
+- lib/flapjack/gateways/jsonapi/helpers/headers.rb
+- lib/flapjack/gateways/jsonapi/helpers/miscellaneous.rb
+- lib/flapjack/gateways/jsonapi/helpers/resources.rb
+- lib/flapjack/gateways/jsonapi/helpers/serialiser.rb
+- lib/flapjack/gateways/jsonapi/helpers/swagger_docs.rb
+- lib/flapjack/gateways/jsonapi/methods/association_delete.rb
+- lib/flapjack/gateways/jsonapi/methods/association_get.rb
+- lib/flapjack/gateways/jsonapi/methods/association_patch.rb
+- lib/flapjack/gateways/jsonapi/methods/association_post.rb
+- lib/flapjack/gateways/jsonapi/methods/metrics.rb
+- lib/flapjack/gateways/jsonapi/methods/resource_delete.rb
+- lib/flapjack/gateways/jsonapi/methods/resource_get.rb
+- lib/flapjack/gateways/jsonapi/methods/resource_patch.rb
+- lib/flapjack/gateways/jsonapi/methods/resource_post.rb
+- lib/flapjack/gateways/jsonapi/middleware/array_param_fixer.rb
+- lib/flapjack/gateways/jsonapi/middleware/json_params_parser.rb
+- lib/flapjack/gateways/jsonapi/middleware/request_timestamp.rb
 - lib/flapjack/gateways/oobetet.rb
-- lib/flapjack/gateways/pagerduty.rb
-- lib/flapjack/gateways/pagerduty/alert.text.erb
+- lib/flapjack/gateways/pager_duty.rb
+- lib/flapjack/gateways/pager_duty/alert.text.erb
 - lib/flapjack/gateways/slack.rb
 - lib/flapjack/gateways/slack/alert.text.erb
 - lib/flapjack/gateways/slack/rollup.text.erb
+- lib/flapjack/gateways/sms_aspsms.rb
+- lib/flapjack/gateways/sms_aspsms/alert.text.erb
+- lib/flapjack/gateways/sms_aspsms/rollup.text.erb
 - lib/flapjack/gateways/sms_messagenet.rb
 - lib/flapjack/gateways/sms_messagenet/alert.text.erb
 - lib/flapjack/gateways/sms_messagenet/rollup.text.erb
@@ -482,13 +458,12 @@ files:
 - 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/middleware/request_timestamp.rb
 - lib/flapjack/gateways/web/public/css/bootstrap.css
+- lib/flapjack/gateways/web/public/css/bootstrap.css.map
 - lib/flapjack/gateways/web/public/css/font-awesome.css
 - lib/flapjack/gateways/web/public/css/nv.d3.css
 - lib/flapjack/gateways/web/public/css/screen.css
-- lib/flapjack/gateways/web/public/css/select2-bootstrap.css
-- lib/flapjack/gateways/web/public/css/select2.css
-- lib/flapjack/gateways/web/public/css/tablesort.css
 - lib/flapjack/gateways/web/public/fonts/FontAwesome.otf
 - lib/flapjack/gateways/web/public/fonts/fontawesome-webfont.eot
 - lib/flapjack/gateways/web/public/fonts/fontawesome-webfont.svg
@@ -498,6 +473,7 @@ files:
 - lib/flapjack/gateways/web/public/fonts/glyphicons-halflings-regular.svg
 - lib/flapjack/gateways/web/public/fonts/glyphicons-halflings-regular.ttf
 - lib/flapjack/gateways/web/public/fonts/glyphicons-halflings-regular.woff
+- lib/flapjack/gateways/web/public/fonts/glyphicons-halflings-regular.woff2
 - lib/flapjack/gateways/web/public/img/flapjack-2013-notext-transparent-25-25.png
 - lib/flapjack/gateways/web/public/img/flapjack-2013-notext-transparent-25-40.png
 - lib/flapjack/gateways/web/public/img/flapjack-2013-notext-transparent-300-300.png
@@ -508,124 +484,98 @@ files:
 - lib/flapjack/gateways/web/public/img/flapjack_white_bg_400_353.jpeg
 - lib/flapjack/gateways/web/public/img/glyphicons-halflings-white.png
 - lib/flapjack/gateways/web/public/img/glyphicons-halflings.png
-- lib/flapjack/gateways/web/public/img/select2-spinner.gif
-- lib/flapjack/gateways/web/public/img/select2.png
-- lib/flapjack/gateways/web/public/img/select2x2.png
-- lib/flapjack/gateways/web/public/js/backbone.js
-- lib/flapjack/gateways/web/public/js/backbone.jsonapi.js
 - lib/flapjack/gateways/web/public/js/bootstrap.js
 - lib/flapjack/gateways/web/public/js/d3.v3.js
-- lib/flapjack/gateways/web/public/js/flapjack.js
 - lib/flapjack/gateways/web/public/js/jquery-1.10.2.js
-- lib/flapjack/gateways/web/public/js/jquery.tablesorter.js
-- lib/flapjack/gateways/web/public/js/jquery.tablesorter.widgets.js
-- lib/flapjack/gateways/web/public/js/modules/contact.js
-- lib/flapjack/gateways/web/public/js/modules/entity.js
-- lib/flapjack/gateways/web/public/js/modules/medium.js
 - lib/flapjack/gateways/web/public/js/moment.js
 - lib/flapjack/gateways/web/public/js/nv.d3.js
-- lib/flapjack/gateways/web/public/js/select2.js
 - lib/flapjack/gateways/web/public/js/self_stats.js
-- lib/flapjack/gateways/web/public/js/tablesort.js
-- lib/flapjack/gateways/web/public/js/underscore.js
+- lib/flapjack/gateways/web/views/_pagination.html.erb
 - lib/flapjack/gateways/web/views/check.html.erb
 - lib/flapjack/gateways/web/views/checks.html.erb
 - lib/flapjack/gateways/web/views/contact.html.erb
 - lib/flapjack/gateways/web/views/contacts.html.erb
-- lib/flapjack/gateways/web/views/edit_contacts.html.erb
-- lib/flapjack/gateways/web/views/entities.html.erb
-- lib/flapjack/gateways/web/views/entity.html.erb
 - lib/flapjack/gateways/web/views/index.html.erb
-- lib/flapjack/gateways/web/views/layout.erb
+- lib/flapjack/gateways/web/views/layout.html.erb
 - lib/flapjack/gateways/web/views/self_stats.html.erb
+- lib/flapjack/gateways/web/views/tag.html.erb
+- lib/flapjack/gateways/web/views/tags.html.erb
 - lib/flapjack/logger.rb
 - lib/flapjack/notifier.rb
 - lib/flapjack/patches.rb
 - lib/flapjack/pikelet.rb
 - lib/flapjack/processor.rb
-- lib/flapjack/rack_logger.rb
-- lib/flapjack/redis_pool.rb
+- lib/flapjack/record_queue.rb
+- lib/flapjack/redis_proxy.rb
 - lib/flapjack/utility.rb
 - lib/flapjack/version.rb
 - libexec/httpbroker.go
 - libexec/oneoff.go
 - log/.gitkeep
+- spec/lib/flapjack/configuration_spec.rb
 - spec/lib/flapjack/coordinator_spec.rb
+- spec/lib/flapjack/data/check_spec.rb
 - spec/lib/flapjack/data/contact_spec.rb
-- spec/lib/flapjack/data/entity_check_spec.rb
-- spec/lib/flapjack/data/entity_spec.rb
 - spec/lib/flapjack/data/event_spec.rb
-- spec/lib/flapjack/data/message_spec.rb
-- spec/lib/flapjack/data/migration_spec.rb
-- spec/lib/flapjack/data/notification_rule_spec.rb
-- spec/lib/flapjack/data/notification_spec.rb
-- spec/lib/flapjack/data/semaphore_spec.rb
-- spec/lib/flapjack/filters/acknowledgement_spec.rb
-- spec/lib/flapjack/filters/delays_spec.rb
-- spec/lib/flapjack/filters/ok_spec.rb
-- spec/lib/flapjack/filters/scheduled_maintenance_spec.rb
-- spec/lib/flapjack/filters/unscheduled_maintenance_spec.rb
+- spec/lib/flapjack/data/medium_spec.rb
+- spec/lib/flapjack/data/rule_spec.rb
+- spec/lib/flapjack/data/scheduled_maintenance_spec.rb
+- spec/lib/flapjack/data/unscheduled_maintenance_spec.rb
 - spec/lib/flapjack/gateways/aws_sns_spec.rb
 - spec/lib/flapjack/gateways/email_spec.rb
 - spec/lib/flapjack/gateways/jabber_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/check_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/check_presenter_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/contact_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/entity_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/medium_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/notification_rule_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/pagerduty_credential_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/report_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/check_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/checks_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/contact_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/contacts_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/events_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/media_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/medium_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/metrics_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/rule_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/rules_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/scheduled_maintenance_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/scheduled_maintenances_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/tag_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/tags_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/unscheduled_maintenance_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/unscheduled_maintenances_spec.rb
 - spec/lib/flapjack/gateways/jsonapi_spec.rb
 - spec/lib/flapjack/gateways/oobetet_spec.rb
-- spec/lib/flapjack/gateways/pagerduty_spec.rb
+- spec/lib/flapjack/gateways/pager_duty_spec.rb
 - spec/lib/flapjack/gateways/slack_spec.rb
+- spec/lib/flapjack/gateways/sms_aspsms_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet_spec.rb
 - spec/lib/flapjack/gateways/sms_nexmo_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
 - spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/logger_spec.rb
 - spec/lib/flapjack/notifier_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/processor_spec.rb
-- spec/lib/flapjack/redis_pool_spec.rb
+- spec/lib/flapjack/redis_proxy_spec.rb
 - spec/lib/flapjack/utility_spec.rb
+- spec/service_consumers/fixture_data.rb
 - spec/service_consumers/pact_helper.rb
-- spec/service_consumers/pacts/flapjack-diner_v1.0.json
+- spec/service_consumers/pacts/flapjack-diner_v2.0.json
 - spec/service_consumers/provider_states_for_flapjack-diner.rb
+- spec/service_consumers/provider_support.rb
 - spec/spec_helper.rb
 - spec/support/erb_view_helper.rb
+- spec/support/factories.rb
 - spec/support/jsonapi_helper.rb
+- spec/support/mock_logger.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb
+- spec/support/xmpp_comparable.rb
 - src/flapjack/event.go
 - src/flapjack/event_test.go
 - src/flapjack/transport.go
 - src/flapjack/transport_test.go
-- tasks/entities.rake
+- tasks/dump_keys.rake
 - tasks/events.rake
-- tasks/profile.rake
+- tasks/support/flapjack_config_benchmark.toml
 - tasks/support/flapjack_config_benchmark.yaml
-- tmp/acknowledge.rb
-- tmp/create_config_yaml.rb
-- tmp/create_event_ok.rb
-- tmp/create_event_unknown.rb
-- tmp/create_events_failure.rb
-- tmp/create_events_ok.rb
-- tmp/create_events_ok_fail_ack_ok.rb
-- tmp/create_events_ok_failure.rb
-- tmp/create_events_ok_failure_ack.rb
-- tmp/dummy_contacts.json
-- tmp/dummy_entities.json
-- tmp/generate_nagios_test_hosts.rb
-- tmp/notification_rules.rb
-- tmp/parse_config_yaml.rb
-- tmp/redis_find_spurious_unknown_states.rb
-- tmp/test_json_post.rb
-- tmp/test_notification_rules_api.rb
 homepage: http://flapjack.io/
 licenses:
 - MIT
@@ -641,12 +591,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Intelligent, scalable, distributed monitoring notification system.
@@ -655,7 +605,6 @@ test_files:
 - features/cli.feature
 - features/cli_flapjack-feed-events.feature
 - features/cli_flapjack-nagios-receiver.feature
-- features/cli_flapjack-populator.feature
 - features/cli_flapper.feature
 - features/cli_purge.feature
 - features/cli_receive-events.feature
@@ -674,55 +623,59 @@ test_files:
 - features/steps/time_travel_steps.rb
 - features/support/daemons.rb
 - features/support/env.rb
-- features/support/silent_system.rb
+- spec/lib/flapjack/configuration_spec.rb
 - spec/lib/flapjack/coordinator_spec.rb
+- spec/lib/flapjack/data/check_spec.rb
 - spec/lib/flapjack/data/contact_spec.rb
-- spec/lib/flapjack/data/entity_check_spec.rb
-- spec/lib/flapjack/data/entity_spec.rb
 - spec/lib/flapjack/data/event_spec.rb
-- spec/lib/flapjack/data/message_spec.rb
-- spec/lib/flapjack/data/migration_spec.rb
-- spec/lib/flapjack/data/notification_rule_spec.rb
-- spec/lib/flapjack/data/notification_spec.rb
-- spec/lib/flapjack/data/semaphore_spec.rb
-- spec/lib/flapjack/filters/acknowledgement_spec.rb
-- spec/lib/flapjack/filters/delays_spec.rb
-- spec/lib/flapjack/filters/ok_spec.rb
-- spec/lib/flapjack/filters/scheduled_maintenance_spec.rb
-- spec/lib/flapjack/filters/unscheduled_maintenance_spec.rb
+- spec/lib/flapjack/data/medium_spec.rb
+- spec/lib/flapjack/data/rule_spec.rb
+- spec/lib/flapjack/data/scheduled_maintenance_spec.rb
+- spec/lib/flapjack/data/unscheduled_maintenance_spec.rb
 - spec/lib/flapjack/gateways/aws_sns_spec.rb
 - spec/lib/flapjack/gateways/email_spec.rb
 - spec/lib/flapjack/gateways/jabber_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/check_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/check_presenter_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/contact_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/entity_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/medium_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/notification_rule_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/pagerduty_credential_methods_spec.rb
-- spec/lib/flapjack/gateways/jsonapi/report_methods_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/check_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/checks_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/contact_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/contacts_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/events_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/media_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/medium_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/metrics_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/rule_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/rules_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/scheduled_maintenance_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/scheduled_maintenances_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/tag_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/tags_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/unscheduled_maintenance_links_spec.rb
+- spec/lib/flapjack/gateways/jsonapi/methods/unscheduled_maintenances_spec.rb
 - spec/lib/flapjack/gateways/jsonapi_spec.rb
 - spec/lib/flapjack/gateways/oobetet_spec.rb
-- spec/lib/flapjack/gateways/pagerduty_spec.rb
+- spec/lib/flapjack/gateways/pager_duty_spec.rb
 - spec/lib/flapjack/gateways/slack_spec.rb
+- spec/lib/flapjack/gateways/sms_aspsms_spec.rb
 - spec/lib/flapjack/gateways/sms_messagenet_spec.rb
 - spec/lib/flapjack/gateways/sms_nexmo_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
 - spec/lib/flapjack/gateways/web_spec.rb
 - spec/lib/flapjack/logger_spec.rb
 - spec/lib/flapjack/notifier_spec.rb
 - spec/lib/flapjack/pikelet_spec.rb
 - spec/lib/flapjack/processor_spec.rb
-- spec/lib/flapjack/redis_pool_spec.rb
+- spec/lib/flapjack/redis_proxy_spec.rb
 - spec/lib/flapjack/utility_spec.rb
+- spec/service_consumers/fixture_data.rb
 - spec/service_consumers/pact_helper.rb
-- spec/service_consumers/pacts/flapjack-diner_v1.0.json
+- spec/service_consumers/pacts/flapjack-diner_v2.0.json
 - spec/service_consumers/provider_states_for_flapjack-diner.rb
+- spec/service_consumers/provider_support.rb
 - spec/spec_helper.rb
 - spec/support/erb_view_helper.rb
+- spec/support/factories.rb
 - spec/support/jsonapi_helper.rb
+- spec/support/mock_logger.rb
 - spec/support/profile_all_formatter.rb
 - spec/support/uncolored_doc_formatter.rb
+- spec/support/xmpp_comparable.rb