flapjack 0.6.49 → 0.6.50

Sign up to get free protection for your applications and to get access to all the features.
@@ -32,6 +32,7 @@ module Flapjack
32
32
  'state' => event.state,
33
33
  'summary' => event.summary,
34
34
  'time' => event.time,
35
+ 'duration' => event.duration || nil,
35
36
  'notification_type' => type}
36
37
  end
37
38
 
@@ -173,7 +173,7 @@ module Flapjack
173
173
 
174
174
  acknowledged = pagerduty_acknowledged?(options)
175
175
  if acknowledged.nil?
176
- @logger.debug "#{check} is not acknowledged in pagerduty, skipping"
176
+ @logger.debug "#{entity_check.entity_name}:#{check} is not acknowledged in pagerduty, skipping"
177
177
  next
178
178
  end
179
179
 
@@ -206,6 +206,10 @@ module Flapjack
206
206
  options = { :head => { 'authorization' => [username, password] },
207
207
  :query => query }
208
208
 
209
+ @logger.debug("pagerduty_acknowledged?: request to #{url}")
210
+ @logger.debug("pagerduty_acknowledged?: query: #{query.inspect}")
211
+ @logger.debug("pagerduty_acknowledged?: auth: #{options[:head].inspect}")
212
+
209
213
  http = EM::HttpRequest.new(url).get(options)
210
214
  # DEBUG flapjack-pagerduty: pagerduty_acknowledged?: decoded response as:
211
215
  # {"incidents"=>[{"incident_number"=>40, "status"=>"acknowledged",
@@ -217,11 +221,11 @@ module Flapjack
217
221
  response = Yajl::Parser.parse(http.response)
218
222
  rescue Yajl::ParseError
219
223
  @logger.error("failed to parse json from a post to #{url} ... response headers and body follows...")
220
- @logger.error(http.response_header.inspect)
221
- @logger.error(http.response)
222
224
  return nil
223
225
  end
224
226
  status = http.response_header.status
227
+ @logger.debug(http.response_header.inspect)
228
+ @logger.debug(http.response)
225
229
 
226
230
  @logger.debug("pagerduty_acknowledged?: decoded response as: #{response.inspect}")
227
231
  if response.nil?
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
3
  module Flapjack
4
- VERSION = "0.6.49"
4
+ VERSION = "0.6.50"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flapjack
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.49
4
+ version: 0.6.50
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2012-11-23 00:00:00.000000000 Z
14
+ date: 2012-11-29 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: daemons
@@ -481,12 +481,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
481
481
  - - ! '>='
482
482
  - !ruby/object:Gem::Version
483
483
  version: '0'
484
+ segments:
485
+ - 0
486
+ hash: 2264351146423610852
484
487
  required_rubygems_version: !ruby/object:Gem::Requirement
485
488
  none: false
486
489
  requirements:
487
490
  - - ! '>='
488
491
  - !ruby/object:Gem::Version
489
492
  version: '0'
493
+ segments:
494
+ - 0
495
+ hash: 2264351146423610852
490
496
  requirements: []
491
497
  rubyforge_project:
492
498
  rubygems_version: 1.8.23