sensu-dashboard 0.9.1 → 0.9.3

data/lib/sensu-dashboard/app.rb

@@ -173,6 +173,57 @@ EventMachine.run do
       end
     end
 
+    # api proxy
+    aget '/clients/autocomplete.json' do
+      multi = EventMachine::MultiRequest.new
+
+      requests = [
+        "#{api_server}/clients"
+      ]
+
+      requests.each do |url|
+        multi.add EventMachine::HttpRequest.new(url).get
+      end
+
+      multi.callback do
+        events = {}
+        clients = []
+
+        multi.responses[:succeeded].each do |request|
+          body = JSON.parse(request.response)
+          case body
+          when Array
+            clients = body
+          end
+        end
+
+        if clients
+          autocomplete = []
+          subscriptions = {}
+
+          # searching by client
+          clients.each do |client|
+            client_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
+          end
+
+          # searching by subscription
+          subscriptions.each do |k, v|
+            autocomplete.push({:value => v.uniq, :type => 'subscription', :name => k})
+          end
+
+          body autocomplete.to_json
+        else
+          status 404
+          body '{"error":"could not retrieve clients from the sensu api"}'
+        end
+      end
+    end
+
     aget '/client/:id.json' do |id|
       begin
         http = EventMachine::HttpRequest.new("#{api_server}/client/#{id}").get

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

@@ -198,8 +198,42 @@ function fetchClients() {
 
     $('table#clients > tbody').empty();
 
+    // 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]);
+        }
+      }
+    }
+
+    // iterate through each node
     for (var clientkey in data) {
       var client = data[clientkey];
+      
+      // skip node if client filters exist and the client is not in the filter
+      if ((Object.size(grouped_filters['client']) > 0) && ($.inArray(client['name'], 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(client['name'], grouped_filters['subscription']) == -1)) {
+        continue;
+      }
+
       client['subscriptions'] = client['subscriptions'].join(', ');
       m_clients.push(client);
     }
@@ -227,64 +261,66 @@ function fetchStashes() {
     type: 'GET',
     url: '/stashes.json',
     success: function(data, textStatus, xhr) {
-      $.ajax({
-        type: 'POST',
-        url: '/stashes.json',
-        data: JSON.stringify(data),
-        success: function(stash_data, textStatus, xhr) {
-          stashes = new Array();
-          for (var stash in stash_data) {
-            stash_keys = new Array();
-            stash_values = new Array();
-            for (var stash_value in stash_data[stash]) {
-              stash_keys.push(stash_value);
-              stash_values.push({
-                name: stash_value,
-                value: stash_data[stash][stash_value]
+      if (data.legnth > 0) {
+        $.ajax({
+          type: 'POST',
+          url: '/stashes.json',
+          data: JSON.stringify(data),
+          success: function(stash_data, textStatus, xhr) {
+            stashes = new Array();
+            for (var stash in stash_data) {
+              stash_keys = new Array();
+              stash_values = new Array();
+              for (var stash_value in stash_data[stash]) {
+                stash_keys.push(stash_value);
+                stash_values.push({
+                  name: stash_value,
+                  value: stash_data[stash][stash_value]
+                });
+              }
+              stashes.push({
+                identifier: SHA1(stash),
+                name: stash,
+                keys: stash_keys.join(', '),
+                values: stash_values
               });
             }
-            stashes.push({
-              identifier: SHA1(stash),
-              name: stash,
-              keys: stash_keys.join(', '),
-              values: stash_values
-            });
-          }
-          $('table#events > tbody').empty();
-          $('#stashTemplate').tmpl(stashes).appendTo('table#events > tbody');
-          $('tbody > tr').click(function() {
-            $('div#event_details_modal').empty();
-            var row = $(this).parent().children().index($(this));
-            $('#stashDetailsTemplate').tmpl(stashes[row]).appendTo('div#event_details_modal');
-            $('div#delete_stash').click(function() {
-              $('div#delete_stash > img').attr("src", "/img/loading_circle.gif");
-              $.ajax({
-                type: 'DELETE',
-                url: '/stash/'+stashes[row]['name']+'.json',
-                success: function(data, textStatus, xhr) {
-                  $("#lean_overlay").fadeOut(200);
-                  $("#event_details_modal").css({'display':'none'});
-                  fetchStashes();
-                },
-                error: function(xhr, textStatus, errorThrown) {
-                  $('div#delete_stash > img').attr("src", "/img/cross.png");
-                  console.log('XHR: ' + xhr);
-                  console.log('textStatus: ' + textStatus);
-                  console.log('errorThrown: ' + errorThrown);
-                  alert('Error deleting stash');
-                }
+            $('table#events > tbody').empty();
+            $('#stashTemplate').tmpl(stashes).appendTo('table#events > tbody');
+            $('tbody > tr').click(function() {
+              $('div#event_details_modal').empty();
+              var row = $(this).parent().children().index($(this));
+              $('#stashDetailsTemplate').tmpl(stashes[row]).appendTo('div#event_details_modal');
+              $('div#delete_stash').click(function() {
+                $('div#delete_stash > img').attr("src", "/img/loading_circle.gif");
+                $.ajax({
+                  type: 'DELETE',
+                  url: '/stash/'+stashes[row]['name']+'.json',
+                  success: function(data, textStatus, xhr) {
+                    $("#lean_overlay").fadeOut(200);
+                    $("#event_details_modal").css({'display':'none'});
+                    fetchStashes();
+                  },
+                  error: function(xhr, textStatus, errorThrown) {
+                    $('div#delete_stash > img').attr("src", "/img/cross.png");
+                    console.log('XHR: ' + xhr);
+                    console.log('textStatus: ' + textStatus);
+                    console.log('errorThrown: ' + errorThrown);
+                    alert('Error deleting stash');
+                  }
+                });
               });
             });
-          });
-          $('tr[rel*=leanModal]').leanModal({ top : 50, bottom : 50 });
-        },
-        error: function(xhr, textStatus, errorThrown) {
-          console.log('XHR: ' + xhr);
-          console.log('textStatus: ' + textStatus);
-          console.log('errorThrown: ' + errorThrown);
-          alert('Error retrieving stashes');
-        }
-     });
+            $('tr[rel*=leanModal]').leanModal({ top : 50, bottom : 50 });
+          },
+          error: function(xhr, textStatus, errorThrown) {
+            console.log('XHR: ' + xhr);
+            console.log('textStatus: ' + textStatus);
+            console.log('errorThrown: ' + errorThrown);
+            alert('Error retrieving stashes');
+          }
+        });
+      }
     },
     error: function(xhr, textStatus, errorThrown) {
       console.log('XHR: ' + xhr);
@@ -298,19 +334,6 @@ function fetchStashes() {
 /* trigger when page is ready */
 $(document).ready(function() {
 
-  $("input[type=text]").autoSuggest("http://" + location.hostname + ":" + location.port + "/autocomplete.json", {
-    startText: "Enter keywords to filter by",
-    selectedItemProp: "name",
-    searchObjProps: "name",
-    selectionAdded: function(elem) {
-      fetchEvents();
-    },
-    selectionRemoved: function(elem) {
-      elem.fadeTo("fast", 0, function() { elem.remove(); });
-      fetchEvents();
-    }
-  });
-
   $(document).keyup(function(e) {
     if (e.keyCode == 27) { // esc
       $("#lean_overlay").fadeOut(200);
@@ -318,11 +341,6 @@ $(document).ready(function() {
     }
   });
 
-  $('#filter_unknown_checks').change(function() {
-    filter_unknown_checks = !filter_unknown_checks;
-    fetchEvents();
-  });
-
   // TODO: fix clipboard support
   /*$('div#event_details_modal > div.event_detail_group > div.copy').click(function() {
     var currentVal = $(this).parent().find('div.event_detail').children().last().text();

data/lib/sensu-dashboard/version.rb

@@ -1,5 +1,5 @@
 module Sensu
   module Dashboard
-    VERSION = "0.9.1"
+    VERSION = "0.9.3"
   end
 end

data/lib/sensu-dashboard/views/client_templates.erb

@@ -1,7 +1,10 @@
 <!-- Client template -->
 <script id="clientTemplate" type="text/x-jquery-tmpl">
   <tr id="${name}" rel="leanModal" href="#event_details_modal">
-    <td id="client_id">${name}</td><td id="public_ip">${address}</td><td id="timestamp">${timestamp}</td><td>${subscriptions}</td>
+    <td id="client_id">${name}</td>
+    <td id="public_ip">${address}</td>
+    <td id="timestamp">${timestamp}</td>
+    <td id="subscriptions">${subscriptions}</td>
   </tr>
 </script>
 
@@ -48,4 +51,17 @@ $("#remove_client").click(function() {
     }
   });
 });
+
+$("input[type=text]").autoSuggest("http://" + location.hostname + ":" + location.port + "/clients/autocomplete.json", {
+  startText: "Enter keywords to filter by",
+  selectedItemProp: "name",
+  searchObjProps: "name",
+  selectionAdded: function(elem) {
+    fetchClients();
+  },
+  selectionRemoved: function(elem) {
+    elem.fadeTo("fast", 0, function() { elem.remove(); });
+    fetchClients();
+  }
+});
 </script>

data/lib/sensu-dashboard/views/clients.erb

@@ -1,14 +1,16 @@
 <h1>Current Clients <span class="clients_count">(<span id="client_count">0</span>)</span></h1>
 
+<input type="text" id="autosuggest_filter" style="width: 300px;"/>
+
 <table id="clients">
 
     <thead>
 
       <tr>
-        <td class="col_clients">Client</td>
-        <td class="col_public_ip">Public IP</td>
-        <td class="col_timestamp">Timestamp</td>
-        <td class="col_output">Subscriptions</td>
+        <th class="col_clients">Client</th>
+        <th class="col_public_ip">Public IP</th>
+        <th class="col_timestamp">Timestamp</th>
+        <th class="col_output">Subscriptions</th>
       </tr>
 
     </thead>

data/lib/sensu-dashboard/views/event_templates.erb

@@ -5,7 +5,9 @@
   {{else}}
   <tr class="status${status}" id="${identifier}" rel="leanModal" href="#event_details_modal">
   {{/if}}
-    <td id="client">${client}</td><td id="check">${check}</td><td id="status">${status}</td><td id="output">${output}</td>
+    <td id="client">${client}</td>
+    <td id="check">${check}</td>
+    <td id="output">${output}</td>
   </tr>
 </script>
 
@@ -147,6 +149,7 @@ $("#disable_client_check_alerts").click(function() {
     });
   }
 });
+
 $("#resolve_event").click(function() {
   var client = $("#client_id_value").html();
   var check = $("#check_name_value").html();
@@ -165,4 +168,22 @@ $("#resolve_event").click(function() {
     }
   });
 });
+
+$("input[type=text]").autoSuggest("http://" + location.hostname + ":" + location.port + "/autocomplete.json", {
+  startText: "Enter keywords to filter by",
+  selectedItemProp: "name",
+  searchObjProps: "name",
+  selectionAdded: function(elem) {
+    fetchEvents();
+  },
+  selectionRemoved: function(elem) {
+    elem.fadeTo("fast", 0, function() { elem.remove(); });
+    fetchEvents();
+  }
+});
+
+$('#filter_unknown_checks').change(function() {
+  filter_unknown_checks = !filter_unknown_checks;
+  fetchEvents();
+});
 </script>

data/lib/sensu-dashboard/views/index.erb

@@ -4,17 +4,16 @@
 <input type="checkbox" checked="checked" id="filter_unknown_checks" style="margin-right: 7px;"/>Filter Unknown Checks
 </div>
 
-<input type="text" id="autosuggest_filter" style="width: 300px;"/>
+<input type="text" id="autosuggest_client_filter" style="width: 300px;"/>
 
 <table id="events">
 
     <thead>
 
       <tr>
-        <td class="col_clients">Client</td>
-        <td class="col_checks">Check</td>
-        <td class="col_status">Status</td>
-        <td class="col_output">Output</td>
+        <th class="col_clients">Client</th>
+        <th class="col_checks">Check</th>
+        <th class="col_output">Output</th>
       </tr>
 
     </thead>

data/lib/sensu-dashboard/views/sonian.sass

@@ -59,22 +59,16 @@ section#main_content
      *-moz-box-shadow: 0 -1px 0 rgba(0,0,0,0.15);
      *box-shadow: 0 -1px 0 rgba(0,0,0,0.15);
   table
-    table-layout: fixed
+    //table-layout: fixed
     width: 100%
     thead tr
       cursor: pointer
-      td
+      th
         padding: 7px
         font-weight: 600
         font-size: 14px
         text-shadow: 0 1px 0 white
-        &.col_clients
-          width: 100px
-        &.col_checks
-          width: 150px 
-        &.col_status
-          width: 80px
-          display: none
+        text-align: left
     tbody tr
       background-color: #fff
       cursor: pointer
@@ -103,9 +97,15 @@ section#main_content
         border-top: 1px solid #880000
       td
         padding: 7px
-        word-break: break-all
-        &#status
-          display: none
+        white-space: nowrap
+        &#output
+          white-space: normal
+          word-break: break-all
+          width: 100%
+        &#subscriptions
+          white-space: normal
+          word-break: break-all
+          width: 100%
   table#clients
     table-layout: auto
     tbody

metadata

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