sensu 0.13.0.alpha.2-java → 0.13.0.beta.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca362a35da09af8f55b176889be21e2d38f7cb4
-  data.tar.gz: 9ec53b9cbaecdebab79b00ea5c7ce37152a7d6dc
+  metadata.gz: e6b5f28dcc77e1d930eb8e71d6a7907eb36aa32c
+  data.tar.gz: 50303ac9338607ee19dd12e9d8e1f3f084bb6b25
 SHA512:
-  metadata.gz: b474c4e01dde4807f377fddf9bfe8f2e7f5c2ee182dc0479f423ba1cd6345155d1f00b4511994bfbc2f5af3c2ecf2f2aec47b6b558f7142d8660a0015bd671c6
-  data.tar.gz: 3bb667b544c46c8aa6f50d2c02dc7651162ab61abbd18306b5b70383b0881125990b9bb7648db07d5215f3465f2821d17a86ef9a4655809a5f481d3ec75e3132
+  metadata.gz: 87d745900be3449d1b5a63f36e5d5c8a088386b85bad15baa50ee88df3fcf7d54112165a593598ccc6dccff51759c91014f209789b172d73c061c5ab5f2e361a
+  data.tar.gz: 0476381bb4114bdc7d6332ce279eab2fa226245c9aee39c1cf273bfe5b8940949c3a774c36c417b858c8ad5500d30f02f1cac940d33f595be910a41a1be4ec84

data/CHANGELOG.md

@@ -5,6 +5,8 @@
 API GET /events now provides all event data, the same data passed to event
 handlers.
 
+AMQP handler type ("amqp") has been replaced by "transport".
+
 Standalone check results are no longer merged with check definitions
 residing on the server(s).
 
@@ -30,7 +32,8 @@ everything but check extensions.
 
 Fixed standalone check scheduling, no longer mutating definitions.
 
-Fixed command token substitution, allowing for the use of colons.
+Fixed command token substitution, allowing for the use of colons and
+working value defaults.
 
 Log events are flushed when the eventmachine reactor stops.
 

data/lib/sensu/client.rb

@@ -68,17 +68,20 @@ module Sensu
       end
     end
 
+    def find_client_attribute(tree, path, default)
+      attribute = tree[path.shift]
+      if attribute.is_a?(Hash)
+        find_client_attribute(attribute, path, default)
+      else
+        attribute.nil? ? default : attribute
+      end
+    end
+
     def substitute_command_tokens(check)
       unmatched_tokens = Array.new
-      substituted = check[:command].gsub(/:::([^:]*?):::/) do
+      substituted = check[:command].gsub(/:::([^:].*?):::/) do
         token, default = $1.to_s.split('|', -1)
-        matched = token.split('.').inject(@settings[:client]) do |client, attribute|
-          if client[attribute].nil?
-            default.nil? ? break : default
-          else
-            client[attribute]
-          end
-        end
+        matched = find_client_attribute(@settings[:client], token.split('.'), default)
         if matched.nil?
           unmatched_tokens << token
         end

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.13.0.alpha.2'
+    VERSION = '0.13.0.beta.1'
 
     SEVERITIES = %w[ok warning critical unknown]
 

data/lib/sensu/daemon.rb

@@ -2,12 +2,12 @@ require 'rubygems'
 
 gem 'multi_json', '1.10.1'
 
-gem 'sensu-em', '2.0.0'
+gem 'sensu-em', '2.1.0'
 gem 'sensu-logger', '0.0.1'
-gem 'sensu-settings', '0.0.5'
+gem 'sensu-settings', '0.0.7'
 gem 'sensu-extension', '0.0.3'
 gem 'sensu-extensions', '0.0.5'
-gem 'sensu-transport', '0.0.2'
+gem 'sensu-transport', '0.0.6'
 gem 'sensu-spawn', '0.0.3'
 
 require 'time'
@@ -123,17 +123,14 @@ module Sensu
     end
 
     def setup_transport
-      if @settings[:transport].is_a?(Hash)
-        transport_name = @settings[:transport][:name]
-      end
-      transport_name ||= 'rabbitmq'
-      transport_settings = @settings[transport_name.to_sym]
+      transport_name = @settings[:transport][:name] || 'rabbitmq'
+      transport_settings = @settings[transport_name]
       @logger.debug('connecting to transport', {
         :name => transport_name,
         :settings => transport_settings
       })
+      Transport.logger = @logger
       @transport = Transport.connect(transport_name, transport_settings)
-      @transport.logger = @logger
       @transport.on_error do |error|
         @logger.fatal('transport connection error', {
           :error => error.to_s

data/lib/sensu/server.rb

@@ -340,7 +340,7 @@ module Sensu
       @extensions[:bridges].each do |name, bridge|
         bridge.safe_run(event) do |output, status|
           output.each_line do |line|
-            @logger.info('bridge extension output', {
+            @logger.debug('bridge extension output', {
               :extension => bridge.definition,
               :output => line
             })
@@ -632,7 +632,7 @@ module Sensu
           master_duties
         else
           @redis.get('lock:master') do |timestamp|
-            if Time.now.to_i - timestamp.to_i >= 60
+            if Time.now.to_i - timestamp.to_i >= 30
               @redis.getset('lock:master', Time.now.to_i) do |previous|
                 if previous == timestamp
                   @is_master = true
@@ -648,7 +648,7 @@ module Sensu
 
     def setup_master_monitor
       request_master_election
-      @timers[:run] << EM::PeriodicTimer.new(20) do
+      @timers[:run] << EM::PeriodicTimer.new(10) do
         if @is_master
           @redis.set('lock:master', Time.now.to_i) do
             @logger.debug('updated master lock timestamp')
@@ -659,35 +659,16 @@ module Sensu
       end
     end
 
-    def resign_as_master(&block)
-      block ||= Proc.new {}
+    def resign_as_master
       if @is_master
         @logger.warn('resigning as master')
         @timers[:master].each do |timer|
           timer.cancel
         end
         @timers[:master].clear
-        if @redis.connected?
-          @redis.del('lock:master') do
-            @logger.info('removed master lock')
-            @is_master = false
-          end
-        end
-        timestamp = Time.now.to_i
-        retry_until_true do
-          if !@is_master
-            block.call
-            true
-          elsif Time.now.to_i - timestamp >= 3
-            @logger.warn('failed to remove master lock')
-            @is_master = false
-            block.call
-            true
-          end
-        end
+        @is_master = false
       else
         @logger.debug('not currently master')
-        block.call
       end
     end
 
@@ -729,11 +710,10 @@ module Sensu
         end
         @timers[:run].clear
         unsubscribe
-        resign_as_master do
-          @state = :paused
-          if block
-            block.call
-          end
+        resign_as_master
+        @state = :paused
+        if block
+          block.call
         end
       end
     end
@@ -751,8 +731,8 @@ module Sensu
 
     def stop
       @logger.warn('stopping')
-      @state = :stopping
       pause do
+        @state = :stopping
         complete_handlers_in_progress do
           @redis.close
           @transport.close

data/sensu.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |s|
   s.add_dependency('json') if RUBY_VERSION < "1.9"
   s.add_dependency('multi_json', '1.10.1')
   s.add_dependency('uuidtools', '2.1.4')
-  s.add_dependency('sensu-em', '2.0.0')
+  s.add_dependency('sensu-em', '2.1.0')
   s.add_dependency('sensu-logger', '0.0.1')
-  s.add_dependency('sensu-settings', '0.0.5')
+  s.add_dependency('sensu-settings', '0.0.7')
   s.add_dependency('sensu-extension', '0.0.3')
   s.add_dependency('sensu-extensions', '0.0.5')
-  s.add_dependency('sensu-transport', '0.0.2')
+  s.add_dependency('sensu-transport', '0.0.6')
   s.add_dependency('sensu-spawn', '0.0.3')
   s.add_dependency('em-redis-unified', '0.5.0')
   s.add_dependency('sinatra', '1.3.5')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.13.0.alpha.2
+  version: 0.13.0.beta.1
 platform: java
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -45,12 +45,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -73,12 +73,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -115,12 +115,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.6
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.6
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency