flapjack 0.7.18 → 0.7.19

data/lib/flapjack/data/notification_rule.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'yajl/json_gem'
+require 'oj'
 require 'active_support/time'
 require 'ice_cube'
 require 'flapjack/utility'
@@ -129,11 +129,11 @@ module Flapjack
         json_rule_data = {
           :id                 => rule_data[:id].to_s,
           :contact_id         => rule_data[:contact_id].to_s,
-          :entities           => Yajl::Encoder.encode(rule_data[:entities]),
-          :entity_tags        => Yajl::Encoder.encode(rule_data[:entity_tags]),
-          :time_restrictions  => Yajl::Encoder.encode(rule_data[:time_restrictions]),
-          :warning_media      => Yajl::Encoder.encode(rule_data[:warning_media]),
-          :critical_media     => Yajl::Encoder.encode(rule_data[:critical_media]),
+          :entities           => Oj.dump(rule_data[:entities]),
+          :entity_tags        => Oj.dump(rule_data[:entity_tags]),
+          :time_restrictions  => Oj.dump(rule_data[:time_restrictions]),
+          :warning_media      => Oj.dump(rule_data[:warning_media]),
+          :critical_media     => Oj.dump(rule_data[:critical_media]),
           :warning_blackhole  => rule_data[:warning_blackhole],
           :critical_blackhole => rule_data[:critical_blackhole],
         }
@@ -284,11 +284,11 @@ module Flapjack
         rule_data = @redis.hgetall("notification_rule:#{@id}")
 
         @contact_id         = rule_data['contact_id']
-        @entity_tags        = Yajl::Parser.parse(rule_data['entity_tags'] || '')
-        @entities           = Yajl::Parser.parse(rule_data['entities'] || '')
-        @time_restrictions  = Yajl::Parser.parse(rule_data['time_restrictions'] || '')
-        @warning_media      = Yajl::Parser.parse(rule_data['warning_media'] || '')
-        @critical_media     = Yajl::Parser.parse(rule_data['critical_media'] || '')
+        @entity_tags        = Oj.load(rule_data['entity_tags'] || '')
+        @entities           = Oj.load(rule_data['entities'] || '')
+        @time_restrictions  = Oj.load(rule_data['time_restrictions'] || '')
+        @warning_media      = Oj.load(rule_data['warning_media'] || '')
+        @critical_media     = Oj.load(rule_data['critical_media'] || '')
         @warning_blackhole  = ((rule_data['warning_blackhole'] || 'false').downcase == 'true')
         @critical_blackhole = ((rule_data['critical_blackhole'] || 'false').downcase == 'true')
       end

data/lib/flapjack/filters/acknowledgement.rb

@@ -21,8 +21,8 @@ module Flapjack
               if ec.nil?
                 @logger.error "Filter: Acknowledgement: unknown entity for event '#{event.id}'"
               else
-                ec.create_unscheduled_maintenance(:start_time => timestamp,
-                  :duration => (event.duration || (4 * 60 * 60)),
+                ec.create_unscheduled_maintenance(timestamp,
+                  (event.duration || (4 * 60 * 60)),
                   :summary  => event.summary)
                 message = "unscheduled maintenance created for #{event.id}"
               end

data/lib/flapjack/filters/ok.rb

@@ -40,7 +40,7 @@ module Flapjack
           end
 
           # end any unscheduled downtime
-          entity_check.end_unscheduled_maintenance
+          entity_check.end_unscheduled_maintenance(Time.now.to_i)
         end
 
         @logger.debug("Filter: Ok: #{result ? "block" : "pass"}")

data/lib/flapjack/gateways/api/entity_check_presenter.rb

@@ -21,6 +21,7 @@ module Flapjack
         def status
           {'name'                              => @entity_check.check,
            'state'                             => @entity_check.state,
+           'enabled'                           => @entity_check.enabled?,
            'summary'                           => @entity_check.summary,
            'details'                           => @entity_check.details,
            'in_unscheduled_maintenance'        => @entity_check.in_unscheduled_maintenance?,

data/lib/flapjack/gateways/api/entity_methods.rb

@@ -222,8 +222,8 @@ module Flapjack
             halt( err(403, "start time must be provided") ) unless start_time
 
             act_proc = proc {|entity_check|
-              entity_check.create_scheduled_maintenance(:start_time => start_time,
-                :duration => params[:duration].to_i, :summary => params[:summary])
+              entity_check.create_scheduled_maintenance(start_time,
+                params[:duration].to_i, :summary => params[:summary])
             }
 
             bulk_api_check_action(entities, checks, act_proc)
@@ -272,10 +272,8 @@ module Flapjack
               opts = {}
               proc {|entity_check| entity_check.end_scheduled_maintenance(start_time.to_i) }
             when 'unscheduled_maintenances'
-              end_time = validate_and_parsetime(params[:end_time])
-              opts = {}
-              opts[:end_time] = end_time.to_i if end_time
-              proc {|entity_check| entity_check.end_unscheduled_maintenance(opts) }
+              end_time = validate_and_parsetime(params[:end_time]) || Time.now
+              proc {|entity_check| entity_check.end_unscheduled_maintenance(end_time.to_i) }
             end
 
             bulk_api_check_action(entities, checks, act_proc)

data/lib/flapjack/gateways/api/rack/json_params_parser.rb

@@ -9,7 +9,7 @@ module Rack
         env['rack.request.form_input'] = env['rack.input']
         data = env['rack.input'].read
         env['rack.input'].rewind
-        env['rack.request.form_hash'] = data.empty? ? {} : JSON.parse(data)
+        env['rack.request.form_hash'] = data.empty? ? {} : Oj.load(data)
       end
       app.call(env)
     end

data/lib/flapjack/gateways/email.rb

@@ -2,7 +2,6 @@
 
 require 'mail'
 require 'erb'
-require 'haml'
 require 'socket'
 
 require 'em-synchrony'
@@ -113,10 +112,9 @@ module Flapjack
         text_template = ERB.new(File.read(File.dirname(__FILE__) +
           '/email/alert.text.erb'))
 
-        haml_engine = Haml::Engine.new(File.read(File.dirname(__FILE__) +
-          '/email/alert.html.haml'))
+        html_template = ERB.new(File.read(File.dirname(__FILE__) +
+          '/email/alert.html.erb'))
 
-        mail_scope = self
         bnd = binding
 
         # this part is the only use of the mail gem -- maybe this can be done
@@ -133,7 +131,7 @@ module Flapjack
 
           html_part do
             content_type 'text/html; charset=UTF-8'
-            body haml_engine.render(mail_scope)
+            body html_template.result(bnd)
           end
         end
       end

data/lib/flapjack/gateways/jabber.rb

@@ -10,11 +10,9 @@ require 'em-synchrony'
 require 'redis/connection/synchrony'
 require 'redis'
 
-require 'chronic_duration'
-
 require 'blather/client/client'
-require 'em-synchrony/fiber_iterator'
-require 'yajl/json_gem'
+require 'chronic_duration'
+require 'oj'
 
 require 'flapjack/data/entity_check'
 require 'flapjack/redis_pool'
@@ -28,11 +26,27 @@ module Flapjack
     class Jabber < Blather::Client
       include Flapjack::Utility
 
-      log = Logger.new(STDOUT)
-      # log.level = Logger::DEBUG
-      log.level = Logger::INFO
+      log = ::Logger.new(STDOUT)
+      log.level = ::Logger::INFO
       Blather.logger = log
 
+      # TODO if we use 'xmpp4r' rather than 'blather', port this to 'rexml'
+      class TextHandler < Nokogiri::XML::SAX::Document
+        def initialize
+          @chunks = []
+        end
+
+        attr_reader :chunks
+
+        def cdata_block(string)
+          characters(string)
+        end
+
+        def characters(string)
+          @chunks << string.strip if string.strip != ""
+        end
+      end
+
       def initialize(opts = {})
         @config = opts[:config]
         @redis_config = opts[:redis_config]
@@ -49,7 +63,7 @@ module Flapjack
 
       def stop
         @should_quit = true
-        @redis.rpush(@config['queue'], JSON.generate('notification_type' => 'shutdown'))
+        @redis.rpush(@config['queue'], Oj.dump('notification_type' => 'shutdown'))
       end
 
       def setup
@@ -116,12 +130,18 @@ module Flapjack
         end
       end
 
-      def interpreter(command)
+      def interpreter(command_raw)
         msg          = nil
         action       = nil
         entity_check = nil
-        case
-        when command =~ /^ACKID\s+(\d+)(?:\s*(.*?)(?:\s*duration:.*?(\w+.*))?)$/i;
+
+        th = TextHandler.new
+        parser = Nokogiri::HTML::SAX::Parser.new(th)
+        parser.parse(command_raw)
+        command = th.chunks.join(' ')
+
+        case command
+        when /^ACKID\s+(\d+)(?:\s*(.*?)(?:\s*duration:.*?(\w+.*))?)$/i
           ackid        = $1
           comment      = $2
           duration_str = $3
@@ -171,16 +191,16 @@ module Flapjack
             }
           end
 
-        when command =~ /^help$/
+        when /^help$/i
           msg = "commands: \n" +
                 "  ACKID <id> <comment> [duration: <time spec>] \n" +
                 "  find entities matching /pattern/ \n" +
                 "  test notifications for <entity>[:<check>] \n" +
-                "  tell me about <entity>[:<check>]" +
+                "  tell me about <entity>[:<check>] \n" +
                 "  identify \n" +
                 "  help \n"
 
-        when command =~ /^identify$/
+        when /^identify$/i
           t    = Process.times
           fqdn = `/bin/hostname -f`.chomp
           pid  = Process.pid
@@ -190,7 +210,7 @@ module Flapjack
                  "System CPU Time: #{t.stime}\n" +
                  `uname -a`.chomp + "\n"
 
-        when command =~ /^test notifications for\s+([a-z0-9\-\.]+)(?::(.+))?$/i
+        when /^test notifications for\s+([a-z0-9\-\.]+)(?::(.+))?$/i
           entity_name = $1
           check_name  = $2 || 'test'
 
@@ -203,7 +223,7 @@ module Flapjack
             msg = "yeah, no I can't see #{entity_name} in my systems"
           end
 
-        when command =~ /^tell me about\s+([a-z0-9\-\.]+)(?::(.+))?$+/
+        when /^tell me about\s+([a-z0-9\-\.]+)(?::(.+))?$+/i
           entity_name = $1
           check_name  = $2
 
@@ -216,27 +236,38 @@ module Flapjack
             get_details = proc {|entity_check|
               sched   = entity_check.current_maintenance(:scheduled => true)
               unsched = entity_check.current_maintenance(:unscheduled => true)
+              out = ''
 
-              if (sched || unsched) && check_name.nil?
+              if check_name.nil?
                 check = entity_check.check
-                msg += "---\n#{entity_name}:#{check}\n"
+                out += "---\n#{entity_name}:#{check}\n"
               end
 
-              unless sched.nil?
-                start  = Time.at(sched[:start_time])
-                finish = Time.at(sched[:start_time] + sched[:duration])
-                remain = time_period_in_words( (finish - current_time).ceil )
-                # TODO a simpler time format?
-                msg += "Currently in scheduled maintenance: #{start} -> #{finish} (#{remain} remaining)\n"
-              end
+              if sched.nil? && unsched.nil?
+                out += "Not in scheduled or unscheduled maintenance.\n"
+              else
+                if sched.nil?
+                  out += "Not in scheduled maintenance.\n"
+                else
+                  start  = Time.at(sched[:start_time])
+                  finish = Time.at(sched[:start_time] + sched[:duration])
+                  remain = time_period_in_words( (finish - current_time).ceil )
+                  # TODO a simpler time format?
+                  out += "In scheduled maintenance: #{start} -> #{finish} (#{remain} remaining)\n"
+                end
 
-              unless unsched.nil?
-                start  = Time.at(unsched[:start_time])
-                finish = Time.at(unsched[:start_time] + unsched[:duration])
-                remain = time_period_in_words( (finish - current_time).ceil )
-                # TODO a simpler time format?
-                msg += "Currently in unscheduled maintenance: #{start} -> #{finish} (#{remain} remaining)\n"
+                if unsched.nil?
+                  out += "Not in unscheduled maintenance.\n"
+                else
+                  start  = Time.at(unsched[:start_time])
+                  finish = Time.at(unsched[:start_time] + unsched[:duration])
+                  remain = time_period_in_words( (finish - current_time).ceil )
+                  # TODO a simpler time format?
+                  out += "In unscheduled maintenance: #{start} -> #{finish} (#{remain} remaining)\n"
+                end
               end
+
+              out
             }
 
             check_names = check_name.nil? ? entity.check_list.sort : [check_name]
@@ -247,14 +278,14 @@ module Flapjack
               check_names.each do |check|
                 entity_check = Flapjack::Data::EntityCheck.for_entity(entity, check, :redis => @redis)
                 next if entity_check.nil?
-                get_details.call(entity_check)
+                msg += get_details.call(entity_check)
               end
             end
           else
             msg = "hmmm, I can't see #{entity_name} in my systems"
           end
 
-        when command =~ /^(find )?entities matching\s+\/(.*)\/.*$/i
+        when /^(find )?entities matching\s+\/(.*)\/.*$/i
           pattern = $2.chomp.strip
           entity_list = Flapjack::Data::Entity.find_all_name_matching(pattern, :redis => @redis)
 
@@ -279,7 +310,7 @@ module Flapjack
             msg = "that doesn't seem to be a valid pattern - /#{pattern}/"
           end
 
-        when command =~ /^(.*)/
+        when /^(.*)/
           words = $1
           msg   = "what do you mean, '#{words}'? Type 'help' for a list of acceptable commands."
 
@@ -399,7 +430,7 @@ module Flapjack
           if connected?
             @logger.debug("jabber is connected so commencing blpop on #{queue}")
             events[queue] = @redis.blpop(queue, 0)
-            event         = Yajl::Parser.parse(events[queue][1])
+            event         = Oj.load(events[queue][1])
             type          = event['notification_type'] || 'unknown'
             @logger.debug('jabber notification event received')
             @logger.debug(event.inspect)

data/lib/flapjack/gateways/oobetet.rb

@@ -4,8 +4,7 @@ require 'socket'
 require 'eventmachine'
 require 'em-synchrony'
 require 'blather/client/client'
-require 'em-synchrony/fiber_iterator'
-require 'yajl/json_gem'
+require 'oj'
 
 require 'flapjack/utility'
 
@@ -16,9 +15,8 @@ module Flapjack
     class Oobetet < Blather::Client
       include Flapjack::Utility
 
-      log = Logger.new(STDOUT)
-      # log.level = Logger::DEBUG
-      log.level = Logger::INFO
+      log = ::Logger.new(STDOUT)
+      log.level = ::Logger::INFO
       Blather.logger = log
 
       def initialize(opts = {})
@@ -212,9 +210,9 @@ module Flapjack
       end
 
       def send_pagerduty_event(event)
-        options  = { :body => Yajl::Encoder.encode(event) }
+        options  = { :body => Oj.dump(event) }
         http = EM::HttpRequest.new(@pagerduty_events_api_url).post(options)
-        response = Yajl::Parser.parse(http.response)
+        response = Oj.load(http.response)
         status   = http.response_header.status
         @logger.debug "send_pagerduty_event got a return code of #{status.to_s} - #{response.inspect}"
         [status, response]

data/lib/flapjack/gateways/pagerduty.rb

@@ -3,7 +3,7 @@
 require 'em-synchrony'
 require 'em-synchrony/em-http'
 
-require 'yajl/json_gem'
+require 'oj'
 
 require 'flapjack/data/entity_check'
 require 'flapjack/data/global'
@@ -32,7 +32,7 @@ module Flapjack
       def stop
         @logger.info("stopping")
         @should_quit = true
-        @redis.rpush(@config['queue'], JSON.generate('notification_type' => 'shutdown'))
+        @redis.rpush(@config['queue'], Oj.dump('notification_type' => 'shutdown'))
       end
 
       def start
@@ -56,7 +56,7 @@ module Flapjack
         until @should_quit
           @logger.debug("pagerduty gateway is going into blpop mode on #{queue}")
           events[queue] = @redis.blpop(queue, 0)
-          event         = Yajl::Parser.parse(events[queue][1])
+          event         = Oj.load(events[queue][1])
           type          = event['notification_type']
           @logger.debug("pagerduty notification event popped off the queue: " + event.inspect)
           unless 'shutdown'.eql?(type)
@@ -134,9 +134,9 @@ module Flapjack
       end
 
       def send_pagerduty_event(event)
-        options  = { :body => Yajl::Encoder.encode(event) }
+        options  = { :body => Oj.dump(event) }
         http = EM::HttpRequest.new(PAGERDUTY_EVENTS_API_URL).post(options)
-        response = Yajl::Parser.parse(http.response)
+        response = Oj.load(http.response)
         status   = http.response_header.status
         @logger.debug "send_pagerduty_event got a return code of #{status.to_s} - #{response.inspect}"
         [status, response]
@@ -215,8 +215,8 @@ module Flapjack
 
         http = EM::HttpRequest.new(url).get(options)
         begin
-          response = Yajl::Parser.parse(http.response)
-        rescue Yajl::ParseError
+          response = Oj.load(http.response)
+        rescue Oj::Error
           @logger.error("failed to parse json from a post to #{url} ... response headers and body follows...")
           return nil
         end

data/lib/flapjack/gateways/web.rb

@@ -3,8 +3,9 @@
 require 'chronic'
 require 'chronic_duration'
 require 'sinatra/base'
-require 'haml'
+require 'erb'
 require 'rack/fiber_pool'
+require 'json'
 
 require 'flapjack/rack_logger'
 
@@ -61,6 +62,16 @@ module Flapjack
       set :views, settings.root + '/web/views'
       set :public_folder, settings.root + '/web/public'
 
+      helpers do
+        def h(text)
+          ERB::Util.h(text)
+        end
+
+        def u(text)
+          ERB::Util.u(text)
+        end
+      end
+
       def redis
         self.class.instance_variable_get('@redis')
       end
@@ -72,39 +83,48 @@ module Flapjack
       get '/' do
         check_stats
         entity_stats
-        haml :index
+
+        erb 'index.html'.to_sym
       end
 
       get '/checks_all' do
         check_stats
         @adjective = 'all'
 
-        # TODO (?) recast as Entity.all do |e|; e.checks.do |ec|; ...
-        @states = redis.keys('*:*:states').map { |r|
-          entity, check = r.sub(/:states$/, '').split(':', 2)
-          [entity, check] + entity_check_state(entity, check)
-        }.compact.sort_by {|parts| parts }
+        checks_by_entity = Flapjack::Data::EntityCheck.find_all_by_entity(:redis => redis)
+        @states = checks_by_entity.keys.inject({}) {|result, entity|
+          result[entity] = checks_by_entity[entity].sort.map {|check|
+            [check] + entity_check_state(entity, check)
+          }
+          result
+        }
+        @entities_sorted = checks_by_entity.keys.sort
 
-        haml :checks
+        erb 'checks.html'.to_sym
       end
 
       get '/checks_failing' do
         check_stats
         @adjective = 'failing'
 
-        @states = redis.zrange('failed_checks', 0, -1).map {|key|
-          parts  = key.split(':', 2)
-          [parts[0], parts[1]] + entity_check_state(parts[0], parts[1])
-        }.compact.sort_by {|parts| parts}
+        checks_by_entity = Flapjack::Data::EntityCheck.find_all_failing_by_entity(:redis => redis)
+        @states = checks_by_entity.keys.inject({}) {|result, entity|
+          result[entity] = checks_by_entity[entity].sort.map {|check|
+            [check] + entity_check_state(entity, check)
+          }
+          result
+        }
+        @entities_sorted = checks_by_entity.keys.sort
 
-        haml :checks
+        erb 'checks.html'.to_sym
       end
 
       get '/self_stats' do
         self_stats
         entity_stats
         check_stats
-        haml :self_stats
+
+        erb 'self_stats.html'.to_sym
       end
 
       get '/self_stats.json' do
@@ -124,13 +144,6 @@ module Flapjack
               'failure' => @event_counters['failure'].to_i,
               'action'  => @event_counters['action'].to_i,
             }
-#            'instance' => {
-#              'total'   => @event_counters_instance['all'].to_i,
-#              'ok'      => @event_counters_instance['ok'].to_i,
-#              'failure' => @event_counters_instance['failure'].to_i,
-#              'action'  => @event_counters_instance['action'].to_i,
-#              'average' => @event_rate_all.to_i,
-#            }
           },
           'total_keys' => @dbsize,
           'uptime'     => @uptime_string,
@@ -144,24 +157,26 @@ module Flapjack
         entity_stats
         @adjective = 'all'
         @entities = Flapjack::Data::Entity.find_all_with_checks(:redis => redis)
-        haml :entities
+
+        erb 'entities.html'.to_sym
       end
 
       get '/entities_failing' do
         entity_stats
         @adjective = 'failing'
         @entities = Flapjack::Data::Entity.find_all_with_failing_checks(:redis => redis)
-        haml :entities
+
+        erb 'entities.html'.to_sym
       end
 
       get '/entity/:entity' do
         @entity = params[:entity]
         entity_stats
-        @states = redis.keys("#{@entity}:*:states").map { |r|
-          check = r.sub(/^#{@entity}:/, '').sub(/:states$/, '')
-          [@entity, check] + entity_check_state(@entity, check)
-        }.compact.sort_by {|parts| parts }
-        haml :entity
+        @states = Flapjack::Data::EntityCheck.find_all_for_entity_name(@entity, :redis => redis).sort.map { |check|
+          [check] + entity_check_state(@entity, check)
+        }.sort_by {|parts| parts }
+
+        erb 'entity.html'.to_sym
       end
 
       get '/check' do
@@ -176,11 +191,14 @@ module Flapjack
         last_change = entity_check.last_change
 
         @check_state                = entity_check.state
+        @check_enabled              = entity_check.enabled?
         @check_last_update          = entity_check.last_update
         @check_last_change          = last_change
         @check_summary              = entity_check.summary
         @check_details              = entity_check.details
-        @last_notifications         = entity_check.last_notifications_of_each_type
+
+        @last_notifications         = last_notification_data(entity_check)
+
         @scheduled_maintenances     = entity_check.maintenances(nil, nil, :scheduled => true)
         @acknowledgement_id         = entity_check.failed? ?
           entity_check.event_count_at(entity_check.last_change) : nil
@@ -193,7 +211,7 @@ module Flapjack
         @state_changes = entity_check.historical_states(nil, Time.now.to_i,
                            :order => 'desc', :limit => 20)
 
-        haml :check
+        erb 'check.html'.to_sym
       end
 
       post '/acknowledgements/:entity/:check' do
@@ -256,14 +274,23 @@ module Flapjack
         redirect back
       end
 
+      # delete a check (actually just disables it)
+      delete '/checks/:entity/:check' do
+        entity_check = get_entity_check(params[:entity], params[:check])
+        return 404 if entity_check.nil?
+
+        entity_check.disable!
+        redirect back
+      end
+
       get '/contacts' do
         #self_stats
         @contacts = Flapjack::Data::Contact.all(:redis => redis)
-        haml :contacts
+
+        erb 'contacts.html'.to_sym
       end
 
       get "/contacts/:contact" do
-        #self_stats
         contact_id = params[:contact]
 
         if contact_id
@@ -279,17 +306,22 @@ module Flapjack
           @pagerduty_credentials = @contact.pagerduty_credentials
         end
 
+        # FIXME: intersect with current checks, or push down to Contact.entities
         @entities_and_checks = @contact.entities(:checks => true).sort_by {|ec|
           ec[:entity].name
         }
 
-        haml :contact
+        erb 'contact.html'.to_sym
       end
 
     protected
 
-      def render_haml(file, scope)
-        Haml::Engine.new(File.read(File.dirname(__FILE__) + '/web/views/' + file)).render(scope)
+      # TODO cache constructed erb object to improve performance -- check mtime
+      # to know when to refresh; would need to synchronize accesses to the cache,
+      # to lock out reads while it's being refreshed
+      def render_erb(file, bind)
+        erb = ERB.new(File.read(File.dirname(__FILE__) + '/web/views/' + file))
+        erb.result(bind)
       end
 
     private
@@ -307,18 +339,33 @@ module Flapjack
         return if entity.nil?
         entity_check = Flapjack::Data::EntityCheck.for_entity(entity,
           check, :redis => redis)
+        summary = entity_check.summary
+        summary = summary[0..76] + '...' unless summary.length < 81
         latest_notif =
           {:problem         => entity_check.last_notification_for_state(:problem)[:timestamp],
            :recovery        => entity_check.last_notification_for_state(:recovery)[:timestamp],
            :acknowledgement => entity_check.last_notification_for_state(:acknowledgement)[:timestamp]
           }.max_by {|n| n[1] || 0}
+
+        lc = entity_check.last_change
+        last_change   = lc ? ChronicDuration.output(Time.now.to_i - lc.to_i,
+                               :format => :short, :keep_zero => true, :units => 2) : 'never'
+
+        lu = entity_check.last_update
+        last_update   = lu ? ChronicDuration.output(Time.now.to_i - lu.to_i,
+                               :format => :short, :keep_zero => true, :units => 2) : 'never'
+
+        ln = latest_notif[1]
+        last_notified = ln ? ChronicDuration.output(Time.now.to_i - ln.to_i,
+                               :format => :short, :keep_zero => true, :units => 2) + ", #{latest_notif[0]}" : 'never'
+
         [(entity_check.state       || '-'),
-         (entity_check.last_change || '-'),
-         (entity_check.last_update || '-'),
+         (summary                  || '-'),
+         last_change,
+         last_update,
          entity_check.in_unscheduled_maintenance?,
          entity_check.in_scheduled_maintenance?,
-         latest_notif[0],
-         latest_notif[1]
+         last_notified
         ]
       end
 
@@ -347,10 +394,23 @@ module Flapjack
       end
 
       def check_stats
-        @count_all_checks        = redis.keys('check:*:*').length
-        @count_failing_checks    = redis.zcard 'failed_checks'
+        # FIXME: move this logic to Flapjack::Data::EntityCheck
+        @count_all_checks        = Flapjack::Data::EntityCheck.count_all(:redis => redis)
+        @count_failing_checks    = Flapjack::Data::EntityCheck.count_all_failing(:redis => redis)
       end
 
+      def last_notification_data(entity_check)
+        last_notifications = entity_check.last_notifications_of_each_type
+        [: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]}
+          end
+          memo
+        end
+      end
 
     end