flapjack 1.5.0 → 1.6.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527afe51b2c92417e28c6dff0139868e0a4987f7
-  data.tar.gz: 168f3b38c439cc9e8390295530cfd1d3a66cc98f
+  metadata.gz: 1a5aa06a9caf7b8c5b81d7b5b5245f8b623cda1b
+  data.tar.gz: 5d10f49f09e6ab9e87da21537d80add6409708a8
 SHA512:
-  metadata.gz: 37bc4528c77fb1cbbed6262a267bff322f96b9d3838481c4c4ccd7a5582da10645b5ca19b59be4b27d527709652f69319e8e9cbee8f3f8c5052ed51bb05afbf4
-  data.tar.gz: 33ba01bf8b3c0d35559fd4f1c266561d4d2bea05a19fed96e6c210335a62b09c39a67a0db727994cc3df9317e6cb45dc2d2e09c4cd6aec62aac931198c626a24
+  metadata.gz: e4d57fdb2ee84f2a56118808d390fcea5087ca7b68c36c4588d8a352d490d98cccba536509606189524515800fd0b559a6b30dfeb2ab7ccc552a035dad5cd9a5
+  data.tar.gz: fe92aeefa1f66b21d690d7902f775b175a1d95fc09ae601107bd8aad5fbcfe28d784be65f561387b7c5192c87f45b4d9b52e8457cd935b226606c14f37b73dcf

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Flapjack Changelog
 
+# 1.6.0 - 2015-05-13
+- Feature: use token authentication for pagerduty gateway #831 (@alperkokmen)
+- Feature: expose failure delays in web UI #849 (@jessereynolds)
+- Bug: performance improvement - fix usage of KEYS command for entity check names c57d3a5 (@ali-graham)
+- Bug: remove disabled checks from rollup calculations #843 (@ali-graham)
+- Bug: fall back to basic auth for pagerduty incidents api #853 (@jessereynolds)
+- Chore: pagerduty ack retrieval improvements #858 (@jessereynolds)
+
 # 1.5.0 - 2015-03-31
 - No changes
 

data/features/rollup.feature

@@ -175,6 +175,52 @@ Feature: Rollup on a per contact, per media basis
     Then  2 sms alerts should be queued for +61400000001
     And   1 sms alert of type problem and rollup problem should be queued for +61400000001
 
+  @time
+  Scenario: Disabling a failing check suppresses 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   1 minute passes
+    And   a critical event is received for check 'ping' on entity 'foo'
+    Then  1 sms alert should be queued for +61400000001
+    Then  1 sms alerts of type problem and rollup none should be queued for +61400000001
+    When  5 minutes passes
+    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 'baz'
+    Then  1 sms alert of type problem and rollup problem should be queued for +61400000001
+    And   2 sms alerts should be queued for +61400000001
+    When  check 'ping' on entity 'foo' is disabled
+    And   30 minutes passes
+    And   a critical event is received for check 'ping' on entity 'baz'
+    Then  1 sms alert of rollup recovery should be queued for +61400000001
+
+  @time
+  Scenario: Enabling a failing check promotes 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   1 minute passes
+    And   a critical event is received for check 'ping' on entity 'foo'
+    Then  1 sms alert should be queued for +61400000001
+    Then  1 sms alert of type problem and rollup none should be queued for +61400000001
+    When  check 'ping' for entity 'foo' is disabled
+    And   5 minutes passes
+    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 'baz'
+    Then  2 sms alerts should be queued for +61400000001
+    Then  1 sms alert of type problem and rollup none should be queued for +61400000001
+    Then  1 sms alert of type problem and rollup recovery should be queued for +61400000001
+    When  1 hour passes
+    And   check 'ping' on entity 'foo' is enabled
+    And   5 minutes passes
+    And   a critical event is received for check 'ping' on entity 'foo'
+    Then  3 sms alerts should be queued for +61400000001
+    Then  1 sms alert of type problem and rollup none should be queued for +61400000001
+    Then  1 sms alert of type problem and rollup recovery should be queued for +61400000001
+    And   1 sms alert of type problem and rollup problem should be queued for +61400000001
+
   @time
   Scenario: Contact ceases to be a contact on an entity that they were being alerted for
     Given check 'ping' for entity 'foo' is in an ok state

data/features/steps/events_steps.rb

@@ -279,6 +279,16 @@ When /^the unscheduled maintenance is ended(?: for check '([\w\.\-]+)' on entity
   end_unscheduled_maintenance(entity, check)
 end
 
+When /^check '([\w\.\-]+)' (?:for|on) entity '([\w\.\-]+)' is (dis|en)abled$/ do |check, entity, dis_en|
+  entity_check = Flapjack::Data::EntityCheck.for_entity_name(entity, check, :redis => @redis)
+  case dis_en
+  when 'dis'
+    entity_check.disable!
+  when 'en'
+    entity_check.enable!
+  end
+end
+
 # TODO logging is a side-effect, should test for notification generation itself
 Then /^a notification should not be generated(?: for check '([\w\.\-]+)' on entity '([\w\.\-]+)')?$/ do |check, entity|
   check  ||= @check

data/lib/flapjack/data/contact.rb

@@ -160,7 +160,7 @@ module Flapjack
       def set_pagerduty_credentials(details)
         @redis.hset("contact_media:#{self.id}", 'pagerduty', details['service_key'])
         @redis.hmset("contact_pagerduty:#{self.id}",
-                     *['subdomain', 'username', 'password'].collect {|f| [f, details[f]]})
+                     *['subdomain', 'token', 'username', 'password'].collect {|f| [f, details[f]]})
       end
 
       def delete_pagerduty_credentials
@@ -387,25 +387,29 @@ module Flapjack
         end
       end
 
-      def add_alerting_check_for_media(media, check)
-        @redis.zadd("contact_alerting_checks:#{self.id}:media:#{media}", Time.now.to_i, check)
+      def add_alerting_check_for_media(media, event_id)
+        @redis.zadd("contact_alerting_checks:#{self.id}:media:#{media}", Time.now.to_i, event_id)
       end
 
       def remove_alerting_check_for_media(media, check)
         @redis.zrem("contact_alerting_checks:#{self.id}:media:#{media}", check)
       end
 
-      # removes any checks that are in ok, scheduled or unscheduled maintenance
-      # from the alerting checks set for the given media
-      # returns the number of checks removed
+      # removes any checks that are in ok, scheduled or unscheduled maintenance,
+      # or are disabled from the alerting checks set for the given media;
+      # returns whether this cleaning moved the medium from rollup to recovery
       def clean_alerting_checks_for_media(media)
-        key = "contact_alerting_checks:#{self.id}:media:#{media}"
         cleaned = 0
-        alerting_checks_for_media(media).each do |check|
+
+        alerting_checks  = alerting_checks_for_media(media)
+        rollup_threshold = rollup_threshold_for_media(media)
+
+        alerting_checks.each do |check|
           entity_check = Flapjack::Data::EntityCheck.for_event_id(check, :redis => @redis)
           next unless Flapjack::Data::EntityCheck.state_for_event_id?(check, :redis => @redis) == 'ok' ||
             Flapjack::Data::EntityCheck.in_unscheduled_maintenance_for_event_id?(check, :redis => @redis) ||
             Flapjack::Data::EntityCheck.in_scheduled_maintenance_for_event_id?(check, :redis => @redis) ||
+            !entity_check.enabled? ||
             !entity_check.contacts.map {|c| c.id}.include?(self.id)
 
           # FIXME: why can't i get this logging when called from notifier (notification.rb)?
@@ -413,7 +417,11 @@ module Flapjack
           remove_alerting_check_for_media(media, check)
           cleaned += 1
         end
-        cleaned
+
+        return false if rollup_threshold.nil? || (rollup_threshold <= 0) ||
+          (alerting_checks.size < rollup_threshold)
+
+        return(cleaned > (alerting_checks.size - rollup_threshold))
       end
 
       def alerting_checks_for_media(media)
@@ -498,7 +506,7 @@ module Flapjack
             when 'pagerduty'
               redis.hset("contact_media:#{contact_id}", medium, details['service_key'])
               redis.hmset("contact_pagerduty:#{contact_id}",
-                          *['subdomain', 'username', 'password'].collect {|f| [f, details[f]]})
+                          *['subdomain', 'token', 'username', 'password'].collect {|f| [f, details[f]]})
             else
               redis.hset("contact_media:#{contact_id}", medium, details['address'])
               redis.hset("contact_media_intervals:#{contact_id}", medium, details['interval']) if details['interval']

data/lib/flapjack/data/entity.rb

@@ -605,7 +605,7 @@ module Flapjack
           entity_name = redis.hget('all_entity_names_by_id', entity_id)
           next memo if entity_name.nil? || entity_name.empty?
           en = Regexp.escape(entity_name)
-          check_names = redis.keys("check:#{entity_name}:*").map {|c| c.sub(/^check:#{en}:/, '') } |
+          check_names = redis.zrange("all_checks:#{entity_name}", 0, -1) |
             Flapjack::Data::EntityCheck.find_current_names_for_entity_name(entity_name, :redis => redis)
           memo[entity_id] = check_names.map {|cn| "#{entity_name}:#{cn}"}
           memo

data/lib/flapjack/data/entity_check.rb

@@ -681,7 +681,6 @@ module Flapjack
         @redis.zadd("all_checks:#{entity_name}", timestamp, check)
         @redis.zrem("current_checks:#{entity_name}", check)
         if @redis.zcount("current_checks:#{entity_name}", '-inf', '+inf') == 0
-          @redis.zrem("current_checks:#{entity_name}", check)
           @redis.zrem("current_entities", entity.name)
         end
       end

data/lib/flapjack/data/migration.rb

@@ -215,6 +215,20 @@ module Flapjack
         redis.set('validated_scheduled_maintenance_periods', 'true')
       end
 
+      def self.correct_rollup_including_disabled_checks(options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+        logger = options[:logger]
+        return if redis.exists('corrected_rollup_including_disabled_checks')
+
+        Flapjack::Data::Contact.all(:redis => redis).each do |contact|
+          contact.media_list.each do |medium|
+            contact.clean_alerting_checks_for_media(medium)
+          end
+        end
+
+        logger.warn "Corrected rollup to no longer include disabled checks" unless logger.nil?
+        redis.set('corrected_rollup_including_disabled_checks', 'true')
+      end
     end
   end
 end

data/lib/flapjack/data/notification.rb

@@ -221,8 +221,8 @@ module Flapjack
             contact.add_alerting_check_for_media(media, @event_id) unless ok? || acknowledgement? || test?
 
             # expunge checks in (un)scheduled maintenance from the alerting set
-            cleaned = contact.clean_alerting_checks_for_media(media)
-            logger.debug("cleaned alerting checks for #{media}: #{cleaned}")
+            recovered = contact.clean_alerting_checks_for_media(media)
+            logger.debug("cleaned alerting checks for #{media}: recovered? #{recovered}")
 
             # pagerduty is an example of a medium which should never be rolled up
             unless ['pagerduty'].include?(media)
@@ -236,7 +236,7 @@ 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 recovered
                 # 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'

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

@@ -30,7 +30,7 @@ module Flapjack
               halt err(422, "No valid pagerduty credentials were submitted")
             end
 
-            fields = ['service_key', 'subdomain', 'username', 'password']
+            fields = ['service_key', 'subdomain', 'token', 'username', 'password']
 
             pagerduty_credential = pagerduty_credentials_data.last
 
@@ -102,6 +102,9 @@ module Flapjack
                   when 'subdomain'
                     pd_data['subdomain'] = value
                     contact.set_pagerduty_credentials(pd_data)
+                  when 'token'
+                    pd_data['token'] = value
+                    contact.set_pagerduty_credentials(pd_data)
                   when 'username'
                     pd_data['username'] = value
                     contact.set_pagerduty_credentials(pd_data)

data/lib/flapjack/gateways/pagerduty.rb

@@ -16,6 +16,7 @@ module Flapjack
     class Pagerduty
       PAGERDUTY_EVENTS_API_URL   = 'https://events.pagerduty.com/generic/2010-04-15/create_event.json'
       SEM_PAGERDUTY_ACKS_RUNNING = 'sem_pagerduty_acks_running'
+      SEM_PAGERDUTY_ACKS_RUNNING_TIMEOUT = 3600
 
       include Flapjack::Utility
 
@@ -129,7 +130,8 @@ module Flapjack
         # ensure we're the only instance of the pagerduty acknowledgement check running (with a naive
         # timeout of five minutes to guard against stale locks caused by crashing code) either in this
         # process or in other processes
-        if (@pagerduty_acks_started and @pagerduty_acks_started > (Time.now.to_i - 300)) or
+        if (@pagerduty_acks_started and @pagerduty_acks_started >
+          (Time.now.to_i - SEM_PAGERDUTY_ACKS_RUNNING_TIMEOUT)) or
             @redis.get(SEM_PAGERDUTY_ACKS_RUNNING) == 'true'
           @logger.debug("skipping looking for acks in pagerduty as this is already happening")
           return
@@ -137,7 +139,7 @@ module Flapjack
 
         @pagerduty_acks_started = Time.now.to_i
         @redis.set(SEM_PAGERDUTY_ACKS_RUNNING, 'true')
-        @redis.expire(SEM_PAGERDUTY_ACKS_RUNNING, 300)
+        @redis.expire(SEM_PAGERDUTY_ACKS_RUNNING, SEM_PAGERDUTY_ACKS_RUNNING_TIMEOUT)
 
         find_pagerduty_acknowledgements
 
@@ -200,19 +202,25 @@ module Flapjack
           # FIXME: try each set of credentials until one works (may have stale contacts turning up)
           options = ec_credentials.first.merge('check' => "#{entity_name}:#{check}")
 
-          acknowledged = pagerduty_acknowledged?(options)
-          if acknowledged.nil?
-            @logger.debug "#{entity_name}:#{check} is not acknowledged in pagerduty, skipping"
+          # check again that the check is still unacknowledged
+          if entity_check.in_unscheduled_maintenance?
+            # skip this one
+            @logger.warn "#{entity_name}:#{check} seems to have been acknowledged by " +
+              "some other process while I've been running. Cancelling acknowledgement creation"
             next
           end
 
-          # check again that the check is still unacknowledged in flapjack
-          unless Flapjack::Data::EntityCheck.unacknowledged_failing(:redis => @redis).map {|ec|
-              "#{ec.entity_name}:#{ec.check}"
-            }.include?("#{entity_name}:#{check}")
+          # check again that the check is still failing
+          unless entity_check.failed?
             # skip this one
-            @logger.warn "#{entity_name}:#{check} seems to have been acknowledged by " +
-              "some other process while I've been running, cancelling acknowledgement creation"
+            @logger.warn "#{entity_name}:#{check} seems to have recovered " +
+              "while I've been running. Cancelling acknowledgement creation"
+            next
+          end
+
+          acknowledged = pagerduty_acknowledged?(options)
+          if acknowledged.nil?
+            @logger.debug "#{entity_name}:#{check} is not acknowledged in pagerduty, skipping"
             next
           end
 
@@ -237,14 +245,16 @@ module Flapjack
 
       def pagerduty_acknowledged?(opts)
         subdomain   = opts['subdomain']
+        token       = opts['token']
         username    = opts['username']
         password    = opts['password']
         check       = opts['check']
 
-        unless subdomain && username && password && check
+        unless subdomain && (token || (username && password)) && check
           @logger.warn("pagerduty_acknowledged?: Unable to look for acknowledgements on pagerduty" +
-                       " as all of the following options are required:" +
-                       " subdomain (#{subdomain}), username (#{username}), password (#{password}), check (#{check})")
+                       " as the following options are required:" +
+                       " subdomain (#{subdomain}), token (#{token}) or" +
+                       " username (#{username}) and password (#{password}), check (#{check})")
           return nil
         end
 
@@ -257,7 +267,13 @@ module Flapjack
                   'incident_key' => check,
                   'status'       => 'acknowledged' }
 
-        options = { :head  => { 'authorization' => [username, password] },
+        auth_header = if token && token.length > 0
+          "Token token=#{token}"
+        else
+          [username, password]
+        end
+
+        options = { :head  => { 'authorization' => auth_header },
                     :query => query }
 
         @logger.debug("pagerduty_acknowledged?: request to #{url}")
@@ -295,4 +311,3 @@ module Flapjack
   end
 
 end
-

data/lib/flapjack/gateways/web.rb

@@ -289,8 +289,6 @@ module Flapjack
         entity_check = get_entity_check(@entity, @check)
         halt(404, "Could not find check '#{@entity}:#{@check}'") if entity_check.nil?
 
-        check_stats
-
         last_change = entity_check.last_change
 
         @check_state                = entity_check.state
@@ -301,6 +299,14 @@ module Flapjack
         @check_details              = entity_check.details
         @check_perfdata             = entity_check.perfdata
 
+        @check_initial_failure_delay = entity_check.initial_failure_delay ||
+          Flapjack::DEFAULT_INITIAL_FAILURE_DELAY
+        @check_repeat_failure_delay  = entity_check.repeat_failure_delay  ||
+          Flapjack::DEFAULT_REPEAT_FAILURE_DELAY
+
+        @check_initial_failure_delay_is_default = entity_check.initial_failure_delay ? false : true
+        @check_repeat_failure_delay_is_default  = entity_check.repeat_failure_delay  ? false : true
+
         @last_notifications         = last_notification_data(entity_check)
 
         @scheduled_maintenances     = entity_check.maintenances(nil, nil, :scheduled => true)

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

@@ -278,6 +278,32 @@
   </div><!-- col-md-6 -->
 </div><!-- row -->
 
+<div class="row">
+  <div id="failure-delays" class="col-md-6">
+    <a name="failure_delays"></a>
+    <h3>Failure Delays</h3>
+    <table class="table table-hover table-condensed">
+
+      <tr>
+        <td>Initial failure delay:</td>
+        <td><%= h(ChronicDuration.output(@check_initial_failure_delay, :keep_zero => true)) %>
+          <% if @check_initial_failure_delay_is_default %>
+            (default)
+          <% end %>
+        </td>
+      </tr>
+      <tr>
+        <td>Repeat failure delay:</td>
+        <td><%= h(ChronicDuration.output(@check_repeat_failure_delay, :keep_zero => true)) %>
+          <% if @check_repeat_failure_delay_is_default %>
+            (default)
+          <% end %>
+        </td>
+      </tr>
+    </table>
+  </div>
+</div>
+
 <div class="row">
   <div id="scheduled-maintenance-periods" class="col-md-12">
     <a name="scheduled_maintenance_periods"></a>

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

@@ -24,7 +24,9 @@
           <td>PagerDuty</td>
           <td>
             <% @pagerduty_credentials.each_pair do |pk, pv| %>
-              <p><%= 'password'.eql?(pk) ? h("#{pk}: ...") : h("#{pk}: #{pv}") %></p>
+              <% unless pv.empty? %>
+                <p><%= 'password'.eql?(pk) ? h("#{pk}: ...") : h("#{pk}: #{pv}") %></p>
+              <% end %>
             <% end %>
           </td>
           <td></td>

data/lib/flapjack/redis_pool.rb

@@ -32,6 +32,8 @@ module Flapjack
         Flapjack::Data::Migration.refresh_archive_index(:redis => redis)
         Flapjack::Data::Migration.validate_scheduled_maintenance_periods(:redis => redis,
           :logger => logger)
+        Flapjack::Data::Migration.correct_rollup_including_disabled_checks(:redis => redis,
+          :logger => logger)
         redis
       }
     end

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "1.5.0"
+  VERSION = "1.6.0rc1"
 end

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

@@ -39,8 +39,9 @@ describe Flapjack::Data::Contact, :redis => true do
           'pagerduty' => {
             'service_key' => '123456789012345678901234',
             'subdomain'   => 'flpjck',
-            'username'    => 'flapjack',
-            'password'    => 'very_secure'
+            'token'       => 'token123',
+            'username'    => nil,
+            'password'    => nil
           },
         },
       },
@@ -276,23 +277,26 @@ describe Flapjack::Data::Contact, :redis => true do
     expect(credentials).not_to be_nil
     expect(credentials).to be_a(Hash)
     expect(credentials).to eq({'service_key' => '123456789012345678901234',
-                           'subdomain'   => 'flpjck',
-                           'username'    => 'flapjack',
-                           'password'    => 'very_secure'})
+                               'subdomain'   => 'flpjck',
+                               'token'       => 'token123',
+                               'username'    => '',
+                               'password'    => ''})
   end
 
   it "sets pagerduty credentials for a contact" do
     contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
     contact.set_pagerduty_credentials('service_key' => '567890123456789012345678',
                                       'subdomain'   => 'eggs',
-                                      'username'    => 'flapjack',
-                                      'password'    => 'tomato')
+                                      'token'       => 'token123',
+                                      'username'    => 'mary',
+                                      'password'    => 'mary_password')
 
     expect(@redis.hget('contact_media:c362', 'pagerduty')).to eq('567890123456789012345678')
     expect(@redis.hgetall('contact_pagerduty:c362')).to eq({
       'subdomain'   => 'eggs',
-      'username'    => 'flapjack',
-      'password'    => 'tomato'
+      'token'       => 'token123',
+      'username'    => 'mary',
+      'password'    => 'mary_password'
     })
   end
 

data/spec/lib/flapjack/data/migration_spec.rb

@@ -60,4 +60,45 @@ describe Flapjack::Data::Migration, :redis => true do
     expect(rule.contact_id).to eq(contact.id)
   end
 
+  it "removes a disabled check from a medium's alerting checks" do
+    contact = Flapjack::Data::Contact.add( {
+        'id'         => 'c363_a-f@42%*',
+        'first_name' => 'Jane',
+        'last_name'  => 'Janeley',
+        'email'      => 'janej@example.com',
+        'media'      => {
+          'email' => {
+            'address'          => 'janej@example.com',
+            'interval'         => 60,
+            'rollup_threshold' => 5,
+          },
+        },
+      },
+      :redis => @redis)
+
+    entity = Flapjack::Data::Entity.add({ 'id'   => '5000',
+                                          'name' => 'abc-123',
+                                          'contacts' => ['c363_a-f@42%*'] },
+                                          :redis => @redis)
+
+    entity_check_ping = Flapjack::Data::EntityCheck.for_entity_name('abc-123', 'ping', :redis => @redis)
+    entity_check_ping.update_state('critical')
+
+    entity_check_ssh  = Flapjack::Data::EntityCheck.for_entity_name('abc-123', 'ssh', :redis => @redis)
+    entity_check_ssh.update_state('critical')
+
+    contact.add_alerting_check_for_media('email', 'abc-123:ping')
+    contact.add_alerting_check_for_media('email', 'abc-123:ssh')
+
+    expect(contact.alerting_checks_for_media('email')).to eq(['abc-123:ping', 'abc-123:ssh'])
+
+    entity_check_ssh.disable!
+
+    expect(contact.alerting_checks_for_media('email')).to eq(['abc-123:ping', 'abc-123:ssh'])
+
+    Flapjack::Data::Migration.correct_rollup_including_disabled_checks(:redis => @redis)
+
+    expect(contact.alerting_checks_for_media('email')).to eq(['abc-123:ping'])
+  end
+
 end

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

@@ -10,8 +10,9 @@ describe 'Flapjack::Gateways::JSONAPI::PagerdutyCredentialMethods', :sinatra =>
   let(:pagerduty_credentials) {
     {'service_key' => 'abc',
      'subdomain'   => 'def',
-     'username'    => 'ghi',
-     'password'    => 'jkl',
+     'token'       => 'ghi',
+     'username'    => 'mongoose',
+     'password'    => 'mongoose_password'
     }
   }
 

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

@@ -32,7 +32,7 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
   it "looks for acknowledgements if the search is not already running" do
     expect(redis).to receive(:get).with('sem_pagerduty_acks_running').and_return(nil)
     expect(redis).to receive(:set).with('sem_pagerduty_acks_running', 'true')
-    expect(redis).to receive(:expire).with('sem_pagerduty_acks_running', 300)
+    expect(redis).to receive(:expire).with('sem_pagerduty_acks_running', 3600)
 
     expect(redis).to receive(:del).with('sem_pagerduty_acks_running')
 
@@ -69,16 +69,56 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
     stub_request(:get, "https://flpjck.pagerduty.com/api/v1/incidents?" +
       "fields=incident_number,status,last_status_change_by&incident_key=#{check}&" +
       "since=#{since}&status=acknowledged&until=#{unt}").
-       with(:headers => {'Authorization'=>['flapjack', 'password123']}).
+       with(:headers => {'Authorization'=>'Token token=token123'}).
        to_return(:status => 200, :body => response.to_json, :headers => {})
 
     expect(Flapjack::RedisPool).to receive(:new).and_return(redis)
     fp = Flapjack::Gateways::Pagerduty.new(:config => config, :logger => @logger)
 
+    EM.synchrony do
+      result = fp.send(:pagerduty_acknowledged?, 'subdomain' => 'flpjck', 'token' => 'token123',
+        'check' => check)
+
+      expect(result).to be_a(Hash)
+      expect(result).to have_key(:pg_acknowledged_by)
+      expect(result[:pg_acknowledged_by]).to be_a(Hash)
+      expect(result[:pg_acknowledged_by]).to have_key('id')
+      expect(result[:pg_acknowledged_by]['id']).to eq('ABCDEFG')
+      EM.stop
+    end
+
+  end
+
+  it "looks for acknowledgements via the PagerDuty API with basic auth" do
+    check = 'PING'
+    expect(Time).to receive(:now).and_return(time)
+    since = (time.utc - (60*60*24*7)).iso8601 # the last week
+    unt   = (time.utc + (60*60*24)).iso8601   # 1 day in the future
+
+    response = {"incidents" =>
+      [{"incident_number" => 12,
+        "status" => "acknowledged",
+        "last_status_change_by" => {"id"=>"ABCDEFG", "name"=>"John Smith",
+                                    "email"=>"johns@example.com",
+                                    "html_url"=>"http://flpjck.pagerduty.com/users/ABCDEFG"}
+       }
+      ],
+      "limit"=>100,
+      "offset"=>0,
+      "total"=>1}
+
+    stub_request(:get, "https://flpjck.pagerduty.com/api/v1/incidents?" +
+      "fields=incident_number,status,last_status_change_by&incident_key=#{check}&" +
+      "since=#{since}&status=acknowledged&until=#{unt}").
+      with(:headers => {'Authorization'=>['flapjack', 'password123']}).
+      to_return(:status => 200, :body => response.to_json, :headers => {})
+
+    expect(Flapjack::RedisPool).to receive(:new).and_return(redis)
+    fp = Flapjack::Gateways::Pagerduty.new(:config => config, :logger => @logger)
 
     EM.synchrony do
-      result = fp.send(:pagerduty_acknowledged?, 'subdomain' => 'flpjck', 'username' => 'flapjack',
-        'password' => 'password123', 'check' => check)
+      result = fp.send(:pagerduty_acknowledged?, 'subdomain' => 'flpjck',
+      'username' => 'flapjack', 'password' => 'password123', 'check' => check)
 
       expect(result).to be_a(Hash)
       expect(result).to have_key(:pg_acknowledged_by)
@@ -98,18 +138,19 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
     expect(contact).to receive(:pagerduty_credentials).and_return({
       'service_key' => '12345678',
       'subdomain"'  => 'flpjck',
-      'username'    => 'flapjack',
-      'password'    => 'password123'
+      'token'       => 'token123'
     })
 
     entity_check = double('entity_check')
-    expect(entity_check).to receive(:check).exactly(2).times.and_return('PING')
+    expect(entity_check).to receive(:check).exactly(1).times.and_return('PING')
     expect(entity_check).to receive(:contacts).and_return([contact])
-    expect(entity_check).to receive(:entity_name).exactly(2).times.and_return('foo-app-01.bar.net')
+    expect(entity_check).to receive(:entity_name).exactly(1).times.and_return('foo-app-01.bar.net')
+    expect(entity_check).to receive(:in_unscheduled_maintenance?).exactly(1).times.and_return(false)
+    expect(entity_check).to receive(:failed?).exactly(1).times.and_return(true)
     expect(Flapjack::Data::Event).to receive(:create_acknowledgement).with('foo-app-01.bar.net', 'PING',
       :summary => 'Acknowledged on PagerDuty', :duration => 14400, :redis => redis)
 
-    expect(Flapjack::Data::EntityCheck).to receive(:unacknowledged_failing).exactly(2).times.and_return([entity_check])
+    expect(Flapjack::Data::EntityCheck).to receive(:unacknowledged_failing).exactly(1).times.and_return([entity_check])
 
     expect(fp).to receive(:pagerduty_acknowledged?).and_return({})
 
@@ -192,7 +233,6 @@ describe Flapjack::Gateways::Pagerduty, :logger => true do
 
   it "does not look for acknowledgements if all required credentials are not present" do
     creds = {'subdomain' => 'example',
-             'username'  => 'sausage',
              'check'     => 'PING'}
 
     expect(Flapjack::RedisPool).to receive(:new).and_return(redis)

data/spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'chronic_duration'
 
 describe 'web/views/check.html.erb', :erb_view => true do
 
@@ -8,6 +9,10 @@ describe 'web/views/check.html.erb', :erb_view => true do
     @entity = 'abc-xyz-01'
     @check  = 'Disk / Utilisation'
     @last_notifications = {}
+    @check_initial_failure_delay = 30
+    @check_repeat_failure_delay  = 60
+    @check_initial_failure_delay_is_default = true
+    @check_repeat_failure_delay_is_default  = true
 
     page = render_erb('check.html.erb', binding)
     expect(page).to match(%r{/abc-xyz-01/Disk%20%2F%20Utilisation})

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

@@ -175,7 +175,6 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
                             :recovery        => {:timestamp => time.to_i - (3 * 60 * 60), :summary => nil},
                             :acknowledgement => {:timestamp => nil, :summary => nil} }
 
-      expect_check_stats
       expect(entity_check).to receive(:state).and_return('ok')
       expect(entity_check).to receive(:last_update).and_return(time.to_i - (3 * 60 * 60))
       expect(entity_check).to receive(:last_change).and_return(time.to_i - (3 * 60 * 60))
@@ -191,6 +190,8 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
       expect(entity_check).to receive(:historical_states).
         with(nil, time.to_i, :order => 'desc', :limit => 20).and_return([])
       expect(entity_check).to receive(:enabled?).and_return(true)
+      expect(entity_check).to receive(:initial_failure_delay).exactly(2).times.and_return(30)
+      expect(entity_check).to receive(:repeat_failure_delay).exactly(2).times.and_return(60)
 
       expect(Flapjack::Data::Entity).to receive(:find_by_name).
         with(entity_name, :redis => redis).and_return(entity)

data/spec/lib/flapjack/redis_pool_spec.rb

@@ -18,6 +18,7 @@ describe Flapjack::RedisPool do
       expect(Flapjack::Data::Migration).to receive(:clear_orphaned_entity_ids).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:refresh_archive_index).exactly(redis_count).times
       expect(Flapjack::Data::Migration).to receive(:validate_scheduled_maintenance_periods).exactly(redis_count).times
+      expect(Flapjack::Data::Migration).to receive(:correct_rollup_including_disabled_checks).exactly(redis_count).times
 
       frp = Flapjack::RedisPool.new(:size => redis_count)
 

data/spec/service_consumers/pacts/flapjack-diner_v1.0.json

@@ -18,8 +18,8 @@
         "body": [
           {
             "op": "replace",
-            "path": "/pagerduty_credentials/0/password",
-            "value": "pswrd"
+            "path": "/pagerduty_credentials/0/token",
+            "value": "token123"
           }
         ]
       },
@@ -47,8 +47,8 @@
         "body": [
           {
             "op": "replace",
-            "path": "/pagerduty_credentials/0/password",
-            "value": "pswrd"
+            "path": "/pagerduty_credentials/0/token",
+            "value": "token123"
           }
         ]
       },
@@ -71,8 +71,8 @@
         "body": [
           {
             "op": "replace",
-            "path": "/pagerduty_credentials/0/password",
-            "value": "pswrd"
+            "path": "/pagerduty_credentials/0/token",
+            "value": "token123"
           }
         ]
       },
@@ -147,8 +147,7 @@
             {
               "service_key": "abc",
               "subdomain": "def",
-              "username": "ghi",
-              "password": "jkl"
+              "token": "ghi"
             }
           ]
         }
@@ -177,8 +176,7 @@
             {
               "service_key": "abc",
               "subdomain": "def",
-              "username": "ghi",
-              "password": "jkl"
+              "token": "ghi"
             }
           ]
         }
@@ -212,14 +210,12 @@
             {
               "service_key": "abc",
               "subdomain": "def",
-              "username": "ghi",
-              "password": "jkl"
+              "token": "ghi"
             },
             {
               "service_key": "mno",
               "subdomain": "pqr",
-              "username": "stu",
-              "password": "vwx"
+              "token": "stu"
             }
           ]
         }
@@ -261,8 +257,7 @@
             {
               "service_key": "abc",
               "subdomain": "def",
-              "username": "ghi",
-              "password": "jkl"
+              "token": "ghi"
             }
           ]
         }
@@ -285,8 +280,7 @@
             {
               "service_key": "abc",
               "subdomain": "def",
-              "username": "ghi",
-              "password": "jkl"
+              "token": "ghi"
             }
           ]
         }

data/spec/service_consumers/provider_states_for_flapjack-diner.rb

@@ -301,8 +301,7 @@ Pact.provider_states_for "flapjack-diner" do
       pdc_data = {
         'service_key' => 'abc',
         'subdomain'   => 'def',
-        'username'    => 'ghi',
-        'password'    => 'jkl',
+        'token'       => 'ghi',
       }
       contact.set_pagerduty_credentials(pdc_data)
     end
@@ -333,15 +332,13 @@ Pact.provider_states_for "flapjack-diner" do
       pdc_data = {
         'service_key' => 'abc',
         'subdomain'   => 'def',
-        'username'    => 'ghi',
-        'password'    => 'jkl',
+        'token'       => 'ghi',
       }
       contact.set_pagerduty_credentials(pdc_data)
       pdc_data_2 = {
         'service_key' => 'mno',
         'subdomain'   => 'pqr',
-        'username'    => 'stu',
-        'password'    => 'vwx',
+        'token'       => 'stu',
     }
     contact_2.set_pagerduty_credentials(pdc_data_2)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0rc1
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -635,9 +635,9 @@ 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