flapjack 1.0.0rc2 → 1.0.0rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcd6cb806d57b78108cc67f2064b1b435a73f79e
-  data.tar.gz: 753950c0c1decff7c6d5fc954eede8a0e686d0ec
+  metadata.gz: d91c5e561fafc64a7698f898d1c02b6f00386c97
+  data.tar.gz: c7c4e4ba3e84c4a59ff09964fc67278c12b2fb04
 SHA512:
-  metadata.gz: 08641c26fb0307d9d9df4d97cc28876d962e883ea5094e719a2837eaad608f8f03d5c936a495cb42aba8d67c651c89dfc1a70da2a22e4aaf5caa70d5414c61b3
-  data.tar.gz: 7011a9ad02bf9bebed297f288496f7e1dc5af7a91e9fffa1d85e78a040514fc069e9cbe021917533f32b3f224b3f1b7c63f5f5d981749c0420afcbd04f52a1dc
+  metadata.gz: 6efd501448115a5a97a23df6ece95b2f53bf2b4a01d4fe268c1ae851bdb850aaa5d242497f2c5e4871f5b945076151081ae7df33b6eb15fe6e01f06d99a8cda0
+  data.tar.gz: d11a32ab75ad2cbcf7b9f9d432cd6f5dfd2da498b127a2c653291f55cf08b7f7eafbc9da9894510b94bbde7d9edcc5ac9ede703761c612563d5e32b2851dabad

data/.travis.yml

@@ -14,11 +14,15 @@ before_install:
 - gem install bundler
 script: bundle exec rspec spec && bundle exec cucumber features
 notifications:
-  irc: 'irc.freenode.net#flapjack'
+  irc:
+    channels:
+      - 'irc.freenode.net#flapjack'
+    template:
+      - '%{message} %{repository}#%{build_number} (%{branch} - %{commit} : %{author})'
   hipchat:
     template:
-    - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}
-      (<a href="%{build_url}">Details</a>/<a href="%{compare_url}">Change view</a>)'
+      - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}
+        (<a href="%{build_url}">Details</a>/<a href="%{compare_url}">Change view</a>)'
     format: html
     rooms:
       secure: ajMolTKDuprYJ9Fadcjb3evh80MyJSgjW4hl4OWnEHyrjQLnsO0hbAvSrKRFUzorMoi58L8XZXd01gMgRqRxMvwqfoHLv4njw8px4X9+F/hySPZj3aMAFM1HuoTmHqeP+Rl+1Ssg+Kss6N4JkgNS81s+tkRnnoHG1n/EhfH6PkE=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Flapjack Changelog
 
+# 1.0.0rc3 - 2014-07-24
+- Bug: fix jsonapi methods for report checks/methods, maintenance reports, outage reports (@ali-graham)
+- Bug: improve tests around notification rules and rollup, tweak rollup behaviour on recovery (@ali-graham)
+- Bug: fix handling of base_url config warnings in web gateway #560 (@jessereynolds)
+
 # 1.0.0rc2 - 2014-07-17
 - Feature: jsonapi GET /checks badab0d (@ali-graham)
 - Feature: Add HTTP broker, one-off event submitter, general Go support #553 (@auxesis)

data/features/notification_rules.feature

@@ -96,7 +96,6 @@ Feature: Notification rules on a per contact basis
     When  a critical event is received
     Then  3 email alerts should be queued for malak@example.com
     When  the time is February 1 2013 18:01
-    Then  all alert dropping keys for user c1 should have expired
     When  a critical event is received
     Then  3 email alerts should be queued for malak@example.com
 
@@ -210,7 +209,7 @@ Feature: Notification rules on a per contact basis
     When  10 minutes passes
     And   a critical event is received
     Then  1 email alert should be queued for malak@example.com
-    When  5 minutes passes
+    When  6 minutes passes
     And   a critical event is received
     Then  2 email alerts should be queued for malak@example.com
 
@@ -226,7 +225,7 @@ Feature: Notification rules on a per contact basis
     When  10 minutes passes
     And   an unknown event is received
     Then  1 email alert should be queued for malak@example.com
-    When  5 minutes passes
+    When  6 minutes passes
     And   an unknown event is received
     Then  2 email alerts should be queued for malak@example.com
 

data/features/rollup.feature

@@ -214,3 +214,21 @@ Feature: Rollup on a per contact, per media basis
     Then  2 sms alerts of type problem and rollup none should be queued for +61400000001
     And   3 sms alerts should be queued for +61400000001
 
+  @time
+  Scenario: Multiple notifications should not occur when in rollup
+    Given check 'ping' for entity 'foo' is in an ok state
+    And   check 'ping' for entity 'baz' is in an ok state
+    When  a critical event is received for check 'ping' on entity 'foo'
+    And   a critical event is received for check 'ping' on entity 'baz'
+    And   1 minute passes
+    And   a critical event is received for check 'ping' on entity 'foo'
+    And   a critical event is received for check 'ping' on entity 'baz'
+    And   1 minute passes
+    And   a critical event is received for check 'ping' on entity 'foo'
+    Then  1 email alert of type problem and rollup problem should be queued for malak@example.com
+    And   19 minutes passes
+    And   a critical event is received for check 'ping' on entity 'baz'
+    Then  2 email alerts of type problem and rollup problem should be queued for malak@example.com
+    And   1 minute passes
+    And   a critical event is received for check 'ping' on entity 'baz'
+    Then  2 email alerts of type problem and rollup problem should be queued for malak@example.com

data/features/steps/events_steps.rb

@@ -395,7 +395,7 @@ Given /^user (\S+) has the following notification rules:$/ do |contact_id, rules
 end
 
 Then /^all alert dropping keys for user (\S+) should have expired$/ do |contact_id|
-  expect(@redis.keys("drop_alerts_for_contact:#{contact_id}*")).to be_empty
+  expect(@redis.keys("drop_alerts_for_contact:#{contact_id}:*")).to be_empty
 end
 
 Then /^(\w+) (\w+) alert(?:s)?(?: of)?(?: type (\w+))?(?: and)?(?: rollup (\w+))? should be queued for (.*)$/ do |num_queued, media, notification_type, rollup, address|
@@ -408,13 +408,13 @@ Then /^(\w+) (\w+) alert(?:s)?(?: of)?(?: type (\w+))?(?: and)?(?: rollup (\w+))
   queue = Resque.peek("#{media}_notifications", 0, 30)
   queued_length = queue.find_all {|n|
     type_ok = notification_type ? ( n['args'].first['notification_type'] == notification_type ) : true
-    rollup_ok = true
-    if rollup
-      if rollup == 'none'
-        rollup_ok = n['args'].first['rollup'].nil?
-      else
-        rollup_ok = n['args'].first['rollup'] == rollup
-      end
+    rollup_ok = case rollup
+    when 'none'
+      n['args'].first['rollup'].nil?
+    when nil, n['args'].first['rollup']
+      true
+    else
+      false
     end
     type_ok && rollup_ok && ( n['args'].first['address'] == address )
   }.length

data/features/support/env.rb

@@ -68,27 +68,31 @@ end
 
 class RedisDelorean
 
-  ExpireAsIfAtScript = <<EXPIRE_AS_IF_AT
+  ShiftTTLsScript = <<SHIFT_TTLS
     local keys = redis.call('keys', KEYS[1])
-    local current_time = tonumber(ARGV[1])
-    local expire_as_if_at = tonumber(ARGV[2])
-    local counter = 0
+    local ttl_decrease = tonumber(ARGV[1])
+    local deleted = 0
 
     for i,k in ipairs(keys) do
       local key_ttl = redis.call('ttl', k)
 
       -- key does not have timeout if < 0
-      if ( (key_ttl >= 0) and ((current_time + key_ttl) <= expire_as_if_at) ) then
-        redis.call('del', k)
-        counter = counter + 1
+      if key_ttl >= 0 then
+        local diff = key_ttl - ttl_decrease
+        if diff <= 0 then
+          redis.call('del', k)
+          deleted = deleted + 1
+        else
+          redis.call('expire', k, diff)
+        end
       end
     end
-    return counter
-EXPIRE_AS_IF_AT
+    return deleted
+SHIFT_TTLS
 
   def self.before_all(options = {})
     redis = options[:redis]
-    @expire_as_if_at_sha = redis.script(:load, ExpireAsIfAtScript)
+    @shift_ttls_sha = redis.script(:load, ShiftTTLsScript)
   end
 
   def self.before_each(options = {})
@@ -96,28 +100,20 @@ EXPIRE_AS_IF_AT
   end
 
   def self.time_travel_to(dest_time)
-    #puts "travelling to #{Time.now.in_time_zone}, real time is #{Time.now_without_delorean.in_time_zone}"
     old_maybe_fake_time = Time.now.in_time_zone
-
     Delorean.time_travel_to(dest_time)
-    #puts "travelled to #{Time.now.in_time_zone}, real time is #{Time.now_without_delorean.in_time_zone}"
-    return if dest_time < old_maybe_fake_time
-
-    # dumps the first offset -- we're not interested in time difference from
-    # real, only with context to the fake frame of reference...
-    # This may mean all scenarios using this code should have an initial
-    #    Given it is *datetime*
-    # step
-    offsets = Delorean.send(:time_travel_offsets).dup
-    offsets.shift
-    delta = -offsets.inject(0){ |sum, val| sum + val }.floor
-
-    real_time = Time.now_without_delorean.to_i
-    #puts "delta #{delta}, expire before real time #{Time.at(real_time + delta)}"
-
-    result = @redis.evalsha(@expire_as_if_at_sha, ['*'],
-               [real_time, real_time + delta])
-    #puts "Expired #{result} key#{(result == 1) ? '' : 's'}"
+    # puts "real time is #{Time.now_without_delorean.in_time_zone}"
+    # puts "old assumed time is #{old_maybe_fake_time}"
+    # puts "new assumed time is #{Time.now.in_time_zone}"
+
+    # keys_prior = @redis.keys('*')
+
+    del = @redis.evalsha(@shift_ttls_sha, ['*'],
+            [(dest_time - old_maybe_fake_time).to_i])
+
+    # keys_after = @redis.keys('*')
+
+    # puts "Expired #{del} key#{(del == 1) ? '' : 's'}, #{(keys_prior - keys_after).inspect}"
   end
 
 end

data/lib/flapjack/data/notification.rb

@@ -224,6 +224,7 @@ module Flapjack
             unless ['pagerduty'].include?(media)
               alerting_checks  = contact.count_alerting_checks_for_media(media)
               rollup_threshold = contact.rollup_threshold_for_media(media)
+
               case
               when rollup_threshold.nil?
                 # back away slowly
@@ -231,8 +232,9 @@ module Flapjack
                 next ret if contact.drop_rollup_notifications_for_media?(media)
                 contact.update_sent_rollup_alert_keys_for_media(media, :delete => ok?)
                 rollup_type = 'problem'
-              when (alerting_checks + cleaned >= rollup_threshold)
+              when (alerting_checks + cleaned) >= rollup_threshold
                 # alerting checks was just cleaned such that it is now below the rollup threshold
+                contact.update_sent_rollup_alert_keys_for_media(media, :delete => true)
                 rollup_type = 'recovery'
               end
               logger.debug "rollup decisions: #{@event_id} #{@state} #{media} #{address} rollup_type: #{rollup_type}"

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

@@ -81,7 +81,7 @@ module Flapjack
                       }
           end
 
-          result
+          {:outages => result}
         end
 
         def unscheduled_maintenance(start_time, end_time)
@@ -96,7 +96,7 @@ module Flapjack
               pu[:end_time] >= start_time
             }
 
-          start_in_unsched + unsched_maintenance
+          {:unscheduled_maintenances => (start_in_unsched + unsched_maintenance)}
         end
 
         def scheduled_maintenance(start_time, end_time)
@@ -111,7 +111,7 @@ module Flapjack
               ps[:end_time] >= start_time
             }
 
-          start_in_sched + sched_maintenance
+          {:scheduled_maintenances => (start_in_sched + sched_maintenance)}
         end
 
         # TODO test whether the below overlapping logic is prone to off-by-one
@@ -120,9 +120,7 @@ module Flapjack
         #
         # TODO test performance with larger data sets
         def downtime(start_time, end_time)
-          sched_maintenances = scheduled_maintenance(start_time, end_time)
-
-          outs = outage(start_time, end_time)
+          outs = outage(start_time, end_time)[:outages]
 
           total_secs  = {}
           percentages = {}
@@ -139,6 +137,8 @@ module Flapjack
             # We then create two new outage periods to cover the time around
             # the scheduled maintenance period, and remove the original.
 
+            sched_maintenances = scheduled_maintenance(start_time, end_time)[:scheduled_maintenances]
+
             sched_maintenances.each do |sm|
 
               split_outs = []

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

@@ -27,7 +27,9 @@ module Flapjack
             end
 
             checks = if event_ids.nil?
-              Flapjack::Data::EntityCheck.find_all(:redis => redis)
+              Flapjack::Data::EntityCheck.find_all(:redis => redis).collect {|check_name|
+                find_entity_check_by_name(*check_name.split(':', 2))
+              }
             elsif !event_ids.empty?
               event_ids.collect {|event_id| find_entity_check_by_name(*event_id.split(':', 2)) }
             else

data/lib/flapjack/gateways/web.rb

@@ -68,12 +68,14 @@ module Flapjack
           end
 
           @base_url = @config['base_url']
-          if @base_url
-            @base_url = $1 if @base_url.match(/^(.+\/)$/)
-          else
-	          dummy_url = "/"
-            @logger.error "base_url must contain trailing '/', setting it to safe default (#{dummy_url})"
-            @base_url = dummy_url
+          unless @base_url
+            @logger.info "base_url is not configured, setting to '/'"
+            @base_url = '/'
+          end
+
+          unless @base_url.match(/^.*\/$/)
+            @logger.warn "base_url must end with a trailing '/', setting to '#{@base_url}/'"
+            @base_url = "#{@base_url}/"
           end
 
           # constants won't be exposed to eRb scope

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/gateways/jsonapi/check_presenter_spec.rb

@@ -47,8 +47,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(time - (5 * 60 * 60), time - (2 * 60 * 60))
     expect(outages).not_to be_nil
-    expect(outages).to be_an(Array)
-    expect(outages.size).to eq(4)
+    expect(outages).to be_a(Hash)
+    expect(outages).to have_key(:outages)
+    expect(outages[:outages]).to be_an(Array)
+    expect(outages[:outages].size).to eq(4)
 
     # TODO check the data in those hashes
   end
@@ -63,8 +65,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(nil, nil)
     expect(outages).not_to be_nil
-    expect(outages).to be_an(Array)
-    expect(outages.size).to eq(4)
+    expect(outages).to be_a(Hash)
+    expect(outages).to have_key(:outages)
+    expect(outages[:outages]).to be_an(Array)
+    expect(outages[:outages].size).to eq(4)
 
     # TODO check the data in those hashes
   end
@@ -82,8 +86,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(nil, nil)
     expect(outages).not_to be_nil
-    expect(outages).to be_an(Array)
-    expect(outages.size).to eq(3)
+    expect(outages).to be_a(Hash)
+    expect(outages).to have_key(:outages)
+    expect(outages[:outages]).to be_an(Array)
+    expect(outages[:outages].size).to eq(3)
   end
 
   it "returns a (small) outage hash for a single state change" do
@@ -95,8 +101,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     outages = ecp.outage(nil, nil)
     expect(outages).not_to be_nil
-    expect(outages).to be_an(Array)
-    expect(outages.size).to eq(1)
+    expect(outages).to be_a(Hash)
+    expect(outages).to have_key(:outages)
+    expect(outages[:outages]).to be_an(Array)
+    expect(outages[:outages].size).to eq(1)
   end
 
   it "a list of unscheduled maintenances for an entity check" do
@@ -109,8 +117,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     unsched_maint = ecp.unscheduled_maintenance(time - (12 * 60 * 60), time)
 
-    expect(unsched_maint).to be_an(Array)
-    expect(unsched_maint.size).to eq(4)
+    expect(unsched_maint).to be_a(Hash)
+    expect(unsched_maint).to have_key(:unscheduled_maintenances)
+    expect(unsched_maint[:unscheduled_maintenances]).to be_an(Array)
+    expect(unsched_maint[:unscheduled_maintenances].size).to eq(4)
 
     # TODO check the data in those hashes
   end
@@ -125,8 +135,10 @@ describe 'Flapjack::Gateways::JSONAPI::CheckPresenter' do
     ecp = Flapjack::Gateways::JSONAPI::CheckPresenter.new(entity_check)
     sched_maint = ecp.scheduled_maintenance(time - (12 * 60 * 60), time)
 
-    expect(sched_maint).to be_an(Array)
-    expect(sched_maint.size).to eq(4)
+    expect(sched_maint).to be_a(Hash)
+    expect(sched_maint).to have_key(:scheduled_maintenances)
+    expect(sched_maint[:scheduled_maintenances]).to be_an(Array)
+    expect(sched_maint[:scheduled_maintenances].size).to eq(4)
 
     # TODO check the data in those hashes
   end

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
 if ENV['COVERAGE']
   require 'simplecov'
-
   SimpleCov.start do
     add_filter '/spec/'
   end
+  SimpleCov.at_exit do
+    Oj.default_options = { :mode => :compat }
+    SimpleCov.result.format!
+  end
 end
 
 $testing = true
@@ -16,16 +19,17 @@ ENV['RACK_ENV'] = ENV["FLAPJACK_ENV"]
 require 'bundler'
 Bundler.require(:default, :test)
 
+require 'oj'
+Oj.default_options = { :indent => 0, :mode => :strict }
+Oj.mimic_JSON
+require 'active_support/json'
+
 require 'webmock/rspec'
 WebMock.disable_net_connect!
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'flapjack/configuration'
 
-require 'oj'
-Oj.mimic_JSON
-Oj.default_options = { :indent => 0, :mode => :strict }
-require 'active_support/json'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.0.0rc2
+  version: 1.0.0rc3
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante