lib/flapjack/gateways/pagerduty.rb in flapjack-0.6.49 vs lib/flapjack/gateways/pagerduty.rb in flapjack-0.6.50

@@ -171,11 +171,11 @@
           # FIXME: try each set of credentials until one works (may have stale contacts turning up)
           options = pagerduty_credentials.first.merge('check' => check)
 
           acknowledged = pagerduty_acknowledged?(options)
           if acknowledged.nil?
-            @logger.debug "#{check} is not acknowledged in pagerduty, skipping"
+            @logger.debug "#{entity_check.entity_name}:#{check} is not acknowledged in pagerduty, skipping"
             next
           end
 
           pg_acknowledged_by = acknowledged[:pg_acknowledged_by]
           @logger.debug "#{check} is acknowledged in pagerduty, creating flapjack acknowledgement... "
@@ -204,10 +204,14 @@
                   'status'       => 'acknowledged' }
 
         options = { :head  => { 'authorization' => [username, password] },
                     :query => query }
 
+        @logger.debug("pagerduty_acknowledged?: request to #{url}")
+        @logger.debug("pagerduty_acknowledged?: query: #{query.inspect}")
+        @logger.debug("pagerduty_acknowledged?: auth: #{options[:head].inspect}")
+
         http = EM::HttpRequest.new(url).get(options)
         # DEBUG flapjack-pagerduty: pagerduty_acknowledged?: decoded response as:
         # {"incidents"=>[{"incident_number"=>40, "status"=>"acknowledged",
         # "last_status_change_by"=>{"id"=>"PO1NWPS", "name"=>"Jesse Reynolds",
         # "email"=>"[e-mail]",
@@ -215,14 +219,14 @@
         # "total"=>1}
         begin
           response = Yajl::Parser.parse(http.response)
         rescue Yajl::ParseError
           @logger.error("failed to parse json from a post to #{url} ... response headers and body follows...")
-          @logger.error(http.response_header.inspect)
-          @logger.error(http.response)
           return nil
         end
         status   = http.response_header.status
+        @logger.debug(http.response_header.inspect)
+        @logger.debug(http.response)
 
         @logger.debug("pagerduty_acknowledged?: decoded response as: #{response.inspect}")
         if response.nil?
           @logger.error('no valid response received from pagerduty!')
           return nil