RubyGems - flapjack - Versions diffs - 0.7.35 → 0.8.0 - Mend

flapjack 0.7.35 → 0.8.0

Files changed (114) hide show

checksums.yaml +7 -0
data/.gitignore +1 -1
data/Gemfile +3 -4
data/Guardfile +1 -1
data/README.md +38 -19
data/Rakefile +1 -3
data/etc/flapjack_config.yaml.example +11 -1
data/features/steps/cli_steps.rb +3 -3
data/features/steps/events_steps.rb +7 -6
data/features/steps/flapjack-netsaint-parser_steps.rb +8 -8
data/features/steps/notifications_steps.rb +10 -10
data/features/steps/packaging-lintian_steps.rb +5 -9
data/features/steps/time_travel_steps.rb +1 -1
data/flapjack.gemspec +4 -3
data/lib/flapjack/data/contact.rb +78 -6
data/lib/flapjack/data/entity.rb +11 -2
data/lib/flapjack/data/notification_rule.rb +67 -59
data/lib/flapjack/data/semaphore.rb +44 -0
data/lib/flapjack/gateways/api.rb +24 -28
data/lib/flapjack/gateways/api/contact_methods.rb +1 -2
data/lib/flapjack/gateways/api/entity_methods.rb +3 -3
data/lib/flapjack/gateways/jsonapi.rb +249 -0
data/lib/flapjack/gateways/jsonapi/contact_methods.rb +544 -0
data/lib/flapjack/gateways/jsonapi/entity_check_presenter.rb +217 -0
data/lib/flapjack/gateways/jsonapi/entity_methods.rb +350 -0
data/lib/flapjack/gateways/jsonapi/entity_presenter.rb +75 -0
data/lib/flapjack/gateways/jsonapi/rack/json_params_parser.rb +32 -0
data/lib/flapjack/gateways/web.rb +78 -12
data/lib/flapjack/gateways/web/public/css/bootstrap-theme.css +397 -0
data/lib/flapjack/gateways/web/public/css/bootstrap-theme.min.css +7 -0
data/lib/flapjack/gateways/web/public/css/bootstrap.css +7118 -0
data/lib/flapjack/gateways/web/public/css/bootstrap.min.css +6 -8
data/lib/flapjack/gateways/web/public/css/font-awesome.css +1338 -0
data/lib/flapjack/gateways/web/public/css/font-awesome.min.css +4 -0
data/lib/flapjack/gateways/web/public/css/screen.css +80 -0
data/lib/flapjack/gateways/web/public/css/select2-bootstrap.css +87 -0
data/lib/flapjack/gateways/web/public/css/select2.css +615 -0
data/lib/flapjack/gateways/web/public/fonts/FontAwesome.otf +0 -0
data/lib/flapjack/gateways/web/public/fonts/fontawesome-webfont.eot +0 -0
data/lib/flapjack/gateways/web/public/fonts/fontawesome-webfont.svg +414 -0
data/lib/flapjack/gateways/web/public/fonts/fontawesome-webfont.ttf +0 -0
data/lib/flapjack/gateways/web/public/fonts/fontawesome-webfont.woff +0 -0
data/lib/flapjack/gateways/web/public/fonts/glyphicons-halflings-regular.eot +0 -0
data/lib/flapjack/gateways/web/public/fonts/glyphicons-halflings-regular.svg +229 -0
data/lib/flapjack/gateways/web/public/fonts/glyphicons-halflings-regular.ttf +0 -0
data/lib/flapjack/gateways/web/public/fonts/glyphicons-halflings-regular.woff +0 -0
data/lib/flapjack/gateways/web/public/img/flapjack-2013-notext-transparent-300-300.png +0 -0
data/lib/flapjack/gateways/web/public/img/select2.png +0 -0
data/lib/flapjack/gateways/web/public/img/select2x2.png +0 -0
data/lib/flapjack/gateways/web/public/js/backbone-min.js +2 -0
data/lib/flapjack/gateways/web/public/js/backbone.js +1581 -0
data/lib/flapjack/gateways/web/public/js/backbone.jsonapi.js +75 -0
data/lib/flapjack/gateways/web/public/js/bootstrap.js +2276 -0
data/lib/flapjack/gateways/web/public/js/contacts.js +225 -0
data/lib/flapjack/gateways/web/public/js/jquery-1.10.2.js +9789 -0
data/lib/flapjack/gateways/web/public/js/jquery-1.10.2.min.js +6 -0
data/lib/flapjack/gateways/web/public/js/select2.js +3255 -0
data/lib/flapjack/gateways/web/public/js/select2.min.js +22 -0
data/lib/flapjack/gateways/web/public/js/underscore-min.js +6 -0
data/lib/flapjack/gateways/web/public/js/underscore.js +1276 -0
data/lib/flapjack/gateways/web/views/check.html.erb +423 -193
data/lib/flapjack/gateways/web/views/checks.html.erb +51 -71
data/lib/flapjack/gateways/web/views/contact.html.erb +142 -164
data/lib/flapjack/gateways/web/views/contacts.html.erb +20 -40
data/lib/flapjack/gateways/web/views/edit_contacts.html.erb +83 -0
data/lib/flapjack/gateways/web/views/entities.html.erb +18 -37
data/lib/flapjack/gateways/web/views/entity.html.erb +46 -65
data/lib/flapjack/gateways/web/views/index.html.erb +6 -27
data/lib/flapjack/gateways/web/views/layout.erb +95 -0
data/lib/flapjack/gateways/web/views/self_stats.html.erb +100 -114
data/lib/flapjack/pikelet.rb +4 -2
data/lib/flapjack/version.rb +1 -1
data/spec/lib/flapjack/coordinator_spec.rb +120 -120
data/spec/lib/flapjack/data/contact_spec.rb +66 -58
data/spec/lib/flapjack/data/entity_check_spec.rb +179 -179
data/spec/lib/flapjack/data/entity_spec.rb +71 -71
data/spec/lib/flapjack/data/event_spec.rb +34 -30
data/spec/lib/flapjack/data/message_spec.rb +6 -6
data/spec/lib/flapjack/data/notification_rule_spec.rb +24 -24
data/spec/lib/flapjack/data/notification_spec.rb +19 -19
data/spec/lib/flapjack/data/semaphore_spec.rb +24 -0
data/spec/lib/flapjack/data/tag_spec.rb +11 -10
data/spec/lib/flapjack/gateways/api/contact_methods_spec.rb +201 -201
data/spec/lib/flapjack/gateways/api/entity_check_presenter_spec.rb +55 -55
data/spec/lib/flapjack/gateways/api/entity_methods_spec.rb +257 -257
data/spec/lib/flapjack/gateways/api/entity_presenter_spec.rb +26 -26
data/spec/lib/flapjack/gateways/api_spec.rb +1 -1
data/spec/lib/flapjack/gateways/email_spec.rb +4 -4
data/spec/lib/flapjack/gateways/jabber_spec.rb +77 -77
data/spec/lib/flapjack/gateways/jsonapi/contact_methods_spec.rb +830 -0
data/spec/lib/flapjack/gateways/jsonapi/entity_check_presenter_spec.rb +211 -0
data/spec/lib/flapjack/gateways/jsonapi/entity_methods_spec.rb +863 -0
data/spec/lib/flapjack/gateways/jsonapi/entity_presenter_spec.rb +108 -0
data/spec/lib/flapjack/gateways/jsonapi_spec.rb +8 -0
data/spec/lib/flapjack/gateways/oobetet_spec.rb +35 -35
data/spec/lib/flapjack/gateways/pagerduty_spec.rb +40 -40
data/spec/lib/flapjack/gateways/sms_messagenet_spec.rb +3 -3
data/spec/lib/flapjack/gateways/web/views/check.html.erb_spec.rb +1 -1
data/spec/lib/flapjack/gateways/web/views/contact.html.erb_spec.rb +5 -5
data/spec/lib/flapjack/gateways/web/views/index.html.erb_spec.rb +1 -1
data/spec/lib/flapjack/gateways/web_spec.rb +73 -74
data/spec/lib/flapjack/logger_spec.rb +13 -13
data/spec/lib/flapjack/pikelet_spec.rb +33 -33
data/spec/lib/flapjack/processor_spec.rb +22 -22
data/spec/lib/flapjack/redis_pool_spec.rb +1 -1
data/spec/lib/flapjack/utility_spec.rb +12 -12
data/spec/spec_helper.rb +9 -9
data/spec/support/erb_view_helper.rb +4 -0
metadata +107 -96
data/lib/flapjack/gateways/web/public/css/flapjack.css +0 -49
data/lib/flapjack/gateways/web/views/_css.html.erb +0 -42
data/lib/flapjack/gateways/web/views/_foot.html.erb +0 -3
data/lib/flapjack/gateways/web/views/_head.html.erb +0 -5
data/lib/flapjack/gateways/web/views/_nav.html.erb +0 -10

data/lib/flapjack/gateways/web/views/edit_contacts.html.erb ADDED Viewed

@@ -0,0 +1,83 @@
+<%
+  require_css 'select2'
+  require_js  'underscore'
+  require_js  'jquery-1.10.2'
+  require_js  'select2'
+  require_js  'backbone'
+  require_js  'backbone.jsonapi'
+  require_js  'bootstrap.min'
+  require_js  'contacts'
+%>
+<script type="text/template" id="contact-actions-template">
+  <button class="btn btn-success" id="addContact">
+    Add contact
+  </button>
+</script>
+<script type="text/template" id="contact-list-item-template">
+  <td><@- first_name @></td>
+  <td><@- last_name @></td>
+  <td><@- email @></td>
+</script>
+<div id="data-api-url" data-api-url="<%= @api_url %>">
+    <div class="page-header">
+      <h2>Edit Contacts</h2>
+    </div>
+    <div id="container">
+      <table class="table">
+        <thead>
+          <tr>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Email</th>
+          </tr>
+        </thead>
+        <tbody id="contactList">
+        </tbody>
+      </table>
+<!-- Modal -->
+<div class="modal fade" id="contactModal" tabindex="-1" role="dialog" aria-labelledby="contactModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title" id="contactModalLabel">New Contact</h4>
+      </div>
+      <div class="modal-body">
+        <form action="/contacts" method="post" role="form" class="form-horizontal">
+          <div class="form-group">
+            <label class="col-sm-3 control-label" for="contact_first_name">First name</label>
+            <div class="col-sm-9">
+              <input type="text" name="contact_first_name" class="form-control" value="">
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="col-sm-3 control-label" for="contact_last_name">Last name</label>
+            <div class="col-sm-9">
+              <input type="text" name="contact_last_name" class="form-control" value="">
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="col-sm-3 control-label" for="contact_email">Email</label>
+            <div class="col-sm-9">
+              <input type="text" name="contact_email" class="form-control" value="">
+            </div>
+          </div>
+        </form><!-- form-horizontal-->
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-success">Create Contact</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+    </div>
+</div>

data/lib/flapjack/gateways/web/views/entities.html.erb CHANGED Viewed

@@ -1,39 +1,20 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <% nav  = render_erb('_nav.html.erb', binding) %>
-    <% head = render_erb('_head.html.erb', binding) %>
-    <% foot = render_erb('_foot.html.erb', binding) %>
-    <title>Flapjack - <%= h @adjective.capitalize %> Entities</title>
-    <%= head %>
-  </head>
-  <body>
-    <div id="wrap">
-      <div class="container">
-        <div class="page-header">
-          <%= nav %>
-          <h2><%= h @adjective.capitalize %> Entities</h2>
-        </div>
+<% page_title "#{@adjective.capitalize} Entities" %>
-        <p><%= h @count_failing_entities %> failing out of <%= h @count_all_entities %></p>
+<div class="page-header">
+  <h2><%= h @adjective.capitalize %> Entities</h2>
+</div>
-        <% if @entities.length > 0 %>
-        <table class="table table-bordered table-hover table-condensed">
-          <% @entities.sort.each do |entity| %>
-            <tr>
-              <td><a href="/entity/<%= CGI.escape(entity) %>"><%= h entity %></a>
-              </td>
-            </tr>
-          <% end %>
-        </table>
-        <% else %>
-          <p>No check output has been processed yet, so there are no entities we can show you here.</p>
-        <% end %>
-      </div>
-      <div id="push"></div>
-    </div>
-    <div id="footer">
-      <%= foot %>
-    </div>
-  </body>
-</html>
+<p><%= h @count_failing_entities %> failing out of <%= h @count_all_entities %></p>
+<% if @entities.length > 0 %>
+<table class="table table-bordered table-hover table-condensed">
+  <% @entities.sort.each do |entity| %>
+    <tr>
+      <td><a href="/entity/<%= CGI.escape(entity) %>"><%= h entity %></a>
+      </td>
+    </tr>
+  <% end %>
+</table>
+<% else %>
+  <p>No check output has been processed yet, so there are no entities we can show you here.</p>
+<% end %>

data/lib/flapjack/gateways/web/views/entity.html.erb CHANGED Viewed

@@ -1,67 +1,48 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <% nav  = render_erb('_nav.html.erb', binding) %>
-    <% head = render_erb('_head.html.erb', binding) %>
-    <% foot = render_erb('_foot.html.erb', binding) %>
-    <title>Flapjack - <%=h @entity %> (entity) </title>
-    <%= head %>
-  </head>
-  <body>
-    <div id="wrap">
-      <div class="container">
-        <div class="page-header">
-          <%= nav %>
-          <h2><%= h @entity %></h2>
-        </div>
-        <% if @states.empty? %>
-          <div>
-            <p>This entity has no check output associated with it</p>
-          </div>
-        <% else %>
-          <table class="table table-bordered table-hover table-condensed">
-            <tr>
-              <th>Check</th>
-              <th>State</th>
-              <th>Summary</th>
-              <th>Last State Change</th>
-              <th>Last Update</th>
-              <th>Last Notification</th>
-            </tr>
-            <% @states.each do |check, status, summary, changed, updated, in_unscheduled_outage, in_scheduled_outage, notified| %>
-              <%
-                row_colour = case status
-                when 'critical', 'unknown'
-                  'error'
-                when 'ok', 'up'
-                  'success'
-                else
-                  status
-                end
+<% page_title "#{h(@entity)} (entity)" %>
-                check_link = "/check?entity=" << u(@entity) << "&amp;check=" << u(check)
+<div class="page-header">
+  <h2><%= h @entity %></h2>
+</div>
+<% if @states.empty? %>
+  <div>
+    <p>This entity has no check output associated with it</p>
+  </div>
+<% else %>
+  <table class="table table-bordered table-hover table-condensed">
+    <tr>
+      <th>Check</th>
+      <th>State</th>
+      <th>Summary</th>
+      <th>Last State Change</th>
+      <th>Last Update</th>
+      <th>Last Notification</th>
+    </tr>
+    <% @states.each do |check, status, summary, changed, updated, in_unscheduled_outage, in_scheduled_outage, notified| %>
+      <%
+        row_colour = case status
+        when 'critical', 'unknown'
+          'error'
+        when 'ok', 'up'
+          'success'
+        else
+          status
+        end
-              %>
-              <tr class="<%= row_colour %>">
-                <td><a href="<%= check_link %>" title="check detail"><%= h check %></a></td>
-                <td class="<%= status %>">
-                  <%= h status.upcase %>
-                  <% if in_unscheduled_outage%> (Ack'd)<% end %>
-                  <% if in_scheduled_outage %> (Sched)<% end %>
-                </td>
-                <td><%= summary %></td>
-                <td><%= changed %></td>
-                <td><%= updated %></td>
-                <td><%= notified %></td>
-              </tr>
-            <% end %>
-          </table>
-        <% end %>
-      </div>
-      <div id="push"></div>
-    </div>
-    <div id="footer">
-      <%= foot %>
-    </div>
-  </body>
-</html>
+        check_link = "/check?entity=" << u(@entity) << "&amp;check=" << u(check)
+      %>
+      <tr class="<%= row_colour %>">
+        <td><a href="<%= check_link %>" title="check detail"><%= h check %></a></td>
+        <td class="<%= status %>">
+          <%= h status.upcase %>
+          <% if in_unscheduled_outage%> (Ack'd)<% end %>
+          <% if in_scheduled_outage %> (Sched)<% end %>
+        </td>
+        <td><%= summary %></td>
+        <td><%= changed %></td>
+        <td><%= updated %></td>
+        <td><%= notified %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>

data/lib/flapjack/gateways/web/views/index.html.erb CHANGED Viewed

@@ -1,29 +1,8 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <% nav  = render_erb('_nav.html.erb', binding) %>
-    <% head = render_erb('_head.html.erb', binding) %>
-    <% foot = render_erb('_foot.html.erb', binding) %>
-    <title>Flapjack - Summary</title>
-    <%= head %>
-  </head>
-  <body>
-    <div id="wrap">
-      <div class="container">
-        <div class="page-header">
-          <%= nav %>
-          <h2>Summary</h2>
-        </div>
+<% page_title 'Summary' %>
-        <h4><a href="/entities_failing" title="failing entities"><%= h @count_failing_entities %></a> out of <a href="/entities_all" title="all entities"><%= h @count_all_entities %></a> entities have failing checks</h4>
-        <h4><a href="/checks_failing" title="failing checks"><%= h @count_failing_checks %></a> out of <a href="/checks_all" title="all checks"><%= h @count_all_checks %></a> checks are failing</h4>
+<div class="page-header">
+  <h2>Summary</h2>
+</div> <!-- page header -->
-      </div>
-      <div id="push"></div>
-    </div>
-    <div id="footer">
-      <%= foot %>
-    </div>
-  </body>
-</html>
+<h4><a href="/entities_failing" title="failing entities"><%= h @count_failing_entities %></a> out of <a href="/entities_all" title="all entities"><%= h @count_all_entities %></a> entities have failing checks</h4>
+<h4><a href="/checks_failing" title="failing checks"><%= h @count_failing_checks %></a> out of <a href="/checks_all" title="all checks"><%= h @count_all_checks %></a> checks are failing</h4>

data/lib/flapjack/gateways/web/views/layout.erb ADDED Viewed

@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title><%= include_page_title %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="/css/bootstrap.min.css" media="screen">
+    <link rel="stylesheet" href="/css/bootstrap-responsive.min.css" media="screen">
+    <link rel="stylesheet" href="/css/screen.css" media="screen">
+    <link rel="stylesheet" href="/css/font-awesome.min.css">
+    <link rel="shortcut icon" href="/img/flapjack-favicon-64-32-24-16.ico"> <!-- thank you http://xiconeditor.com/ -->
+    <%= include_required_css %>
+    <%= include_required_js %>
+  </head>
+  <body>
+    <nav class="navbar navbar-default navbar-inverse" role="navigation">
+      <div class="navbar-header">
+        <a class="navbar-brand" title="Summary" href="/">
+          <img alt="Flapjack" class="logo" src="/img/flapjack-2013-notext-transparent-300-300.png">
+        </a>
+      </div>
+      <div class="collapse navbar-collapse navbar-ex1-collapse">
+        <ul class="nav navbar-nav">
+          <li>
+            <a title="Summary" href="/">
+              <i class="fa fa-trophy fa-lg"></i>
+              Summary
+            </a>
+          </li>
+          <li>
+            <a title="All Entities" href="/entities_all">
+              <i class="fa fa-bullseye fa-lg"></i>
+              All Entities
+            </a>
+          </li>
+          <li>
+            <a title="Failing Entities" href="/entities_failing">
+              <i class="fa fa-bullhorn fa-lg"></i>
+              Failing Entities
+            </a>
+          </li>
+          <li>
+            <a title="All Checks" href="/checks_all">
+              <i class="fa fa-check-circle-o fa-lg"></i>
+              All Checks
+            </a>
+          </li>
+          <li>
+            <a title="Failing Checks" href="/checks_failing">
+              <i class="fa fa-times-circle-o fa-lg"></i>
+              Failing Checks
+            </a>
+          </li>
+          <li>
+            <a title="Contacts" href="/contacts">
+              <i class="fa fa-users fa-lg"></i>
+              Contacts
+            </a>
+          </li>
+        </ul>
+        <ul class="nav navbar-nav navbar-right">
+          <li>
+            <a title="Internal Statistics" href="/self_stats">
+              <i class="fa fa-tachometer fa-lg"></i>
+              Internal Statistics
+            </a>
+          </li>
+        </ul>
+      </div>
+    </nav>
+    <div class="container">
+      <%= yield %>
+    </div>
+    <footer>
+      <p class="credits">Flapjack version <%= ::Flapjack::VERSION %>
+        <span class="separator">|</span>
+        <a href="http://flapjack.io" target="_website">
+          <i class="fa fa-cloud"></i>
+          Flapjack Website
+        </a>
+        <span class="separator">|</span>
+        <a href="https://github.com/flpjck/flapjack" target="_github">
+          <i class="fa fa-github"></i>
+          Flapjack on GitHub
+        </a>
+      </p>
+    </footer>
+  </body>
+</html>

data/lib/flapjack/gateways/web/views/self_stats.html.erb CHANGED Viewed

@@ -1,116 +1,102 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <% nav  = render_erb('_nav.html.erb', binding) %>
-    <% head = render_erb('_head.html.erb', binding) %>
-    <% foot = render_erb('_foot.html.erb', binding) %>
-    <title>Flapjack - Internal Statistics</title>
-    <%= head %>
-  </head>
-  <body>
-    <div id="wrap">
-      <div class="container">
-        <div class="page-header">
-          <%= nav %>
-          <h2>Internal Statistics</h2>
-        </div>
+<% page_title 'Internal Statistics' %>
-        <div class="row">
-          <div class="span5">
-            <h4>Global Statistics:</h4>
-            <table class="table table-bordered table-hover table-condensed">
-              <tr>
-                <td>Events queued:</td>
-                <td><%= h @events_queued %></td>
-              </tr>
-              <tr>
-                <td>Number of entities:</td>
-                <td><%= h @count_all_entities %></td>
-              </tr>
-              <tr>
-                <td>Number of failing entities:</td>
-                <td><%= h @count_failing_entities %></td>
-              </tr>
-              <tr>
-                <td>Number of checks:</td>
-                <td><%= h @count_all_checks %></td>
-              </tr>
-              <tr>
-                <td>Number of failing checks:</td>
-                <td><%= h @count_failing_checks %></td>
-              </tr>
-              <tr>
-                <td>Events processed (all time)</td>
-                <td>
-                  <ul>
-                    <li>all: <%= h @event_counters['all'] %> events</li>
-                    <li>ok: <%= h @event_counters['ok'] %> events</li>
-                    <li>failure: <%= h @event_counters['failure'] %> events</li>
-                    <li>action: <%= h @event_counters['action'] %> events</li>
-                  </ul>
-                </td>
-              </tr>
-              <tr>
-                <td>Check Freshness</td>
-                <td>
-                  <ul>
-                    <% @current_checks_ages.each_pair do |age, check_count| %>
-                      <li>&gt;= <%= age %>: <%= check_count %></li>
-                    <% end %>
-                  </ul>
-                </td>
-              </tr>
-              <tr>
-                <td>Total keys in redis</td>
-                <td><%= h @dbsize %></td>
-              </tr>
-              <tr>
-                <td>Current time</td>
-                <td><%= h Time.now.to_s %></td>
-              </tr>
-            </table>
-          </div>
-          <div class="span7">
-            <h4>Processor Instances:</h4>
-            <table class="table table-bordered table-hover">
-              <tr>
-                <th>Hostname</th>
-                <th>PID</th>
-                <th>Uptime</th>
-                <th>Events Processed</th>
-              </tr>
-              <% @executive_instances.sort_by {|i, d| d['uptime']}.each do |ei| %>
-                <%
-                  instance_id, details = ei
-                  hostname, pid  = instance_id.split(':')
-                  started        = details['uptime_string']
-                  event_counters = details['event_counters']
-                  event_rates    = details['event_rates']
-                 %>
-                <tr>
-                  <td><%= h hostname %></td>
-                  <td><%= h pid %></td>
-                  <td><%= h started %></td>
-                  <td>
-                    <ul>
-                      <li>all: <%= h event_counters['all'] %> (<%= h event_rates['all'] %> events/s)</li>
-                      <li>ok: <%= h event_counters['ok'] %> (<%= h event_rates['ok'] %> events/s)</li>
-                      <li>failure: <%= h event_counters['failure'] %> (<%= h event_rates['failure'] %> events/s)</li>
-                      <li>action: <%= h event_counters['action'] %> (<%= h event_rates['action'] %> events/s)</li>
-                    </ul>
-                  </td>
-                </tr>
-              <% end %>
-            </table>
-          </div>
-        </div>
+<div class="page-header">
+  <h2>Internal Statistics</h2>
+</div>
-        <p><a href="/self_stats.json">Instrument as JSON</a></p>
-      </div>
-      <div id="push"></div>
-    </div>
-    <div id="footer">
-      <%= foot %>
-    </div>
-  </body>
-</html>
+<div class="row">
+  <div class="col-md-6">
+    <h4>Global Statistics:</h4>
+    <table class="table table-bordered table-hover table-condensed">
+      <tr>
+        <td>Events queued:</td>
+        <td><%= h @events_queued %></td>
+      </tr>
+      <tr>
+        <td>Number of entities:</td>
+        <td><%= h @count_all_entities %></td>
+      </tr>
+      <tr>
+        <td>Number of failing entities:</td>
+        <td><%= h @count_failing_entities %></td>
+      </tr>
+      <tr>
+        <td>Number of checks:</td>
+        <td><%= h @count_all_checks %></td>
+      </tr>
+      <tr>
+        <td>Number of failing checks:</td>
+        <td><%= h @count_failing_checks %></td>
+      </tr>
+      <tr>
+        <td>Events processed (all time)</td>
+        <td>
+          <ul>
+            <li>all: <%= h @event_counters['all'] %> events</li>
+            <li>ok: <%= h @event_counters['ok'] %> events</li>
+            <li>failure: <%= h @event_counters['failure'] %> events</li>
+            <li>action: <%= h @event_counters['action'] %> events</li>
+          </ul>
+        </td>
+      </tr>
+      <tr>
+        <td>Check Freshness</td>
+        <td>
+          <ul>
+            <% @current_checks_ages.each_pair do |age, check_count| %>
+              <li>&gt;= <%= age %>: <%= check_count %></li>
+            <% end %>
+          </ul>
+        </td>
+      </tr>
+      <tr>
+        <td>Total keys in redis</td>
+        <td><%= h @dbsize %></td>
+      </tr>
+      <tr>
+        <td>Current time</td>
+        <td><%= h Time.now.to_s %></td>
+      </tr>
+    </table>
+  </div>
+  <div class="col-md-6">
+    <h4>Processor Instances:</h4>
+    <table class="table table-bordered table-hover">
+      <tr>
+        <th>Hostname</th>
+        <th>PID</th>
+        <th>Uptime</th>
+        <th>Events Processed</th>
+      </tr>
+      <% @executive_instances.sort_by {|i, d| d['uptime']}.each do |ei| %>
+        <%
+          instance_id, details = ei
+          hostname, pid  = instance_id.split(':')
+          started        = details['uptime_string']
+          event_counters = details['event_counters']
+          event_rates    = details['event_rates']
+         %>
+        <tr>
+          <td><%= h hostname %></td>
+          <td><%= h pid %></td>
+          <td><%= h started %></td>
+          <td>
+            <ul>
+              <li>all: <%= h event_counters['all'] %> (<%= h event_rates['all'] %> events/s)</li>
+              <li>ok: <%= h event_counters['ok'] %> (<%= h event_rates['ok'] %> events/s)</li>
+              <li>failure: <%= h event_counters['failure'] %> (<%= h event_rates['failure'] %> events/s)</li>
+              <li>action: <%= h event_counters['action'] %> (<%= h event_rates['action'] %> events/s)</li>
+            </ul>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+</div>
+<p>
+  <a class="btn btn-success" href="/self_stats.json">View as JSON</a>.
+  Learn how to
+  <a href="https://github.com/flpjck/flapjack/wiki/Gathering-internal-statistics-with-collectd">
+    use these metrics</a>.
+</p>