sensu 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffda8bc29ab44f27d429a83caca7dc70c779c474
-  data.tar.gz: 1be8182e6b77bc9ad9be630e74f5b3511d5a60f1
+  metadata.gz: 470d5d06d500705e8017f9d70e6094c247112445
+  data.tar.gz: 6f9cabd3ec17b07adf35978555a0143e9cc8a4dd
 SHA512:
-  metadata.gz: 576a015911e86dce7699586be7904777590a47e9a6ec88f20116b569f6ce685931e426084bd15e57225a271dc9d767882968c61f3377484d49debed48e95ac2a
-  data.tar.gz: 9c8fcb61b2405cc8aae22ec16fe61836830c521700f9d017b21da15e705d548a4feab3273afe933f2b236194db92dc7606d5e4de83d7c3dac3f69b139050cd3d
+  metadata.gz: f061b1950a4f8567743b79286b7e931df6e50c0d930c7313eb8ec6d1ee879d7c3c89c8e6c044e585d1ca487f87c75184563a89c695682ae55a20342307b3c90c
+  data.tar.gz: 7d608cb8b7d23298aa40f21fb0b86174f6171936bc37d1a3bfc0e44243b7bbc3cf96d6162787b02f92ef85e1362bfe8d0eba72e7e839c4e15ab8fe8aefb56b3b

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+m�Ą�,D.x�٬��Ŀ~�H��-�N-.x�qa'U4Ɂ���+Zܑ	����&��ǔ���	�nGX8!x�u�����t7��d���Zi�|�p���=�}M,/��^>�P4J+��&�8��%<�{�xF��	���G�c��Sv9�{�n���zu%�h��њ�*r�%���L��-H7�JT�)���"�h_��M�����%Zd�l��8��e��X�^���E>|=�y6�k�
�˽�j�+$4�=$�����O�|'X�

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+## 1.3.0 - 2018-03-09
+
+### Features
+
+Redis TLS connection support. Sensu Redis connections can now be
+configured to use TLS, this includes the Sensu server and Redis
+transport connections! The Sensu Redis configuration definition now
+includes the optional "tls" (or "ssl") attribute, a hash containing
+TLS options ("private_key_file", "cert_chain_file", and
+"verify_peer").
+
+The Sensu client TCP/UDP socket can now be disabled via configuration.
+The Sensu client configuration definition now includes the socket
+"enabled" attribute, which defaults to `true`, and it can be set to
+`false` in order to disable the socket. (#1799)
+
+The Sensu Ruby gems are now cryptographically signed. To learn more
+about Ruby gem signing, [please refer to the RubyGems security
+guide](http://guides.rubygems.org/security/). (#1819)
+
+The Sensu API POST /clients endpoint no longer requires client
+subscriptions to be specified. (#1795)
+
+All Sensu event handler types now include event ID in log events.
+
+### Fixes
+
+Sensu TCP event handlers will no longer connect to a socket if the
+provided event data is nil or empty. (#1734)
+
+The RabbitMQ transport will now reconnect after failing to resolve
+DNS, instead of independently retrying broker hostname resolution.
+This fixes retry timer backoff and allows the transport to connect to
+another eligible broker after failing to resolve a hostname.
+
 ## 1.2.1 - 2018-02-06
 
 ### Fixes

data/lib/sensu/api/routes/clients.rb

@@ -17,6 +17,7 @@ module Sensu
             client[:keepalives] = client.fetch(:keepalives, false)
             client[:version] = VERSION
             client[:timestamp] = Time.now.to_i
+            client[:subscriptions] ||= []
             validator = Validators::Client.new
             if validator.valid?(client)
               client[:subscriptions] = (client[:subscriptions] + ["client:#{client[:name]}"]).uniq

data/lib/sensu/client/process.rb

@@ -455,8 +455,9 @@ module Sensu
       # Setup the Sensu client JSON socket, for external check result
       # input. By default, the client socket is bound to localhost on
       # TCP & UDP port 3030. The socket can be configured via the
-      # client definition, `:socket` with `:bind` and `:port`. The
-      # current instance of the Sensu logger, settings, and transport
+      # client definition, `:socket` with `:bind` and `:port`. Users can opt-out
+      # of using the TCP and UDP socket by setting `:enabled` to `false`.
+      # The current instance of the Sensu logger, settings, and transport
       # are passed to the socket handler, `Sensu::Client::Socket`. The
       # TCP socket server signature (Fixnum) and UDP connection object
       # are stored in `@sockets`, so that they can be managed
@@ -465,17 +466,21 @@ module Sensu
         options = @settings[:client][:socket] || Hash.new
         options[:bind] ||= "127.0.0.1"
         options[:port] ||= 3030
-        @logger.debug("binding client tcp and udp sockets", :options => options)
-        @sockets << EM::start_server(options[:bind], options[:port], Socket) do |socket|
-          socket.logger = @logger
-          socket.settings = @settings
-          socket.transport = @transport
-        end
-        @sockets << EM::open_datagram_socket(options[:bind], options[:port], Socket) do |socket|
-          socket.logger = @logger
-          socket.settings = @settings
-          socket.transport = @transport
-          socket.protocol = :udp
+        unless options[:enabled] == false
+          @logger.debug("binding client tcp and udp sockets", :options => options)
+          @sockets << EM::start_server(options[:bind], options[:port], Socket) do |socket|
+            socket.logger = @logger
+            socket.settings = @settings
+            socket.transport = @transport
+          end
+          @sockets << EM::open_datagram_socket(options[:bind], options[:port], Socket) do |socket|
+            socket.logger = @logger
+            socket.settings = @settings
+            socket.transport = @transport
+            socket.protocol = :udp
+          end
+        else
+          @logger.info("client tcp/udp socket disabled per configuration")
         end
       end
 
@@ -500,6 +505,8 @@ module Sensu
             socket.settings = @settings
             socket.transport = @transport
           end
+        else
+          @logger.info("client http socket disabled per configuration")
         end
       end
 

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "1.2.1".freeze
+    VERSION = "1.3.0".freeze
 
     # Sensu release information.
     RELEASE_INFO = {

data/lib/sensu/daemon.rb

@@ -2,14 +2,14 @@ require "rubygems"
 
 gem "eventmachine", "1.2.5"
 
-gem "sensu-json", "2.1.0"
-gem "sensu-logger", "1.2.1"
-gem "sensu-settings", "10.12.0"
-gem "sensu-extension", "1.5.1"
-gem "sensu-extensions", "1.9.0"
-gem "sensu-transport", "7.0.2"
-gem "sensu-spawn", "2.2.1"
-gem "sensu-redis", "2.2.0"
+gem "sensu-json", "2.1.1"
+gem "sensu-logger", "1.2.2"
+gem "sensu-settings", "10.13.1"
+gem "sensu-extension", "1.5.2"
+gem "sensu-extensions", "1.9.1"
+gem "sensu-transport", "7.1.0"
+gem "sensu-spawn", "2.2.2"
+gem "sensu-redis", "2.3.0"
 
 require "time"
 require "uri"

data/lib/sensu/server/handle.rb

@@ -8,11 +8,15 @@ module Sensu
       #
       # @param handler [Object]
       # @param event_data [Object]
+      # @param event_id [String] event UUID
       # @return [Proc] error callback.
-      def handler_error(handler, event_data)
+      def handler_error(handler, event_data, event_id)
         Proc.new do |error|
           @logger.error("handler error", {
             :handler => handler,
+            :event => {
+              :id => event_id
+            },
             :event_data => event_data,
             :error => error.to_s
           })
@@ -40,7 +44,9 @@ module Sensu
           log_level = status == 0 ? :info : :error
           @logger.send(log_level, "handler output", {
             :handler => handler,
-            :event => { :id => event_id },
+            :event => {
+              :id => event_id
+            },
             :output => output.split("\n+")
           })
           @in_progress[:events] -= 1 if @in_progress
@@ -59,21 +65,32 @@ module Sensu
       #
       # @param handler [Hash] definition.
       # @param event_data [Object] to transmit to the TCP socket.
-      def tcp_handler(handler, event_data)
-        on_error = handler_error(handler, event_data)
-        begin
-          EM::connect(handler[:socket][:host], handler[:socket][:port], Socket) do |socket|
-            socket.on_success = Proc.new do
-              @in_progress[:events] -= 1 if @in_progress
+      # @param event_id [String] event UUID
+      def tcp_handler(handler, event_data, event_id)
+        unless event_data.nil? || event_data.empty?
+          on_error = handler_error(handler, event_data, event_id)
+          begin
+            EM::connect(handler[:socket][:host], handler[:socket][:port], Socket) do |socket|
+              socket.on_success = Proc.new do
+                @in_progress[:events] -= 1 if @in_progress
+              end
+              socket.on_error = on_error
+              timeout = handler[:timeout] || 10
+              socket.set_timeout(timeout)
+              socket.send_data(event_data.to_s)
+              socket.close_connection_after_writing
             end
-            socket.on_error = on_error
-            timeout = handler[:timeout] || 10
-            socket.set_timeout(timeout)
-            socket.send_data(event_data.to_s)
-            socket.close_connection_after_writing
+          rescue => error
+            on_error.call(error)
           end
-        rescue => error
-          on_error.call(error)
+        else
+          @logger.debug("not connecting to tcp socket due to empty event data", {
+            :handler => handler,
+            :event => {
+              :id => event_id
+            }
+          })
+          @in_progress[:events] -= 1 if @in_progress
         end
       end
 
@@ -83,7 +100,8 @@ module Sensu
       #
       # @param handler [Hash] definition.
       # @param event_data [Object] to transmit to the UDP socket.
-      def udp_handler(handler, event_data)
+      # @param event_id [String] event UUID
+      def udp_handler(handler, event_data, event_id)
         begin
           EM::open_datagram_socket("0.0.0.0", 0, nil) do |socket|
             socket.send_datagram(event_data.to_s, handler[:socket][:host], handler[:socket][:port])
@@ -91,7 +109,7 @@ module Sensu
             @in_progress[:events] -= 1 if @in_progress
           end
         rescue => error
-          handler_error(handler, event_data).call(error)
+          handler_error(handler, event_data, event_id).call(error)
         end
       end
 
@@ -102,13 +120,14 @@ module Sensu
       #
       # @param handler [Hash] definition.
       # @param event_data [Object] to publish to the transport pipe.
-      def transport_handler(handler, event_data)
+      # @param event_id [String] event UUID
+      def transport_handler(handler, event_data, event_id)
         unless event_data.nil? || event_data.empty?
           pipe = handler[:pipe]
           pipe_options = pipe[:options] || {}
           @transport.publish(pipe[:type].to_sym, pipe[:name], event_data, pipe_options) do |info|
             if info[:error]
-              handler_error(handler, event_data).call(info[:error])
+              handler_error(handler, event_data, event_id).call(info[:error])
             end
           end
         end
@@ -129,7 +148,9 @@ module Sensu
           log_level = (output.empty? && status.zero?) ? :debug : :info
           @logger.send(log_level, "handler extension output", {
             :extension => handler.definition,
-            :event => { :id => event_id },
+            :event => {
+              :id => event_id
+            },
             :output => output,
             :status => status
           })
@@ -148,11 +169,11 @@ module Sensu
         when "pipe"
           pipe_handler(handler, event_data, event_id)
         when "tcp"
-          tcp_handler(handler, event_data)
+          tcp_handler(handler, event_data, event_id)
         when "udp"
-          udp_handler(handler, event_data)
+          udp_handler(handler, event_data, event_id)
         when "transport"
-          transport_handler(handler, event_data)
+          transport_handler(handler, event_data, event_id)
         when "extension"
           handler_extension(handler, event_data, event_id)
         end

data/sensu.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name        = "sensu"
   s.version     = Sensu::VERSION
   s.authors     = ["Sean Porter", "Justin Kolberg"]
-  s.email       = ["portertech@gmail.com", "amdprophet@gmail.com"]
+  s.email       = ["portertech@gmail.com", "amdprophet@gmail.com", "engineering@sensu.io"]
   s.homepage    = "http://sensuapp.org"
   s.summary     = "A monitoring framework"
   s.description = "A monitoring framework that aims to be simple, malleable, and scalable."
@@ -13,14 +13,14 @@ Gem::Specification.new do |s|
   s.has_rdoc    = false
 
   s.add_dependency "eventmachine", "1.2.5"
-  s.add_dependency "sensu-json", "2.1.0"
-  s.add_dependency "sensu-logger", "1.2.1"
-  s.add_dependency "sensu-settings", "10.12.0"
-  s.add_dependency "sensu-extension", "1.5.1"
-  s.add_dependency "sensu-extensions", "1.9.0"
-  s.add_dependency "sensu-transport", "7.0.2"
-  s.add_dependency "sensu-spawn", "2.2.1"
-  s.add_dependency "sensu-redis", "2.2.0"
+  s.add_dependency "sensu-json", "2.1.1"
+  s.add_dependency "sensu-logger", "1.2.2"
+  s.add_dependency "sensu-settings", "10.13.1"
+  s.add_dependency "sensu-extension", "1.5.2"
+  s.add_dependency "sensu-extensions", "1.9.1"
+  s.add_dependency "sensu-transport", "7.1.0"
+  s.add_dependency "sensu-spawn", "2.2.2"
+  s.add_dependency "sensu-redis", "2.3.0"
   s.add_dependency "em-http-server", "0.1.8"
   s.add_dependency "parse-cron", "0.1.4"
 
@@ -33,4 +33,6 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |file| File.basename(file) }
   s.bindir        = "exe"
   s.require_paths = ["lib"]
+  s.cert_chain    = ['certs/sensu.pem']
+  s.signing_key   = File.expand_path("~/.ssh/gem-sensu-private_key.pem") if $0 =~ /gem\z/
 end

metadata

@@ -1,15 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Sean Porter
 - Justin Kolberg
 autorequire: 
 bindir: exe
-cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRQwEgYDVQQDDAtlbmdp
+  bmVlcmluZzEVMBMGCgmSJomT8ixkARkWBXNlbnN1MRIwEAYKCZImiZPyLGQBGRYC
+  aW8wHhcNMTgwMzAyMjIxNTA2WhcNMTkwMzAyMjIxNTA2WjBBMRQwEgYDVQQDDAtl
+  bmdpbmVlcmluZzEVMBMGCgmSJomT8ixkARkWBXNlbnN1MRIwEAYKCZImiZPyLGQB
+  GRYCaW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFiEE/Mer+J4jX
+  UWH/jedrTgixZ6MTVmDXroqLHCsQ+btu5+k3fbtsjulmnJyrpt/SAA4Ylb90y37A
+  obuJJHGL5LCT94WUI3AoqJYCBo7z2BbE+/b/Q9dCsyt91qQsgU56GLi5Leljd8YI
+  Q+tvSqbStVjsBtLrFRkpMVYMo3JcmqYT68pzLJTIlLU9OpNcPMUOOFcxVfv4YAOl
+  w73scBA8VySrZlpydYbmjBGhhD2766nl46SYqXXZewR7+2j3exEJxG17OiGFKQcV
+  pXqOeTM0kIPtb+UMvBuJ882rlJ+mgsALqNQdZTFcfvr4NhCgBPtEPehAsVTOosPZ
+  3fAWy+UhAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBRL9qnIxrqcdUuc2RO9XDKN/ZVoEDAfBgNVHREEGDAWgRRlbmdpbmVlcmluZ0Bz
+  ZW5zdS5pbzAfBgNVHRIEGDAWgRRlbmdpbmVlcmluZ0BzZW5zdS5pbzANBgkqhkiG
+  9w0BAQUFAAOCAQEAuNsslABtgeYx81Qa+h9CeRlvTG36+ZLApFBlpywU5gcojl7/
+  488Ji9YH6A1RDKENfSfbd5jfvaWUKgF7/PvJqZQ2ABI7ssoX6XF8s19b3GwnfkYD
+  6aveBKPk+4F3qPzv82/QF1vzDzrSqNIaCtHLMnupMcB34TWgVAibShf0XXu2ePId
+  szNjBUMQ7lXr/eR8rLpwoyd1JYICe3DjYCyj6T9xfFLMcUbrb1Wcn5gtYrp9y3PI
+  jOeGyhtQa9j4FFmsEJDg59f5v/3hECXsa3Xuml3foaFHzX3Ya/YIyd2YFxvkFKIu
+  GVbe7A3YdxzdkH2Es/Ym9twdxXaIDdXzj8sWhw==
+  -----END CERTIFICATE-----
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -31,112 +53,112 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: sensu-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: sensu-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.12.0
+        version: 10.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.12.0
+        version: 10.13.1
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: sensu-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: sensu-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: sensu-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: sensu-redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: em-http-server
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +247,7 @@ description: A monitoring framework that aims to be simple, malleable, and scala
 email:
 - portertech@gmail.com
 - amdprophet@gmail.com
+- engineering@sensu.io
 executables:
 - sensu-api
 - sensu-client