sensu-dashboard 0.9.8.beta.2 → 0.9.8

data/lib/sensu-dashboard/app.rb

@@ -2,7 +2,6 @@ require 'sensu/base'
 require 'thin'
 require 'sinatra/async'
 require 'em-http-request'
-require 'em-websocket'
 require 'sass'
 
 class Dashboard < Sinatra::Base
@@ -11,7 +10,6 @@ class Dashboard < Sinatra::Base
   def self.run(options={})
     EM::run do
       self.setup(options)
-      self.websocket_server
 
       Thin::Logging.silent = true
       Thin::Server.start(self, $settings[:dashboard][:port])
@@ -44,20 +42,6 @@ class Dashboard < Sinatra::Base
     end
   end
 
-  def self.websocket_server
-    $websocket_connections = []
-    EM::WebSocket.start(:host => '0.0.0.0', :port => 9000) do |websocket|
-      websocket.onopen do
-        $logger.debug('client connected to websocket')
-        $websocket_connections.push(websocket)
-      end
-      websocket.onclose do
-        $logger.debug('client disconnected from websocket')
-        $websocket_connections.delete(websocket)
-      end
-    end
-  end
-
   def request_log(env)
     $logger.info([env['REQUEST_METHOD'], env['REQUEST_PATH']].join(' '), {
       :remote_address => env['REMOTE_ADDR'],
@@ -106,12 +90,7 @@ class Dashboard < Sinatra::Base
   end
 
   apost '/events.json' do
-    unless $websocket_connections.empty?
-      $websocket_connections.each do |websocket|
-        websocket.send '{"update":"true"}'
-      end
-    end
-    body '{"success":"triggered dashboard refresh"}'
+    body '{"error": "this feature has been removed"}'
   end
 
   aget '/autocomplete.json' do

data/lib/sensu-dashboard/version.rb

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

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

@@ -73,11 +73,6 @@
 <script type="text/javascript">
 fetchEvents();
 
-ws = new WebSocket("ws://" + location.hostname + ":9000");
-ws.onmessage = function(evt) {
-  fetchEvents();
-}
-
 $("#disable_client_alerts").click(function() {
   var client_id = $("#client_id_value").html();
   var alert_img = $("#disable_client_alerts").children().first();
@@ -187,4 +182,4 @@ $('#filter_unknown_checks').change(function() {
   filter_unknown_checks = !filter_unknown_checks;
   fetchEvents();
 });
-</script>
+</script>

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

@@ -53,9 +53,9 @@
 	<!-- all our JS is at the bottom of the page, except for Modernizr. -->
 	<script src="js/modernizr-1.7.min.js"></script>
 
-  <% if $settings['dashboard']['autorefresh'] %>
+  <% if $settings['dashboard']['autorefresh'] || $settings['dashboard']['auto_refresh'] %>
   <!-- page autorefresh -->
-  <meta http-equiv="refresh" content="<%= $settings['dashboard']['autorefresh'] %>">
+  <meta http-equiv="refresh" content="<%= $settings['dashboard']['autorefresh'] || $settings['dashboard']['auto_refresh'] %>">
   <% end %>
 </head>
 

data/sensu-dashboard.gemspec

@@ -6,14 +6,13 @@ Gem::Specification.new do |s|
   s.name        = "sensu-dashboard"
   s.version     = Sensu::Dashboard::VERSION
   s.authors     = ["Justin Kolberg", "Sean Porter"]
-  s.email       = ["justin.kolberg@sonian.net", "sean.porter@sonian.net"]
+  s.email       = ["justin.kolberg@sonian.net", "portertech@gmail.com"]
   s.homepage    = "https://github.com/sonian/sensu-dashboard"
   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}
 
-  s.add_dependency("sensu", "~> 0.9.6.beta.3")
+  s.add_dependency("sensu", "~> 0.9.6")
   s.add_dependency("em-http-request", "1.0.1")
-  s.add_dependency("em-websocket", "0.3.6")
   s.add_dependency("sass")
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu-dashboard
 version: !ruby/object:Gem::Version 
-  hash: 62196343
-  prerelease: true
+  hash: 43
+  prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - beta
-  - 2
-  version: 0.9.8.beta.2
+  version: 0.9.8
 platform: ruby
 authors: 
 - Justin Kolberg
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-24 00:00:00 -07:00
+date: 2012-07-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,14 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196229
+        hash: 55
         segments: 
         - 0
         - 9
         - 6
-        - beta
-        - 3
-        version: 0.9.6.beta.3
+        version: 0.9.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -55,26 +51,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: em-websocket
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 3
-        - 6
-        version: 0.3.6
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sass
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -84,11 +64,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: Display current events and clients in sensu via a simple web interface
 email: 
 - justin.kolberg@sonian.net
-- sean.porter@sonian.net
+- portertech@gmail.com
 executables: 
 - sensu-dashboard
 extensions: []
@@ -158,14 +138,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: