flapjack 0.7.21 → 0.7.22

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Flapjack Changelog
 
+# 0.7.22 - 2013-08-08
+- Bug: fix potential exception in json serialisation of tags in notifications gh-281 (@jessereynolds)
+
 # 0.7.21 - 2013-08-08
 - Feature: make eneity search scopable by tags gh-89 (@jessereynolds)
 - Feature: add benchmark rake task gh-259 (@jessereynolds)

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

@@ -90,6 +90,7 @@
               <th>Warning Media</th>
               <th>Critical Media</th>
               <th>Time Restrictions</th>
+              <th>Blackholes</th>
             </tr>
             <% rules.each do |rule| %>
               <tr>
@@ -99,6 +100,10 @@
                 <td><%= h( (rule.warning_media && !rule.warning_media.empty?) ? rule.warning_media.join(', ') : '-')%></td>
                 <td><%= h( (rule.critical_media && !rule.critical_media.empty?) ? rule.critical_media.join(', ') : '-') %></td>
                 <td><%= h(rule.time_restrictions) %></td>
+                <% blackholes = [] %>
+                <% blackholes << 'Warning' if rule.warning_blackhole %>
+                <% blackholes << 'Critical' if rule.critical_blackhole %>
+                <td><%= h(blackholes.join(', ')) %></td>
               </tr>
             <% end %>
             </table>

data/lib/flapjack/notifier.rb

@@ -145,6 +145,10 @@ module Flapjack
             :state => notification.event_state)
         end
 
+
+        contents_tags = contents['tags']
+        contents['tags'] = contents_tags.is_a?(Set) ? contents_tags.to_a : contents_tags
+
         # TODO consider changing Resque jobs to use raw blpop like the others
         case media_type.to_sym
         when :sms

data/lib/flapjack/processor.rb

@@ -245,7 +245,7 @@ module Flapjack
       @redis.set("#{event.id}:last_#{event.state}_notification", timestamp) if event.failure?
       @redis.rpush("#{event.id}:#{notification_type}_notifications", timestamp)
       @redis.rpush("#{event.id}:#{event.state}_notifications", timestamp) if event.failure?
-      @logger.debug("Notification of type #{notification_type} is being generated for #{event.id}.")
+      @logger.debug("Notification of type #{notification_type} is being generated for #{event.id}: " + event.inspect)
 
       severity = Flapjack::Data::Notification.severity_for_event(event, max_notified_severity)
       last_state = entity_check.historical_state_before(timestamp)

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.7.21"
+  VERSION = "0.7.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.21
+  version: 0.7.22
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -529,7 +529,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 358666244309813915
+      hash: 525306744622522205
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -538,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 358666244309813915
+      hash: 525306744622522205
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23