flapjack 0.6.36 → 0.6.37

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - "1.9.3"
+gemfile:
+  - Gemfile
+services:
+  - redis-server
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec
+

data/Rakefile

@@ -27,7 +27,7 @@ end
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => :tests
 
 namespace :verify do
   task :uncommitted do
@@ -46,3 +46,4 @@ end
 
 # FIXME: getting that intermittent gherken lexing error so removing :features from verify list
 task :verify => [ 'verify:all', :spec, :features]
+task :tests  => [ :spec, :features]

data/lib/flapjack/api.rb

@@ -47,8 +47,13 @@ module Flapjack
 
   class API < Sinatra::Base
 
-    # doesn't work with Rack::Test for some reason
-    unless 'test'.eql?(FLAPJACK_ENV)
+    set :show_exceptions, false
+
+    if 'test'.eql?(FLAPJACK_ENV)
+      # expose test errors properly
+      set :raise_errors, true
+    else
+      # doesn't work with Rack::Test unless we wrap tests in EM.synchrony blocks
       rescue_exception = Proc.new { |env, exception|
         logger.error exception.message
         logger.error exception.backtrace.join("\n")
@@ -62,8 +67,6 @@ module Flapjack
 
     extend Flapjack::Pikelet
 
-    set :show_exceptions, 'development'.eql?(FLAPJACK_ENV)
-
     before do
       # will only initialise the first time it's run
       Flapjack::API.bootstrap

data/lib/flapjack/data/contact.rb

@@ -1,77 +1,115 @@
 #!/usr/bin/env ruby
 
+# NB: use of redis.keys probably indicates we should maintain a data
+# structure to avoid the need for this type of query
+
 module Flapjack
 
   module Data
 
     class Contact
 
-      # takes a check, looks up contacts that are interested in this check (or in the check's entity)
-      # and returns an array of contact ids
-      def self.find_all_for_entity_check(entity_check, options = {})
+      attr_accessor :first_name, :last_name, :email, :media, :pagerduty_credentials, :id
+
+      def self.all(options = {})
         raise "Redis connection not set" unless redis = options[:redis]
-        logger = options[:logger]
 
-        entity = entity_check.entity
-        check  = entity_check.check
+        contact_keys = redis.keys('contact:*')
 
-        if logger
-          logger.debug("contacts for #{entity.id} (#{entity.name}): " + redis.smembers("contacts_for:#{entity.id}").length.to_s)
-          logger.debug("contacts for #{check}: " + redis.smembers("contacts_for:#{check}").length.to_s)
-        end
-
-        union = redis.sunion("contacts_for:#{entity.id}", "contacts_for:#{check}")
-        logger.debug("contacts for union of #{entity.id} and #{check}: " + union.length.to_s) if logger
-        union
+        contact_keys.inject([]) {|ret, k|
+          k =~ /^contact:(\d+)$/
+          id = $1
+          contact = self.find_by_id(id, :redis => redis)
+          ret << contact if contact
+          ret
+        }
       end
 
       def self.delete_all(options = {})
         raise "Redis connection not set" unless redis = options[:redis]
 
-        contacts = redis.keys('contact:*')
+        redis.del( redis.keys("contact:*") +
+                   redis.keys("contact_media:*") +
+                   redis.keys("contact_pagerduty:*") +
+                   redis.keys('contacts_for:*') )
+      end
 
-        contacts.each do |c|
-          c =~ /^contact:(\d+)$/
-          id = $1
+      def self.find_by_id(id, options = {})
+        raise "Redis connection not set" unless redis = options[:redis]
+        raise "No id value passed" unless id
+        logger = options[:logger]
 
-          redis.del("contact:#{id}")
-          redis.del("contact_media:#{id}")
-          redis.del("contact_pagerduty:#{id}")
+        fn, ln, em = redis.hmget("contact:#{id}", 'first_name', 'last_name', 'email')
+        me = redis.hgetall("contact_media:#{id}")
+
+        # similar to code in instance method pagerduty_credentials
+        pc = nil
+        if service_key = redis.hget("contact_media:#{id}", 'pagerduty')
+          pc = redis.hgetall("contact_pagerduty:#{id}").merge('service_key' => service_key)
         end
+
+        self.new(:first_name => fn, :last_name => ln,
+          :email => em, :id => id, :media => me, :pagerduty_credentials => pc, :redis => redis )
       end
 
+
       # NB: should probably be called in the context of a Redis multi block; not doing so
       # here as calling classes may well be adding/updating multiple records in the one
       # operation
+      # TODO maybe return the instantiated Contact record?
       def self.add(contact, options = {})
         raise "Redis connection not set" unless redis = options[:redis]
 
-        redis.del("contact:#{contact['id']}")
-        redis.del("contact_media:#{contact['id']}")
-        redis.del("contact_pagerduty:#{contact['id']}")
-        ['first_name', 'last_name', 'email'].each do |field|
-          redis.hset("contact:#{contact['id']}", field, contact[field])
-        end
+        redis.del("contact:#{contact['id']}",
+                  "contact_media:#{contact['id']}",
+                  "contact_pagerduty:#{contact['id']}")
+
+        redis.hmset("contact:#{contact['id']}",
+                    *['first_name', 'last_name', 'email'].collect {|f| [f, contact[f]]})
+
         contact['media'].each_pair {|medium, address|
           case medium
           when 'pagerduty'
             redis.hset("contact_media:#{contact['id']}", medium, address['service_key'])
-            redis.hset("contact_pagerduty:#{contact['id']}", 'subdomain', address['subdomain'])
-            redis.hset("contact_pagerduty:#{contact['id']}", 'username',  address['username'])
-            redis.hset("contact_pagerduty:#{contact['id']}", 'password',  address['password'])
+            redis.hmset("contact_pagerduty:#{contact['id']}",
+                        *['subdomain', 'username', 'password'].collect {|f| [f, address[f]]})
           else
             redis.hset("contact_media:#{contact['id']}", medium, address)
           end
         }
       end
 
-      def self.pagerduty_credentials_for_contact(contact, options = {})
-        raise "Redis connection not set" unless redis = options[:redis]
+      def pagerduty_credentials
+        return unless service_key = @redis.hget("contact_media:#{self.id}", 'pagerduty')
+        @redis.hgetall("contact_pagerduty:#{self.id}").
+          merge('service_key' => service_key)
+      end
+
+      def entities
+        @redis.keys('contacts_for:*').inject([]) {|ret, k|
+          if @redis.sismember(k, self.id)
+            k =~ /^contacts_for:(.+)$/
+            entity_id = $1
+            if entity_name = @redis.hget("entity:#{entity_id}", 'name')
+              ret << Flapjack::Data::Entity.new(:name => entity_name,
+                      :id => entity_id, :redis => @redis)
+            end
+          end
+          ret
+        }
+      end
 
-        return unless service_key = redis.hget("contact_media:#{contact}", 'pagerduty')
+      def name
+        [(self.first_name || ''), (self.last_name || '')].join(" ").strip
+      end
 
-        redis.hgetall("contact_pagerduty:#{contact}").
-          merge('service_key' => service_key)
+    private
+
+      def initialize(options = {})
+        raise "Redis connection not set" unless @redis = options[:redis]
+        [:first_name, :last_name, :email, :media, :id].each do |field|
+          instance_variable_set(:"@#{field.to_s}", options[field])
+        end
       end
 
     end

data/lib/flapjack/data/entity_check.rb

@@ -6,6 +6,9 @@ require 'flapjack/patches'
 
 require 'flapjack/data/entity'
 
+# TODO might want to split the class methods out to a separate class, DAO pattern
+# ( http://en.wikipedia.org/wiki/Data_access_object ).
+
 module Flapjack
 
   module Data
@@ -415,21 +418,33 @@ module Flapjack
       # has pagerduty credentials then there'll be one hash in the array for each set of
       # credentials.
       def pagerduty_credentials(options)
-        creds = []
-        raise "Redis connection not set" unless redis = options[:redis]
-        logger = options[:logger]
+        # raise "Redis connection not set" unless redis = options[:redis]
 
-        contacts = Flapjack::Data::Contact.find_all_for_entity_check(self, { :redis => redis, :logger => logger })
-        contacts.each {|contact|
-          cred = Flapjack::Data::Contact.pagerduty_credentials_for_contact(contact, { :redis => redis, :logger => logger })
-          creds << cred if cred
+        self.contacts.inject([]) {|ret, contact|
+          cred = contact.pagerduty_credentials
+          ret << cred if cred
+          ret
         }
-        creds
+      end
+
+      # takes a check, looks up contacts that are interested in this check (or in the check's entity)
+      # and returns an array of contact records
+      def contacts
+        entity = @entity
+        check  = @check
+
+        if @logger
+          @logger.debug("contacts for #{@entity.id} (#{@entity.name}): " + @redis.smembers("contacts_for:#{@entity.id}").length.to_s)
+          @logger.debug("contacts for #{check}: " + @redis.smembers("contacts_for:#{check}").length.to_s)
+        end
+
+        union = @redis.sunion("contacts_for:#{@entity.id}", "contacts_for:#{check}")
+        @logger.debug("contacts for union of #{@entity.id} and #{check}: " + union.length.to_s) if @logger
+        union.collect {|c_id| Flapjack::Data::Contact.find_by_id(c_id, :redis => @redis) }
       end
 
     private
 
-      # Passing around the redis handle like this is a SMELL.
       def initialize(entity, check, options = {})
         raise "Redis connection not set" unless @redis = options[:redis]
         raise "Invalid entity" unless @entity = entity

data/lib/flapjack/executive.rb

@@ -204,8 +204,7 @@ module Flapjack
       @redis.rpush("#{event.id}:#{notification_type}_notifications", timestamp)
       @logger.debug("Notification of type #{notification_type} is being generated for #{event.id}.")
 
-      send_notifications(event, notification_type,
-                         Flapjack::Data::Contact.find_all_for_entity_check(entity_check, :redis => @redis))
+      send_notifications(event, notification_type, entity_check.contacts)
     end
 
     # takes an event, a notification type, and an array of contacts and creates jobs in resque
@@ -217,20 +216,28 @@ module Flapjack
                        'time'              => event.time,
                        'notification_type' => notification_type }
 
-      contacts.each {|contact_id|
-        media = media_for_contact(contact_id)
+      if contacts.empty?
+        @notifylog.info("#{Time.now.to_s} | #{event.id} | #{notification_type} | NO CONTACTS")
+        return
+      end
 
-        contact_deets = {'contact_id'         => contact_id,
-                         'contact_first_name' => @redis.hget("contact:#{contact_id}", 'first_name'),
-                         'contact_last_name'  => @redis.hget("contact:#{contact_id}", 'last_name'), }
+      contacts.each {|contact|
 
-        notification = notification.merge(contact_deets)
+        if contact.media.empty?
+          @notifylog.info("#{Time.now.to_s} | #{event.id} | #{notification_type} | #{contact.id} | NO MEDIA FOR CONTACT")
+          next
+        end
 
-        media.each_pair {|media_type, address|
+        notification.merge!({'contact_id'         => contact.id,
+                             'contact_first_name' => contact.first_name,
+                             'contact_last_name'  => contact.last_name, })
+
+        contact.media.each_pair {|media_type, address|
+
+          @notifylog.info("#{Time.now.to_s} | #{event.id} | " +
+            "#{notification_type} | #{contact.id} | #{media_type} | #{address}")
 
-          @notifylog.info("#{Time.now.to_s} | #{event.id} | #{notification_type} | #{contact_id} | #{media} | #{address}")
           # queue this notification
-          # FIXME: make a Contact class perhaps
           notif = notification.dup
           notif['media']   = media_type
           notif['address'] = address
@@ -239,43 +246,26 @@ module Flapjack
           notif['duration'] = dur if dur
           @logger.debug("send_notifications: sending notification: #{notif.inspect}")
 
+          unless @queues[media_type.to_sym]
+            # TODO log error
+            next
+          end
+
+          # TODO consider changing Resque jobs to use raw blpop like the others
           case media_type
           when "sms"
-            if @queues[:sms]
-              Resque.enqueue_to(@queues[:sms], Notification::Sms, notif)
-            end
+            Resque.enqueue_to(@queues[:sms], Notification::Sms, notif)
           when "email"
-            if @queues[:email]
-              Resque.enqueue_to(@queues[:email], Notification::Email, notif)
-            end
+            Resque.enqueue_to(@queues[:email], Notification::Email, notif)
           when "jabber"
-            if @queues[:jabber]
-              notif['event_count'] = @event_count if @event_count
-              # puts a notification into the jabber queue (redis list)
-              @redis.rpush(@queues[:jabber], Yajl::Encoder.encode(notif))
-            end
+            # TODO move next line up into other notif value setting above?
+            notif['event_count'] = @event_count if @event_count
+            @redis.rpush(@queues[:jabber], Yajl::Encoder.encode(notif))
           when "pagerduty"
-            if @queues[:pagerduty]
-              @redis.rpush(@queues[:pagerduty], Yajl::Encoder.encode(notif))
-            end
+            @redis.rpush(@queues[:pagerduty], Yajl::Encoder.encode(notif))
           end
         }
-        if media.length == 0
-          @notifylog.info("#{Time.now.to_s} | #{event.id} | #{notification_type} | #{contact_id} | NO MEDIA FOR CONTACT")
-        end
       }
-      if contacts.length == 0
-        @notifylog.info("#{Time.now.to_s} | #{event.id} | #{notification_type} | NO CONTACTS")
-      end
-    end
-
-    # takes a contact ID and returns a hash containing each of the media the contact wishes to be
-    # contacted by, and the associated address for each.
-    # eg:
-    #   media_for_contact('123') -> { :sms => "+61401234567", :email => "gno@free.dom" }
-    #
-    def media_for_contact(contact)
-      @redis.hgetall("contact_media:#{contact}")
     end
 
     # generates a fairly unique identifier to use as a message id

data/lib/flapjack/pagerduty.rb

@@ -134,7 +134,7 @@ module Flapjack
       # ok lets do it
       unacknowledged_failing_checks.each {|check|
         entity_check = Flapjack::Data::EntityCheck.for_event_id(check, { :redis => @redis_timer, :logger => @logger } )
-        pagerduty_credentials = entity_check.pagerduty_credentials( { :redis => @redis_timer, :logger => @logger } )
+        pagerduty_credentials = entity_check.pagerduty_credentials(:redis => @redis_timer)
 
         if pagerduty_credentials.length == 0
           @logger.debug("Found no pagerduty creditials for #{entity_check.entity_name}:#{entity_check.check}, moving on")

data/lib/flapjack/version.rb

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

data/lib/flapjack/web.rb

@@ -9,20 +9,33 @@ require 'haml'
 require 'rack/fiber_pool'
 
 require 'flapjack/pikelet'
+require 'flapjack/data/contact'
 require 'flapjack/data/entity_check'
 require 'flapjack/utility'
 
 module Flapjack
   class Web < Sinatra::Base
 
-    # doesn't work with Rack::Test for some reason
-    unless 'test'.eql?(FLAPJACK_ENV)
-      rescue_exception = Proc.new { |env, exception|
-        logger.error exception.message
-        logger.error exception.backtrace.join("\n")
-        [503, {}, exception.message]
-      }
+    if 'test'.eql?(FLAPJACK_ENV)
+      # expose test errors properly
+      set :raise_errors, true
+      set :show_exceptions, false
+    else
+      rescue_exception = Proc.new do |env, e|
+        if settings.show_exceptions?
+          # ensure the sinatra error page shows properly
+          request = Sinatra::Request.new(env)
+          printer = Sinatra::ShowExceptions.new(proc{ raise e })
+          s, h, b = printer.call(env)
+          [s, h, b]
+        else
+          logger.error e.message
+          logger.error e.backtrace.join("\n")
+          [503, {}, ""]
+        end
+      end
 
+      # doesn't work with Rack::Test unless we wrap tests in EM.synchrony blocks
       use Rack::FiberPool, :size => 25, :rescue_exception => rescue_exception
     end
     use Rack::MethodOverride
@@ -62,7 +75,6 @@ module Flapjack
     end
 
     get '/check' do
-      #begin
       @entity = params[:entity]
       @check  = params[:check]
 
@@ -83,12 +95,9 @@ module Flapjack
       @current_scheduled_maintenance   = entity_check.current_maintenance(:scheduled => true)
       @current_unscheduled_maintenance = entity_check.current_maintenance(:scheduled => false)
 
-      haml :check
-      #rescue Exception => e
-      #  puts e.message
-      #  puts e.backtrace.join("\n")
-      #end
+      @contacts                   = entity_check.contacts
 
+      haml :check
     end
 
     post '/acknowledgements/:entity/:check' do
@@ -110,6 +119,7 @@ module Flapjack
     end
 
     # FIXME: there is bound to be a more idiomatic / restful way of doing this
+    # (probably using 'delete' or 'patch')
     post '/end_unscheduled_maintenance/:entity/:check' do
       @entity = params[:entity]
       @check  = params[:check]
@@ -140,29 +150,20 @@ module Flapjack
 
     # modify scheduled maintenance
     patch '/scheduled_maintenances/:entity/:check' do
+      entity_check = get_entity_check(params[:entity], params[:check])
+      return 404 if entity_check.nil?
 
-      begin
-        puts "params: #{params.inspect}"
-
-        entity_check = get_entity_check(params[:entity], params[:check])
-        return 404 if entity_check.nil?
-
-        end_time   = Chronic.parse(params[:end_time]).to_i
-        start_time = params[:start_time].to_i
-        raise ArgumentError, "start time parsed to zero" unless start_time > 0
-
-        patches = {}
-        patches[:end_time] = end_time if end_time && (end_time > start_time)
+      end_time   = Chronic.parse(params[:end_time]).to_i
+      start_time = params[:start_time].to_i
+      raise ArgumentError, "start time parsed to zero" unless start_time > 0
 
-        raise ArgumentError.new("no valid data received to patch with") if patches.empty?
+      patches = {}
+      patches[:end_time] = end_time if end_time && (end_time > start_time)
 
-        entity_check.update_scheduled_maintenance(start_time, patches)
-        redirect back
+      raise ArgumentError.new("no valid data received to patch with") if patches.empty?
 
-      rescue Exception => e
-        puts e.message
-        puts e.backtrace.join("\n")
-      end
+      entity_check.update_scheduled_maintenance(start_time, patches)
+      redirect back
     end
 
     # delete a scheduled maintenance
@@ -174,6 +175,32 @@ module Flapjack
       redirect back
     end
 
+    get '/contacts' do
+      @contacts = Flapjack::Data::Contact.all(:redis => @@redis)
+      haml :contacts
+    end
+
+    get "/contacts/:contact" do
+      contact_id = params[:contact]
+
+      if contact_id
+        @contact = Flapjack::Data::Contact.find_by_id(contact_id, :redis => @@redis)
+      end
+
+      unless @contact
+        status 404
+        return
+      end
+
+      if @contact.media.has_key?('pagerduty')
+        @pagerduty_credentials = @contact.pagerduty_credentials
+      end
+
+      @entities = @contact.entities
+
+      haml :contact
+    end
+
   private
 
     def get_entity_check(entity, check)

data/lib/flapjack/web/views/_css.haml

@@ -0,0 +1,38 @@
+:css
+  * { margin: 0; padding: 0; }
+  html { font-size: 62.5%; }
+  body { font-size: 16px; }
+  div#wrapper {
+    margin: 24px auto;
+    width: 1000px;
+  }
+  h1, h2, h3, h4, h5 {
+    font-family: Helvetica Neue, sans-serif;
+    margin-bottom: 12px;
+  }
+  table {
+    text-align: left;
+    width: 100%;
+  }
+  table th {
+    font-family: Helvetica Neue, sans-serif;
+    background-color: #eee;
+  }
+  table td, table th {
+    padding: 4px;
+  }
+  table td.critical {
+    background-color: #fb9a99;
+  }
+  table td.down {
+    background-color: #fb9a99;
+  }
+  table td.warning {
+    background-color: #f9bb34;
+  }
+  table td.ok {
+    background-color: #B2DF8A;
+  }
+  table td.up {
+    background-color: #B2DF8A;
+  }

data/lib/flapjack/web/views/_nav.haml

@@ -0,0 +1,8 @@
+%p
+  %a(title='' href='/') All Checks
+  |
+  %a(title='' href='/failing') Failing Checks
+  |
+  %a(title='' href='/self_stats') Internal Statistics
+  |
+  %a(title='' href='/contacts') Contacts

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

@@ -1,50 +1,15 @@
 !!! 5
+- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
+- nav      = nav_haml.render
+- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
+- css      = css_haml.render
 %html
   %head
-    :css
-      * { margin: 0; padding: 0; }
-      html { font-size: 62.5%; }
-      body { font-size: 16px; }
-      div#wrapper {
-        margin: 24px auto;
-        width: 1000px;
-      }
-      h1, h2, h3, h4, h5 {
-        font-family: Helvetica Neue, sans-serif;
-        margin-bottom: 12px;
-      }
-      table {
-        text-align: left;
-        width: 100%;
-      }
-      table th {
-        font-family: Helvetica Neue, sans-serif;
-        background-color: #eee;
-      }
-      table td, table th {
-        padding: 4px;
-      }
-      table td.critical {
-        background-color: #fb9a99;
-      }
-      table td.down {
-        background-color: #fb9a99;
-      }
-      table td.warning {
-        background-color: #f9bb34;
-      }
-      table td.ok {
-        background-color: #B2DF8A;
-      }
-      table td.up {
-        background-color: #B2DF8A;
-      }
+    %title Flapjack - Check: #{@entity}:#{@check}
+    = css
   %body
     %div#wrapper
-      %p
-        %a(title='Dashboard' href='/') All Checks
-        |
-        %a(title='Dashboard' href='/failing') Failing Checks
+      = nav
       %h1 #{@check} on #{@entity}
       %form{:action => "/acknowledgements/#{@entity}/#{@check}", :method => "post"}
         %h2
@@ -107,7 +72,7 @@
           %td= last_ack_relative
           %td= last_ack
       %h3 Scheduled Maintenance Periods
-      - if @scheduled_maintenances && (@scheduled_maintenances.length > 0)
+      - if @scheduled_maintenances && !@scheduled_maintenances.empty?
         %table
           %tr
             %th Start
@@ -165,4 +130,21 @@
               %td
               %td
                 %input{:type => 'submit', :value => 'Save', :class => 'button'}
-
+      %h3 Contacts
+      - if @contacts && !@contacts.empty?
+        %table
+          %tr
+            %th Name
+            %th Media
+          - @contacts.sort_by {|c| [c.last_name, c.first_name] }.each do |contact|
+            %tr
+              %td
+                - link = "/contacts/#{contact.id}"
+                %a(title='contact details' href=link) #{contact.name}
+              %td
+                - if contact.media && !contact.media.empty?
+                  %p= contact.media.keys.collect(&:capitalize).join(", ")
+                - else
+                  %p No media
+      - else
+        %p No contacts

data/lib/flapjack/web/views/contact.haml

@@ -0,0 +1,50 @@
+!!! 5
+- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
+- nav      = nav_haml.render
+- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
+- css      = css_haml.render
+%html
+  %head
+    %title Flapjack - Contact: #{@contact.name}
+    = css
+  %body
+    %div#wrapper
+      = nav
+      %h1= @contact.name
+      - if @entities && !@entities.empty?
+        %table
+          %tr
+            %th Entity name
+            %th Checks
+            %th Media
+          - @entities.sort_by(&:name).each do |entity|
+            %tr
+              %td
+                %p= entity.name
+              %td
+                - checks = entity.check_list
+                - if !checks.empty?
+                  - checks.each do |check|
+                    - link = "/check?entity=#{entity.name}&check=#{check}"
+                    %p
+                      %a(title='check status' href=link) #{check}
+                - else
+                  %p No checks
+              %td
+                - if @contact.media && !@contact.media.empty?
+                  %ul
+                    - @contact.media.each_pair do |mk, mv|
+                      - if 'pagerduty'.eql?(mk)
+                        %li= "PagerDuty: "
+                        %ul
+                          - @pagerduty_credentials.each_pair do |pk, pv|
+                            - if 'password'.eql?(pk)
+                              %li= "#{pk}: ..."
+                            - else
+                              %li= "#{pk}: #{pv}"
+                      - else
+                        %li= "#{mk.capitalize}: #{mv}"
+                - else
+                  %p No media
+      - else
+        %p No entities

data/lib/flapjack/web/views/contacts.haml

@@ -0,0 +1,26 @@
+!!! 5
+- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
+- nav      = nav_haml.render
+- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
+- css      = css_haml.render
+%html
+  %head
+    %title Flapjack - Contacts
+    = css
+  %body
+    %div#wrapper
+      = nav
+      %h1 Contacts
+      - if @contacts && !@contacts.empty?
+        %table
+          %tr
+            %th Name
+            %th Email
+          - @contacts.sort_by {|c| [c.last_name, c.first_name] }.each do |contact|
+            %tr
+              %td
+                - link = "/contacts/#{contact.id}"
+                %a(title='contact details' href=link) #{contact.name}
+              %td= contact.email
+      - else
+        %p No contacts

data/lib/flapjack/web/views/index.haml

@@ -1,52 +1,15 @@
 !!! 5
+- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
+- nav      = nav_haml.render
+- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
+- css      = css_haml.render
 %html
   %head
-    :css
-      * { margin: 0; padding: 0; }
-      html { font-size: 62.5%; }
-      body { font-size: 16px; }
-      div#wrapper {
-        margin: 24px auto;
-        width: 1000px;
-      }
-      h1, h2, h3, h4, h5 {
-        font-family: Helvetica Neue, sans-serif;
-        margin-bottom: 12px;
-      }
-      table {
-        text-align: left;
-        width: 100%;
-      }
-      table th {
-        font-family: Helvetica Neue, sans-serif;
-        background-color: #eee;
-      }
-      table td, table th {
-        padding: 4px;
-      }
-      table td.critical {
-        background-color: #fb9a99;
-      }
-      table td.down {
-        background-color: #fb9a99;
-      }
-      table td.warning {
-        background-color: #f9bb34;
-      }
-      table td.ok {
-        background-color: #B2DF8A;
-      }
-      table td.up {
-        background-color: #B2DF8A;
-      }
+    %title Flapjack
+    = css
   %body
     %div#wrapper
-      %p
-        %a(title='internal stats' href='/') All Checks
-        |
-        %a(title='internal stats' href='/failing') Failing Checks
-        |
-        %a(title='internal stats' href='/self_stats') Internal Statistics
+      = nav
       %h1 Flapjack Status
       %h4
         Events queued:

data/lib/flapjack/web/views/self_stats.haml

@@ -1,46 +1,15 @@
 !!! 5
+- nav_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_nav.haml'))
+- nav      = nav_haml.render
+- css_haml = Haml::Engine.new(File.read(File.dirname(__FILE__) + '/_css.haml'))
+- css      = css_haml.render
 %html
   %head
-    :css
-      * { margin: 0; padding: 0; }
-      html { font-size: 62.5%; }
-      body { font-size: 20px; }
-      div#wrapper {
-        margin: 24px auto;
-        width: 800px;
-      }
-      h1, h2, h3, h4, h5 {
-        font-family: Helvetica Neue, sans-serif;
-        margin-bottom: 12px;
-      }
-      table {
-        text-align: left;
-        width: 100%;
-      }
-      table th {
-        font-family: Helvetica Neue, sans-serif;
-        background-color: #eee;
-      }
-      table td, table th {
-        padding: 4px;
-      }
-      table td.critical {
-        background-color: #fb9a99;
-      }
-      table td.down {
-        background-color: #fb9a99;
-      }
-      table td.warning {
-        background-color: #f9bb34;
-      }
-      table td.ok {
-        background-color: #B2DF8A;
-      }
-      table td.up {
-        background-color: #B2DF8A;
-      }
+    %title Flapjack - Self Stats
+    = css
   %body
     %div#wrapper
+      = nav
       %h1 Flapjack Self Status
       %h4
         Events queued:

data/spec/lib/flapjack/web_spec.rb

@@ -105,6 +105,7 @@ describe Flapjack::Web, :sinatra => true, :redis => true do
     entity_check.should_receive(:failed?).and_return(false)
     entity_check.should_receive(:current_maintenance).with(:scheduled => true).and_return(false)
     entity_check.should_receive(:current_maintenance).with(:scheduled => false).and_return(false)
+    entity_check.should_receive(:contacts).and_return([])
 
     Flapjack::Data::Entity.should_receive(:find_by_name).
       with(entity_name, :redis => @redis).and_return(entity)
@@ -207,4 +208,15 @@ describe Flapjack::Web, :sinatra => true, :redis => true do
     last_response.status.should == 302
   end
 
+  it "shows a list of all known contacts" do
+    Flapjack::Data::Contact.should_receive(:all)
+
+    get "/contacts"
+    last_response.should be_ok
+  end
+
+  it "shows details of an individual contact found by email"
+
+  it "shows details of an individual contact found by id"
+
 end

data/spec/spec_helper.rb

@@ -6,6 +6,8 @@ if ENV['COVERAGE']
   end
 end
 
+$testing = true
+
 FLAPJACK_ENV = ENV["FLAPJACK_ENV"] || 'test'
 require 'bundler'
 Bundler.require(:default, :test)
@@ -41,4 +43,4 @@ RSpec.configure do |config|
   end
 
   config.include Rack::Test::Methods, :sinatra => true
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.36
+  version: 0.6.37
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -352,6 +352,7 @@ files:
 - .gitignore
 - .rbenv-version
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENCE
@@ -415,7 +416,6 @@ files:
 - lib/flapjack/data/entity.rb
 - lib/flapjack/data/entity_check.rb
 - lib/flapjack/data/event.rb
-- lib/flapjack/data/notification.rb
 - lib/flapjack/executive.rb
 - lib/flapjack/filters/acknowledgement.rb
 - lib/flapjack/filters/base.rb
@@ -458,7 +458,11 @@ files:
 - lib/flapjack/utility.rb
 - lib/flapjack/version.rb
 - lib/flapjack/web.rb
+- lib/flapjack/web/views/_css.haml
+- lib/flapjack/web/views/_nav.haml
 - lib/flapjack/web/views/check.haml
+- lib/flapjack/web/views/contact.haml
+- lib/flapjack/web/views/contacts.haml
 - lib/flapjack/web/views/index.haml
 - lib/flapjack/web/views/self_stats.haml
 - lib/flapjack/worker/application.rb

data/lib/flapjack/data/notification.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-module Flapjack
-
-  module Data
-
-    class Notification
-
-    end
-
-  end
-
-end