sensu 0.9.13.beta → 0.9.13.beta.1

data/lib/sensu/client.rb

@@ -78,9 +78,13 @@ module Sensu
     def substitute_command_tokens(check)
       unmatched_tokens = Array.new
       substituted = check[:command].gsub(/:::(.*?):::/) do
-        token = $1.to_s
+        token, default = $1.to_s.split('|')
         matched = token.split('.').inject(@settings[:client]) do |client, attribute|
-          client[attribute].nil? ? break : client[attribute]
+          if client[attribute].nil?
+            default.nil? ? break : default
+          else
+            client[attribute]
+          end
         end
         if matched.nil?
           unmatched_tokens << token
@@ -99,6 +103,7 @@ module Sensu
         command, unmatched_tokens = substitute_command_tokens(check)
         check[:executed] = Time.now.to_i
         if unmatched_tokens.empty?
+          check[:command_executed] = command
           execute = Proc.new do
             @logger.debug('executing check command', {
               :check => check

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.13.beta'
+    VERSION = '0.9.13.beta.1'
 
     LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
 

data/lib/sensu/server.rb

@@ -508,6 +508,9 @@ module Sensu
           result[:check][:output].is_a?(String) &&
           result[:check][:status].is_a?(Integer)
       else
+        @logger.warn('invalid result', {
+          :result => result
+        })
         false
       end
     end
@@ -523,10 +526,6 @@ module Sensu
         })
         if valid_result?(result)
           process_result(result)
-        else
-          @logger.warn('invalid result', {
-            :result => result
-          })
         end
         EM::next_tick do
           header.ack
@@ -599,40 +598,42 @@ module Sensu
       @redis.smembers('clients') do |clients|
         clients.each do |client_name|
           @redis.get('client:' + client_name) do |client_json|
-            client = Oj.load(client_json)
-            check = {
-              :name => 'keepalive',
-              :issued => Time.now.to_i,
-              :executed => Time.now.to_i
-            }
-            thresholds = {
-              :warning => 120,
-              :critical => 180
-            }
-            if client.has_key?(:keepalive)
-              if client[:keepalive].has_key?(:handler) || client[:keepalive].has_key?(:handlers)
-                check[:handlers] = Array(client[:keepalive][:handlers] || client[:keepalive][:handler])
+            unless client_json.nil?
+              client = Oj.load(client_json)
+              check = {
+                :name => 'keepalive',
+                :issued => Time.now.to_i,
+                :executed => Time.now.to_i
+              }
+              thresholds = {
+                :warning => 120,
+                :critical => 180
+              }
+              if client.has_key?(:keepalive)
+                if client[:keepalive].has_key?(:handler) || client[:keepalive].has_key?(:handlers)
+                  check[:handlers] = Array(client[:keepalive][:handlers] || client[:keepalive][:handler])
+                end
+                if client[:keepalive].has_key?(:thresholds)
+                  thresholds.merge!(client[:keepalive][:thresholds])
+                end
               end
-              if client[:keepalive].has_key?(:thresholds)
-                thresholds.merge!(client[:keepalive][:thresholds])
+              time_since_last_keepalive = Time.now.to_i - client[:timestamp]
+              case
+              when time_since_last_keepalive >= thresholds[:critical]
+                check[:output] = 'No keep-alive sent from client in over '
+                check[:output] << thresholds[:critical].to_s + ' seconds'
+                check[:status] = 2
+              when time_since_last_keepalive >= thresholds[:warning]
+                check[:output] = 'No keep-alive sent from client in over '
+                check[:output] << thresholds[:warning].to_s + ' seconds'
+                check[:status] = 1
+              else
+                check[:output] = 'Keep-alive sent from client less than '
+                check[:output] << thresholds[:warning].to_s + ' seconds ago'
+                check[:status] = 0
               end
+              publish_result(client, check)
             end
-            time_since_last_keepalive = Time.now.to_i - client[:timestamp]
-            case
-            when time_since_last_keepalive >= thresholds[:critical]
-              check[:output] = 'No keep-alive sent from client in over '
-              check[:output] << thresholds[:critical].to_s + ' seconds'
-              check[:status] = 2
-            when time_since_last_keepalive >= thresholds[:warning]
-              check[:output] = 'No keep-alive sent from client in over '
-              check[:output] << thresholds[:warning].to_s + ' seconds'
-              check[:status] = 1
-            else
-              check[:output] = 'Keep-alive sent from client less than '
-              check[:output] << thresholds[:warning].to_s + ' seconds ago'
-              check[:status] = 0
-            end
-            publish_result(client, check)
           end
         end
       end

data/lib/sensu/settings.rb

@@ -210,7 +210,10 @@ module Sensu
     end
 
     def validate_check(check)
-      unless check[:interval].is_a?(Integer) && check[:interval] > 0
+      unless check[:name] =~ /^[\w-]+$/
+        invalid_check(check, 'check name cannot contain spaces or special characters')
+      end
+      unless (check[:interval].is_a?(Integer) && check[:interval] > 0) || !check[:publish]
         invalid_check(check, 'check is missing interval')
       end
       unless check[:command].is_a?(String)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: -799367686
+  hash: 1864401177
   prerelease: true
   segments: 
   - 0
   - 9
   - 13
   - beta
-  version: 0.9.13.beta
+  - 1
+  version: 0.9.13.beta.1
 platform: ruby
 authors: 
 - Sean Porter
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-19 00:00:00 -07:00
+date: 2013-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency