sensu 0.27.0.alpha → 0.27.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 889fe13d5be50c9cb7fb891ee70290c5da0815f5
-  data.tar.gz: ee86423e7b3d8837b869904dbb7ae050e58dce15
+  metadata.gz: 994997d6e22b6bbb53345295b583987194967aaa
+  data.tar.gz: 58c8d9573c10beaca0f4c4ef880ff9a9c724b028
 SHA512:
-  metadata.gz: ac0100bdec9cba408c27ef4bae7c2b511e5260aec4868881b0754a128a94871a029a3747bdee653a2a6d229ed32ca5e5c9a780b0fc140a3454ef29290d953b19
-  data.tar.gz: b84039c62794fa94cdcb2cc44beec273fa1d89fe8514ae8d289b698db7a1afd00ae0c9e22f2582290ee25dc0764a69e8604d653c521fa96523c3117430a325d7
+  metadata.gz: 33bbfc2de4defdb2ac1c0a107962453159380bb8238ddbbb392445bae96bc956dde882e776b64aa0ee0a2fd20579d47cdb8c5f79cbac3d595dc25e5cec21e4d3
+  data.tar.gz: 2dfb80ad2efd1a65222c56e4b08a3db91e337f285f2285a38a4e36d4147ecfd82149c9906bd1859af9bde0e7ed7911e7db3450afce8cf109ec1258beba8c199a

data/exe/sensu-install

@@ -9,7 +9,8 @@ module Sensu
         options = {
           :verbose => false,
           :plugins => [],
-          :extensions => []
+          :extensions => [],
+          :clean => false
         }
         optparse = OptionParser.new do |opts|
           opts.on("-h", "--help", "Display this message") do
@@ -31,9 +32,12 @@ module Sensu
           opts.on("-E", "--extensions EXTENSION[,EXT]", "EXTENSION or comma-delimited list of Sensu extensions to install") do |extensions|
             options[:extensions].concat(extensions.split(","))
           end
-          opts.on("-s", "--source SOURCE", "Install Sensu plugins from a custom SOURCE") do |source|
+          opts.on("-s", "--source SOURCE", "Install Sensu plugins and extensions from a custom SOURCE") do |source|
             options[:source] = source
           end
+          opts.on("-c", "--clean", "Clean up (remove) other installed versions of the plugin(s) and/or extension(s)") do
+            options[:clean] = true
+          end
         end
         optparse.parse!(arguments)
         options
@@ -78,6 +82,39 @@ module Sensu
         end
       end
 
+      def gem_installed_versions(raw_gem, options={})
+        gem_name, gem_version = raw_gem.split(":")
+        log "determining installed versions of Sensu gem '#{gem_name}' ..."
+        gem_command = "gem list #{gem_name}"
+        log gem_command if options[:verbose]
+        gem_command_output = `#{gem_command}`
+        last_line = gem_command_output.split("\n").last
+        if last_line == "false"
+          []
+        else
+          /\((.*)\)/.match(last_line)[1].split(", ")
+        end
+      end
+
+      def clean_gem(raw_gem, options={})
+        log "cleaning Sensu gem '#{raw_gem}'"
+        gem_name, gem_version = raw_gem.split(":")
+        gem_command = "gem clean #{gem_name}"
+        if gem_version
+          if gem_installed_versions(raw_gem, options) == [gem_version]
+            log "Sensu gem '#{gem_name}' version '#{gem_version}' is the only version installed"
+          else
+            gem_command = "gem uninstall #{gem_name} --version '!= #{gem_version}' -a"
+          end
+        end
+        log gem_command if options[:verbose]
+        if system(gem_command)
+          log "successfully cleaned Sensu gem '#{gem_name}'"
+        else
+          log "failed to clean Sensu gem '#{gem_name}'"
+        end
+      end
+
       def install_plugins(plugins, options={})
         log "installing Sensu plugins ..."
         log "provided Sensu plugins: #{plugins}" if options[:verbose]
@@ -89,14 +126,20 @@ module Sensu
           end
         end
         log "compiled Sensu plugin gems: #{plugin_gems}" if options[:verbose]
-        plugin_gems.reject! do |raw_gem|
+        to_be_installed = plugin_gems.reject do |raw_gem|
           gem_installed?(raw_gem, options)
         end
-        log "Sensu plugin gems to be installed: #{plugin_gems}"
-        plugin_gems.each do |raw_gem|
+        log "Sensu plugin gems to be installed: #{to_be_installed}"
+        to_be_installed.each do |raw_gem|
           install_gem(raw_gem, options)
         end
-        log "successfully installed Sensu plugins: #{plugins}"
+        log "successfully installed Sensu plugins: #{to_be_installed}"
+        if options[:clean]
+          log "cleaning Sensu plugin gems: #{plugin_gems}" if options[:verbose]
+          plugin_gems.each do |raw_gem|
+            clean_gem(raw_gem, options)
+          end
+        end
       end
 
       def install_extensions(extensions, options={})
@@ -110,14 +153,20 @@ module Sensu
           end
         end
         log "compiled Sensu extension gems: #{extension_gems}" if options[:verbose]
-        extension_gems.reject! do |raw_gem|
+        to_be_installed = extension_gems.reject do |raw_gem|
           gem_installed?(raw_gem, options)
         end
-        log "Sensu extension gems to be installed: #{extension_gems}"
-        extension_gems.each do |raw_gem|
+        log "Sensu extension gems to be installed: #{to_be_installed}"
+        to_be_installed.each do |raw_gem|
           install_gem(raw_gem, options)
         end
-        log "successfully installed Sensu extensions: #{extensions}"
+        log "successfully installed Sensu extensions: #{to_be_installed}"
+        if options[:clean]
+          log "cleaning Sensu extension gems: #{extension_gems}" if options[:verbose]
+          extension_gems.each do |raw_gem|
+            clean_gem(raw_gem, options)
+          end
+        end
       end
 
       def run

data/lib/sensu/client/http_socket.rb

@@ -0,0 +1,183 @@
+require "base64"
+require "em-http-server"
+require "sensu/json"
+require "sensu/utilities"
+require "sensu/api/utilities/transport_info"
+require "sensu/client/utils"
+
+module Sensu
+  module Client
+    # EventMachine connection handler for the Sensu HTTP client's socket.
+    #
+    # The Sensu client listens on localhost, port 3031 (by default), for
+    # TCP HTTP connections. This allows software running on the host to
+    # push check results (that may contain metrics) into Sensu, without
+    # needing to know anything about Sensu's internal implementation.
+    #
+    # All requests and responses expect a json-encoded body (if a body
+    # is expected at all).
+    #
+    # This socket requires receiving a proper HTTP request to any of
+    # the following endpoints:
+    #
+    # GET /info
+    #  This endpoint returns 200 OK with some basic Sensu info
+    #
+    # POST /results
+    #  This endpoint expects application/json body with a check result
+    #
+    # GET /settings
+    #  This endpoint responds with 200 OK and the Sensu configuration
+    #
+    # GET /brew
+    #  This endpoint gets you some fresh coffee
+    class HTTPSocket < EM::HttpServer::Server
+      include Sensu::API::Utilities::TransportInfo
+      include Utilities
+      include CheckUtils
+
+      attr_accessor :logger, :settings, :transport
+
+      def initialize
+        super
+        @endpoints = {
+          "/info" => {
+            "methods" => {
+              "GET" => method(:process_request_info)
+            },
+            "help" => "Sensu client information"
+          },
+          "/results" => {
+            "methods" => {
+              "POST" => method(:process_request_results)
+            },
+            "help" => "Send check JSON results here"
+          },
+          "/settings" => {
+            "methods" => {
+              "GET" => method(:process_request_settings)
+            },
+            "help" => "Get redacted Sensu settings (requires basic auth). Use ?redacted=false if you want the setting unredacted."
+          },
+          "/brew" => {
+            "methods" => {
+              "GET" => Proc.new { |response|
+                send_response(418, "I'm a teapot", {
+                  :response => "I'm a teapot!"
+                })
+              }
+            },
+            "help" => "Ask Sensu to brew a cup of joe (try it!)"
+          }
+        }
+        @response = nil
+      end
+
+      def authorized?
+        http_options = @settings[:client][:http_socket] || Hash.new
+        if http_options[:user] and http_options[:password]
+          if @http[:authorization]
+            scheme, base64 = @http[:authorization].split("\s")
+            if scheme == "Basic"
+              user, password = Base64.decode64(base64).split(":")
+              return (user == http_options[:user] && password == http_options[:password])
+            end
+          end
+        end
+        false
+      end
+
+      def send_response(status, status_string, content)
+        @logger.debug("sending HTTP response #{status} #{status_string}", :content => content)
+        @response.status = status
+        @response.status_string = status_string
+        @response.content = Sensu::JSON::dump(content)
+        @response.send_response
+      end
+
+      def process_request_info
+        transport_info do |info|
+          send_response(200, "OK", {
+            :sensu => {
+              :version => VERSION
+            },
+            :transport => info
+          })
+        end
+      end
+
+      def process_request_results
+        if @http[:content_type] and @http[:content_type] == "application/json" and @http_content
+          begin
+            check = Sensu::JSON::load(@http_content)
+            process_check_result(check)
+            send_response(200, "OK", {:response => "ok"})
+          rescue Sensu::JSON::ParseError, ArgumentError
+            send_response(400, "Failed to parse JSON body", {:response => "Failed to parse JSON body"})
+          end
+        else
+          send_response(415, "Only application/json content type accepted", {:response => "Invalid content type"})
+        end
+      end
+
+      def process_request_settings
+        if authorized?
+          @logger.info("responding to HTTP 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")
+          @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"
+          })
+        end
+      end
+
+      def http_request_errback(ex)
+        @logger.error("exception while processing HTTP request: #{ex.class}: #{ex.message}", backtrace: ex.backtrace)
+        @response = EM::DelegatedHttpResponse.new(self)
+        @response.content_type "application/json"
+        send_response(500, "Internal Server Error", {
+          "response" => "Internal Server Error: Check your Sensu logs for error details"
+        })
+      end
+
+      # This method is called to process HTTP requests
+      def process_http_request
+        @logger.debug("processing #{@http_request_method} #{@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)
+          method_name = @http_request_method.upcase
+          method_handler = endpoint["methods"][method_name]
+          if method_handler
+            @logger.debug("executing #{method_name} #{@http_request_uri} handler")
+            method_handler.call
+          else
+            @logger.debug("method #{method_name} is not allowed for endpoint #{@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}")
+          help_response = {
+            :endpoints => {}
+          }
+          @endpoints.each do |key, value|
+            help_response[:endpoints][key] ||= Hash.new
+            help_response[:endpoints][key]["help"] = value["help"]
+            help_response[:endpoints][key]["methods"] = value["methods"].keys
+          end
+          send_response(404, "Not Found", help_response)
+        end
+      end
+    end
+  end
+end

data/lib/sensu/client/process.rb

@@ -1,5 +1,6 @@
 require "sensu/daemon"
 require "sensu/client/socket"
+require "sensu/client/http_socket"
 
 module Sensu
   module Client
@@ -372,6 +373,16 @@ 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
       end
 
       # Call a callback (Ruby block) when there are no longer check
@@ -424,7 +435,7 @@ module Sensu
       # connection object indicates a socket connection that needs to
       # be closed, eg. a UDP datagram socket.
       def close_sockets
-        @logger.info("closing client tcp and udp sockets")
+        @logger.info("closing client sockets")
         @sockets.each do |socket|
           if socket.is_a?(Numeric)
             EM.stop_server(socket)

data/lib/sensu/client/socket.rb

@@ -1,4 +1,5 @@
 require "sensu/json"
+require "sensu/client/utils"
 
 module Sensu
   module Client
@@ -47,7 +48,7 @@ module Sensu
     # of data was received, the agent will give up on the sender, and
     # instead respond +"invalid"+ and close the connection.
     class Socket < EM::Connection
-      class DataError < StandardError; end
+      include CheckUtils
 
       attr_accessor :logger, :settings, :transport, :protocol
 
@@ -115,64 +116,6 @@ module Sensu
         end
       end
 
-      # Validate check result attributes.
-      #
-      # @param [Hash] check result to validate.
-      def validate_check_result(check)
-        unless check[:name] =~ /\A[\w\.-]+\z/
-          raise DataError, "check name must be a string and cannot contain spaces or special characters"
-        end
-        unless check[:source].nil? || check[:source] =~ /\A[\w\.-]+\z/
-          raise DataError, "check source must be a string and cannot contain spaces or special characters"
-        end
-        unless check[:output].is_a?(String)
-          raise DataError, "check output must be a string"
-        end
-        unless check[:status].is_a?(Integer)
-          raise DataError, "check status must be an integer"
-        end
-        unless check[:executed].is_a?(Integer)
-          raise DataError, "check executed timestamp must be an integer"
-        end
-        unless check[:ttl].nil? || (check[:ttl].is_a?(Integer) && check[:ttl] > 0)
-          raise DataError, "check ttl must be an integer greater than 0"
-        end
-      end
-
-      # Publish a check result to the Sensu transport.
-      #
-      # @param [Hash] check result.
-      def publish_check_result(check)
-        payload = {
-          :client => @settings[:client][:name],
-          :check => check.merge(:issued => Time.now.to_i)
-        }
-        payload[:signature] = @settings[:client][:signature] if @settings[:client][:signature]
-        @logger.info("publishing check result", :payload => payload)
-        @transport.publish(:direct, "results", Sensu::JSON.dump(payload)) do |info|
-          if info[:error]
-            @logger.error("failed to publish check result", {
-              :payload => payload,
-              :error => info[:error].to_s
-            })
-          end
-        end
-      end
-
-      # Process a check result. Set check result attribute defaults,
-      # validate the attributes, publish the check result to the Sensu
-      # transport, and respond to the sender with the message +"ok"+.
-      #
-      # @param [Hash] check result to be validated and published.
-      # @raise [DataError] if +check+ is invalid.
-      def process_check_result(check)
-        check[:status] ||= 0
-        check[:executed] ||= Time.now.to_i
-        validate_check_result(check)
-        publish_check_result(check)
-        respond("ok")
-      end
-
       # Parse a JSON check result. For UDP, immediately raise a parser
       # error. For TCP, record parser errors, so the connection
       # +watchdog+ can report them.
@@ -183,6 +126,7 @@ module Sensu
           check = Sensu::JSON.load(data)
           cancel_watchdog
           process_check_result(check)
+          respond("ok")
         rescue Sensu::JSON::ParseError, ArgumentError => error
           if @protocol == :tcp
             @parse_error = error.to_s

data/lib/sensu/client/utils.rb

@@ -0,0 +1,65 @@
+require "sensu/json"
+
+module Sensu
+  module Client
+    module CheckUtils
+      class DataError < StandardError; end
+      # Validate check result attributes.
+      #
+      # @param [Hash] check result to validate.
+      def validate_check_result(check)
+        unless check[:name] =~ /\A[\w\.-]+\z/
+          raise DataError, "check name must be a string and cannot contain spaces or special characters"
+        end
+        unless check[:source].nil? || check[:source] =~ /\A[\w\.-]+\z/
+          raise DataError, "check source must be a string and cannot contain spaces or special characters"
+        end
+        unless check[:output].is_a?(String)
+          raise DataError, "check output must be a string"
+        end
+        unless check[:status].is_a?(Integer)
+          raise DataError, "check status must be an integer"
+        end
+        unless check[:executed].is_a?(Integer)
+          raise DataError, "check executed timestamp must be an integer"
+        end
+        unless check[:ttl].nil? || (check[:ttl].is_a?(Integer) && check[:ttl] > 0)
+          raise DataError, "check ttl must be an integer greater than 0"
+        end
+      end
+
+      # Process a check result. Set check result attribute defaults,
+      # validate the attributes, publish the check result to the Sensu
+      # transport, and respond to the sender with the message +"ok"+.
+      #
+      # @param [Hash] check result to be validated and published.
+      # @raise [DataError] if +check+ is invalid.
+      def process_check_result(check)
+        check[:status] ||= 0
+        check[:executed] ||= Time.now.to_i
+        validate_check_result(check)
+        publish_check_result(check)
+      end
+
+      # Publish a check result to the Sensu transport.
+      #
+      # @param [Hash] check result.
+      def publish_check_result(check)
+        payload = {
+          :client => @settings[:client][:name],
+          :check => check.merge(:issued => Time.now.to_i)
+        }
+        payload[:signature] = @settings[:client][:signature] if @settings[:client][:signature]
+        @logger.info("publishing check result", :payload => payload)
+        @transport.publish(:direct, "results", Sensu::JSON.dump(payload)) do |info|
+          if info[:error]
+            @logger.error("failed to publish check result", {
+              :payload => payload,
+              :error => info[:error].to_s
+            })
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -1,6 +1,6 @@
 require "rubygems"
 
-gem "eventmachine", "1.2.0.1"
+gem "eventmachine", "1.2.1"
 
 gem "sensu-json", "2.0.1"
 gem "sensu-logger", "1.2.1"
@@ -9,7 +9,7 @@ gem "sensu-extension", "1.5.1"
 gem "sensu-extensions", "1.7.1"
 gem "sensu-transport", "7.0.2"
 gem "sensu-spawn", "2.2.1"
-gem "sensu-redis", "2.0.0"
+gem "sensu-redis", "2.1.0"
 
 require "time"
 require "uri"

data/sensu.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.has_rdoc    = false
 
-  s.add_dependency "eventmachine", "1.2.0.1"
+  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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sensu-extensions", "1.7.1"
   s.add_dependency "sensu-transport", "7.0.2"
   s.add_dependency "sensu-spawn", "2.2.1"
-  s.add_dependency "sensu-redis", "2.0.0"
+  s.add_dependency "sensu-redis", "2.1.0"
   s.add_dependency "em-http-server", "0.1.8"
 
   s.add_development_dependency "rake", "10.5.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.27.0.alpha
+  version: 0.27.0.alpha.2
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: sensu-json
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: em-http-server
   requirement: !ruby/object:Gem::Requirement
@@ -248,8 +248,10 @@ files:
 - lib/sensu/api/validators/client.rb
 - lib/sensu/api/validators/invalid.rb
 - lib/sensu/cli.rb
+- lib/sensu/client/http_socket.rb
 - lib/sensu/client/process.rb
 - lib/sensu/client/socket.rb
+- lib/sensu/client/utils.rb
 - lib/sensu/constants.rb
 - lib/sensu/daemon.rb
 - lib/sensu/server/filter.rb
@@ -280,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A monitoring framework