flapjack 0.7.1 → 0.7.2

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

@@ -0,0 +1,49 @@
+!!! 5
+- nav = render_haml('_nav.haml', self)
+- head = render_haml('_head.haml', self)
+- foot = render_haml('_foot.haml', self)
+%html
+  %head
+    %title Flapjack - #{@adjective.capitalize} Checks
+    = head
+  %body
+    %div#wrap
+      %div{:class => "container"}
+        %div{:class => "page-header"}
+          = nav
+          %h2 #{@adjective.capitalize} Checks
+        %p #{@count_failing_checks} failing out of #{@count_all_checks}
+        %table{:class => "table table-bordered table-hover table-condensed"}
+          %tr
+            %th Entity
+            %th Check
+            %th State
+            %th Last State Change
+            %th Last Update
+            %th Last Notification
+          - @states.each do |entity, check, status, changed, updated, in_unscheduled_outage, in_scheduled_outage, notified_kind, notified|
+            - colour_class = status
+            - case status
+            - when 'critical', 'unknown'
+              - colour_class = 'error'
+            - when 'ok', 'up'
+              - colour_class = 'success'
+            %tr{:class => colour_class}
+              %td= entity
+              %td
+                - link = "/check?entity=" + CGI.escape(entity) + "&check=" + CGI.escape(check)
+                %a(title='check detail' href=link) #{check}
+              %td{:class => status}
+                = status.upcase
+                = " (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'
+              - if notified && (notified > 0)
+                - last_notified = relative_time_ago(Time.at(notified.to_i)) + " ago, #{notified_kind}"
+              - else
+                - last_notified = 'never'
+              %td= last_notified
+      %div#push
+    %div#footer
+      = foot

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

@@ -1,44 +1,85 @@
 !!! 5
 - nav = render_haml('_nav.haml', self)
-- css = render_haml('_css.haml', self)
+- head = render_haml('_head.haml', self)
+- foot = render_haml('_foot.haml', self)
 %html
   %head
-    %title Flapjack - Contact: #{@contact.name}
-    = css
+    %title Flapjack - #{@contact.name} (contact)
+    = head
   %body
-    %div#wrapper
-      = nav
-      %h1= @contact.name
-      - 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
-      - if @entities_and_checks && !@entities_and_checks.empty?
-        %table
-          %tr
-            %th Entity name
-            %th Checks
-          - @entities_and_checks.each do |ec|
-            - entity = ec[:entity]
-            - checks = ec[:checks]
+    %div#wrap
+      %div{:class => "container"}
+        %div{:class => "page-header"}
+          = nav
+          %h2= @contact.name
+        %h3= "Contact Media"
+        - if @contact.media && !@contact.media.empty?
+          %table{:class => "table table-bordered table-hover table-condensed"}
             %tr
-              %td
-                %p= entity.name
-              %td
-                - checks.each do |check|
-                  - link = "/check?entity=#{CGI.escape(entity.name)}&check=#{CGI.escape(check)}"
-                  %p
+              %th Media
+              %th Address
+              %th Interval
+            - @contact.media.each_pair do |mk, mv|
+              %tr
+                - if 'pagerduty'.eql?(mk)
+                  %td PagerDuty
+                  %td
+                    - @pagerduty_credentials.each_pair do |pk, pv|
+                      - if 'password'.eql?(pk)
+                        %p= "#{pk}: ..."
+                      - else
+                        %p= "#{pk}: #{pv}"
+                  %td -
+                - else
+                  %td #{mk.capitalize}
+                  %td #{mv}
+                  %td
+                    - if interval = @contact.media_intervals[mk]
+                      #{@contact.media_intervals[mk]} seconds
+                    - else
+                      no custom interval
+        - else
+          %p No media
+        %h3= "Entities and Checks"
+        - if @entities_and_checks && !@entities_and_checks.empty?
+          %table{:class => "table table-bordered table-hover table-condensed"}
+            %tr
+              %th Entity
+              %th Checks
+            - @entities_and_checks.each do |ec|
+              - entity = ec[:entity]
+              - checks = ec[:checks]
+              %tr
+                %td
+                  - link = "/entity/#{CGI.escape(entity.name)}"
+                  %a(title='entity status' href=link) #{entity.name}
+                %td
+                  - checks.each do |check|
+                    - link = "/check?entity=#{CGI.escape(entity.name)}&check=#{CGI.escape(check)}"
                     %a(title='check status' href=link) #{check}
-      - else
-        %p No entities
+        - else
+          %p No entities
+        %h3= "Notification Rules"
+        - rules = @contact.notification_rules
+        - if rules && rules.length > 0
+          %table{:class => "table table-bordered table-hover table-condensed"}
+            %tr
+              %th ID
+              %th Entities
+              %th Entity Tags
+              %th Warning Media
+              %th Critical Media
+              %th Time Restrictions
+            - rules.each do |r|
+              %tr
+                %td #{r.id}
+                %td #{r.entities.join(', ')}
+                %td #{r.entity_tags ? r.entity_tags.join(', ') : ''}
+                %td #{r.warning_media.join(', ')}
+                %td #{r.critical_media.join(', ')}
+                %td #{r.time_restrictions}
+        - else
+          %p No notification rules
+      %div#push
+    %div#footer
+      = foot

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

@@ -1,24 +1,30 @@
 !!! 5
 - nav = render_haml('_nav.haml', self)
-- css = render_haml('_css.haml', self)
+- head = render_haml('_head.haml', self)
+- foot = render_haml('_foot.haml', self)
 %html
   %head
     %title Flapjack - Contacts
-    = css
+    = head
   %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|
+    %div#wrap
+      %div{:class => "container"}
+        %div{:class => "page-header"}
+          = nav
+          %h2 Contacts
+        - if @contacts && !@contacts.empty?
+          %table{:class => "table table-bordered table-hover table-condensed"}
             %tr
-              %td
-                - link = "/contacts/#{contact.id}"
-                %a(title='contact details' href=link) #{contact.name}
-              %td= contact.email
-      - else
-        %p No contacts
+              %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
+      %div#push
+    %div#footer
+      = foot

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

@@ -0,0 +1,28 @@
+!!! 5
+- nav = render_haml('_nav.haml', self)
+- head = render_haml('_head.haml', self)
+- foot = render_haml('_foot.haml', self)
+%html
+  %head
+    %title Flapjack - #{@adjective.capitalize} Entities
+    = head
+  %body
+    %div#wrap
+      %div{:class => "container"}
+        %div{:class => "page-header"}
+          = nav
+          %h2 #{@adjective.capitalize} Entities
+        %p #{@count_failing_entities} failing out of #{@count_all_entities}
+        %table{:class => "table table-bordered table-hover table-condensed"}
+          - if @entities.length > 0
+            - @entities.each do |entity|
+              %tr
+                %td
+                  - link = "/entity/#{CGI.escape(entity)}"
+                  %a{:href => link}
+                    #{entity}
+          - else
+            %p No check output has been processed yet, so there's no entities we can show you here.
+      %div#push
+    %div#footer
+      = foot

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

@@ -0,0 +1,44 @@
+!!! 5
+- nav = render_haml('_nav.haml', self)
+- head = render_haml('_head.haml', self)
+- foot = render_haml('_foot.haml', self)
+%html
+  %head
+    %title Flapjack - #{@entity} (entity)
+    = head
+  %body
+    %div#wrap
+      %div{:class => "container"}
+        %div{:class => "page-header"}
+          = nav
+          %h2 #{@entity}
+        - if @states.length > 0
+          %table{:class => "table table-bordered table-hover table-condensed"}
+            %tr
+              %th Check
+              %th State
+              %th Last State Change
+              %th Last Update
+              %th Last Notification
+            - @states.each do |entity, check, status, changed, updated, in_unscheduled_outage, in_scheduled_outage, notified_kind, notified|
+              %tr
+                %td
+                  - link = "/check?entity=" + CGI.escape(entity) + "&check=" + CGI.escape(check)
+                  %a(title='check detail' href=link) #{check}
+                %td{:class => status}
+                  = status.upcase
+                  = " (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'
+                - if notified && (notified > 0)
+                  - last_notified = relative_time_ago(Time.at(notified.to_i)) + " ago, #{notified_kind}"
+                - else
+                  - last_notified = 'never'
+                %td= last_notified
+        - else
+          %div#foo
+            %p This entity has no check output associated with it
+      %div#push
+    %div#footer
+      = foot

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

@@ -1,49 +1,32 @@
 !!! 5
 - nav = render_haml('_nav.haml', self)
-- css = render_haml('_css.haml', self)
+- head = render_haml('_head.haml', self)
+- foot = render_haml('_foot.haml', self)
 %html
   %head
-    %title Flapjack
-    = css
+    %title Flapjack - Summary
+    = head
   %body
-    %div#wrapper
-      = nav
-      %h1 Flapjack Status
-      %h4
-        Events queued:
-        = @events_queued
-      %h4
-        All checks:
-        %a(title='all checks' href='/')
-          = @count_all_checks
-      %h4
-        Failing checks:
-        %a(title='failing checks' href='/failing')
-          = @count_failing_checks
-      %h3
-        All Checks
-      %table
-        %tr
-          %th Entity
-          %th Check
-          %th State
-          %th Last State Change
-          %th Last Update
-          %th Last Notification
-        - @states.each do |entity, check, status, changed, updated, in_unscheduled_outage, in_scheduled_outage, notified_kind, notified|
-          %tr
-            %td= entity
-            %td
-              - link = "/check?entity=" + CGI.escape(entity) + "&check=" + CGI.escape(check)
-              %a(title='check detail' href=link) #{check}
-            %td{:class => status}
-              = status.upcase
-              = " (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'
-            - if notified && (notified > 0)
-              - last_notified = relative_time_ago(Time.at(notified.to_i)) + " ago, #{notified_kind}"
-            - else
-              - last_notified = 'never'
-            %td= last_notified
+    %div#wrap
+      %div{:class => "container"}
+        %div{:class => "page-header"}
+          = nav
+          %h2 Summary
+        %h4
+          %a(title='failing entities' href='/entities_failing')
+            #{@count_failing_entities}
+          out of
+          %a(title='all entities' href='/entities_all')
+            #{@count_all_entities}
+          entities have failing checks
+        %h4
+          %a(title='failing checks' href='/checks_failing')
+            #{@count_failing_checks}
+          out of
+          %a(title='all checks' href='/checks_all')
+            #{@count_all_checks}
+          checks are failing
+        %img{:src => '/img/flapjack_white_bg_400_353.jpeg', :height => 353, :width => 400}
+      %div#push
+    %div#footer
+      = foot

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

@@ -1,27 +1,70 @@
 !!! 5
 - nav = render_haml('_nav.haml', self)
-- css = render_haml('_css.haml', self)
+- head = render_haml('_head.haml', self)
+- foot = render_haml('_foot.haml', self)
 %html
   %head
-    %title Flapjack - Self Stats
-    = css
+    %title Flapjack - Internal Statistics
+    = head
   %body
-    %div#wrapper
-      = nav
-      %h1 Flapjack Self Status
-      %h4
-        Events queued:
-        = @events_queued
-      %h4
-        Number of failing services:
-        = @count
-      %p Events processed (all time): #{@event_counters['all']} (ok: #{@event_counters['ok']}, failure: #{@event_counters['failure']}, action: #{@event_counters['action']})
-      %p Events processed (this instance): #{@event_counters_instance['all']} (ok: #{@event_counters_instance['ok']}, failure: #{@event_counters_instance['failure']}, action: #{@event_counters_instance['action']})
-      %p Average rate (this instance): #{@event_rate_all} events per second
-      %p Total keys in redis: #{@keys.length}
-      %p Uptime: #{@uptime_string}
-      %p Boot time: #{@boot_time}
-      %p Current time: #{Time.now}
-      %p Executive Instances: #{@executive_instances.inspect}
-      %p
-        %a{:href => 'self_stats.json'} Instrument as JSON
+    %div#wrap
+      %div{:class => "container"}
+        %div{:class => "page-header"}
+          = nav
+          %h2 Internal Statistics
+        %table{:class => "table table-bordered table-hover table-condensed"}
+          %tr
+            %td Events queued:
+            %td= @events_queued
+          %tr
+            %td Number of entities:
+            %td= @count_all_entities
+          %tr
+            %td Number of failing entities:
+            %td= @count_failing_entities
+          %tr
+            %td Number of checks:
+            %td= @count_all_checks
+          %tr
+            %td Number of failing checks:
+            %td= @count_failing_checks
+          %tr
+            %td Events processed (all time)
+            %td #{@event_counters['all']} (ok: #{@event_counters['ok']}, failure: #{@event_counters['failure']}, action: #{@event_counters['action']})
+          %tr
+            %td Events processed (this instance)
+            %td #{@event_counters_instance['all']} (ok: #{@event_counters_instance['ok']}, failure: #{@event_counters_instance['failure']}, action: #{@event_counters_instance['action']})
+          %tr
+            %td Average rate (this instance)
+            %td #{@event_rate_all} events per second
+          %tr
+            %td Total keys in redis
+            %td #{@keys.length}
+          %tr
+            %td Uptime
+            %td= @uptime_string
+          %tr
+            %td Boot time
+            %td= @boot_time
+          %tr
+            %td Current time
+            %td= Time.now
+        %h4
+          Executive Instances:
+        %table{:class => "table table-bordered table-hover"}
+          %tr
+            %th Hostname
+            %th PID
+            %th Started
+          - @executive_instances.each do |i|
+            - hostname, pid = i[0].split(':')
+            - started = "#{relative_time_ago(Time.at(i[1].to_i))} ago"
+            %tr
+              %td= hostname
+              %td= pid
+              %td= started
+        %p
+          %a{:href => 'self_stats.json'} Instrument as JSON
+      %div#push
+    %div#footer
+      = foot