sensu-dashboard 0.9.0 → 0.9.1

data/lib/sensu-dashboard/app.rb

@@ -179,12 +179,32 @@ EventMachine.run do
       rescue => e
         puts e
         status 404
-        body '{"error":"could not retrieve clients from the sensu api"}'
+        body '{"error":"could not retrieve client from the sensu api"}'
       end
 
       http.errback do
         status 404
-        body '{"error":"could not retrieve clients from the sensu api"}'
+        body '{"error":"could not retrieve client from the sensu api"}'
+      end
+
+      http.callback do
+        status http.response_header.status
+        body http.response
+      end
+    end
+
+    adelete '/client/:id.json' do |id|
+      begin
+        http = EventMachine::HttpRequest.new("#{api_server}/client/#{id}").delete
+      rescue => e
+        puts e
+        status 404
+        body '{"error":"could not delete client from the sensu api"}'
+      end
+
+      http.errback do
+        status 404
+        body '{"error":"could not delete client from the sensu api"}'
       end
 
       http.callback do

data/lib/sensu-dashboard/version.rb

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

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

@@ -11,7 +11,7 @@
 <div class="event_detail_group">
   <div class="event_detail">
     <h1>${capitaliseFirstLetter($index)}</h1>
-    <p>${$value}</p>
+    <p id="${$index}">${$value}</p>
   </div>
   <!--<div class="copy">Copy</div>-->
   <div style="clear: both;"></div>
@@ -26,4 +26,26 @@ ws = new WebSocket("ws://" + location.hostname + ":9000");
 ws.onmessage = function(evt) {
   fetchClients();
 }
+
+$("#remove_client").click(function() {
+  var client = $("#name").html();
+  var cross_img = $("#remove_client").children().first();
+  cross_img.attr("src", "/img/loading_circle.gif");
+  $.ajax({
+    type: 'DELETE',
+    contentType: 'application/json',
+    url: '/client/'+client+'.json',
+    success: function(data, textStatus, xhr) {
+      alert('Client '+client+' is being removed, resolving events...');
+	    cross_img.attr("src", "/img/cross.png");
+      $("#lean_overlay").fadeOut(200);
+      $("#event_details_modal").css({'display':'none'});
+      fetchClients();
+    },
+    error: function(xhr, textStatus, errorThrown) {
+      cross_img.attr("src", "/img/cross.png");
+      alert('Client was not found in sensu. This may be due to a delay in a previous removal attempt.');
+    }
+  });
+});
 </script>

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

@@ -18,6 +18,17 @@
 </table>
 
 <div id="event_details_modal" class="event_details_modal">
+  <h1 class="section_title">Actions</h1>
+  <div id="event_actions">
+    <div class="event_detail_group">
+      <div class="event_detail">
+        <div id="remove_client" class="action_btn" style="margin-right: 7px;">
+          <img src="/img/cross.png" style="vertical-align: middle; padding-right: 7px;"/><strong>Remove</strong>
+        </div>
+      </div>
+      <div style="clear: both;"></div>
+    </div>
+  </div>
   <h1 class="section_title">Client Data</h1>
   <div id="client_data"></div>
 </div>

metadata

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