flapjack 1.6.0 → 2.0.0b1

data/lib/flapjack/gateways/web/public/js/self_stats.js

@@ -62,11 +62,10 @@ $(document).ready(function() {
 
   function updateData() {
     var api_url = $('div#data-api-url').data('api-url');
-    $.get(api_url + 'metrics?filter=event_queue_length', function(json) {
+    $.get(api_url + 'metrics?fields=event_queue_length', function(json) {
       var d = new Date().getTime();
       var value = {x: d, y: json.event_queue_length}
       data[0].values.push(value);
-      // console.log(data[0].values.length);
 
       // Remove old data, to keep the graph performant
       if (data[0].values.length > 100) {

data/lib/flapjack/gateways/web/views/_pagination.html.erb

@@ -0,0 +1,19 @@
+<% if instance_variable_defined?('@pagination') && !@pagination.nil? %>
+  <ul class="pagination">
+    <% if @pagination[:page] == 1 %>
+      <li class="disabled"><span>&laquo;</span></li>
+      <li class="disabled"><span>&lt;</span></li>
+    <% else %>
+      <li><a href="<%= @links[:first] %>">&laquo;</a></li>
+      <li><a href="<%= @links[:prev] %>">&lt;</a></li>
+    <% end %>
+
+    <% if @pagination[:page] >= @pagination[:total_pages] %>
+      <li class="disabled"><span>&gt;</span></li>
+      <li class="disabled"><span>&raquo;</span></li>
+    <% else %>
+      <li><a href="<%= @links[:next] %>">&gt;</a></li>
+      <li><a href="<%= @links[:last] %>">&raquo;</a></li>
+    <% end %>
+  </ul>
+<% end %>

data/lib/flapjack/gateways/web/views/check.html.erb

@@ -1,18 +1,19 @@
-<% page_title "#{h(@check)} on #{h(@entity)}" %>
-<%
-  check_path_escaped = u(@entity) << '/' << u(@check)
-  current_time = Time.now
-%>
+<% unless @error.nil? %>
+<div class="alert alert-danger" role="alert">
+  <%= h @error %>
+</div>
+<% end %>
+
+<% page_title "#{h(@check[:name])}" %>
 <div class="page-header">
-  <% entity_link = @base_url + "entity/" << u(@entity) %>
-  <h2><%= h @check %> on <a href="<%= entity_link %>" title="entity summary"><%= h @entity %></a></h2>
+  <h2><%= h @check[:name] %></h2>
 </div>
 
 <div class="row">
   <div id="state" class="col-md-6">
     <%
-      state_qualifier = @check_enabled ? '' : "DISABLED. Last "
-      state_class     = case @check_state
+      state_qualifier = @check[:enabled] ? '' : "DISABLED. Last "
+      state_class     = case @check[:condition]
                         when 'ok'
                           'success'
                         when 'warning'
@@ -20,22 +21,25 @@
                         when 'critical'
                           'danger'
                         else
-                          "info #{@check_state}"
+                          "info #{@check[:condition]}"
                         end
-
     %>
 
     <div class="alert alert-<%= state_class %>">
       <%= state_qualifier %>State:
-      <span class="alert-link"><%= @check_state ? h(@check_state.upcase) : '' %></span>
+      <span class="alert-link"><%= @check[:condition] ? h(@check[:condition].upcase) : '' %></span>
     </div>
   </div><!-- col-md-6 -->
 
   <div class="col-md-6">
    <%
-    if !@current_scheduled_maintenance and
-       !@current_unscheduled_maintenance and
-       !(['warning', 'critical', 'unknown'].include?(@check_state))
+    current_scheduled_maintenance = @state.nil? ? nil : @state[:current_scheduled_maintenance]
+    current_unscheduled_maintenance = @state.nil? ? nil : @state[:current_unscheduled_maintenance]
+    latest_notifications = @state.nil? ? nil : @state[:latest_notifications]
+
+    if current_scheduled_maintenance.nil? &&
+       current_unscheduled_maintenance.nil? &&
+       !@check[:failing]
     %>
     <div id="no-maintenance-summary" class="alert alert-info">
       <form class="form-horizontal" role="form">
@@ -59,10 +63,11 @@
     </div>
   <% end %>
 
-  <% if @current_unscheduled_maintenance %>
+  <% if current_unscheduled_maintenance %>
     <div id="unscheduled-maintenance-summary" class="alert alert-warning">
 
-      <form action="<%= @base_url %>end_unscheduled_maintenance/<%= check_path_escaped %>" method="post" class="form-horizontal" role="form">
+      <form action="<%= @base_url %>unscheduled_maintenances/<%= u(current_unscheduled_maintenance[:id]) %>" method="post" class="form-horizontal" role="form">
+        <input type="hidden" name="_method" value="patch">
 
         <div class="form-group">
           <label class="col-md-3 control-label">State</label>
@@ -78,7 +83,7 @@
           <div class="col-md-9">
             <p class="form-control-static">
               <%
-                ack_msg = @current_unscheduled_maintenance[:summary]
+                ack_msg = current_unscheduled_maintenance[:summary]
                 ack_msg ||= 'No summary given'
               %>
               <%= h(ack_msg) %>
@@ -90,7 +95,7 @@
           <label class="col-md-3 control-label">Started</label>
           <div class="col-md-9">
             <p class="form-control-static">
-              <% start = Time.at(@current_unscheduled_maintenance[:start_time]).to_s %>
+              <% start = current_unscheduled_maintenance[:start_time] %>
               <%= h(start) %>
             </p>
           </div>
@@ -100,8 +105,8 @@
           <label class="col-md-3 control-label">Finishing</label>
           <div class="col-md-9">
             <p class="form-control-static">
-              <% finish = Time.at(@current_unscheduled_maintenance[:start_time] + @current_unscheduled_maintenance[:duration]) %>
-              <%= h(finish) %>
+              <% current_unscheduled_maintenance[:end_time] %>
+              <%= h(current_unscheduled_maintenance[:end_time]) %>
             </p>
           </div>
         </div>
@@ -110,8 +115,15 @@
           <label class="col-md-3 control-label">Remaining</label>
           <div class="col-md-9">
             <p class="form-control-static">
-              <% remaining = time_period_in_words( (finish - current_time).ceil ) %>
-              <%= h(remaining) %>
+              <%
+                remaining = begin
+                  finish = DateTime.parse(current_unscheduled_maintenance[:end_time])
+                  time_period_in_words(finish.to_i - @current_time.to_i)
+                rescue ArgumentError
+                  nil
+                end
+              %>
+              <%= remaining.nil? ? "???" : h(remaining) %>
             </p>
           </div>
         </div>
@@ -119,7 +131,7 @@
         <div class="row">
           <div class="col-md-offset-3 col-md-9">
             <p class="form-control-static">
-              <button id="end-unscheduled-maintenance" type="submit" class="btn btn-danger">End Unscheduled Maintenance (Unacknowledge)</button>
+              <button id="end-unscheduled-maintenance" type="submit" class="btn btn-danger">End Unscheduled Maintenance</button>
             </p>
           </div>
         </div>
@@ -128,16 +140,16 @@
     </div>
   <% end %>
 
-  <% if (['warning', 'critical', 'unknown'].include?(@check_state) and !@current_scheduled_maintenance) %>
+  <% if (@check[:failing] and current_scheduled_maintenance.nil?) %>
     <div id="add-unscheduled-maintenance" class="alert alert-warning">
-      <% action = @current_unscheduled_maintenance ? "Re-acknowledge" : "Acknowledge" %>
+      <% action = current_unscheduled_maintenance.nil? ? "Acknowledge" : "Re-acknowledge" %>
       <h4><%= action %> alert</h4>
-      <form action="<%= @base_url %>acknowledgements/<%= check_path_escaped %>" method="post" class="form-horizontal">
+      <form action="<%= @base_url %>acknowledgements" method="post" class="form-horizontal">
+        <input type="hidden" name="check_id" value="<%= u(@check[:id]) %>">
         <div class="form-group">
           <div class="col-sm-12 text-left">
             <label class="col-sm-3 control-label" for="summary">Summary</label>
             <div class="col-sm-9">
-              <input type="hidden" name="acknowledgement_id" value="<%= @acknowledgement_id %>">
               <input type="text" class="form-control" name="summary" value=""/>
             </div>
           </div>
@@ -159,7 +171,7 @@
           <div class="col-sm-12">
             <div class="col-sm-offset-3 col-sm-9">
               <button type="submit" class="btn btn-warning">
-                <%= @current_unscheduled_maintenance ? 'Replace acknowledgment' : 'Acknowledge' %>
+                <%= current_unscheduled_maintenance.nil? ? 'Acknowledge' : 'Replace acknowledgment' %>
               </button>
             </div>
           </div>
@@ -168,7 +180,7 @@
     </div>
   <% end %>
 
-  <% if @current_scheduled_maintenance %>
+  <% unless current_scheduled_maintenance.nil? %>
     <div id="scheduled-maintenance-summary" class="alert alert-warning">
       <div class="row">
         <div class="col-md-3 text-right">State</div>
@@ -181,7 +193,7 @@
         <div class="col-md-3 text-right">Reason</div>
         <div class="col-md-9">
           <%
-            maint_msg = "#{@current_scheduled_maintenance[:summary]}"
+            maint_msg = "#{current_scheduled_maintenance[:summary]}"
             maint_msg = maint_msg.length > 0 ? maint_msg : 'No summary given'
           %>
           <%= h maint_msg %>
@@ -191,7 +203,7 @@
       <div class="row">
         <div class="col-md-3 text-right">Started</div>
         <div class="col-md-9">
-          <% start = Time.at(@current_scheduled_maintenance[:start_time]).to_s %>
+          <% start = current_scheduled_maintenance[:start_time] %>
           <%= h(start) %>
         </div>
       </div>
@@ -199,7 +211,7 @@
       <div class="row">
         <div class="col-md-3 text-right">Finishing</div>
         <div class="col-md-9">
-          <% finish = Time.at(@current_scheduled_maintenance[:start_time] + @current_scheduled_maintenance[:duration]) %>
+          <% finish = current_scheduled_maintenance[:end_time] %>
           <%= h(finish) %>
         </div>
       </div>
@@ -207,8 +219,15 @@
       <div class="row">
         <div class="col-md-3 text-right">Remaining</div>
         <div class="col-md-9">
-          <% remaining = time_period_in_words( (finish - current_time).ceil ) %>
-          <%= h(remaining) %>
+          <%
+            remaining = begin
+              finish = DateTime.parse(current_scheduled_maintenance[:end_time])
+              time_period_in_words(finish.to_i - @current_time.to_i)
+            rescue ArgumentError
+              nil
+            end
+          %>
+          <%= remaining.nil? ? "???" : h(remaining) %>
         </div>
       </div>
     </div>
@@ -218,41 +237,70 @@
 
 <div class="row">
   <div id="output" class="col-md-6">
-    <h3>Output: <%= h @check_summary %></h3>
-    <p><%= h @check_details %></p>
-    <% if @check_perfdata && @check_perfdata.is_a?(Array) %>
-    <h3>Performance Data:</h3>
-    <table>
-      <% @check_perfdata.each do |perfdata| %>
-      <tr>
-        <td><%= perfdata["key"] %></td>
-        <td><%= perfdata["value"] %></td>
-      </tr>
-      <% end %>
-    </table>
-    <% end %>
-    <table class="table table-hover table-condensed">
-      <tr>
-        <td>Last state change:</td>
-        <td><%= h relative_time_ago(Time.at(@check_last_change.to_i)) %> ago</td>
-        <td><%= h Time.at(@check_last_change.to_i).to_s %></td>
-        <td>&nbsp;</td>
-      </tr>
-      <tr>
-        <td>Last update:</td>
-        <td><%= h relative_time_ago(Time.at(@check_last_update.to_i)) %> ago</td>
-        <td><%= h Time.at(@check_last_update.to_i).to_s %></td>
-        <td>&nbsp;</td>
-      </tr>
-      <% [:critical, :warning, :unknown, :recovery, :acknowledgement].each do |type| %>
+    <% if @state.nil? %>
+      <p>No events received for this check.</p>
+    <% else %>
+      <h3>Output</h3>
+      <p><%= h @state[:details] %></p>
+      <% if @state[:perfdata] && @state[:perfdata].is_a?(Array) %>
+      <h3>Performance Data:</h3>
+      <table>
+        <% @state[:perfdata].each do |perfdata| %>
         <tr>
-          <td>Last <%= h type.to_s %> notification:</td>
-          <td><%= @last_notifications[type] ? h(@last_notifications[type][:relative]) : 'never' %></td>
-          <td><%= @last_notifications[type] ? h(@last_notifications[type][:time].to_s) : '&nbsp;' %></td>
-          <td><%= @last_notifications[type] ? h(@last_notifications[type][:summary]) : '&nbsp;' %></td>
+          <td><%= perfdata["key"] %></td>
+          <td><%= perfdata["value"] %></td>
         </tr>
+        <% end %>
+      </table>
       <% end %>
-    </table>
+      <table class="table table-hover table-condensed">
+        <tr>
+          <td>Last state change:</td>
+          <% if @state[:last_changed].nil? %>
+            <td>-</td>
+            <td>-</td>
+          <% else %>
+            <td><%= h relative_time_ago(@state[:last_changed], @current_time) %> ago</td>
+            <td><%= h @state[:last_changed].to_s %></td>
+          <% end %>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td>Last update:</td>
+          <% if @state[:last_updated].nil? %>
+            <td>-</td>
+            <td>-</td>
+          <% else %>
+            <td><%= h relative_time_ago(@state[:last_updated], @current_time) %> ago</td>
+            <td><%= h @state[:last_updated].to_s %></td>
+          <% end %>
+          <td>&nbsp;</td>
+        </tr>
+        <% [:critical, :warning, :unknown, :ok, :acknowledgement].each do |type| %>
+          <tr>
+            <td>Last <%= h type.to_s %> notification:</td>
+            <% notif = latest_notifications.detect {|ln| ln[:condition].eql?(type.to_s) || ln[:action].eql?(type.to_s) } %>
+            <% if notif.nil? %>
+              <td>never</td>
+              <td>&nbsp;</td>
+              <td>&nbsp;</td>
+            <% else %>
+              <%
+                notif_relative = begin
+                  notif_created = DateTime.parse(notif[:created_at])
+                  relative_time_ago(@current_time, notif_created) + " ago"
+                rescue ArgumentError
+                  nil
+                end
+              %>
+              <td><%= h(notif_relative) %></td>
+              <td><%= h(notif[:created_at]) %></td>
+              <td><%= h(notif[:summary]) %></td>
+            <% end %>
+          </tr>
+        <% end %>
+      </table>
+    <% end %>
   </div><!-- col-md-6 -->
 
   <div id="recent-state-changes" class="col-md-6">
@@ -266,8 +314,8 @@
       </tr>
       <% @state_changes.each do |state_change| %>
       <tr>
-        <td><%= h Time.at(state_change[:timestamp]).to_s %></td>
-        <td><%= h state_change[:state] %></td>
+        <td><%= h state_change[:created_at] %></td>
+        <td><%= h state_change[:condition] %></td>
         <td><%= h state_change[:summary] %></td>
       </tr>
       <% end %>
@@ -278,37 +326,11 @@
   </div><!-- col-md-6 -->
 </div><!-- row -->
 
-<div class="row">
-  <div id="failure-delays" class="col-md-6">
-    <a name="failure_delays"></a>
-    <h3>Failure Delays</h3>
-    <table class="table table-hover table-condensed">
-
-      <tr>
-        <td>Initial failure delay:</td>
-        <td><%= h(ChronicDuration.output(@check_initial_failure_delay, :keep_zero => true)) %>
-          <% if @check_initial_failure_delay_is_default %>
-            (default)
-          <% end %>
-        </td>
-      </tr>
-      <tr>
-        <td>Repeat failure delay:</td>
-        <td><%= h(ChronicDuration.output(@check_repeat_failure_delay, :keep_zero => true)) %>
-          <% if @check_repeat_failure_delay_is_default %>
-            (default)
-          <% end %>
-        </td>
-      </tr>
-    </table>
-  </div>
-</div>
-
 <div class="row">
   <div id="scheduled-maintenance-periods" class="col-md-12">
     <a name="scheduled_maintenance_periods"></a>
     <h3>Scheduled Maintenance Periods</h3>
-    <% if @scheduled_maintenances && !@scheduled_maintenances.empty? %>
+    <% unless @scheduled_maintenances.empty? %>
     <table class="table table-bordered table-hover table-condensed">
       <tr>
         <th>Start</th>
@@ -318,29 +340,43 @@
         <th>Actions</th>
       </tr>
 
-    <% @scheduled_maintenances.sort_by {|s| s[:start_time]}.each do |scheduled_maintenance| %>
+    <% @scheduled_maintenances.each do |scheduled_maintenance| %>
       <%
-        start_time = scheduled_maintenance[:start_time]
-        end_time   = scheduled_maintenance[:end_time]
-        duration   = scheduled_maintenance[:duration]
-        summary    = scheduled_maintenance[:summary]
+        start_time = begin
+          DateTime.parse(scheduled_maintenance[:start_time])
+        rescue ArgumentError
+          nil
+        end
+        end_time = begin
+          DateTime.parse(scheduled_maintenance[:end_time])
+        rescue ArgumentError
+          nil
+        end
+        duration = (start_time.nil? || end_time.nil?) ? nil : (end_time.to_i - start_time.to_i)
+        summary = scheduled_maintenance[:summary]
       %>
       <tr>
-        <td><%= h Time.at(start_time).to_s %></td>
-        <td><%= h Time.at(end_time).to_s %></td>
-        <td><%= h(ChronicDuration.output(duration, :keep_zero => true) || '0 secs') %></td>
+        <td><%= h start_time.to_s %></td>
+        <td><%= h end_time.to_s %></td>
+        <td><%= h(ChronicDuration.output(duration.to_i.round, :keep_zero => true) || '0 secs') %></td>
         <td><%= h summary %></td>
         <td>
-        <% if end_time > current_time.to_i %>
-          <% label = (start_time > current_time.to_i) ? 'Delete' : 'End Now' %>
-            <form action="<%= @base_url %>scheduled_maintenances/<%= check_path_escaped %>" method="post">
+        <% if end_time > @current_time %>
+          <% if start_time > @current_time %>
+            <form action="<%= @base_url %>scheduled_maintenances/<%= u(scheduled_maintenance[:id]) %>" method="post">
               <input type="hidden" name="_method" value="delete">
-              <input type="hidden" name="start_time" value="<%= start_time %>">
-              <button type="submit" class="btn btn-danger"><%= label %></button>
+              <button type="submit" class="btn btn-danger">Delete</button>
             </form>
           <% else %>
-            &nbsp;
+            <form action="<%= @base_url %>scheduled_maintenances/<%= u(scheduled_maintenance[:id]) %>" method="post">
+              <input type="hidden" name="_method" value="patch">
+              <input type="hidden" name="end_time" value="<% h end_time.iso8601 %>">
+              <button type="submit" class="btn btn-danger">End Now</button>
+            </form>
           <% end %>
+        <% else %>
+          &nbsp;
+        <% end %>
         </td>
       </tr>
     <% end %>
@@ -359,7 +395,8 @@
         <h3 class="panel-title">Add Scheduled Maintenance</h4>
       </div>
       <div class="panel-body">
-        <form action="<%= @base_url %>scheduled_maintenances/<%= check_path_escaped %>" method="post" role="form" class="form-horizontal">
+        <form action="<%= @base_url %>scheduled_maintenances" method="post" role="form" class="form-horizontal">
+        <input type="hidden" name="check_id" value="<%= u(@check[:id]) %>">
 
           <div class="form-group">
             <label class="col-sm-2 control-label" for="start_time">Start time:</label>
@@ -412,27 +449,28 @@
 <div class="row">
   <div id="contacts" class="col-md-8">
     <h3>Contacts</h3>
-    <% if @contacts && !@contacts.empty? %>
+    <% if @contacts.nil? || @contacts.empty? %>
+      <p>There are <strong>no contacts</strong> associated with this check.</p>
+    <% else %>
       <table class="table table-bordered table-hover table-condensed">
         <tr>
           <th>Name</th>
           <th>Media</th>
         </tr>
-        <% @contacts.sort_by {|c| [c.first_name, c.last_name] }.each do |contact| %>
+        <% @contacts.each do |contact| %>
           <tr>
-            <td><a href="<%= @base_url %>contacts/<%= contact.id %>" title="contact details"><%= h contact.name %></a></td>
+            <td><a href="<%= @base_url %>contacts/<%= u(contact[:id]) %>" title="contact details"><%= h contact[:name] %></a></td>
             <td>
-              <% if contact.media && !contact.media.empty? %>
-                <p><%= h contact.media.keys.collect(&:capitalize).join(", ") %></p>
-              <% else %>
+              <% contact_media = @media_by_contact_id[contact[:id]] %>
+              <% if contact_media.nil? || contact_media.empty? %>
                 <p>No media</p>
+              <% else %>
+                <p><%= h contact_media.map {|m| m[:transport] }.collect(&:capitalize).join(", ") %></p>
               <% end %>
             </td>
           </tr>
         <% end %>
       </table>
-    <% else %>
-      <p>There are <strong>no contacts</strong> associated with this check.</p>
     <% end %>
   </div><!-- col-md-8 -->
 </div><!-- row -->
@@ -447,9 +485,9 @@
         </h3>
       </div>
       <div class="panel-body">
-      <% if @check_enabled %>
+      <% if @check[:enabled] %>
         <h4>Decommission check</h4>
-        <form action="<%= @base_url %>checks/<%= check_path_escaped %>" method="post" style="display:inline-block" class="pull-right">
+        <form action="<%= @base_url %>checks/<%= u(@check[:id]) %>" method="post" style="display:inline-block" class="pull-right">
           <input type='hidden' name='_method' value='delete'>
           <button type='submit' class="btn btn-danger decommission-check">Decommission Check</button>
         </form>