flapjack 0.7.14 → 0.7.15

data/lib/flapjack/gateways/web/views/check.haml

@@ -14,10 +14,10 @@
           = nav
           %h2 #{@check} on #{@entity}
         %h3 State: #{@check_state ? @check_state.upcase : ''}
-        - if (['warning', 'critical', 'unknown'].include?(@check_state) and !(@current_unscheduled_maintenance || @current_scheduled_maintenance))
+        - if (['warning', 'critical', 'unknown'].include?(@check_state) and !@current_scheduled_maintenance)
           %form{:action => "/acknowledgements/#{check_path_escaped}", :method => "post", :class => "form-inline"}
             %input{:type => 'hidden', :name => 'acknowledgement_id', :value => "#{@acknowledgement_id}"}
-            %input{:type => 'submit', :value => 'Acknowledge', :class => 'button'}
+            %input{:type => 'submit', :value => @current_unscheduled_maintenance ? 'Replace acknowledgment' : 'Acknowledge', :class => 'button'}
             with
             %label{:for => 'summary'}
               summary:
@@ -25,14 +25,23 @@
             %label{:for => 'duration'}
               duration:
             %input{:type => 'text', :name => 'duration', :value => ''}
-            eg "5 hours"
+              e.g. "5 hours"
+        - current_time = (@current_unscheduled_maintenance || @current_scheduled_maintenance) ? Time.now : nil
         - if @current_unscheduled_maintenance
           %h3 (Acknowledged - #{@current_unscheduled_maintenance[:summary]})
+          - start  = Time.at(@current_unscheduled_maintenance[:start_time])
+          - finish = Time.at(@current_unscheduled_maintenance[:start_time] + @current_unscheduled_maintenance[:duration])
+          - remain = time_period_in_words( (finish - current_time).ceil )
+          %p #{start} -> #{finish} (#{remain} remaining)
           %form{:action => "/end_unscheduled_maintenance/#{check_path_escaped}", :method => "post"}
             %p
               %input{:type => 'submit', :value => 'End Unscheduled Maintenance (Unacknowledge)', :class => 'button'}
         - if @current_scheduled_maintenance
           %h4 (Scheduled Maintenance - #{@current_scheduled_maintenance[:summary]})
+          - start  = Time.at(@current_scheduled_maintenance[:start_time])
+          - finish = Time.at(@current_scheduled_maintenance[:start_time] + @current_scheduled_maintenance[:duration])
+          - remain = time_period_in_words( (finish - current_time).ceil )
+          %p #{start} -> #{finish} (#{remain} remaining)
         %h3 Output: #{@check_summary}
         %p #{@check_details}
         %table{:class => "table table-hover table-condensed"}
@@ -40,60 +49,62 @@
             %td Last state change:
             %td #{relative_time_ago(Time.at(@check_last_change.to_i))} ago
             %td #{Time.at(@check_last_change.to_i)}
+            %td  
           %tr
             %td Last update:
             %td #{relative_time_ago(Time.at(@check_last_update.to_i))} ago
             %td #{Time.at(@check_last_update.to_i)}
-          - if @last_notifications[:critical]
-            - last_critical_relative = relative_time_ago(Time.at(@last_notifications[:critical])) + " ago"
-            - last_critical          = Time.at(@last_notifications[:critical]).to_s
-          - else
-            - last_critical_relative = 'never'
-            - last_critical          = ''
+            %td  
+          - last_critical = nil
+          - if @last_notifications[:critical] && @last_notifications[:critical][:timestamp]
+            - t = Time.at(@last_notifications[:critical][:timestamp])
+            - last_critical = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:critical][:summary]}
           %tr
             %td Last critical notification:
-            %td= last_critical_relative
-            %td= last_critical
-          - if @last_notifications[:warning]
-            - last_warning_relative = relative_time_ago(Time.at(@last_notifications[:warning])) + " ago"
-            - last_warning          = Time.at(@last_notifications[:warning]).to_s
-          - else
-            - last_warning_relative = 'never'
-            - last_warning          = ''
+            %td= last_critical ? last_critical[:relative] : 'never'
+            %td= last_critical ? last_critical[:time] : ''
+            %td= last_critical ? last_critical[:summary] : ''
+
+          - last_warning = nil
+          - if @last_notifications[:warning] && @last_notifications[:warning][:timestamp]
+            - t = Time.at(@last_notifications[:warning][:timestamp])
+            - last_warning = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:warning][:summary]}
           %tr
             %td Last warning notification:
-            %td= last_warning_relative
-            %td= last_warning
-          - if @last_notifications[:unknown]
-            - last_unknown_relative = relative_time_ago(Time.at(@last_notifications[:unknown])) + " ago"
-            - last_unknown          = Time.at(@last_notifications[:unknown]).to_s
-          - else
-            - last_unknown_relative = 'never'
-            - last_unknown          = ''
+            %td= last_warning ? last_warning[:relative] : 'never'
+            %td= last_warning ? last_warning[:time] : ''
+            %td= last_warning ? last_warning[:summary] : ''
+
+          - last_unknown = nil
+          - if @last_notifications[:unknown] && @last_notifications[:unknown][:timestamp]
+            - t = Time.at(@last_notifications[:unknown][:timestamp])
+            - last_unknown = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:unknown][:summary]}
           %tr
             %td Last unknown notification:
-            %td= last_unknown_relative
-            %td= last_unknown
-          - if @last_notifications[:recovery]
-            - last_recovery_relative = relative_time_ago(Time.at(@last_notifications[:recovery])) + " ago"
-            - last_recovery          = Time.at(@last_notifications[:recovery]).to_s
-          - else
-            - last_recovery_relative = 'never'
-            - last_recovery          = ''
+            %td= last_unknown ? last_unknown[:relative] : 'never'
+            %td= last_unknown ? last_unknown[:time] : ''
+            %td= last_unknown ? last_unknown[:summary] : ''
+
+          - last_recovery = nil
+          - if @last_notifications[:recovery] && @last_notifications[:recovery][:timestamp]
+            - t = Time.at(@last_notifications[:recovery][:timestamp])
+            - last_recovery = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:recovery][:summary]}
           %tr
             %td Last recovery notification:
-            %td= last_recovery_relative
-            %td= last_recovery
-          - if @last_notifications[:acknowledgement]
-            - last_ack_relative = relative_time_ago(Time.at(@last_notifications[:acknowledgement])) + " ago"
-            - last_ack          = Time.at(@last_notifications[:acknowledgement]).to_s
-          - else
-            - last_ack_relative = 'never'
-            - last_ack          = ''
+            %td= last_recovery ? last_recovery[:relative] : 'never'
+            %td= last_recovery ? last_recovery[:time] : ''
+            %td= last_recovery ? last_recovery[:summary] : ''
+
+          - last_ack = nil
+          - if @last_notifications[:acknowledgement] && @last_notifications[:acknowledgement][:timestamp]
+            - t = Time.at(@last_notifications[:acknowledgement][:timestamp])
+            - last_ack = {:time => t.to_s, :relative => relative_time_ago(t) + " ago", :summary => @last_notifications[:acknowledgement][:summary]}
           %tr
             %td Last acknowledgement notification:
-            %td= last_ack_relative
-            %td= last_ack
+            %td= last_ack ? last_ack[:relative] : 'never'
+            %td= last_ack ? last_ack[:time] : ''
+            %td= last_ack ? last_ack[:summary] : ''
+
         %h3 Scheduled Maintenance Periods
         - if @scheduled_maintenances && !@scheduled_maintenances.empty?
           %table{:class => "table table-bordered table-hover table-condensed"}
@@ -134,12 +145,12 @@
             %label{:class => "control-label", :for => 'start_time'} Start time:
             %div{:class => "controls"}
               %input{:type => 'text', :name => 'start_time', :class => 'text', :size => '20', :maxlength => '80'}
-              eg "today 4pm", "two hours hence", "friday 2pm", "2012-01-28 13:00"
+              e.g. "today 4pm", "two hours hence", "friday 2pm", "2012-01-28 13:00"
           %div{:class => "control-group"}
             %label{:class => "control-label", :for => 'duration'} Duration:
             %div{:class => "controls"}
               %input{:type => 'text', :name => 'duration', :class => 'text', :size => '20', :maxlength => '80'}
-              eg "1 hour", "2:30:00", "three days", etc
+              e.g. "1 hour", "2:30:00", "three days", etc
           %div{:class => "control-group"}
             %label{:class => "control-label", :for => 'summary'} Summary:
             %div{:class => "controls"}
@@ -148,6 +159,20 @@
             %div{:class => "controls"}
               %input{:type => 'submit', :value => 'Save', :class => 'button'}
         %p Times given will be interpreted in the local timezone of  #{local_timezone}
+
+        - if @state_changes && !@state_changes.empty?
+          %h3 Recent state changes
+          %table{:class => "table table-bordered table-hover table-condensed"}
+            %tr
+              %th Timestamp
+              %th State
+              %th Summary
+            - @state_changes.each do |sc|
+              %tr
+                %td= Time.at(sc[:timestamp]).to_s
+                %td= sc[:state]
+                %td= sc[:summary]
+
         %h3 Contacts
         - if @contacts && !@contacts.empty?
           %table{:class => "table table-bordered table-hover table-condensed"}

data/lib/flapjack/gateways/web/views/checks.haml

@@ -38,7 +38,7 @@
                 = " (Acknowledged)" if in_unscheduled_outage
                 = " (Scheduled Maintenance)" if in_scheduled_outage
               %td= relative_time_ago(Time.at(changed.to_i)) + ' ago'
-              %td= (Time.now.to_i - updated.to_i).to_s + ' seconds ago'
+              %td= relative_time_ago(Time.at(updated.to_i)) + ' ago'
               - if notified && (notified > 0)
                 - last_notified = relative_time_ago(Time.at(notified.to_i)) + " ago, #{notified_kind}"
               - else

data/lib/flapjack/gateways/web/views/entity.haml

@@ -36,7 +36,7 @@
                   = " (Acknowledged)" if in_unscheduled_outage
                   = " (Scheduled Maintenance)" if in_scheduled_outage
                 %td= relative_time_ago(Time.at(changed.to_i)) + ' ago'
-                %td= (Time.now.to_i - updated.to_i).to_s + ' seconds ago'
+                %td= relative_time_ago(Time.at(updated.to_i)) + ' ago'
                 - if notified && (notified > 0)
                   - last_notified = relative_time_ago(Time.at(notified.to_i)) + " ago, #{notified_kind}"
                 - else

data/lib/flapjack/patches.rb

@@ -44,6 +44,8 @@ class Hash
   end
 end
 
+# we don't want to stop the entire EM reactor when we stop a web server
+# & @connections data type changed in thin 1.5.1
 module Thin
 
   # see https://github.com/flpjck/flapjack/issues/169
@@ -64,7 +66,6 @@ module Thin
     end
   end
 
-  # we don't want to stop the entire EM reactor when we stop a web server
   module Backends
     class Base
       def stop!
@@ -72,7 +73,13 @@ module Thin
         @stopping = false
 
         # EventMachine.stop if EventMachine.reactor_running?
-        @connections.each { |connection| connection.close_connection }
+
+        case @connections
+        when Array
+          @connections.each { |connection| connection.close_connection }
+        when Hash
+          @connections.each_value { |connection| connection.close_connection }
+        end
         close
       end
     end

data/lib/flapjack/pikelet.rb

@@ -28,7 +28,6 @@ require 'flapjack/gateways/web'
 require 'flapjack/logger'
 require 'thin/version'
 
-
 module Thin
   # disable Thin's loading of daemons
   # workaround for https://github.com/flpjck/flapjack/issues/133
@@ -52,12 +51,13 @@ module Flapjack
       !type_klass.nil?
     end
 
-    def self.create(type, config = {})
+    def self.create(type, opts = {})
       pikelet = nil
       [Flapjack::Pikelet::Generic,
        Flapjack::Pikelet::Resque,
        Flapjack::Pikelet::Thin].each do |kl|
-        break if pikelet = kl.create(type, config)
+        next unless kl::PIKELET_TYPES[type]
+        break if pikelet = kl.create(type, opts)
       end
       pikelet
     end
@@ -71,6 +71,7 @@ module Flapjack
 
         @config = opts[:config] || {}
         @redis_config = opts[:redis_config] || {}
+        @boot_time = opts[:boot_time]
 
         @logger = Flapjack::Logger.new("flapjack-#{type}", @config['logger'])
 
@@ -98,9 +99,10 @@ module Flapjack
                       'pagerduty'  => Flapjack::Gateways::Pagerduty,
                       'oobetet'    => Flapjack::Gateways::Oobetet}
 
-      def self.create(type, config = {})
-        return unless pikelet_klass = PIKELET_TYPES[type]
-        self.new(type, pikelet_klass, config)
+      def self.create(type, opts = {})
+        self.new(type, PIKELET_TYPES[type], :config => opts[:config],
+          :redis_config => opts[:redis_config],
+          :boot_time => opts[:boot_time])
       end
 
       def initialize(type, pikelet_klass, opts = {})
@@ -140,8 +142,9 @@ module Flapjack
                        'sms'   => Flapjack::Gateways::SmsMessagenet}
 
       def self.create(type, opts = {})
-        return unless pikelet_klass = PIKELET_TYPES[type]
-        self.new(type, pikelet_klass, opts)
+        self.new(type, PIKELET_TYPES[type], :config => opts[:config],
+          :redis_config => opts[:redis_config],
+          :boot_time => opts[:boot_time])
       end
 
       def initialize(type, pikelet_klass, opts = {})
@@ -198,9 +201,10 @@ module Flapjack
                        'api'  => Flapjack::Gateways::API}
 
       def self.create(type, opts = {})
-        return unless pikelet_klass = PIKELET_TYPES[type]
         ::Thin::Logging.silent = true
-        self.new(type, pikelet_klass, :config => opts[:config], :redis_config => opts[:redis_config])
+        self.new(type, PIKELET_TYPES[type], :config => opts[:config],
+          :redis_config => opts[:redis_config],
+          :boot_time => opts[:boot_time])
       end
 
       def initialize(type, pikelet_klass, opts = {})

data/lib/flapjack/utility.rb

@@ -7,10 +7,10 @@ module Flapjack
       period_mm, period_ss  = period.divmod(60)
       period_hh, period_mm  = period_mm.divmod(60)
       period_dd, period_hh  = period_hh.divmod(24)
-      ["#{period_dd} days",
-       "#{period_hh} hours",
-       "#{period_mm} minutes",
-       "#{period_ss} seconds"].reject {|s| s =~ /^0 /}.join(', ')
+      ["#{period_dd} day#{plural_s(period_dd)}",
+       "#{period_hh} hour#{plural_s(period_hh)}",
+       "#{period_mm} minute#{plural_s(period_mm)}",
+       "#{period_ss} second#{plural_s(period_ss)}"].reject {|s| s =~ /^0 /}.join(', ')
     end
 
     # Returns relative time in words referencing the given date
@@ -68,5 +68,11 @@ module Flapjack
       Hash[ *( key_value_pairs.flatten(1) )]
     end
 
+    private
+
+    def plural_s(value)
+      (value == 1) ? '' : 's'
+    end
+
   end
 end

data/lib/flapjack/version.rb

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

data/spec/lib/flapjack/coordinator_spec.rb

@@ -11,6 +11,8 @@ describe Flapjack::Coordinator do
   let(:stdout_out) { mock('stdout_out') }
   let(:syslog_out) { mock('syslog_out') }
 
+  let!(:time)   { Time.now }
+
   def setup_logger
     formatter = mock('Formatter')
     Log4r::PatternFormatter.should_receive(:new).with(
@@ -41,9 +43,12 @@ describe Flapjack::Coordinator do
     executive.should_receive(:update_status)
     executive.should_receive(:status).exactly(3).times.and_return('stopped')
 
+    Time.should_receive(:now).and_return(time)
+
     fc = Flapjack::Coordinator.new(config)
     Flapjack::Pikelet.should_receive(:create).with('executive',
-        :config => cfg['executive'], :redis_config => {}).and_return(executive)
+        :config => cfg['executive'], :redis_config => {}, :boot_time => time).
+      and_return(executive)
 
     fiber.should_receive(:resume)
     Fiber.should_receive(:new).and_yield.and_return(fiber)
@@ -69,9 +74,12 @@ describe Flapjack::Coordinator do
     executive.should_receive(:update_status)
     executive.should_receive(:status).exactly(3).times.and_return('stopped')
 
+    Time.should_receive(:now).and_return(time)
+
     fc = Flapjack::Coordinator.new(config)
     Flapjack::Pikelet.should_receive(:create).with('executive',
-        :config => cfg['executive'], :redis_config => {}).and_return(executive)
+        :config => cfg['executive'], :redis_config => {}, :boot_time => time)
+      .and_return(executive)
 
     fiber.should_receive(:resume)
     Fiber.should_receive(:new).and_yield.and_return(fiber)
@@ -140,8 +148,10 @@ describe Flapjack::Coordinator do
     executive.should_receive(:status).exactly(3).times.and_return('stopped')
 
     jabber = mock('jabber')
-    Flapjack::Pikelet.should_receive(:create).with('jabber',
-      :config => {"enabled" => "yes"}, :redis_config => {}).and_return(jabber)
+    Flapjack::Pikelet.should_receive(:create).
+      with('jabber', :config => {"enabled" => "yes"}, :redis_config => {},
+        :boot_time => time).
+      and_return(jabber)
     jabber.should_receive(:start)
 
     fiber.should_receive(:resume)
@@ -149,6 +159,7 @@ describe Flapjack::Coordinator do
 
     config.should_receive(:for_redis).and_return({})
     fc = Flapjack::Coordinator.new(config)
+    fc.instance_variable_set('@boot_time', time)
     fc.instance_variable_set('@pikelets', [executive])
     fc.reload
     fc.instance_variable_get('@pikelets').should == [jabber]
@@ -178,6 +189,7 @@ describe Flapjack::Coordinator do
 
     config.should_receive(:for_redis).and_return({})
     fc = Flapjack::Coordinator.new(config)
+    fc.instance_variable_set('@boot_time', time)
     fc.instance_variable_set('@pikelets', [executive])
     fc.reload
     fc.instance_variable_get('@pikelets').should == [executive]
@@ -213,11 +225,13 @@ describe Flapjack::Coordinator do
     new_exec.should_receive(:start)
 
     Flapjack::Pikelet.should_receive(:create).
-      with('executive', :config => new_cfg['executive'], :redis_config => {}).
+      with('executive', :config => new_cfg['executive'], :redis_config => {},
+        :boot_time => time).
       and_return(new_exec)
 
     config.should_receive(:for_redis).and_return({})
     fc = Flapjack::Coordinator.new(config)
+    fc.instance_variable_set('@boot_time', time)
     fc.instance_variable_set('@pikelets', [executive])
     fc.reload
     fc.instance_variable_get('@pikelets').should == [new_exec]

data/spec/lib/flapjack/data/entity_check_spec.rb

@@ -354,33 +354,6 @@ describe Flapjack::Data::EntityCheck, :redis => true do
 
   end
 
-  it "creates an acknowledgement" do
-    ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
-    t = Time.now.to_i
-    ec.create_acknowledgement('summary'            => 'looking now',
-                              'time'               => t,
-                              'acknowledgement_id' => '75',
-                              'duration'           => 40 * 60)
-    event_json = @redis.rpop('events')
-    event_json.should_not be_nil
-    event = nil
-    expect {
-      event = JSON.parse(event_json)
-    }.not_to raise_error
-    event.should_not be_nil
-    event.should be_a(Hash)
-    event.should == {
-      'entity'             => name,
-      'check'              => check,
-      'type'               => 'action',
-      'state'              => 'acknowledgement',
-      'summary'            => 'looking now',
-      'time'               => t,
-      'acknowledgement_id' => '75',
-      'duration'           => 2400
-    }
-  end
-
   it "returns its state" do
     @redis.hset("check:#{name}:#{check}", 'state', 'ok')
 
@@ -520,9 +493,9 @@ describe Flapjack::Data::EntityCheck, :redis => true do
     @redis.set("#{name}:#{check}:last_recovery_notification", t)
 
     ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
-    ec.last_problem_notification.should == t - 30
-    ec.last_acknowledgement_notification.should == t - 15
-    ec.last_recovery_notification.should == t
+    ec.last_notification_for_state(:problem)[:timestamp].should == t - 30
+    ec.last_notification_for_state(:acknowledgement)[:timestamp].should == t - 15
+    ec.last_notification_for_state(:recovery)[:timestamp].should == t
   end
 
   it "finds all related contacts" do