sensu 0.11.0.beta → 0.11.0.beta.1

data/CHANGELOG.md

@@ -14,6 +14,10 @@ as an argument to run.
 You can specify the Sensu log severity level using the -L (--log_level)
 CLI argument, providing a valid level (eg. warn).
 
+You can specify custom sensitive Sensu client key/values to be redacted
+from log events and keepalives, eg. "client": { "redact":
+["secret_access_key"] }.
+
 ### Other
 
 Sensu passes a dup of event data to mutator & handler extensions to
@@ -23,6 +27,10 @@ Extension runs are wrapped in a begin/rescue block, a safety net.
 
 UDP handler now binds to "0.0.0.0".
 
+Faster JSON parser.
+
+Missing AMQP connection heartbeats will result in a reconnect.
+
 ## 0.10.2 - 2013-07-18
 
 ### Other

data/lib/sensu/base.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'oj', '2.0.9'
+gem 'oj', '2.1.4'
 gem 'eventmachine', '1.0.3'
 
 require 'time'

data/lib/sensu/client.rb

@@ -49,7 +49,7 @@ module Sensu
 
     def publish_keepalive
       keepalive = @settings[:client].merge(:timestamp => Time.now.to_i)
-      payload = redact_passwords(keepalive)
+      payload = redact_sensitive(keepalive, @settings[:client][:redact])
       @logger.debug('publishing keepalive', {
         :payload => payload
       })

data/lib/sensu/constants.rb

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

data/lib/sensu/rabbitmq.rb

@@ -1,7 +1,27 @@
-gem 'amqp', '0.9.10'
+gem 'amqp', '1.0.0'
 
 require 'amqp'
 
+module AMQ
+  module Client
+    module Async
+      module Adapter
+        def send_heartbeat
+          if tcp_connection_established? && !reconnecting?
+            if !@handling_skipped_hearbeats && @last_server_heartbeat
+              send_frame(Protocol::HeartbeatFrame)
+              if @last_server_heartbeat < (Time.now - (self.heartbeat_interval * 2))
+                logger.error('detected missing amqp heartbeats')
+                self.handle_skipped_hearbeats
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
 module Sensu
   class RabbitMQError < StandardError; end
 
@@ -36,12 +56,14 @@ module Sensu
         :on_possible_authentication_failure => on_failure
       })
       @connection.logger = Logger.get
-      @connection.on_tcp_connection_loss do |connection, settings|
-        unless connection.reconnecting?
+      reconnect = Proc.new do
+        unless @connection.reconnecting?
           @before_reconnect.call
-          connection.periodically_reconnect(5)
+          @connection.periodically_reconnect(5)
         end
       end
+      @connection.on_tcp_connection_loss(&reconnect)
+      @connection.on_skipped_heartbeats(&reconnect)
       @channel = AMQP::Channel.new(@connection)
       @channel.auto_recovery = true
       @channel.on_error do |channel, channel_close|

data/lib/sensu/settings.rb

@@ -90,7 +90,7 @@ module Sensu
             changes = deep_diff(@settings, merged)
             @logger.warn('config file applied changes', {
               :config_file => file,
-              :changes => redact_passwords(changes)
+              :changes => redact_sensitive(changes)
             })
           end
           @settings = merged
@@ -429,6 +429,16 @@ module Sensu
           end
         end
       end
+      if @settings[:client].has_key?(:redact)
+        unless @settings[:client][:redact].is_a?(Array)
+          invalid('client redact must be an array')
+        end
+        @settings[:client][:redact].each do |key|
+          unless key.is_a?(String) && !key.empty?
+            invalid('client redact keys must each be a string')
+          end
+        end
+      end
     end
 
     def validate_api

data/lib/sensu/utilities.rb

@@ -58,13 +58,19 @@ module Sensu
       end
     end
 
-    def redact_passwords(hash)
+    def redact_sensitive(hash, keys=nil)
+      keys ||= %w[
+        password passwd pass
+        api_key api_token
+        access_key secret_key private_key
+        secret
+      ]
       hash = hash.dup
       hash.each do |key, value|
-        if %w[password passwd pass].include?(key.to_s)
+        if keys.include?(key.to_s)
           hash[key] = "REDACTED"
         elsif value.is_a?(Hash)
-          hash[key] = redact_passwords(value)
+          hash[key] = redact_sensitive(value, keys)
         end
       end
       hash

data/sensu.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.has_rdoc    = false
 
-  s.add_dependency('oj', '2.0.9')
+  s.add_dependency('oj', '2.1.4')
   s.add_dependency('eventmachine', '1.0.3')
-  s.add_dependency('amqp', '0.9.10')
+  s.add_dependency('amqp', '1.0.0')
   s.add_dependency('em-redis-unified', '0.4.1')
   s.add_dependency('thin', '1.5.0')
   s.add_dependency('sinatra', '1.3.5')

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: -1487621072
+  hash: -2637871616
   prerelease: true
   segments: 
   - 0
   - 11
   - 0
   - beta
-  version: 0.11.0.beta
+  - 1
+  version: 0.11.0.beta.1
 platform: ruby
 authors: 
 - Sean Porter
@@ -17,27 +18,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-14 00:00:00 -07:00
+date: 2013-08-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: oj
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 3
         segments: 
         - 2
-        - 0
-        - 9
-        version: 2.0.9
-  requirement: *id001
+        - 1
+        - 4
+        version: 2.1.4
   type: :runtime
-  name: oj
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: eventmachine
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -48,28 +51,28 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  requirement: *id002
   type: :runtime
-  name: eventmachine
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: amqp
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 23
         segments: 
+        - 1
+        - 0
         - 0
-        - 9
-        - 10
-        version: 0.9.10
-  requirement: *id003
+        version: 1.0.0
   type: :runtime
-  name: amqp
-  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: em-redis-unified
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -80,12 +83,12 @@ dependencies:
         - 4
         - 1
         version: 0.4.1
-  requirement: *id004
   type: :runtime
-  name: em-redis-unified
-  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: thin
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -96,12 +99,12 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
-  requirement: *id005
   type: :runtime
-  name: thin
-  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: sinatra
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -112,12 +115,12 @@ dependencies:
         - 3
         - 5
         version: 1.3.5
-  requirement: *id006
   type: :runtime
-  name: sinatra
-  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: async_sinatra
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -128,12 +131,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id007
   type: :runtime
-  name: async_sinatra
-  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,12 +145,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
   type: :development
-  name: rake
-  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,12 +159,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
   type: :development
-  name: rspec
-  prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: em-http-request
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -170,10 +173,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
   type: :development
-  name: em-http-request
-  prerelease: false
+  version_requirements: *id010
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - portertech@gmail.com