sensu 0.20.6 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8db94deef76774c21c9200b21055c0cedc6c1907
-  data.tar.gz: 067c5f4dedbb6315d62c77a1dbe769bd18b6442d
+  metadata.gz: e7241998f1b395c09ed021c94e1391de71b1a1b3
+  data.tar.gz: 8ed7240bf31290a27826d17584a6e13f3ebe1e56
 SHA512:
-  metadata.gz: 0a620e6977eabe3657cfa23409f5732fe9d7a79985752290eafd939b5f0966b3885ded2d47c14c9a9ade611a464cd9ff483fa8f79e14d5ccdd64ddb124c7b01a
-  data.tar.gz: 4d40cdcb998419822642090121c34aded2a47e7c094c4b084516ff0ad7893701ff0598cdaa6a0a5c4922bf686b099086bb9db7f3e739d52a11d7d090fd86a085
+  metadata.gz: 46e0e42fb84c441414534f9f40fd2074cc90ee66964ebef97c72184b2af6c034244686f89d914ef21b70c527638dac7163f2e2049d760f28ef807152d8400dea
+  data.tar.gz: f9effb8a3907bf25952761c07a058e2df972c43454fe1256086e5c41e11266e4736e9c0a454d70934b00acb55499192632245096764314c968b6e4412f39ad97

data/CHANGELOG.md

@@ -1,7 +1,56 @@
+## 0.21.0 - 2015-11-13
+
+### Features
+
+Added a Sensu plugin installation tool, `sensu-install`, making it easier
+to install Sensu community plugins. The `sensu-install` tool will use the
+appropriate Ruby when installing plugins. The tool aims to produce verbose
+and useful output to help when debugging plugin installation issues.
+
+Added the Sensu API DELETE /results/:client/:check endpoint, supporting
+check result deletion via the Sensu API. This feature allows users to
+clean up "stale" check result data for checks that have been removed.
+
+Added the Sensu API POST /results endpoint, supporting check result input
+via the Sensu API. The JIT client feature added in 0.20 enabled this
+functionality. Services that do not have access to a local Sensu client
+socket can make use of this feature.
+
+### Other
+
+Improved the Sensu test suite to reduce the number of timeout triggered
+failures. These changes make Sensu development much more pleasant.
+
+Fixed a few inline documentation typos, e.g. sbuded -> subdued.
+
+Moved the Sensu bins (e.g. `sensu-client`) from `bin` to `exe` to avoid
+the conflict with Ruby bundler bin stubs.
+
+Fixed Sensu API and client socket input validation, no longer accepting
+multi-line values.
+
+Fixed check request publishing for checks that make use of check
+extensions, e.g. `"extension": "check_http_endpoints`.
+
+Fixed the handler `"filters"` bug that caused Sensu to mutate handler
+definitions, removing filters for successive executions.
+
+Fixed Sensu API POST /request endpoint check request publishing to
+round-robin client subscriptions.
+
+Fixed the Windows job handle leak when spawning processes for checks.
+
+Updated the Redis client library (em-redis-unified) to remove duplicate
+Ruby hash key warnings.
+
 ## 0.20.6 - 2015-09-22
 
 ### Other
 
+Removed the use of `EM::Iterator` from event filtering, replacing it with
+`Proc` and `EM::next_tick`. `EM::Iterator` creates anonymous classes that
+cannot be garbage collected on JRuby.
+
 Removed sensu-em as a dependency, now using upstream EventMachine 1.0.8.
 
 The Sensu API will remove a client immediately if there are no current

data/exe/sensu-install

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+require "optparse"
+
+module Sensu
+  class Install
+    class << self
+      def cli_options(arguments=ARGV)
+        options = {
+          :verbose => false,
+          :plugins => []
+        }
+        optparse = OptionParser.new do |opts|
+          opts.on("-h", "--help", "Display this message") do
+            puts opts
+            exit
+          end
+          opts.on("-v", "--verbose", "Enable verbose logging") do
+            options[:verbose] = true
+          end
+          opts.on("-p", "--plugin PLUGIN", "Install a Sensu PLUGIN") do |plugin|
+            options[:plugins] << plugin
+          end
+          opts.on("-P", "--plugins PLUGIN[,PLUGIN]", "PLUGIN or comma-delimited list of Sensu plugins to install") do |plugins|
+            options[:plugins].concat(plugins.split(","))
+          end
+          opts.on("-s", "--source SOURCE", "Install Sensu plugins from a custom SOURCE") do |source|
+            options[:source] = source
+          end
+        end
+        optparse.parse!(arguments)
+        options
+      end
+
+      def log(message)
+        puts "[SENSU-INSTALL] #{message}"
+      end
+
+      def install_plugins(plugins, options={})
+        log "installing Sensu plugins ..."
+        log "provided Sensu plugins: #{plugins}" if options[:verbose]
+        gems = plugins.map do |plugin|
+          if plugin.start_with?("sensu-plugins-")
+            plugin
+          else
+            "sensu-plugins-#{plugin}"
+          end
+        end
+        log "Sensu plugin gems to be installed: #{gems}" if options[:verbose]
+        gem_options = "--no-ri --no-rdoc"
+        gem_options << " --verbose" if options[:verbose]
+        gem_options << " --source #{options[:source]}" if options[:source]
+        gems.each do |gem|
+          log "installing Sensu plugin gem: #{gem}"
+          gem_command = "gem install #{gem} #{gem_options}"
+          log gem_command if options[:verbose]
+          unless system(gem_command)
+            log "failed to install Sensu plugin gem: #{gem}"
+            log "you can run the sensu-install command again with --verbose for more info" unless options[:verbose]
+            log "please take note of any failure messages above"
+            log "make sure you have build tools installed (e.g. gcc)"
+            log "trying to determine Sensu plugin homepage for #{gem} ..."
+            clean_gem = gem.split(":").first
+            system("gem specification #{clean_gem} -r | grep homepage")
+            exit 2
+          end
+        end
+        log "successfully install Sensu plugins: #{plugins}"
+      end
+
+      def run
+        options = cli_options
+        unless options[:plugins].empty?
+          install_plugins(options[:plugins], options)
+        else
+          log "nothing to do"
+        end
+      end
+    end
+  end
+end
+
+Sensu::Install.run

data/lib/sensu/api/process.rb

@@ -177,7 +177,8 @@ module Sensu
             valid = rules.all? do |key, rule|
               value = data[key]
               (value.is_a?(rule[:type]) || (rule[:nil_ok] && value.nil?)) &&
-                rule[:regex].nil? || (rule[:regex] && (value =~ rule[:regex]) == 0)
+                (value.nil? || rule[:regex].nil?) ||
+                (rule[:regex] && (value =~ rule[:regex]) == 0)
             end
             if valid
               callback.call(data)
@@ -190,7 +191,7 @@ module Sensu
         end
 
         def integer_parameter(parameter)
-          parameter =~ /^[0-9]+$/ ? parameter.to_i : nil
+          parameter =~ /\A[0-9]+\z/ ? parameter.to_i : nil
         end
 
         def pagination(items)
@@ -234,18 +235,12 @@ module Sensu
           end
         end
 
-        def resolve_event(event_json)
-          event = MultiJson.load(event_json)
-          check = event[:check].merge(
-            :output => "Resolving on request of the API",
-            :status => 0,
-            :issued => Time.now.to_i,
-            :executed => Time.now.to_i,
-            :force_resolve => true
-          )
-          check.delete(:history)
+        def publish_check_result(client_name, check)
+          check[:issued] = Time.now.to_i
+          check[:executed] = Time.now.to_i
+          check[:status] ||= 0
           payload = {
-            :client => event[:client][:name],
+            :client => client_name,
             :check => check
           }
           settings.logger.info("publishing check result", :payload => payload)
@@ -258,6 +253,47 @@ module Sensu
             end
           end
         end
+
+        def resolve_event(event_json)
+          event = MultiJson.load(event_json)
+          check = event[:check].merge(
+            :output => "Resolving on request of the API",
+            :status => 0,
+            :force_resolve => true
+          )
+          check.delete(:history)
+          publish_check_result(event[:client][:name], check)
+        end
+
+        def transport_publish_options(subscription, message)
+          _, raw_type = subscription.split(":", 2).reverse
+          case raw_type
+          when "direct", "roundrobin"
+            [:direct, subscription, message]
+          else
+            [:fanout, subscription, message]
+          end
+        end
+
+        def publish_check_request(check)
+          payload = check.merge(:issued => Time.now.to_i)
+          settings.logger.info("publishing check request", {
+            :payload => payload,
+            :subscribers => check[:subscribers]
+          })
+          check[:subscribers].each do |subscription|
+            options = transport_publish_options(subscription.to_s, MultiJson.dump(payload))
+            settings.transport.publish(*options) do |info|
+              if info[:error]
+                settings.logger.error("failed to publish check request", {
+                  :subscription => subscription,
+                  :payload => payload,
+                  :error => info[:error].to_s
+                })
+              end
+            end
+          end
+        end
       end
 
       before do
@@ -311,7 +347,7 @@ module Sensu
 
       apost "/clients/?" do
         rules = {
-          :name => {:type => String, :nil_ok => false, :regex => /^[\w\.-]+$/},
+          :name => {:type => String, :nil_ok => false, :regex => /\A[\w\.-]+\z/},
           :address => {:type => String, :nil_ok => false},
           :subscriptions => {:type => Array, :nil_ok => false}
         }
@@ -459,28 +495,11 @@ module Sensu
         }
         read_data(rules) do |data|
           if settings.checks[data[:check]]
-            check = settings.checks[data[:check]]
-            subscribers = data[:subscribers] || check[:subscribers] || Array.new
-            payload = {
-              :name => data[:check],
-              :command => check[:command],
-              :issued => Time.now.to_i
-            }
-            settings.logger.info("publishing check request", {
-              :payload => payload,
-              :subscribers => subscribers
-            })
-            subscribers.uniq.each do |exchange_name|
-              settings.transport.publish(:fanout, exchange_name.to_s, MultiJson.dump(payload)) do |info|
-                if info[:error]
-                  settings.logger.error("failed to publish check request", {
-                    :exchange_name => exchange_name,
-                    :payload => payload,
-                    :error => info[:error].to_s
-                  })
-                end
-              end
-            end
+            check = settings.checks[data[:check]].dup
+            check[:name] = data[:check]
+            check[:subscribers] ||= Array.new
+            check[:subscribers] = data[:subscribers] if data[:subscribers]
+            publish_check_request(check)
             issued!
           else
             not_found!
@@ -743,6 +762,19 @@ module Sensu
         end
       end
 
+      apost "/results/?" do
+        rules = {
+          :name => {:type => String, :nil_ok => false, :regex => /\A[\w\.-]+\z/},
+          :output => {:type => String, :nil_ok => false},
+          :status => {:type => Integer, :nil_ok => true},
+          :source => {:type => String, :nil_ok => true, :regex => /\A[\w\.-]+\z/}
+        }
+        read_data(rules) do |data|
+          publish_check_result("sensu-api", data)
+          issued!
+        end
+      end
+
       aget "/results/?" do
         response = Array.new
         settings.redis.smembers("clients") do |clients|
@@ -807,6 +839,21 @@ module Sensu
           end
         end
       end
+
+      adelete %r{^/results?/([\w\.-]+)/([\w\.-]+)/?$} do |client_name, check_name|
+        result_key = "result:#{client_name}:#{check_name}"
+        settings.redis.exists(result_key) do |result_exists|
+          if result_exists
+            settings.redis.srem("result:#{client_name}", check_name) do
+              settings.redis.del(result_key) do |result_json|
+                no_content!
+              end
+            end
+          else
+            not_found!
+          end
+        end
+      end
     end
   end
 end

data/lib/sensu/client/socket.rb

@@ -116,10 +116,10 @@ module Sensu
       #
       # @param [Hash] check result to validate.
       def validate_check_result(check)
-        unless check[:name] =~ /^[\w\.-]+$/
+        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] =~ /^[\w\.-]+$/
+        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)

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -5,10 +5,10 @@ gem "eventmachine", "1.0.8"
 
 gem "sensu-logger", "1.1.0"
 gem "sensu-settings", "3.1.0"
-gem "sensu-extension", "1.2.0"
-gem "sensu-extensions", "1.3.0"
+gem "sensu-extension", "1.3.0"
+gem "sensu-extensions", "1.4.0"
 gem "sensu-transport", "3.3.0"
-gem "sensu-spawn", "1.5.0"
+gem "sensu-spawn", "1.6.0"
 
 require "time"
 require "uri"

data/lib/sensu/redis.rb

@@ -1,4 +1,4 @@
-gem "em-redis-unified", "1.0.0"
+gem "em-redis-unified", "1.0.1"
 
 require "em-redis-unified"
 

data/lib/sensu/server/filter.rb

@@ -179,7 +179,7 @@ module Sensu
       # @return [TrueClass, FalseClass]
       def eval_attribute_value(raw_eval_string, value)
         begin
-          eval_string = raw_eval_string.gsub(/^eval:(\s+)?/, "")
+          eval_string = raw_eval_string.gsub(/\Aeval:(\s+)?/, "")
           !!Sandbox.eval(eval_string, value)
         rescue => error
           @logger.error("filter attribute eval error", {
@@ -258,7 +258,7 @@ module Sensu
       # @param callback [Proc]
       def event_filtered?(handler, event, &callback)
         if handler.has_key?(:filters) || handler.has_key?(:filter)
-          filter_list = Array(handler[:filters] || handler[:filter])
+          filter_list = Array(handler[:filters] || handler[:filter]).dup
           filter = Proc.new do |filter_list|
             filter_name = filter_list.shift
             if filter_name.nil?
@@ -278,7 +278,7 @@ module Sensu
       # Attempt to filter an event for a handler. This method will
       # check to see if handling is disabled, if the event action is
       # handled, if the event check severity is handled, if the
-      # handler is sbuded, and if the event is filtered by any of the
+      # handler is subdued, and if the event is filtered by any of the
       # filters specified in the handler definition.
       #
       # @param handler [Hash] definition.

data/lib/sensu/server/process.rb

@@ -483,12 +483,12 @@ module Sensu
       end
 
       # Publish a check request to the transport. A check request is
-      # composted of a check `:name`, an `:issued` timestamp, and a
-      # check `:command` if available. The check request is published
-      # to a transport pipe, for each of the check `:subscribers` in
-      # its definition, eg. "webserver". JSON serialization is used
-      # when publishing the check request payload to the transport
-      # pipes. Transport errors are logged.
+      # composed of a check `:name`, an `:issued` timestamp, a check
+      # `:command` if available, and a check `:extension if available.
+      # The check request is published to a transport pipe, for each
+      # of the check `:subscribers` in its definition, eg. "webserver".
+      # JSON serialization is used when publishing the check request
+      # payload to the transport pipes. Transport errors are logged.
       #
       # @param check [Hash] definition.
       def publish_check_request(check)
@@ -498,6 +498,7 @@ module Sensu
         }
         payload[:command] = check[:command] if check.has_key?(:command)
         payload[:source] = check[:source] if check.has_key?(:source)
+        payload[:extension] = check[:extension] if check.has_key?(:extension)
         @logger.info("publishing check request", {
           :payload => payload,
           :subscribers => check[:subscribers]

data/sensu.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.add_dependency "eventmachine", "1.0.8"
   s.add_dependency "sensu-logger", "1.1.0"
   s.add_dependency "sensu-settings", "3.1.0"
-  s.add_dependency "sensu-extension", "1.2.0"
-  s.add_dependency "sensu-extensions", "1.3.0"
+  s.add_dependency "sensu-extension", "1.3.0"
+  s.add_dependency "sensu-extensions", "1.4.0"
   s.add_dependency "sensu-transport", "3.3.0"
-  s.add_dependency "sensu-spawn", "1.5.0"
-  s.add_dependency "em-redis-unified", "1.0.0"
+  s.add_dependency "sensu-spawn", "1.6.0"
+  s.add_dependency "em-redis-unified", "1.0.1"
   s.add_dependency "sinatra", "1.4.6"
   s.add_dependency "async_sinatra", "1.2.0"
   s.add_dependency "thin", "1.6.3" unless RUBY_PLATFORM =~ /java/
@@ -32,7 +32,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 3.0.0"
   s.add_development_dependency "em-http-request", "~> 1.1"
 
-  s.files         = Dir.glob("{bin,lib}/**/*") + %w[sensu.gemspec README.md CHANGELOG.md MIT-LICENSE.txt]
-  s.executables   = Dir.glob("bin/**/*").map { |file| File.basename(file) }
+  s.files         = Dir.glob("{exe,lib}/**/*") + %w[sensu.gemspec README.md CHANGELOG.md MIT-LICENSE.txt]
+  s.executables   = s.files.grep(%r{^exe/}) { |file| File.basename(file) }
+  s.bindir        = "exe"
   s.require_paths = ["lib"]
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.20.6
+  version: 0.21.0
 platform: ruby
 authors:
 - Sean Porter
 - Justin Kolberg
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -87,28 +87,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: sensu-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: sensu-transport
   requirement: !ruby/object:Gem::Requirement
@@ -129,28 +129,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: em-redis-unified
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -240,18 +240,20 @@ email:
 - portertech@gmail.com
 - amdprophet@gmail.com
 executables:
-- sensu-server
-- sensu-client
 - sensu-api
+- sensu-client
+- sensu-install
+- sensu-server
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - MIT-LICENSE.txt
 - README.md
-- bin/sensu-api
-- bin/sensu-client
-- bin/sensu-server
+- exe/sensu-api
+- exe/sensu-client
+- exe/sensu-install
+- exe/sensu-server
 - lib/sensu.rb
 - lib/sensu/api/process.rb
 - lib/sensu/cli.rb
@@ -288,9 +290,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A monitoring framework
 test_files: []
-has_rdoc: false