sensu-dashboard 0.8.1 → 0.9.0

data/lib/sensu-dashboard/app.rb

@@ -104,44 +104,45 @@ EventMachine.run do
           autocomplete = []
           statuses = {:warning => [], :critical => [], :unknown => []}
           subscriptions = {}
-          checks = {}
+          checks = []
 
+          # searching by client
           clients.each do |client|
             client_name = client['name']
             if events.include?(client_name)
-              autocomplete.push({:value => client_name, :name => client_name})
+              autocomplete.push({:value => [client_name], :type => 'client', :name => client_name})
               client['subscriptions'].each do |subscription|
                 subscriptions[subscription] ||= []
                 subscriptions[subscription].push(client_name)
               end
               events[client_name].each do |check, event|
-                case event["status"]
+                
+                case event['status']
                 when 1
-                  statuses[:warning].push(client_name)
+                  statuses[:warning].push(event['status'])
                 when 2
-                  statuses[:critical].push(client_name)
+                  statuses[:critical].push(event['status'])
                 else
-                  statuses[:unknown].push(client_name)
+                  statuses[:unknown].push(event['status'])
                 end
-                checks[check] ||= []
-                checks[check].push(client_name)
+                checks.push(check)
               end
             end
           end
 
           # searching by subscription
           subscriptions.each do |k, v|
-            autocomplete.push({:value => v.join(','), :name => k})
+            autocomplete.push({:value => v.uniq, :type => 'subscription', :name => k})
           end
 
           # searching by status
           statuses.each do |k, v|
-            autocomplete.push({:value => v.join(','), :name => k})
+            autocomplete.push({:value => v.uniq, :type => 'status', :name => k})
           end
 
           # searching by check
-          checks.each do |k, v|
-            autocomplete.push({:value => v.join(','), :name => k})
+          checks.uniq.each do |v|
+            autocomplete.push({:value => [v], :type => 'check', :name => v})
           end
 
           body autocomplete.to_json

data/lib/sensu-dashboard/public/js/functions.js

@@ -1,8 +1,17 @@
 // remap jQuery to $
 (function($){})(window.jQuery);
 
-var filtered_events = [];
-var filtered_events_count = 0;
+Object.size = function(obj) {
+  var size = 0, key;
+  for (key in obj) {
+    if (obj.hasOwnProperty(key)) size++;
+  }
+  return size;
+};
+
+var selected_filters = {};
+var grouped_filters = {};
+
 var filter_unknown_checks = true;
 
 function capitaliseFirstLetter(string) {
@@ -22,46 +31,107 @@ function fetchEvents() {
   var event_count = 0;
 
   $.getJSON('/events.json', function(data) {
-    m_events = new Array();
+    var m_events = new Array();
 
     $('table#events > tbody').empty();
 
-    for (var nodekey in data) {
-      if ((filtered_events_count > 0) && ($.inArray(nodekey, filtered_events) == -1)) {
-      } else {
-        var node = data[nodekey];
-
-        for (var a in node) {
-          var is_unknown = node[a]['status'] >= 3 || node[a]['status'] < 0;
-
-          if (filter_unknown_checks) {
-            if (node[a]['output'] == 'Unknown check') {
-              break;
-            }
-          }
-
-          event_count++;
-          var dataObject = {
-            identifier: SHA1(nodekey+a),
-            client: nodekey,
-            check: a,
-            status: node[a]['status'],
-            output: node[a]['output'],
-            occurrences: node[a]['occurrences'],
-            is_unknown: is_unknown
-          };
-
-          if (m_events[node[a]['status']] == null) {
-            m_events[node[a]['status']] = new Array();
-          }
-
-          m_events[node[a]['status']][nodekey+a] = dataObject;
+    // iterate through the filters
+    grouped_filters = {};
+    for (var i in selected_filters) {
+      var current_filter = selected_filters[i];
+      
+      // store client filters in the grouped filters array
+      if (current_filter['type'] == 'client') {
+        grouped_filters['client'] || (grouped_filters['client'] = []);
+        for (var j in current_filter['value']) {
+          grouped_filters['client'].push(current_filter['value'][j]);
+        }
+      }
+      
+      // store subscription filters in the grouped filters array
+      if (current_filter['type'] == 'subscription') {
+        grouped_filters['subscription'] || (grouped_filters['subscription'] = []);
+        for (var j in current_filter['value']) {
+          grouped_filters['subscription'].push(current_filter['value'][j]);
+        }
+      }
+      
+      // store check filters in the grouped filters array
+      if (current_filter['type'] == 'check') {
+        grouped_filters['check'] || (grouped_filters['check'] = []);
+        for (var j in current_filter['value']) {
+          grouped_filters['check'].push(current_filter['value'][j]);
+        }
+      }
+      
+      // store status filters in the grouped filters array
+      if (current_filter['type'] == 'status') {
+        grouped_filters['status'] || (grouped_filters['status'] = []);
+        for (var j in current_filter['value']) {
+          grouped_filters['status'].push(current_filter['value'][j]);
         }
       }
     }
 
-    for (status in m_events) {
-      for (a in m_events[status]) {
+    // iterate through each node
+    for (var nodekey in data) {
+      // skip node if client filters exist and the client is not in the filter
+      if ((Object.size(grouped_filters['client']) > 0) && ($.inArray(nodekey, grouped_filters['client']) == -1)) {
+        continue;
+      }
+      
+      // skip node if subscription filters exist and the subscription is not in the filter
+      if ((Object.size(grouped_filters['subscription']) > 0) && ($.inArray(nodekey, grouped_filters['subscription']) == -1)) {
+        continue;
+      }
+      
+      var node = data[nodekey];
+
+      // iterate through each event for the current node
+      for (var a in node) {
+        // skip unknown checks if the checkbox is enabled
+        if (filter_unknown_checks && (node[a]['output'] == 'Unknown check')) {
+            continue;
+        }
+        
+        // skip event if check filters exist and the check is not in the filter
+        if ((Object.size(grouped_filters['check']) > 0) && ($.inArray(a, grouped_filters['check']) == -1)) {
+          continue;
+        }
+        
+        // skip event if status filters exist and the status is not in the filter
+        if ((Object.size(grouped_filters['status']) > 0) && ($.inArray(node[a]['status'], grouped_filters['status']) == -1)) {
+          continue;
+        }
+        
+        // if a status code does not exist, set it to unknown
+        node[a]['status'] || (node[a]['status'] = 3);
+        
+        // if an output does not exist, set it to "nil"
+        node[a]['output'] || (node[a]['output'] = "nil output");
+
+        var is_unknown = node[a]['status'] >= 3 || node[a]['status'] < 0;
+
+        event_count++;
+        var dataObject = {
+          identifier: SHA1(nodekey+a),
+          client: nodekey,
+          check: a,
+          status: node[a]['status'],
+          output: node[a]['output'],
+          occurrences: node[a]['occurrences'],
+          is_unknown: is_unknown
+        };
+
+        if (!m_events[node[a]['status']]) {
+          m_events[node[a]['status']] = [];
+        }
+
+        m_events[node[a]['status']][nodekey+a] = dataObject;
+      }
+    }
+    for (var status in m_events) {
+      for (var a in m_events[status]) {
         var m_event = m_events[status][a];
         var ccheck = m_event['client'] + m_event['check'];
 
@@ -163,10 +233,10 @@ function fetchStashes() {
         data: JSON.stringify(data),
         success: function(stash_data, textStatus, xhr) {
           stashes = new Array();
-          for (stash in stash_data) {
+          for (var stash in stash_data) {
             stash_keys = new Array();
             stash_values = new Array();
-            for (stash_value in stash_data[stash]) {
+            for (var stash_value in stash_data[stash]) {
               stash_keys.push(stash_value);
               stash_values.push({
                 name: stash_value,
@@ -225,21 +295,6 @@ function fetchStashes() {
   });
 }
 
-function filterEvents() {
-  var values = $("input[type=hidden]").val().split(",");
-  filtered_events = [];
-  filtered_events_count = 0;
-
-  for(value in values) {
-    if(values[value] != "") {
-      filtered_events_count++;
-      filtered_events.push(values[value]);
-    }
-  }
-
-  fetchEvents();
-}
-
 /* trigger when page is ready */
 $(document).ready(function() {
 
@@ -248,11 +303,11 @@ $(document).ready(function() {
     selectedItemProp: "name",
     searchObjProps: "name",
     selectionAdded: function(elem) {
-      filterEvents();
+      fetchEvents();
     },
     selectionRemoved: function(elem) {
       elem.fadeTo("fast", 0, function() { elem.remove(); });
-      filterEvents();
+      fetchEvents();
     }
   });
 

data/lib/sensu-dashboard/public/js/jquery.autoSuggest.js

@@ -170,7 +170,7 @@
                                                                         var clientname = org_li.prev().text();
                                                                         clientname = clientname.substring(1, clientname.length);
                                                                         var clients = items[clientname];
-									values_input.val(values_input.val().replace(","+clients+",",","));
+                                                                        delete selected_filters[clients];
 									opts.selectionRemoved.call(this, org_li.prev());
 								} else {
 									opts.selectionClick.call(this, org_li.prev());
@@ -329,16 +329,16 @@
 				}
 				
 				function add_selected_item(data, num){
-                                        items[data[opts.selectedItemProp]] = data[opts.selectedValuesProp];
-					if(values_input.val()=="") values_input.val(",");
-					values_input.val(values_input.val()+data[opts.selectedValuesProp]+",");
+                                        var item_id = SHA1(data['name'] + data['type']);
+                                        selected_filters[item_id] = data; 
+                                        items[data[opts.selectedItemProp]] = item_id;
 					var item = $('<li class="as-selection-item" id="as-selection-'+num+'"></li>').click(function(){
 							opts.selectionClick.call(this, $(this));
 							selections_holder.children().removeClass("selected");
 							$(this).addClass("selected");
 						}).mousedown(function(){ input_focus = false; });
 					var close = $('<a class="as-close">&times;</a>').click(function(){
-							values_input.val(values_input.val().replace(","+data[opts.selectedValuesProp]+",",","));
+                                                        delete selected_filters[item_id];
 							opts.selectionRemoved.call(this, item);
 							input_focus = true;
 							input.focus();

data/lib/sensu-dashboard/version.rb

@@ -1,5 +1,5 @@
 module Sensu
   module Dashboard
-    VERSION = "0.8.1"
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu-dashboard
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Justin Kolberg
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 -08:00
+date: 2011-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency