sensu 0.13.0.beta-java → 0.13.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03bb8aada8fc109d81e0b691877050914ccf1175
-  data.tar.gz: f5f1d156a7c084d120f531be643d5919ce357cfc
+  metadata.gz: 9d379ef4e0836c0a4bd83693fd1b2c56f2bd812e
+  data.tar.gz: ab189afb5a1f15166596b52ed60f142a96c396dd
 SHA512:
-  metadata.gz: d5b66d46dcba00c31be02e6e7dadd42657a248073ada1a611f558f65b94f522ae801987987f6aab6840630e6b4a5dad11cab015f65c3c4af1d7c0c8866dd0c8d
-  data.tar.gz: 1fd75e24c411a8c0399c59a9cb5b90b248096c18e871a8a25bd1298e9ecf4756ad43e77322f8e674b69f2025c162e8645ca378a10114fbfa98648fa343c716dc
+  metadata.gz: 782fdd8d034188b6c3c01637637fbf433ae20d31f6d87661a27e87962a613b582c58284e746b9aaf04ba0cc0f2cc91a6dfbc0362c09bb1886f80b0c5a2dff962
+  data.tar.gz: 4330232415934cae548c7673d8e3750757c16762a69df952dea94db86dcb9c5d0777b43098749dbc1b3cab0293e08d10ee52ce168c25300c94cee6becfef34e0

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.13.0 - TBD
+## 0.13.0 - 2014-06-12
 
 ### Non-backwards compatible changes
 
@@ -25,6 +25,10 @@ services.
 
 Client keepalives now contain the Sensu version.
 
+Support for nested handler sets (not deep).
+
+Setting validation reports all invalid definitions before Sensu exits.
+
 ### Other
 
 Clients now only load instances of check extensions, and servers load
@@ -32,7 +36,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.
 
@@ -41,6 +46,8 @@ Dropped the Oj JSON parser, heap allocation issues and memory leaks.
 Client RabbitMQ queues are no longer server named (bugs), they are now
 composed of the client name, Sensu version, and the timestamp at creation.
 
+Server master election lock updates and queries are more frequent.
+
 ## 0.12.6 - 2014-02-19
 
 ### Non-backwards compatible changes

data/MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Sonian Inc.
+Copyright (c) 2014 Sonian Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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.beta'
+    VERSION = '0.13.0'
 
     SEVERITIES = %w[ok warning critical unknown]
 

data/lib/sensu/daemon.rb

@@ -2,13 +2,13 @@ require 'rubygems'
 
 gem 'multi_json', '1.10.1'
 
-gem 'sensu-em', '2.0.0'
-gem 'sensu-logger', '0.0.1'
-gem 'sensu-settings', '0.0.7'
-gem 'sensu-extension', '0.0.3'
-gem 'sensu-extensions', '0.0.5'
-gem 'sensu-transport', '0.0.6'
-gem 'sensu-spawn', '0.0.3'
+gem 'sensu-em', '2.4.0'
+gem 'sensu-logger', '1.0.0'
+gem 'sensu-settings', '1.0.0'
+gem 'sensu-extension', '1.0.0'
+gem 'sensu-extensions', '1.0.0'
+gem 'sensu-transport', '1.0.0'
+gem 'sensu-spawn', '1.0.0'
 
 require 'time'
 require 'uri'

data/lib/sensu/server.rb

@@ -116,12 +116,18 @@ module Sensu
       end
     end
 
-    def derive_handlers(handler_list)
+    def derive_handlers(handler_list, depth=0)
       handler_list.compact.inject(Array.new) do |handlers, handler_name|
         if @settings.handler_exists?(handler_name)
           handler = @settings[:handlers][handler_name].merge(:name => handler_name)
           if handler[:type] == 'set'
-            handlers = handlers + derive_handlers(handler[:handlers])
+            if depth < 2
+              handlers = handlers + derive_handlers(handler[:handlers], depth + 1)
+            else
+              @logger.error('handler sets cannot be deeply nested', {
+                :handler => handler
+              })
+            end
           else
             handlers << handler
           end
@@ -537,17 +543,21 @@ module Sensu
 
     def determine_stale_clients
       @logger.info('determining stale clients')
+      keepalive_check = {
+        :thresholds => {
+          :warning => 120,
+          :critical => 180
+        }
+      }
+      if @settings.handler_exists?(:keepalive)
+        keepalive_check[:handler] = "keepalive"
+      end
       @redis.smembers('clients') do |clients|
         clients.each do |client_name|
           @redis.get('client:' + client_name) do |client_json|
             unless client_json.nil?
               client = MultiJson.load(client_json)
-              check = {
-                :thresholds => {
-                  :warning => 120,
-                  :critical => 180
-                }
-              }
+              check = keepalive_check.dup
               if client.has_key?(:keepalive)
                 check = deep_merge(check, client[:keepalive])
               end

data/sensu.gemspec

@@ -9,20 +9,20 @@ Gem::Specification.new do |s|
   s.email       = ['portertech@gmail.com', 'justin.kolberg@sonian.net']
   s.homepage    = 'https://github.com/sensu/sensu'
   s.summary     = 'A monitoring framework'
-  s.description = 'A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.'
+  s.description = 'A monitoring framework that aims to be simple, malleable, and scalable.'
   s.license     = 'MIT'
   s.has_rdoc    = false
 
   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-logger', '0.0.1')
-  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.6')
-  s.add_dependency('sensu-spawn', '0.0.3')
+  s.add_dependency('sensu-em', '2.4.0')
+  s.add_dependency('sensu-logger', '1.0.0')
+  s.add_dependency('sensu-settings', '1.0.0')
+  s.add_dependency('sensu-extension', '1.0.0')
+  s.add_dependency('sensu-extensions', '1.0.0')
+  s.add_dependency('sensu-transport', '1.0.0')
+  s.add_dependency('sensu-spawn', '1.0.0')
   s.add_dependency('em-redis-unified', '0.5.0')
   s.add_dependency('sinatra', '1.3.5')
   s.add_dependency('async_sinatra', '1.0.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta
+  version: 0.13.0
 platform: java
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-13 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.4.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -59,12 +59,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -73,12 +73,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 1.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -87,12 +87,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -101,12 +101,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 1.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -115,12 +115,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 1.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -129,12 +129,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -221,7 +221,7 @@ dependencies:
         version: '0'
   prerelease: false
   type: :development
-description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
+description: A monitoring framework that aims to be simple, malleable, and scalable.
 email:
 - portertech@gmail.com
 - justin.kolberg@sonian.net
@@ -265,9 +265,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.2.2