flapjack 1.6.0 → 2.0.0b1

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

@@ -1,19 +1,66 @@
 <% if @auto_refresh %>
 <meta http-equiv="refresh" content="<%= @auto_refresh %>" >
 <% end %>
-<% page_title "#{@adjective.capitalize} Checks" %>
+<% page_title "Checks" %>
 
 <div class="page-header">
-  <h2><%= @adjective.capitalize %> Checks</h2>
+  <h2>Checks</h2>
 </div>
 
-<p><%= h @count_failing_checks %> failing out of <%= h @count_current_checks %></p>
+<div class="row">
+  <div class="col-md-12">
 
-<table class="table table-bordered table-hover table-condensed tablesorter">
+    <form action="<%= @base_url %>checks" method="get" role="form" class="form-horizontal">
+
+      <div class="form-group">
+        <label class="col-sm-2 control-label" for="start_time">Name:</label>
+        <div class="col-sm-6">
+          <input type="text" name="name" class="form-control" size="20" maxlength="80" value="<%= h params[:name] %>">
+          <span class="help-block">
+            e.g. the exact name, or a /regexp/
+          </span>
+        </div>
+        <div class="col-sm-2"></div>
+        <div class="col-sm-2">
+          <button type="submit" class="btn btn-success">Refresh</button>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label class="col-sm-2 control-label" for="start_time">Enabled?</label>
+        <div class="col-sm-2">
+          <select name="enabled" class="form-control">
+            <option value="f"<%= @enabled.is_a?(FalseClass) ? 'selected' : '' %>>No</option>
+            <option value="t"<%= @enabled.is_a?(TrueClass) ? 'selected' : '' %>>Yes</option>
+            <option value=""<%= @enabled.nil? ? 'selected' : '' %>>All</option>
+          </select>
+          <span class="help-block">
+            Filter by whether checks are enabled
+          </span>
+        </div>
+        <label class="col-sm-2 control-label" for="start_time">Failing?</label>
+        <div class="col-sm-2">
+          <select name="failing" class="form-control">
+            <option value="f"<%= @failing.is_a?(FalseClass) ? 'selected' : '' %>>No</option>
+            <option value="t"<%= @failing.is_a?(TrueClass) ? 'selected' : '' %>>Yes</option>
+            <option value=""<%= @failing.nil? ? 'selected' : '' %>>All</option>
+          </select>
+          <span class="help-block">
+            Filter by whether checks are failing
+          </span>
+        </div>
+        <div class="col-sm-4"></div>
+      </div>
+
+    </form><!-- form-horizontal-->
+
+  </div>
+</div>
+
+<table class="table table-bordered table-hover table-condensed">
   <thead>
     <tr>
-      <th data-placeholder="e.g. app[1-3]*">Entity</th>
-      <th data-placeholder="e.g. disk">Check</th>
+      <th data-placeholder="e.g. app[1-3]*:disk">Check</th>
       <th data-placeholder="e.g. critical">State</th>
       <th data-placeholder="e.g. !simulated">Summary</th>
       <th data-placeholder="e.g. <2h 0m">Last State Change</th>
@@ -22,41 +69,35 @@
     </tr>
   </thead>
   <tbody>
-    <% @entities_sorted.each do |entity| %>
-      <% row_entity = nil %>
-      <% entity_link = @base_url + "entity/" << u(entity) %>
-      <% @states[entity].each do |check, status, summary, changed, updated, in_unscheduled_outage, in_scheduled_outage, notified| %>
-        <%
-          row_colour = case status
-          when 'critical', 'unknown'
-            'danger'
-          when 'ok', 'up'
-            'success'
-          else
-            status
-          end
-
-          check_link = @base_url + "check?entity=" << u(entity) << "&amp;check=" << u(check)
-        %>
-        <tr class="<%= row_colour %>">
-        <% unless row_entity && entity == row_entity %>
-          <td>
-            <a href="<%= entity_link %>"><%= h entity %></a>
-          </td>
-        <% end %>
-          <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><%= h summary %></td>
-          <td><%= h changed %></td>
-          <td><%= h updated %></td>
-          <td><%= h notified %></td>
-        </tr>
-
-      <% end %>
+    <% @checks.each do |check| %>
+      <%
+        status = @states[check[:id]]
+
+        row_colour = case status[:condition]
+        when 'critical', 'unknown'
+          'danger'
+        when 'ok', 'up'
+          'success'
+        else
+          status[:condition]
+        end
+
+        check_link = @base_url + "checks/" + u(check[:id])
+      %>
+      <tr class="<%= row_colour %>">
+        <td><a href="<%= check_link %>" title="check detail"><%= h check[:name] %></a></td>
+        <td>
+          <%= h status[:condition].upcase %>
+          <% if false %> (Ack'd)<% end %>
+          <% if false %> (Sched)<% end %>
+        </td>
+        <td><%= h status[:summary] %></td>
+        <td><%= h status[:last_changed] %></td>
+        <td><%= h status[:last_updated] %></td>
+        <td><%= h status[:last_notified] %></td>
+      </tr>
     <% end %>
   </tbody>
 </table>
+
+<%= erb '_pagination.html'.to_sym, :layout => false %>

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

@@ -1,11 +1,9 @@
 <div class="page-header">
-  <h2><%= h @contact.name %></h2>
+  <h2><%= h @contact[:name] %></h2>
 </div>
 
-<% alerting = {} %>
-
 <h3>Contact Media</h3>
-<% if !@contact.media || @contact.media.empty? %>
+<% if @media.nil? || @media.empty? %>
   <p>No media</p>
 <% else %>
   <table class="table table-bordered table-hover table-condensed">
@@ -16,16 +14,19 @@
       <th>Summary Mode</th>
       <th>Summary Threshold</th>
     </tr>
-    <% @contact.media.each_pair do |mk, mv| %>
-      <% alerting_checks = @contact.alerting_checks_for_media(mk) %>
-      <% alerting[mk] = alerting_checks unless (alerting_checks.nil? || alerting_checks.empty?) %>
+    <% @media.each do |med| %>
+      <% alerting_checks = @alerting_checks_by_media_id[med[:id]] %>
+      <% media_transport = med[:transport] %>
       <tr>
-        <% if 'pagerduty'.eql?(mk) %>
+        <% if 'pagerduty'.eql?(media_transport) %>
           <td>PagerDuty</td>
           <td>
-            <% @pagerduty_credentials.each_pair do |pk, pv| %>
+            <% [:pagerduty_subdomain, :pagerduty_user_name,
+                :pagerduty_password, :pagerduty_token,
+                :pagerduty_ack_duration].each do |pk| %>
+              <% pv = med[pk] %>
               <% unless pv.empty? %>
-                <p><%= 'password'.eql?(pk) ? h("#{pk}: ...") : h("#{pk}: #{pv}") %></p>
+                <p><%= :pagerduty_password.eql?(pk) ? h("#{pk}: ...") : h("#{pk}: #{pv}") %></p>
               <% end %>
             <% end %>
           </td>
@@ -33,22 +34,22 @@
           <td></td>
           <td></td>
         <% else %>
-          <% if 'sms'.eql?(mk) %>
-            <td><%= h mk.upcase %></td>
+          <% if 'sms'.eql?(media_transport) %>
+            <td><%= h media_transport.upcase %></td>
           <% else %>
-              <td><%= h mk.capitalize %></td>
+            <td><%= h media_transport.capitalize %></td>
           <% end %>
-          <td><%= h mv %></td>
+          <td><%= h med[:address] %></td>
           <td>
-            <% if @contact.media_intervals[mk] %>
-              <%= h @contact.media_intervals[mk] %> seconds
+            <% if med[:interval] %>
+              <%= h med[:interval] %> seconds
             <% else %>
               no custom interval
             <% end %>
           </td>
           <td>
-            <% rollup_threshold = @contact.media_rollup_thresholds[mk] %>
-            <% num_alerting = alerting[mk].nil? ? 0 : alerting[mk].length %>
+            <% rollup_threshold = med[:rollup_threshold] %>
+            <% num_alerting = alerting_checks.nil? ? 0 : alerting_checks.length %>
             <% if rollup_threshold.nil? || (num_alerting < rollup_threshold.to_i) %>
               No -
             <% else %>
@@ -70,27 +71,23 @@
 <% end %>
 
 <h3>Alerting Checks</h3>
-<p>Alerting checks are any that are failing, not acknowledged, not in scheduled maintenance, and currently allowed by this contact's notification rules.</p>
+<p>Alerting checks are any that are failing (and have alerted), not acknowledged, not in scheduled maintenance, and currently allowed by this contact's notification rules.</p>
 
-<% if alerting.empty? %>
+<% if @alerting_checks_by_media_id.nil? || @alerting_checks_by_media_id.empty? %>
   <p><em>There are no currently alerting checks.</em></p>
 <% else %>
   <table class="table table-bordered table-hover table-condensed">
     <tr>
-      <th>Media</th>
+      <th>Medium</th>
       <th>Alerting Checks</th>
     </tr>
-    <% alerting.each_pair do |media, checks| %>
+    <% @alerting_checks_by_media_id.each_pair do |media_id, checks| %>
       <% if checks.length > 0 %>
         <tr>
-          <td><%= h media.capitalize %></td>
+          <td><%= h @media.detect {|m| m[:id].eql?(media_id) }[:transport].capitalize %></td>
           <td>
-            <% checks.each do |entity_check| %>
-              <% entity, check = entity_check.split(':', 2) %>
-              <% check_link = "<a href=\"#{@base_url}check?entity=#{u(entity)}&amp;check=#{u(check)}\" title=\"check status\">" +
-                 h(check) + "</a>"%>
-              <a href="<%= @base_url %>entity/<%= u(entity) %>" title="entity status"><%= h entity %></a> ::
-              <%= check_link %> <br />
+            <% checks.each do |check| %>
+              <a href="<%= @base_url %>checks/<%= u(check[:id]) %>" title="check status"><%= h(check[:name]) %></a><br />
             <% end %>
           </td>
         </tr>
@@ -99,64 +96,55 @@
   </table>
 <% end %>
 
-<h3>Notification Rules</h3>
-<% rules = @contact.notification_rules %>
-<% if !rules || rules.empty? %>
-  <p>No notification rules</p>
+<h3>Rules</h3>
+<% if !@rules || @rules.empty? %>
+  <p>No rules</p>
 <% else %>
   <table class="table table-bordered table-hover table-condensed">
     <tr>
-      <th>ID</th>
-      <th>Entities</th>
-      <th>Entities Regex</th>
+      <th>Name/ID</th>
+      <th>Blackhole</th>
+      <th>Strategy</th>
       <th>Tags</th>
-      <th>Tags Regex</th>
-      <th>Warning Media</th>
-      <th>Critical Media</th>
+      <th>Conditions</th>
+      <th>Media</th>
       <th>Time Restrictions</th>
-      <th>Blackholes</th>
     </tr>
-    <% rules.each do |rule| %>
+    <% @rules.each do |rule| %>
+      <% rule_name = rule[:name].nil? || rule[:name].empty? ? rule[:id] : rule[:name] %>
+      <% blackhole = rule[:blackhole] ? 'true' : 'false' %>
+      <% tags = @tags_by_rule_id[rule[:id]] %>
+      <% tag_names = tags.nil? ? [] : tags.map {|t| t[:name] } %>
+      <% rule_conds = rule[:conditions_list] %>
+      <% media = @media_by_rule_id[rule[:id]] %>
+      <% transports = media.nil? ? [] : media.map {|m| m[:transport] } %>
       <tr>
-        <td><%= h rule.id %></td>
-        <td><%= h( (rule.entities && !rule.entities.empty?) ? rule.entities.join(', ') : '-') %></td>
-        <td><%= h( (rule.regex_entities && !rule.regex_entities.empty?) ? rule.regex_entities.join(', ') : '-') %></td>
-        <td><%= h( (rule.tags && !rule.tags.empty?) ? rule.tags.to_a.join(', ') : '-') %></td>
-        <td><%= h( (rule.regex_tags && !rule.regex_tags.empty?) ? rule.regex_tags.to_a.join(', ') : '-') %></td>
-        <td><%= h( (rule.warning_media && !rule.warning_media.empty?) ? rule.warning_media.join(', ') : '-')%></td>
-        <td><%= h( (rule.critical_media && !rule.critical_media.empty?) ? rule.critical_media.join(', ') : '-') %></td>
-        <td><%= h(rule.time_restrictions) %></td>
-        <% blackholes = [] %>
-        <% blackholes << 'Warning' if rule.warning_blackhole %>
-        <% blackholes << 'Critical' if rule.critical_blackhole %>
-        <td><%= h(blackholes.join(', ')) %></td>
+        <td><%= h( rule_name ) %></td>
+        <td><%= h( blackhole ) %></td>
+        <td><%= h( rule[:strategy]) %></td>
+        <td><%= h( !tag_names.empty? ? tag_names.join(', ') : '-') %></td>
+        <td><%= h( (!rule_conds.nil? && !rule_conds.empty?) ? rule_conds : '-')%></td>
+        <td><%= h( !transports.empty? ? transports.join(', ') : '-') %></td>
+        <td><%= h rule[:time_restriction_ical] %></td>
       </tr>
     <% end %>
   </table>
 <% end %>
 
-<h3>All Entities and Checks</h3>
-<% if !@entities_and_checks || @entities_and_checks.empty? %>
-  <p>No entities</p>
+<h3>All Checks</h3>
+<% if @checks.empty? %>
+  <p>No checks</p>
 <% else %>
   <table class="table table-bordered table-hover table-condensed">
     <tr>
-      <th>Entity</th>
       <th>Checks</th>
     </tr>
-    <% @entities_and_checks.each do |ec| %>
-      <%
-        entity = ec[:entity]
-        checks = ec[:checks]
-       %>
-      <tr>
-        <td><a href="<%= @base_url %>entity/<%= u(entity.name) %>" title="entity status"><%= h entity.name %></a></td>
-        <td>
-          <% checks.each do |check| %>
-          <%= "<a href=\"#{@base_url}check?entity=#{u(entity.name)}&amp;check=#{u(check)}\" title=\"check status\">#{ h check }</a>" %>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
+    <tr>
+      <td>
+        <% @checks.each do |check| %>
+          <a href="<%= @base_url %>checks/<%= u(check[:id]) %>" title="check status"><%= h check[:name] %></a>
+        <% end %>
+      </td>
+    </tr>
   </table>
 <% end %>

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

@@ -4,24 +4,48 @@
   <h2>Contacts</h2>
 </div>
 
+<div class="row">
+  <div class="col-md-8">
+
+    <form action="<%= @base_url %>contacts" method="get" role="form" class="form-horizontal">
+
+      <div class="form-group">
+        <label class="col-sm-2 control-label" for="start_time">Name:</label>
+        <div class="col-sm-10">
+          <input type="text" name="name" class="form-control" size="20" maxlength="80" value="<%= h params[:name] %>">
+          <span class="help-block">
+            e.g. the exact name, or a /regexp/
+          </span>
+        </div>
+
+        <div class="form-group">
+          <div class="col-sm-2"></div>
+          <div class="col-sm-10">
+            <button type="submit" class="btn btn-success">Refresh</button>
+          </div>
+        </div>
+
+      </div>
+
+    </form><!-- form-horizontal-->
+
+  </div>
+</div>
+
 <% if !@contacts || @contacts.empty? %>
   <p>No contacts</p>
 <% else %>
   <table class="table table-bordered table-hover table-condensed">
     <tr>
       <th>Name</th>
-      <th>Email</th>
     </tr>
-    <% @contacts.sort_by {|c| [c.last_name, c.first_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><%= h contact.email %></td>
+      <td><a href="<%= @base_url %>contacts/<%= contact[:id] %>" title="contact details"><%= h contact[:name] %></a></td>
     </tr>
     <% end %>
   </table>
 <% end %>
+<br>
 
-<a href="<%= @base_url %>edit_contacts"/>
-  Edit contacts
-  <span class="label label-danger">beta</span>
-</a>
+<%= erb '_pagination.html'.to_sym, :layout => false %>

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

@@ -4,5 +4,5 @@
   <h2>Summary</h2>
 </div> <!-- page header -->
 
-<h4><a href="<% @base_url %>entities_failing" title="failing entities"><%= h @count_failing_entities %></a> out of <a href="<% @base_url %>entities" title="all entities"><%= h @count_current_entities %></a> entities have failing checks</h4>
-<h4><a href="<% @base_url %>checks_failing" title="failing checks"><%= h @count_failing_checks %></a> out of <a href="<% @base_url %>checks_all" title="all checks"><%= h @count_current_checks %></a> checks are failing</h4>
+<h4><a href="<% @base_url %>checks?failing=1&amp;enabled=1" title="failing checks"><%= h @metrics[:check_counts][:failing] %></a> out of <a href="<% @base_url %>checks?enabled=1" title="enabled checks"><%= h @metrics[:check_counts][:enabled] %></a> checks are failing</h4>
+

data/lib/flapjack/gateways/web/views/{layout.erb → layout.html.erb}

@@ -2,12 +2,8 @@
   require_css 'bootstrap'
   require_css 'screen'
   require_css 'font-awesome'
-  require_css 'tablesort'
 
   require_js  'jquery-1.10.2'
-  require_js  'jquery.tablesorter'
-  require_js  'jquery.tablesorter.widgets'
-  require_js  'tablesort'
   require_js  'moment'
 %>
 
@@ -34,34 +30,22 @@
         <ul class="nav navbar-nav">
           <li<%= include_active?('') %>>
             <a title="Summary" href="<%= @base_url %>">
-              <i class="fa fa-trophy fa-lg"></i>
+              <i class="fa fa-list fa-lg"></i>
               Summary
             </a>
           </li>
-          <li<%= include_active?('entities') %>>
-            <a title="Entities" href="<%= @base_url %>entities">
-              <i class="fa fa-bullseye fa-lg"></i>
-              Entities
-            </a>
-          </li>
-          <li<%= include_active?('entities_failing') %>>
-            <a title="Failing Entities" href="<%= @base_url %>entities_failing">
-              <i class="fa fa-bullhorn fa-lg"></i>
-              Failing Entities
+          <li<%= include_active?('checks_all') %>>
+            <a title="Tags" href="<%= @base_url %>tags">
+              <i class="fa fa-tags fa-lg"></i>
+              Tags
             </a>
           </li>
-          <li<%= include_active?('checks_all') %>>
-            <a title="Checks" href="<%= @base_url %>checks_all">
+          <li<%= include_active?('checks') %>>
+            <a title="Checks" href="<%= @base_url %>checks">
               <i class="fa fa-check-circle-o fa-lg"></i>
               Checks
             </a>
           </li>
-          <li<%= include_active?('checks_failing') %>>
-            <a title="Failing Checks" href="<%= @base_url %>checks_failing">
-              <i class="fa fa-times-circle-o fa-lg"></i>
-              Failing Checks
-            </a>
-          </li>
           <li<%= include_active?('contacts') %>>
             <a title="Contacts" href="<%= @base_url %>contacts">
               <i class="fa fa-users fa-lg"></i>