flapjack 1.0.0rc3 → 1.0.0rc5

data/lib/flapjack/gateways/jabber.rb

@@ -398,7 +398,7 @@ module Flapjack
             when number_found == 0
               msg = "found no entities matching /#{entity_pattern}/"
             when number_found >= 1
-              failing_list = Flapjack::Data::EntityCheck.find_all_failing_by_entity(:redis => @redis)
+              failing_list = Flapjack::Data::EntityCheck.find_current_failing_by_entity(:redis => @redis)
               entities = failing_list.select {|k,v| v.count >= 1 && entity_list.include?(k) }
               if entities.length >= 1
                 entities.each_pair do |entity,check_list|
@@ -474,7 +474,7 @@ module Flapjack
               msg = "found no entities matching /#{entity_pattern}/"
             when number_found >= 1
 
-              failing_list = Flapjack::Data::EntityCheck.find_all_failing_by_entity(:redis => @redis)
+              failing_list = Flapjack::Data::EntityCheck.find_current_failing_by_entity(:redis => @redis)
 
               my_failing_checks = Hash[failing_list.map do |k,v|
                 if entity_list.include?(k)

data/lib/flapjack/gateways/jsonapi/check_methods.rb

@@ -43,7 +43,7 @@ module Flapjack
                 Flapjack::Data::EntityCheck.for_event_id(req_check, :logger => logger, :redis => redis)
               end
             else
-              Flapjack::Data::EntityCheck.find_all(:redis => redis)
+              Flapjack::Data::EntityCheck.find_current(:redis => redis)
             end
             checks.compact!
 

data/lib/flapjack/gateways/jsonapi/contact_methods.rb

@@ -97,7 +97,7 @@ module Flapjack
           end
 
           # Returns all (/contacts) or some (/contacts/1,2,3) or one (/contacts/2) contact(s)
-          # https://github.com/flapjack/flapjack/wiki/API#wiki-get_contacts
+          # http://flapjack.io/docs/1.0/jsonapi/#contacts
           app.get %r{^/contacts(?:/)?([^/]+)?$} do
             requested_contacts = if params[:captures] && params[:captures][0]
               params[:captures][0].split(',').uniq

data/lib/flapjack/gateways/jsonapi/entity_methods.rb

@@ -44,7 +44,21 @@ module Flapjack
             entities = if requested_entities
               Flapjack::Data::Entity.find_by_ids(requested_entities, :logger => logger, :redis => redis)
             else
-              Flapjack::Data::Entity.all(:redis => redis).reject {|e| e.id.nil? || e.id.empty? }
+              enabled = if params.has_key?(:enabled)
+                case params[:enabled].downcase
+                when '0', 'f', 'false', 'n', 'no'
+                  false
+                when '1', 't', 'true', 'y', 'yes'
+                  true
+                else
+                  nil
+                end
+              else
+                nil
+              end
+
+              Flapjack::Data::Entity.all(:enabled => enabled,
+                :redis => redis).reject {|e| e.id.nil? || e.id.empty? }
             end
             entities.compact!
 

data/lib/flapjack/gateways/jsonapi/metrics_methods.rb

@@ -48,15 +48,16 @@ module Flapjack
 
           def entities
             {
-              'all'     => Flapjack::Data::Entity.find_all_with_checks(:redis => redis).length,
+              'all'     => Flapjack::Data::Entity.all(:redis => redis).length,
+              'enabled' => Flapjack::Data::Entity.all(:enabled => true, :redis => redis).length,
               'failing' => Flapjack::Data::Entity.find_all_with_failing_checks(:redis => redis).length,
             }
           end
 
           def checks
             {
-              'all'     => Flapjack::Data::EntityCheck.count_all(:redis => redis),
-              'failing' => Flapjack::Data::EntityCheck.count_all_failing(:redis => redis),
+              'all'     => Flapjack::Data::EntityCheck.count_current(:redis => redis),
+              'failing' => Flapjack::Data::EntityCheck.count_current_failing(:redis => redis),
             }
           end
 

data/lib/flapjack/gateways/jsonapi/report_methods.rb

@@ -27,7 +27,7 @@ module Flapjack
             end
 
             checks = if event_ids.nil?
-              Flapjack::Data::EntityCheck.find_all(:redis => redis).collect {|check_name|
+              Flapjack::Data::EntityCheck.find_current(:redis => redis).collect {|check_name|
                 find_entity_check_by_name(*check_name.split(':', 2))
               }
             elsif !event_ids.empty?

data/lib/flapjack/gateways/web.rb

@@ -58,9 +58,13 @@ module Flapjack
           @api_url = @config['api_url']
           if @api_url
             if (@api_url =~ /^#{URI::regexp(%w(http https))}$/).nil?
-              @logger.error "api_url is not a valid http or https URI (#{@api_url})"
+              @logger.error "api_url is not a valid http or https URI (#{@api_url}), discarding"
               @api_url = nil
             end
+            unless @api_url.match(/^.*\/$/)
+              @logger.info "api_url must end with a trailing '/', setting to '#{@api_url}/'"
+              @api_url = "#{@api_url}/"
+            end
           end
 
           unless @api_url
@@ -147,10 +151,11 @@ module Flapjack
         check_stats
         @adjective = 'all'
 
-        checks_by_entity = Flapjack::Data::EntityCheck.find_all_by_entity(:redis => redis)
-        @states = checks_by_entity.keys.inject({}) {|result, entity|
-          result[entity] = checks_by_entity[entity].sort.map {|check|
-            [check] + entity_check_state(entity, check)
+        checks_by_entity = Flapjack::Data::EntityCheck.find_current_by_entity(:redis => redis)
+        @states = checks_by_entity.keys.inject({}) {|result, entity_name|
+          Flapjack::Data::Entity.find_by_name(entity_name, :redis => redis, :create => true)
+          result[entity_name] = checks_by_entity[entity_name].sort.map {|check|
+            [check] + entity_check_state(entity_name, check)
           }
           result
         }
@@ -163,7 +168,7 @@ module Flapjack
         check_stats
         @adjective = 'failing'
 
-        checks_by_entity = Flapjack::Data::EntityCheck.find_all_failing_by_entity(:redis => redis)
+        checks_by_entity = Flapjack::Data::EntityCheck.find_current_failing_by_entity(:redis => redis)
         @states = checks_by_entity.keys.inject({}) {|result, entity|
           result[entity] = checks_by_entity[entity].sort.map {|check|
             [check] + entity_check_state(entity, check)
@@ -189,9 +194,9 @@ module Flapjack
         check_stats
         {
           'events_queued'       => @events_queued,
-          'all_entities'        => @count_all_entities,
+          'all_entities'        => @count_current_entities,
           'failing_entities'    => @count_failing_entities,
-          'all_checks'          => @count_all_checks,
+          'all_checks'          => @count_current_checks,
           'failing_checks'      => @count_failing_checks,
           'processed_events' => {
             'all_time' => {
@@ -211,9 +216,22 @@ module Flapjack
       end
 
       get '/entities_all' do
+        redirect '/entities'
+      end
+
+      get '/entities' do
+        @entities = Flapjack::Data::Entity.all(:enabled => true, :redis => redis).map {|e| e.name}
+
+        entity_stats(@entities)
+        @adjective = ''
+
+        erb 'entities.html'.to_sym
+      end
+
+      get '/entities_decommissioned' do
         entity_stats
-        @adjective = 'all'
-        @entities = Flapjack::Data::Entity.find_all_with_checks(:redis => redis)
+        @adjective = 'decommissioned'
+        @entities = Flapjack::Data::Entity.all(:enabled => false, :redis => redis)
 
         erb 'entities.html'.to_sym
       end
@@ -229,7 +247,7 @@ module Flapjack
       get '/entity/:entity' do
         @entity = params[:entity]
         entity_stats
-        @states = Flapjack::Data::EntityCheck.find_all_for_entity_name(@entity, :redis => redis).sort.map { |check|
+        @states = Flapjack::Data::EntityCheck.find_current_for_entity_name(@entity, :redis => redis).sort.map { |check|
           [check] + entity_check_state(@entity, check)
         }.sort_by {|parts| parts }
 
@@ -237,10 +255,12 @@ module Flapjack
       end
 
       get '/check' do
+
         @entity = params[:entity]
         @check  = params[:check]
 
         entity_check = get_entity_check(@entity, @check)
+
         return 404 if entity_check.nil?
 
         check_stats
@@ -447,15 +467,14 @@ module Flapjack
         @current_checks_ages = Flapjack::Data::EntityCheck.find_all_split_by_freshness([0, 60, 300, 900, 3600], {:redis => redis, :counts => true } )
       end
 
-      def entity_stats
-        @count_all_entities      = Flapjack::Data::Entity.find_all_with_checks(:redis => redis).length
+      def entity_stats(entities = nil)
+        @count_current_entities  = (entities || Flapjack::Data::Entity.all(:enabled => true, :redis => redis)).length
         @count_failing_entities  = Flapjack::Data::Entity.find_all_with_failing_checks(:redis => redis).length
       end
 
       def check_stats
-        # FIXME: move this logic to Flapjack::Data::EntityCheck
-        @count_all_checks        = Flapjack::Data::EntityCheck.count_all(:redis => redis)
-        @count_failing_checks    = Flapjack::Data::EntityCheck.count_all_failing(:redis => redis)
+        @count_current_checks    = Flapjack::Data::EntityCheck.count_current(:redis => redis)
+        @count_failing_checks    = Flapjack::Data::EntityCheck.count_current_failing(:redis => redis)
       end
 
       def last_notification_data(entity_check)

data/lib/flapjack/gateways/web/public/css/tablesort.css

@@ -15,22 +15,6 @@
   cursor: not-allowed;
 }
 
-.tablesorter-filter-row.hideme td {
-  padding: 2px;
-  margin: 0;
-  line-height: 0;
-  cursor: pointer;
-}
-.tablesorter-filter-row.hideme .tablesorter-filter {
-  height: 1px;
-  min-height: 0;
-  border: 0;
-  padding: 0;
-  margin: 0;
-  opacity: 0;
-  filter: alpha(opacity=0);
-}
-
 .tablesorter-filter {
   width: 95%;
   height: inherit;

data/lib/flapjack/gateways/web/public/js/backbone.jsonapi.js

@@ -187,7 +187,7 @@ Backbone.JSONAPIModel = Backbone.Model.extend({
     this.linked[type].remove(obj);
   },
 
-  urlRoot: function() { return(flapjack.api_url + "/" + this.name); },
+  urlRoot: function() { return(flapjack.api_url + this.name); },
 
   // can only be called from inside a 'change' event
   setDirty: function() {

data/lib/flapjack/gateways/web/public/js/jquery.tablesorter.widgets.js

@@ -603,10 +603,6 @@ ts.filter = {
       ts.filter.checkFilters(table, filter);
     });
 
-    if (wo.filter_hideFilters) {
-      ts.filter.hideFilters(table, c);
-    }
-
     // show processing icon
     if (c.showProcessing) {
       c.$table.bind('filterStart.tsfilter filterEnd.tsfilter', function(event, columns) {
@@ -747,10 +743,6 @@ ts.filter = {
     if (filterArray) {
       ts.setFilters( table, filters );
     }
-    if (wo.filter_hideFilters) {
-      // show/hide filter row as needed
-      c.$table.find('.tablesorter-filter-row').trigger( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
-    }
     // return if the last search is the same; but filter === false when updating the search
     // see example-widget-filter.html filter toggle buttons
     if (c.lastCombinedFilter === combinedFilters && filter !== false) {
@@ -771,43 +763,6 @@ ts.filter = {
       return false;
     }
   },
-  hideFilters: function(table, c) {
-    var $filterRow, $filterRow2, timer;
-    c.$table
-      .find('.tablesorter-filter-row')
-      .addClass('hideme')
-      .bind('mouseenter mouseleave', function(e) {
-        // save event object - http://bugs.jquery.com/ticket/12140
-        var event = e;
-        $filterRow = $(this);
-        clearTimeout(timer);
-        timer = setTimeout(function() {
-          if ( /enter|over/.test(event.type) ) {
-            $filterRow.removeClass('hideme');
-          } else {
-            // don't hide if input has focus
-            // $(':focus') needs jQuery 1.6+
-            if ( $(document.activeElement).closest('tr')[0] !== $filterRow[0] ) {
-              // don't hide row if any filter has a value
-              if (ts.getFilters(table).join('') === '') {
-                $filterRow.addClass('hideme');
-              }
-            }
-          }
-        }, 200);
-      })
-      .find('input, select').bind('focus blur', function(e) {
-        $filterRow2 = $(this).closest('tr');
-        clearTimeout(timer);
-        var event = e;
-        timer = setTimeout(function() {
-          // don't hide row if any filter has a value
-          if (ts.getFilters(table).join('') === '') {
-            $filterRow2[ event.type === 'focus' ? 'removeClass' : 'addClass']('hideme');
-          }
-        }, 200);
-      });
-  },
   findRows: function(table, filters, combinedFilters) {
     if (table.config.lastCombinedFilter === combinedFilters) { return; }
     var cached, len, $rows, rowIndex, tbodyIndex, $tbody, $cells, columnIndex,

data/lib/flapjack/gateways/web/public/js/modules/contact.js

@@ -48,7 +48,7 @@
 
   Contact.List = Backbone.JSONAPICollection.extend({
     model: Contact.Model,
-    url: function() { return flapjack.api_url + "/contacts"; }
+    url: function() { return flapjack.api_url + "contacts"; }
   });
 
   Contact.Views.List = Backbone.View.extend({
@@ -518,4 +518,4 @@
     }
   });
 
-})(flapjack, flapjack.module("contact"));
+})(flapjack, flapjack.module("contact"));

data/lib/flapjack/gateways/web/public/js/modules/entity.js

@@ -22,7 +22,7 @@
   Entity.List = Backbone.JSONAPICollection.extend({
     model:      Entity.Model,
     comparator: 'name',
-    url: function() { return flapjack.api_url + "/entities"; }
+    url: function() { return flapjack.api_url + "entities"; }
   });
 
-})(flapjack, flapjack.module("entity"));
+})(flapjack, flapjack.module("entity"));

data/lib/flapjack/gateways/web/public/js/modules/medium.js

@@ -21,9 +21,9 @@
     },
     sync: function(method, model, options) {
       if ( method == 'create') {
-        options.url = flapjack.api_url + '/contacts/' + model.contact.get('id') + '/' + this.name;
+        options.url = flapjack.api_url + 'contacts/' + model.contact.get('id') + '/' + this.name;
       } else {
-        options.url = flapjack.api_url + '/' + this.name + '/' + model.contact.get('id') + '_' + model.get('type');
+        options.url = flapjack.api_url + this.name + '/' + model.contact.get('id') + '_' + model.get('type');
       }
       Backbone.JSONAPIModel.prototype.sync(method, model, options);
     }
@@ -33,7 +33,7 @@
   Medium.List = Backbone.JSONAPICollection.extend({
     model:      Medium.Model,
     comparator: 'type',
-    url: function() { return flapjack.api_url + "/media"; }
+    url: function() { return flapjack.api_url + "media"; }
   });
 
-})(flapjack, flapjack.module("medium"));
+})(flapjack, flapjack.module("medium"));

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

@@ -62,7 +62,7 @@ $(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?filter=event_queue_length', function(json) {
       var d = new Date().getTime();
       var value = {x: d, y: json.event_queue_length}
       data[0].values.push(value);

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

@@ -9,7 +9,7 @@
 </div>
 
 <div class="row">
-  <div class="col-md-6">
+  <div id="state" class="col-md-6">
     <%
       state_qualifier = @check_enabled ? '' : "DISABLED. Last "
       state_class     = case @check_state
@@ -37,7 +37,7 @@
        !@current_unscheduled_maintenance and
        !(['warning', 'critical', 'unknown'].include?(@check_state))
     %>
-    <div class="alert alert-info">
+    <div id="no-maintenance-summary" class="alert alert-info">
       <form class="form-horizontal" role="form">
         <div class="form-group">
           <label class="col-md-2 control-label">State</label>
@@ -60,7 +60,7 @@
   <% end %>
 
   <% if @current_unscheduled_maintenance %>
-    <div class="alert alert-warning">
+    <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">
 
@@ -129,7 +129,7 @@
   <% end %>
 
   <% if (['warning', 'critical', 'unknown'].include?(@check_state) and !@current_scheduled_maintenance) %>
-    <div class="alert alert-warning">
+    <div id="add-unscheduled-maintenance" class="alert alert-warning">
       <% action = @current_unscheduled_maintenance ? "Re-acknowledge" : "Acknowledge" %>
       <h4><%= action %> alert</h4>
       <form action="<%= @base_url %>acknowledgements/<%= check_path_escaped %>" method="post" class="form-horizontal">
@@ -169,7 +169,7 @@
   <% end %>
 
   <% if @current_scheduled_maintenance %>
-    <div class="alert alert-warning">
+    <div id="scheduled-maintenance-summary" class="alert alert-warning">
       <div class="row">
         <div class="col-md-3 text-right">State</div>
         <div class="col-md-9">
@@ -217,7 +217,7 @@
 </div><!-- row -->
 
 <div class="row">
-  <div class="col-md-6">
+  <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) %>
@@ -255,7 +255,7 @@
     </table>
   </div><!-- col-md-6 -->
 
-  <div class="col-md-6">
+  <div id="recent-state-changes" class="col-md-6">
     <h3>Recent state changes</h3>
     <% if @state_changes && !@state_changes.empty? %>
     <table class="table table-hover table-condensed">
@@ -279,7 +279,7 @@
 </div><!-- row -->
 
 <div class="row">
-  <div class="col-md-12">
+  <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? %>
@@ -328,7 +328,7 @@
 <div class="row">
   <div class="col-md-8">
 
-    <div class="panel panel-default">
+    <div id="add-scheduled-maintenance" class="panel panel-default">
       <div class="panel-heading">
         <h3 class="panel-title">Add Scheduled Maintenance</h4>
       </div>
@@ -384,7 +384,7 @@
 
 
 <div class="row">
-  <div class="col-md-8">
+  <div id="contacts" class="col-md-8">
     <h3>Contacts</h3>
     <% if @contacts && !@contacts.empty? %>
       <table class="table table-bordered table-hover table-condensed">