flapjack 0.7.25 → 0.7.26

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Flapjack Changelog
 
+# 0.7.26 - 2013-09-16
+- Bug: last critical notification is empty in web UI gh-306 (@ali-graham)
+- Bug: Ending unscheduled maintenance in Web UI is broken gh-307 (@jessereynolds)
+- Bug: Acknowledgement jabber message shows incorrect duration gh-309 (@jessereynolds)
+- Bug: Details showing up in email alerts when "empty" gh-310 (@jessereynolds)
+- Bug: Only show Previous State and Summary when current state != previous unique state gh-311 (@jessereynolds)
+
 # 0.7.25 - 2013-09-13
 - Bug: EntityCheck last_update= isn't being called for update_state since refactoring gh-303 (@ali-graham)
 - Bug: flapjack-nagios-receiver is double-escaping its JSON data gh-304 (@jessereynolds)

data/lib/flapjack/coordinator.rb

@@ -151,7 +151,8 @@ module Flapjack
             pik.update_status
             status = pik.status
             next if old_status.eql?(status)
-            @logger.info "#{pik.type}: #{old_status} -> #{status}"
+            # # can't log on exit w/Ruby 2.0
+            # @logger.info "#{pik.type}: #{old_status} -> #{status}"
           end
 
           if piks.any? {|p| p.status == 'stopping' }

data/lib/flapjack/data/event.rb

@@ -106,6 +106,8 @@ module Flapjack
          'acknowledgement_id', 'duration'].each do |key|
           instance_variable_set("@#{key}", attrs[key])
         end
+        # details is optional. set it to nil if it only contains whitespace
+        @details = (@details.is_a?(String) && ! @details.strip.empty?) ? @details.strip : nil
       end
 
       def state

data/lib/flapjack/data/notification.rb

@@ -207,6 +207,7 @@ module Flapjack
         @details        = opts['details']
         @time           = opts['time']
         @count          = opts['count']
+        @duration       = opts['duration']
 
         @last_state     = opts['last_state']
         @last_summary   = opts['last_summary']

data/lib/flapjack/filters/acknowledgement.rb

@@ -33,11 +33,10 @@ module Flapjack
           return true
         end
 
-        entity_check.create_unscheduled_maintenance(timestamp,
-          (event.duration || (4 * 60 * 60)),
-          :summary  => event.summary)
+        um_duration = event.duration || (4 * 60 * 60)
+        entity_check.create_unscheduled_maintenance(timestamp, um_duration, :summary  => event.summary)
 
-        @logger.debug("#{label} pass (unscheduled maintenance created for #{event.id})")
+        @logger.debug("#{label} pass (unscheduled maintenance created for #{event.id}, duration: #{um_duration})")
         false
       end
     end

data/lib/flapjack/gateways/email/alert.text.erb

@@ -2,18 +2,18 @@ Hi <%= @contact_first_name %>
 
 Monitoring has detected the following:
 
-Entity:   <%= @entity_name %>
-Check:    <%= @check %>
-State:    <%= @state.upcase %>
-Summary:  <%= @summary %>
+Entity:           <%= @entity_name %>
+Check:            <%= @check %>
+State:            <%= @state.upcase %>
+Summary:          <%= @summary %>
 <% if @details -%>
-Details:  <%= @details %>
+Details:          <%= @details %>
 <% end -%>
 <% if @time -%>
-Time:     <%= Time.at(@time.to_i).to_s %>
+Time:             <%= Time.at(@time.to_i).to_s %>
 <% end -%>
 <% if @duration && @duration > 40 -%>
-Duration: <%= ChronicDuration.output(@duration) %>
+Duration:         <%= ChronicDuration.output(@duration) %>
 <% end -%>
 <% if @last_state -%>
 Previous State:   <%= @last_state.upcase %>

data/lib/flapjack/gateways/web.rb

@@ -244,7 +244,7 @@ module Flapjack
         entity_check = get_entity_check(@entity, @check)
         return 404 if entity_check.nil?
 
-        entity_check.end_unscheduled_maintenance
+        entity_check.end_unscheduled_maintenance(Time.now.to_i)
 
         redirect back
       end
@@ -403,9 +403,9 @@ module Flapjack
         [:critical, :warning, :unknown, :recovery, :acknowledgement].inject({}) do |memo, type|
           if last_notifications[type] && last_notifications[type][:timestamp]
             t = Time.at(last_notifications[type][:timestamp])
-            memo[t] = {:time => t.to_s,
-                       :relative => relative_time_ago(t) + " ago",
-                       :summary => last_notifications[type][:summary]}
+            memo[type] = {:time => t.to_s,
+                          :relative => relative_time_ago(t) + " ago",
+                          :summary => last_notifications[type][:summary]}
           end
           memo
         end

data/lib/flapjack/notifier.rb

@@ -88,6 +88,8 @@ module Flapjack
     # notification, updates the notification history in redis, generates the
     # notifications
     def process_notification(notification)
+      @logger.debug ("Processing notification: #{notification.inspect}")
+
       timestamp = Time.now
       event_id = notification.event_id
       entity_check = Flapjack::Data::EntityCheck.for_event_id(event_id, :redis => @redis)

data/lib/flapjack/processor.rb

@@ -247,25 +247,21 @@ module Flapjack
 
       severity = Flapjack::Data::Notification.severity_for_event(event, max_notified_severity)
 
-      historical_state = case entity_check.state
-      when previous_state
-        # current state
-        curr = entity_check.historical_states(nil, nil, :order => 'desc', :limit => 1)
-        (curr && (curr.size == 1)) ? curr.first : nil
-      else
-        # last state
-        curr_and_last = entity_check.historical_states(nil, nil, :order => 'desc', :limit => 2)
-        (curr_and_last && (curr_and_last.size == 2)) ? curr_and_last.last : nil
-      end
-
       lc = entity_check.last_change
       state_duration = lc ? (timestamp - lc) : nil
 
       Flapjack::Data::Notification.add(@notifier_queue, event,
         :type => notification_type, :severity => severity,
-        :last_state => historical_state, :state_duration => state_duration,
+        :last_state => previous_unique_state(entity_check), :state_duration => state_duration,
         :redis => @redis)
     end
 
+    def previous_unique_state(entity_check)
+      hs = entity_check.historical_states(nil, nil, :order => 'desc', :limit => 2)
+      return { :last_state => nil, :last_summary => nil } unless hs.length == 2
+      return hs.last
+    end
+
   end
 end
+

data/lib/flapjack/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.25
+  version: 0.7.26
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -547,7 +547,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2327642757705601515
+      hash: -187852671407725987
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -556,7 +556,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2327642757705601515
+      hash: -187852671407725987
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23