flapjack 1.1.0 → 1.2.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e8b5d1bee24a164e37f5db62f177d02cb470cb
-  data.tar.gz: f7e916ff508251675628c89ff70a31a030ee31b2
+  metadata.gz: 2d2385cedabb54ffdf76fab97912ff06918d6d1d
+  data.tar.gz: 5df58568fccb796ee1f45e332a711b5b01003d15
 SHA512:
-  metadata.gz: 4ea75824a365cf143acd0db2581a440799a8d9dda7b093fc55fb3325b05dc5bc4617e64d548bc7529a6bb64a3562f7c202daf9640c4b6c6e489f42119f6e84e0
-  data.tar.gz: 05ed36b6fe5ad8745b4e4d27e44f1bdbf7097c59d4ff1bf5a31edf92ab72e157087e904a44d5e2147584eab58fcd050806f59130b77cf69692945d6920e89f77
+  metadata.gz: 2192ac69c3abfffd68ab6dd23dbbd4bf2ffb0bbb411620b8c6356857511f6792868a678f15796a8a116bec52b7ff2208b5ff251583fc57825e747816218b3532
+  data.tar.gz: f7bfa433a64c42747c3b9359c8e28049d618f10ee6c03787df83818a2f63dd7a2c04194c234371f7151d3bfd21b22cf28715f0783d80ef91fb8148e3b80ce941

data/.gitignore

@@ -19,6 +19,7 @@ vendor
 .bundle
 etc/*.yaml
 coverage
+tmp/pacts
 tmp/cucumber_cli
 tmp/pids/*
 tmp/spec*

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.1.3

data/.travis.yml

@@ -1,10 +1,16 @@
 language: ruby
-rvm:
-- 1.9.3
-- '2.0'
-- '2.1'
-gemfile:
-- Gemfile
+matrix:
+  include:
+    - rvm: 1.9.3
+      gemfile: Gemfile-ruby1.9
+      script:  "bundle exec rspec spec && bundle exec rake pact:verify && bundle exec cucumber features"
+      env: BUNDLE_GEMFILE=Gemfile-ruby1.9
+    - rvm: '2.0'
+      gemfile: Gemfile
+      script: "bundle exec rspec spec && bundle exec rake pact:verify && bundle exec cucumber features"
+    - rvm: '2.1'
+      gemfile: Gemfile
+      script: "bundle exec rspec spec && bundle exec rake pact:verify && bundle exec cucumber features"
 services:
 - redis-server
 before_script:
@@ -12,7 +18,6 @@ before_script:
 before_install:
 - git submodule update --init --recursive
 - gem install bundler
-script: bundle exec rspec spec && bundle exec cucumber features
 notifications:
   irc:
     channels:

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Flapjack Changelog
 
+# 1.2.0rc1 - 2014-10-08
+- Feature: Allow updating an entities name via PATCH /entities/id[,id...] #628 (@ali-graham)
+- Feature: Pact specs for flapjack-diner compatability testing #663 (@ali-graham)
+- Feature: more api check methods #644 (@ali-graham)
+- Chore: optimise tag code #654 (@ali-graham)
+- Chore: fix #653, overuse of Redis KEYS in mirror #661 (@ali-graham)
+- Bug: Entities should return linked checks with list of check "ids" in API #648 (@ali-graham)
+- Bug: 500 error getting all checks from API #641 (@ali-graham)
+- Bug: Pager Duty credentials get throws error #657 (@ali-graham)
+- Bug: Flapjack crashes when email alert is triggered #656 (@ali-graham)
+- Bug: Fix /edit_contacts media saving after adding contacts #651 (@ali-graham)
+
 # 1.1.0 - 2014-09-10
 - Feature: Add autorefresh for the web GUI (Closes: #494) #607 (@Hobbsee)
 - Feature: twilio sms sending #633 (@jessereynolds)

data/Gemfile

@@ -11,6 +11,7 @@ group :test do
   gem 'cucumber'
   gem 'delorean'
   gem 'rack-test'
+  gem 'pact'
   gem 'async_rack_test', '>= 0.0.5'
   gem 'resque_spec'
   gem 'webmock'
@@ -20,6 +21,9 @@ group :test do
   gem 'guard-cucumber'
   gem 'fuubar'
   gem 'simplecov', :require => false
-  gem 'debugger-ruby_core_source', '>= 1.3.4' # required for perftools
-  gem 'perftools.rb'
+
+  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
 end

data/Gemfile-ruby1.9

@@ -0,0 +1,29 @@
+source 'https://rubygems.org'
+
+gemspec :name => 'flapjack'
+
+group :development do
+  gem 'ruby-prof'
+end
+
+group :test do
+  gem 'rspec', '~> 3.0'
+  gem 'cucumber'
+  gem 'delorean'
+  gem 'rack-test'
+  gem 'pact'
+  gem 'async_rack_test', '>= 0.0.5'
+  gem 'resque_spec'
+  gem 'webmock'
+  gem 'guard'
+  gem 'rb-fsevent'
+  gem 'guard-rspec'
+  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
+end

data/Gemfile-ruby1.9.lock

@@ -0,0 +1,251 @@
+PATH
+  remote: .
+  specs:
+    flapjack (1.2.0rc1)
+      activesupport (~> 3.2.14)
+      blather (~> 0.8.3)
+      chronic
+      chronic_duration
+      dante
+      em-http-request
+      em-resque
+      em-synchrony (~> 1.0.2)
+      eventmachine (~> 1.0.0)
+      gli (= 2.12.0)
+      hiredis
+      ice_cube
+      mail
+      nokogiri (= 1.6.2.1)
+      oj (>= 2.9.0)
+      rack-fiber_pool
+      rake
+      rbtrace
+      redis (~> 3.0.6)
+      resque (~> 1.23.0)
+      sinatra
+      terminal-table
+      thin (~> 1.6.1)
+      tzinfo (~> 1.0.1)
+      tzinfo-data
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.19)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    addressable (2.3.6)
+    async_rack_test (0.0.5)
+    awesome_print (1.2.0)
+    blather (0.8.8)
+      activesupport (>= 2.3.11)
+      eventmachine (>= 1.0.0)
+      girl_friday
+      niceogiri (~> 1.0)
+      nokogiri (~> 1.5, >= 1.5.6)
+    builder (3.2.2)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    chronic (0.10.2)
+    chronic_duration (0.10.6)
+      numerizer (~> 0.1.1)
+    coderay (1.1.0)
+    connection_pool (1.2.0)
+    cookiejar (0.3.2)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    cucumber (1.3.17)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    daemons (1.1.9)
+    dante (0.2.0)
+    debugger-ruby_core_source (1.3.5)
+    delorean (2.1.0)
+      chronic
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    em-hiredis (0.1.1)
+      hiredis (~> 0.4.0)
+    em-http-request (1.1.2)
+      addressable (>= 2.3.4)
+      cookiejar
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-resque (1.1.1)
+      em-hiredis (~> 0.1.0)
+      em-synchrony (~> 1.0.0)
+      resque (~> 1.2)
+    em-socksify (0.3.0)
+      eventmachine (>= 1.0.0.beta.4)
+    em-synchrony (1.0.3)
+      eventmachine (>= 1.0.0.beta.1)
+    eventmachine (1.0.3)
+    ffi (1.9.3)
+    find_a_port (1.0.1)
+    formatador (0.2.5)
+    fuubar (2.0.0)
+      rspec (~> 3.0)
+      ruby-progressbar (~> 1.4)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    girl_friday (0.11.2)
+      connection_pool (~> 1.0)
+      rubinius-actor
+    gli (2.12.0)
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-cucumber (1.4.1)
+      cucumber (>= 1.2.0)
+      guard (>= 1.1.0)
+    guard-rspec (4.3.1)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    hiredis (0.4.5)
+    hitimes (1.2.2)
+    http_parser.rb (0.6.0)
+    i18n (0.6.11)
+    ice_cube (0.12.1)
+    json (1.8.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.4.1)
+    mini_portile (0.6.0)
+    msgpack (0.5.9)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    niceogiri (1.1.2)
+      nokogiri (~> 1.5)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    numerizer (0.1.1)
+    oj (2.10.3)
+    pact (1.3.3)
+      awesome_print (~> 1.1)
+      find_a_port (~> 1.0.1)
+      json
+      rack-test (~> 0.6.2)
+      randexp (~> 0.1.7)
+      rspec (>= 2.14)
+      term-ansicolor (~> 1.0)
+      thor
+      webrick
+    perftools.rb (2.0.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-fiber_pool (0.9.3)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.3.2)
+    randexp (0.1.7)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rbtrace (0.4.5)
+      ffi (>= 1.0.6)
+      msgpack (>= 0.4.3)
+      trollop (>= 1.16.2)
+    redis (3.0.7)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
+    resque (1.23.1)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    resque_spec (0.16.0)
+      resque (>= 1.19.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+      rspec-mocks (>= 3.0.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.4)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
+    rubinius-actor (0.0.2)
+      rubinius-core-api
+    rubinius-core-api (0.0.1)
+    ruby-prof (0.15.1)
+    ruby-progressbar (1.6.0)
+    safe_yaml (1.0.3)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    slop (3.6.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    terminal-table (1.4.5)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
+    thor (0.19.1)
+    tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
+    tins (1.3.3)
+    trollop (2.0)
+    tzinfo (1.0.1)
+    tzinfo-data (1.2014.8)
+      tzinfo (>= 1.0.0)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+    webrick (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  async_rack_test (>= 0.0.5)
+  cucumber
+  debugger-ruby_core_source (>= 1.3.4)
+  delorean
+  flapjack!
+  fuubar
+  guard
+  guard-cucumber
+  guard-rspec
+  pact
+  perftools.rb
+  rack-test
+  rb-fsevent
+  resque_spec
+  rspec (~> 3.0)
+  ruby-prof
+  simplecov
+  webmock

data/README.md

@@ -47,7 +47,7 @@ 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/1.0 precise main" | sudo tee /etc/apt/sources.list.d/flapjack.list
+echo "deb http://packages.flapjack.io/deb/v1 precise main" | sudo tee /etc/apt/sources.list.d/flapjack.list
 ```
 
 Install the latest Flapjack package:
@@ -57,7 +57,7 @@ sudo apt-get update
 sudo apt-get install flapjack
 ```
 
-Alternatively, [download the deb](http://packages.flapjack.io/deb/1.0/pool/main/f/flapjack/) and install using `sudo dpkg -i <filename>`
+Alternatively, [download the deb](http://packages.flapjack.io/deb/v1/pool/main/f/flapjack/) and install using `sudo dpkg -i <filename>`
 
 The Flapjack package is an [Omnibus](https://github.com/opscode/omnibus) package and as such contains most dependencies under `/opt/flapjack`, including Redis.
 

data/Rakefile

@@ -8,6 +8,7 @@ require 'fileutils'
 require 'rake'
 
 require 'resque/tasks'
+require 'pact/tasks'
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 

data/etc/flapjack_config.yaml.example

@@ -24,7 +24,7 @@ production:
     # This is useful is cases where your monitoring starts checking something
     # before it is completely provisioned
     # Value parsed by https://github.com/hpoydar/chronic_duration
-    # You can disable this setting by specifying 0 seconds.
+    # You can disable this setting by specifying "0 seconds".
     new_check_scheduled_maintenance_duration: 100 years
     new_check_scheduled_maintenance_ignore_tags:
       - bypass_ncsm
@@ -236,7 +236,7 @@ development:
     # This is useful is cases where your monitoring starts checking something
     # before it is completely provisioned
     # Value parsed by https://github.com/hpoydar/chronic_duration
-    # You can disable this setting by specifying 0 seconds.
+    # You can disable this setting by specifying "0 seconds".
     new_check_scheduled_maintenance_duration: 100 years
     new_check_scheduled_maintenance_ignore_tags:
       - bypass_ncsm

data/features/steps/events_steps.rb

@@ -19,7 +19,7 @@ def drain_notifications
 end
 
 def submit_event(event)
-  @redis.rpush 'events', event.to_json
+  @redis.rpush('events', Flapjack.dump_json(event))
 end
 
 def set_scheduled_maintenance(entity, check, duration)
@@ -300,7 +300,7 @@ Then /^dump notification rules for user (\S+)$/ do |contact|
   puts "There #{(rule_ids.length == 1) ? 'is' : 'are'} #{rule_ids.length} notification rule#{(rule_ids.length == 1) ? '' : 's'} for user #{contact}:"
   rule_ids.each {|rule_id|
     rule = Flapjack::Data::NotificationRule.find_by_id(rule_id, :redis => @redis)
-    puts rule.to_json
+    puts Flapjack.dump_json(rule)
   }
 end
 

data/features/steps/flapjack-netsaint-parser_steps.rb

@@ -14,7 +14,7 @@ end
 
 Then /^I should see a valid JSON output$/ do
   expect {
-    @data = Oj.load(@output)
+    @data = Flapjack.load_json(@output)
   }.not_to raise_error
 end
 

data/features/support/env.rb

@@ -15,7 +15,6 @@ if ENV['COVERAGE']
     add_filter '/features/'
   end
   SimpleCov.at_exit do
-    Oj.default_options = { :mode => :compat }
     SimpleCov.result.format!
   end
 end
@@ -34,11 +33,7 @@ require 'pathname'
 require 'webmock/cucumber'
 WebMock.disable_net_connect!
 
-require 'oj'
-Oj.mimic_JSON
-Oj.default_options = { :indent => 0, :mode => :strict }
-require 'active_support/json'
-
+require 'flapjack'
 require 'flapjack/notifier'
 require 'flapjack/processor'
 require 'flapjack/patches'

data/lib/flapjack/cli/import.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'oj'
-Oj.default_options = { :indent => 0, :mode => :strict }
-
 require 'redis'
 
 require 'flapjack/configuration'
@@ -32,7 +29,7 @@ module Flapjack
       # {'contacts' => [CONTACT_HASH, ...]}
 
       def contacts
-        conts = Oj.load(File.new(@options[:from]))
+        conts = Flapjack.load_json(File.new(@options[:from]))
 
         if conts && conts.is_a?(Enumerable) && conts.any? {|e| !e['id'].nil?}
           conts.each do |contact|
@@ -47,7 +44,7 @@ module Flapjack
       end
 
       def entities
-        ents = Oj.load(File.new(@options[:from]))
+        ents = Flapjack.load_json(File.new(@options[:from]))
 
         if ents && ents.is_a?(Enumerable) && ents.any? {|e| !e['id'].nil?}
           ents.each do |entity|

data/lib/flapjack/cli/purge.rb

@@ -35,10 +35,10 @@ module Flapjack
         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
+        purged = checks.inject([]) do |memo, check|
+          pu = check.purge_history(options)
+          memo << pu unless pu == 0
+        end
 
         if purged.empty?
           puts "Nothing to do"