sensu 0.27.0.alpha.2 → 0.27.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 994997d6e22b6bbb53345295b583987194967aaa
-  data.tar.gz: 58c8d9573c10beaca0f4c4ef880ff9a9c724b028
+  metadata.gz: 768682063e96780394b30a632d9f63ea18184421
+  data.tar.gz: 4e9c6427994c6a6c395b7b588b35d6a558648032
 SHA512:
-  metadata.gz: 33bbfc2de4defdb2ac1c0a107962453159380bb8238ddbbb392445bae96bc956dde882e776b64aa0ee0a2fd20579d47cdb8c5f79cbac3d595dc25e5cec21e4d3
-  data.tar.gz: 2dfb80ad2efd1a65222c56e4b08a3db91e337f285f2285a38a4e36d4147ecfd82149c9906bd1859af9bde0e7ed7911e7db3450afce8cf109ec1258beba8c199a
+  metadata.gz: cc2ef82b079573a137a4f943b074717565b7c503382999f82bf4db1536cec474cf65cae07b8393af75d013c63312da14caaba9de3fa73c2df567967bcf073830
+  data.tar.gz: 3fdca42dd2b54258dd3aefdd7c20306df1fd3f97fc69ee7193d8dbe927519ef28e17e6f83159d5c18f6fd3930ee14ac82666a7fa3eced8cabde81a96c842cd7a

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+## 0.27.0 - TBD
+
+### Features
+
+Sensu client HTTP socket for check result input and informational queries.
+The client HTTP socket provides several endpoints, `/info`, `/results`,
+and `/settings`. Basic authentication is supported, which is required for
+certain endpoints, i.e. `/settings`. The client HTTP socket is
+configurable via the Sensu client definition, `"http_socket": {}`.
+
+Hostnames are now resolved prior to making connection attempts, this
+applies to the Sensu Transport (i.e. RabbitMQ) and Redis connections. This
+allows Sensu to handle resolution failures and enables failover via DNS
+and services like Amazon AWS ElastiCache.
+
+Added API endpoint `/silenced/ids/:id` for fetching a silence entry by id.
+
+Added check attribute `ttl_status`, allowing checks to set a different TTL
+event check status (default is `1` warning).
+
+Added client deregistration attribute `status`, allowing clients to set a
+different event check status for their deregistration events (default is
+`1` warning).
+
+Added Rubygems cleanup support to `sensu-install`, via the command line
+argument `-c/--clean` when installing one or more plugins and/or
+extensions. If a version is provided for the plugin(s) or extension(s),
+all other installed versions of them will be removed, e.g. `sensu-install
+-e snmp-trap:0.0.19 -c`. If a version is not provided, all installed
+versions except the latest will be removed.
+
+### Other
+
+Added the filter name to event filtered log events.
+
 ## 0.26.5 - 2016-10-12
 
 ### Fixes

data/lib/sensu/client/http_socket.rb

@@ -88,7 +88,11 @@ module Sensu
       end
 
       def send_response(status, status_string, content)
-        @logger.debug("sending HTTP response #{status} #{status_string}", :content => content)
+        @logger.debug("http socket sending response", {
+          :status => status,
+          :status_string => status_string,
+          :content => content
+        })
         @response.status = status
         @response.status_string = status_string
         @response.content = Sensu::JSON::dump(content)
@@ -111,7 +115,7 @@ module Sensu
           begin
             check = Sensu::JSON::load(@http_content)
             process_check_result(check)
-            send_response(200, "OK", {:response => "ok"})
+            send_response(202, "OK", {:response => "ok"})
           rescue Sensu::JSON::ParseError, ArgumentError
             send_response(400, "Failed to parse JSON body", {:response => "Failed to parse JSON body"})
           end
@@ -122,14 +126,14 @@ module Sensu
 
       def process_request_settings
         if authorized?
-          @logger.info("responding to HTTP request for configuration settings")
+          @logger.info("http socket responding to request for configuration settings")
           if @http_query_string and @http_query_string.downcase.include?("redacted=false")
             send_response(200, "OK", @settings.to_hash)
           else
             send_response(200, "OK", redact_sensitive(@settings.to_hash))
           end
         else
-          @logger.warn("refusing to serve unauthorized settings request")
+          @logger.warn("http socket refusing to serve unauthorized settings request")
           @response.headers["WWW-Authenticate"] = 'Basic realm="Sensu Client Restricted Area"'
           send_response(401, "Unauthorized", {
             :response => "You must be authenticated using your http_options user and password settings"
@@ -137,8 +141,11 @@ module Sensu
         end
       end
 
-      def http_request_errback(ex)
-        @logger.error("exception while processing HTTP request: #{ex.class}: #{ex.message}", backtrace: ex.backtrace)
+      def http_request_errback(error)
+        @logger.error("http socket error while processing request", {
+          :error => error.to_s,
+          :backtrace => error.backtrace
+        })
         @response = EM::DelegatedHttpResponse.new(self)
         @response.content_type "application/json"
         send_response(500, "Internal Server Error", {
@@ -148,25 +155,37 @@ module Sensu
 
       # This method is called to process HTTP requests
       def process_http_request
-        @logger.debug("processing #{@http_request_method} #{@http_request_uri}")
+        @logger.debug("http socket processing", {
+          :http_request_method => @http_request_method,
+          :http_request_uri => @http_request_uri
+        })
         @response = EM::DelegatedHttpResponse.new(self)
         @response.content_type "application/json"
         endpoint = @endpoints[@http_request_uri]
         if endpoint
-          @logger.debug("endpoint #{@http_request_uri} found", :accepted_methods => endpoint["methods"].keys)
+          @logger.debug("http socket endpoint found", {
+            :http_request_uri => @http_request_uri,
+            :accepted_methods => endpoint["methods"].keys
+          })
           method_name = @http_request_method.upcase
           method_handler = endpoint["methods"][method_name]
           if method_handler
-            @logger.debug("executing #{method_name} #{@http_request_uri} handler")
+            @logger.debug("http socket executing handler", {
+              :method_name => method_name,
+              :http_request_uri => @http_request_uri
+            })
             method_handler.call
           else
-            @logger.debug("method #{method_name} is not allowed for endpoint #{@http_request_uri}")
+            @logger.debug("http socket method is not allowed for endpoint", {
+              :method_name => method_name,
+              :http_request_uri => @http_request_uri
+            })
             send_response(405, "Method Not Allowed", {
               :response => "Valid methods for this endpoint: #{reqdef['methods'].keys}"
             })
           end
         else
-          @logger.warn("unknown endpoint requested: #{@http_request_uri}")
+          @logger.warn("http socket unknown endpoint requested", :http_request_uri => @http_request_uri)
           help_response = {
             :endpoints => {}
           }

data/lib/sensu/client/process.rb

@@ -348,7 +348,7 @@ module Sensu
         schedule_checks(standard_checks + extension_checks)
       end
 
-      # Setup the Sensu client socket, for external check result
+      # 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
@@ -357,7 +357,7 @@ module Sensu
       # TCP socket server signature (Fixnum) and UDP connection object
       # are stored in `@sockets`, so that they can be managed
       # elsewhere, eg. `close_sockets()`.
-      def setup_sockets
+      def setup_json_socket
         options = @settings[:client][:socket] || Hash.new
         options[:bind] ||= "127.0.0.1"
         options[:port] ||= 3030
@@ -373,18 +373,39 @@ module Sensu
           socket.transport = @transport
           socket.protocol = :udp
         end
-        # Setup the HTTP socket
-        http_options = @settings[:client][:http_socket] || Hash.new
-        http_options[:bind] ||= "127.0.0.1"
-        http_options[:port] ||= 3031
-        @logger.debug("binding client http socket", :http_options => http_options)
-        @sockets << EM::start_server(http_options[:bind], http_options[:port], HTTPSocket) do |socket|
-          socket.logger = @logger
-          socket.settings = @settings
-          socket.transport = @transport
+      end
+
+      # Setup the Sensu client HTTP socket, for external check result
+      # input and informational queries. By default, the client HTTP
+      # socket is bound to localhost on TCP port 3031. The socket can
+      # be configured via the client definition, `:http_socket` with
+      # `:bind` and `:port`. Users can opt-out of using the HTTP
+      # socket by setting `:enabled` to `false. The current instance
+      # of the Sensu logger, settings, and transport are passed to the
+      # HTTP socket handler, `Sensu::Client::HTTPSocket`. The HTTP
+      # socket server signature (Fixnum) is stored in `@sockets`, so
+      # that it can be managed elsewhere, eg. `close_sockets()`.
+      def setup_http_socket
+        options = @settings[:client][:http_socket] || Hash.new
+        options[:bind] ||= "127.0.0.1"
+        options[:port] ||= 3031
+        unless options[:enabled] == false
+          @logger.debug("binding client http socket", :options => options)
+          @sockets << EM::start_server(options[:bind], options[:port], HTTPSocket) do |socket|
+            socket.logger = @logger
+            socket.settings = @settings
+            socket.transport = @transport
+          end
         end
       end
 
+      # Setup the Sensu client sockets, JSON TCP & UDP, and HTTP.
+      # Users can opt-out of using the HTTP socket via configuration.
+      def setup_sockets
+        setup_json_socket
+        setup_http_socket
+      end
+
       # Call a callback (Ruby block) when there are no longer check
       # executions in progress. This method is used when stopping the
       # Sensu client. The `retry_until_true` helper method is used to
@@ -409,11 +430,10 @@ module Sensu
       # default, the deregistration check result sets the `:handler` to
       # `deregistration`. If the client provides its own `:deregistration`
       # configuration, it's deep merged with the defaults. The
-      # check `:name`, `:output`, `:status`, `:issued`, and
-      # `:executed` values are always overridden to guard against
-      # an invalid definition.
+      # check `:name`, `:output`, `:issued`, and `:executed` values
+      # are always overridden to guard against an invalid definition.
       def deregister
-        check = {:handler => "deregistration", :interval => 1}
+        check = {:handler => "deregistration", :status => 1}
         if @settings[:client].has_key?(:deregistration)
           check = deep_merge(check, @settings[:client][:deregistration])
         end
@@ -421,7 +441,6 @@ module Sensu
         overrides = {
           :name => "deregistration",
           :output => "client initiated deregistration",
-          :status => 1,
           :issued => timestamp,
           :executed => timestamp
         }

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.27.0.alpha.2".freeze
+    VERSION = "0.27.0.beta.1".freeze
 
     # Sensu check severities.
     SEVERITIES = %w[ok warning critical unknown].freeze

data/lib/sensu/daemon.rb

@@ -4,7 +4,7 @@ gem "eventmachine", "1.2.1"
 
 gem "sensu-json", "2.0.1"
 gem "sensu-logger", "1.2.1"
-gem "sensu-settings", "9.2.2"
+gem "sensu-settings", "9.6.0"
 gem "sensu-extension", "1.5.1"
 gem "sensu-extensions", "1.7.1"
 gem "sensu-transport", "7.0.2"

data/lib/sensu/server/process.rb

@@ -71,11 +71,11 @@ module Sensu
       # default, the registration check definition sets the `:handler`
       # to `registration`. If the client provides its own
       # `:registration` configuration, it's deep merged with the
-      # defaults. The check `:name`, `:output`, `:status`, `:issued`,
-      # and `:executed` values are always overridden to guard against
-      # an invalid definition.
+      # defaults. The check `:name`, `:output`, `:issued`, and
+      # `:executed` values are always overridden to guard against an
+      # invalid definition.
       def create_registration_check(client)
-        check = {:handler => "registration"}
+        check = {:handler => "registration", :status => 1}
         if client.has_key?(:registration)
           check = deep_merge(check, client[:registration])
         end
@@ -83,7 +83,6 @@ module Sensu
         overrides = {
           :name => "registration",
           :output => "new client registration",
-          :status => 1,
           :issued => timestamp,
           :executed => timestamp
         }
@@ -319,7 +318,16 @@ module Sensu
       def truncate_check_output(check)
         case check[:type]
         when METRIC_CHECK_TYPE
-          output_lines = check[:output].split("\n")
+          begin
+            output_lines = check[:output].split("\n")
+          rescue ArgumentError
+            utf8_output = check[:output].encode("UTF-8", "binary", {
+              :invalid => :replace,
+              :undef => :replace,
+              :replace => ""
+            })
+            output_lines = utf8_output.split("\n")
+          end
           output = output_lines.first || check[:output]
           if output_lines.length > 1 || output.length > 255
             output = output[0..255] + "\n..."
@@ -961,7 +969,7 @@ module Sensu
                     unless event_exists
                       check[:output] = "Last check execution was "
                       check[:output] << "#{time_since_last_execution} seconds ago"
-                      check[:status] = 1
+                      check[:status] = check[:ttl_status] || 1
                       publish_check_result(client_name, check)
                     end
                   end

data/sensu.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency "eventmachine", "1.2.1"
   s.add_dependency "sensu-json", "2.0.1"
   s.add_dependency "sensu-logger", "1.2.1"
-  s.add_dependency "sensu-settings", "9.2.2"
+  s.add_dependency "sensu-settings", "9.6.0"
   s.add_dependency "sensu-extension", "1.5.1"
   s.add_dependency "sensu-extensions", "1.7.1"
   s.add_dependency "sensu-transport", "7.0.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.27.0.alpha.2
+  version: 0.27.0.beta.1
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.2.2
+        version: 9.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.2.2
+        version: 9.6.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement