sensu-dashboard-sonian 0.9.6 → 0.9.8.beta

data/lib/sensu-dashboard/app.rb

@@ -41,6 +41,10 @@ class Dashboard < Sinatra::Base
       Process.write_pid(options[:pid_file])
     end
     $api_server = 'http://' + $settings.api.host + ':' + $settings.api.port.to_s
+    $api_options = {}
+    if $settings.api.user && $settings.api.password
+      $api_options.merge!(:head => {'authorization' => [$settings.api.user, $settings.api.password]})
+    end
   end
 
   def self.websocket_server
@@ -104,31 +108,14 @@ class Dashboard < Sinatra::Base
 
   aget '/autocomplete.json' do
     multi = EM::MultiRequest.new
-
-    requests = [
-      $api_server + '/events',
-      $api_server + '/clients'
-    ]
-
-    requests.each do |url|
-      multi.add EM::HttpRequest.new(url).get
-    end
+    multi.add :events, EM::HttpRequest.new($api_server + '/events').get($api_options)
+    multi.add :clients, EM::HttpRequest.new($api_server + '/clients').get($api_options)
 
     multi.callback do
-      events = {}
-      clients = []
-
-      multi.responses[:succeeded].each do |request|
-        body = JSON.parse(request.response)
-        case body
-        when Hash
-          events = body
-        when Array
-          clients = body
-        end
-      end
+      unless multi.responses[:errback].size > 0
+        events = JSON.parse(multi.responses[:callback][:events].response)
+        clients = JSON.parse(multi.responses[:callback][:clients].response)
 
-      if events && clients
         autocomplete = []
         statuses = {:warning => [], :critical => [], :unknown => []}
         subscriptions = {}
@@ -137,23 +124,21 @@ class Dashboard < Sinatra::Base
         # searching by client
         clients.each do |client|
           client_name = client['name']
-          if events.include?(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']
-              when 1
-                statuses[:warning].push(event['status'])
-              when 2
-                statuses[:critical].push(event['status'])
-              else
-                statuses[:unknown].push(event['status'])
-              end
-              checks.push(check)
+          autocomplete.push({:value => [client_name], :type => 'client', :name => client_name})
+          client['subscriptions'].each do |subscription|
+            subscriptions[subscription] ||= []
+            subscriptions[subscription].push(client_name)
+          end
+          events.each do |event|
+            case event['status']
+            when 1
+              statuses[:warning].push(event['status'])
+            when 2
+              statuses[:critical].push(event['status'])
+            else
+              statuses[:unknown].push(event['status'])
             end
+            checks.push(event['check'])
           end
         end
 
@@ -181,29 +166,22 @@ class Dashboard < Sinatra::Base
   end
 
   aget '/clients/autocomplete.json' do
-    multi = EM::MultiRequest.new
-
-    requests = [
-     $api_server + '/clients'
-    ]
-
-    requests.each do |url|
-      multi.add EM::HttpRequest.new(url).get
+    begin
+      http = EM::HttpRequest.new($api_server + '/clients').get($api_options)
+    rescue => e
+      $logger.warn(e)
+      status 404
+      body '{"error":"could not retrieve clients from the sensu api"}'
     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
+    http.errback do
+      status 404
+      body '{"error":"could not retrieve clients from the sensu api"}'
+    end
 
-      if clients
+    http.callback do
+      if http.response_header.status == 200
+        clients = JSON.parse(http.response)
         autocomplete = []
         subscriptions = {}
 
@@ -236,9 +214,9 @@ class Dashboard < Sinatra::Base
 
   aget '/events.json' do
     begin
-      http = EM::HttpRequest.new($api_server + '/events').get
+      http = EM::HttpRequest.new($api_server + '/events').get($api_options)
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not retrieve events from the sensu api"}'
     end
@@ -249,16 +227,26 @@ class Dashboard < Sinatra::Base
     end
 
     http.callback do
+      events = Hash.new
+      if http.response_header.status == 200
+        api_events = JSON.parse(http.response)
+        api_events.each do |event|
+          client = event.delete('client')
+          check = event.delete('check')
+          events[client] ||= Hash.new
+          events[client][check] = event
+        end
+      end
       status http.response_header.status
-      body http.response
+      body events.to_json
     end
   end
 
   aget '/clients.json' do
     begin
-      http = EM::HttpRequest.new($api_server + '/clients').get
+      http = EM::HttpRequest.new($api_server + '/clients').get($api_options)
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not retrieve clients from the sensu api"}'
     end
@@ -276,9 +264,9 @@ class Dashboard < Sinatra::Base
 
   aget '/client/:id.json' do |id|
     begin
-      http = EM::HttpRequest.new($api_server + '/client/' + id).get
+      http = EM::HttpRequest.new($api_server + '/client/' + id).get($api_options)
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not retrieve client from the sensu api"}'
     end
@@ -296,9 +284,9 @@ class Dashboard < Sinatra::Base
 
   adelete '/client/:id.json' do |id|
     begin
-      http = EventMachine::HttpRequest.new($api_server + '/client/' + id).delete
+      http = EventMachine::HttpRequest.new($api_server + '/client/' + id).delete($api_options)
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not delete client from the sensu api"}'
     end
@@ -316,9 +304,9 @@ class Dashboard < Sinatra::Base
 
   aget '/stash/*.json' do |path|
     begin
-      http = EM::HttpRequest.new($api_server + '/stash/' + path).get
+      http = EM::HttpRequest.new($api_server + '/stash/' + path).get($api_options)
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not retrieve a stash from the sensu api"}'
     end
@@ -342,9 +330,9 @@ class Dashboard < Sinatra::Base
           'content-type' => 'application/json'
         }
       }
-      http = EM::HttpRequest.new($api_server + '/stash/' + path).post request_options
+      http = EM::HttpRequest.new($api_server + '/stash/' + path).post(request_options.merge($api_options))
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not create a stash with the sensu api"}'
     end
@@ -362,9 +350,9 @@ class Dashboard < Sinatra::Base
 
   adelete '/stash/*.json' do |path|
     begin
-      http = EM::HttpRequest.new($api_server + '/stash/' + path).delete
+      http = EM::HttpRequest.new($api_server + '/stash/' + path).delete($api_options)
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not delete a stash with the sensu api"}'
     end
@@ -388,9 +376,9 @@ class Dashboard < Sinatra::Base
           'content-type' => 'application/json'
         }
       }
-      http = EM::HttpRequest.new($api_server + '/event/resolve').post request_options
+      http = EM::HttpRequest.new($api_server + '/event/resolve').post(request_options.merge($api_options))
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not resolve an event with the sensu api"}'
     end
@@ -408,9 +396,9 @@ class Dashboard < Sinatra::Base
 
   aget '/stashes.json' do
     begin
-      http = EM::HttpRequest.new($api_server + '/stashes').get
+      http = EM::HttpRequest.new($api_server + '/stashes').get($api_options)
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not retrieve a list of stashes from the sensu api"}'
     end
@@ -434,9 +422,9 @@ class Dashboard < Sinatra::Base
           'content-type' => 'application/json'
         }
       }
-      http = EM::HttpRequest.new($api_server + '/stashes').post request_options
+      http = EM::HttpRequest.new($api_server + '/stashes').post(request_options.merge($api_options))
     rescue => e
-      $logger.warning(e)
+      $logger.warn(e)
       status 404
       body '{"error":"could not retrieve a list of stashes from the sensu api"}'
     end
@@ -454,7 +442,7 @@ class Dashboard < Sinatra::Base
 
   def self.stop(signal)
     $logger.warn('[stop] -- stopping sensu dashboard -- ' + signal)
-    EM::Timer.new(1) do
+    EM::PeriodicTimer.new(0.25) do
       EM::stop_event_loop
     end
   end

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

@@ -186,7 +186,7 @@ function fetchEvents() {
 
           $.getJSON('/client/'+selectedEvent['client']+'.json', function(data) {
             var client = data;
-            client['subscriptions'] = client['subscriptions'].join(', ');
+            client['subscriptions'] = client['subscriptions'].sort().join(', ');
             $('#clientDetailsRowTemplate').tmpl(client).appendTo('div#event_details_modal > div#client_data');
             $('div#event_details_modal > div#client_data > h1').click(function() {
               $(this).select();
@@ -246,7 +246,7 @@ function fetchClients() {
         continue;
       }
 
-      client['subscriptions'] = client['subscriptions'].join(', ');
+      client['subscriptions'] = client['subscriptions'].sort().join(', ');
       m_clients.push(client);
     }
 

data/lib/sensu-dashboard/version.rb

@@ -1,5 +1,5 @@
 module Sensu
   module Dashboard
-    VERSION = "0.9.6"
+    VERSION = "0.9.8.beta"
   end
 end

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

@@ -53,7 +53,7 @@ $("#remove_client").click(function() {
   });
 });
 
-$("input[type=text]").autoSuggest("http://" + location.hostname + ":" + location.port + "/clients/autocomplete.json", {
+$("input[type=text]").autoSuggest(location.protocol + "//" + location.hostname + ":" + location.port + "/clients/autocomplete.json", {
   startText: "Enter keywords to filter by",
   selectedItemProp: "name",
   searchObjProps: "name",

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

@@ -171,7 +171,7 @@ $("#resolve_event").click(function() {
   });
 });
 
-$("input[type=text]").autoSuggest("http://" + location.hostname + ":" + location.port + "/autocomplete.json", {
+$("input[type=text]").autoSuggest(location.protocol + "//" + location.hostname + ":" + location.port + "/autocomplete.json", {
   startText: "Enter keywords to filter by",
   selectedItemProp: "name",
   searchObjProps: "name",

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

@@ -46,6 +46,10 @@
 	<link rel="stylesheet" href="css/sonian.css">
         <link rel="stylesheet" href="css/autoSuggest.css">
 
+        <!-- Favicon: Set the sensu fan image from github as the favicon -->
+        <link rel="icon" href="/favicon.ico" type="image/x-icon">
+        <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+
 	<!-- all our JS is at the bottom of the page, except for Modernizr. -->
 	<script src="js/modernizr-1.7.min.js"></script>
 

data/sensu-dashboard.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.summary     = %q{A web interface for sensu, a publish/subscribe server monitoring framework}
   s.description = %q{Display current events and clients in sensu via a simple web interface. Please use the sensu-dashboard gem as this gem is for Sonian use only.}
 
-  s.add_dependency("sensu", "~> 0.9.1")
-  s.add_dependency("em-http-request", "0.3.0")
+  s.add_dependency("sensu", "~> 0.9.5.beta.4")
+  s.add_dependency("em-http-request", "1.0.1")
   s.add_dependency("em-websocket")
   s.add_dependency("sass")
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu-dashboard-sonian
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: false
+  hash: 31098153
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 8
+  - beta
+  version: 0.9.8.beta
 platform: ruby
 authors: 
 - Justin Kolberg
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-28 00:00:00 -08:00
+date: 2012-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +28,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 62196243
         segments: 
         - 0
         - 9
-        - 1
-        version: 0.9.1
+        - 5
+        - beta
+        - 4
+        version: 0.9.5.beta.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +46,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 21
         segments: 
+        - 1
         - 0
-        - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -99,6 +102,7 @@ files:
 - lib/sensu-dashboard/app.rb
 - lib/sensu-dashboard/public/css/autoSuggest.css
 - lib/sensu-dashboard/public/css/style.css
+- lib/sensu-dashboard/public/favicon.ico
 - lib/sensu-dashboard/public/img/cross.png
 - lib/sensu-dashboard/public/img/footer_bg.png
 - lib/sensu-dashboard/public/img/header_bg.png
@@ -151,12 +155,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: