sensu 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f4831b939bf3b0839d0a4a845fc6320da96e0cd
-  data.tar.gz: 87752deeb5355081b21c97a50ac6a22f219aaa9b
+  metadata.gz: 848a4443459327c245760df5a5845eb525c0f764
+  data.tar.gz: 747c00aa13b824942c83c1d9970ffdc2d922aae3
 SHA512:
-  metadata.gz: 1359a4962efd532af46b7596e2f04bc067ef82cd80a99ce145cc75a7129f469d683051d58ee0591b1d37b294762648e97c0f87aa519a2525f34bbcf930baa4af
-  data.tar.gz: c75815d4ee1a51ddb04edf182cfa916b101b0592d004528e869fc1a189e40bf9d32683d830263664e43878c5b0a228d8ec9c1a31959f39c89846c4b287401b81
+  metadata.gz: 15d626cff0c140b0cad61db37d810c7d4a535c85e938c73b0e12baf31c01bb7850246867c5886e63099308f776754962f6ba03843a6aae19c8580197dc1e4c96
+  data.tar.gz: da0a760f6bb3ebf0ba1832387e6ff2ea84202692f10dab35e03ce06fbdcddf31bd8a8e5230b22b93f9b002303f5b16589f8a3de5ed5aa85050ed5bb01cccb70c

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.27.1 - 2017-02-17
+
+### Other
+
+Failed pipe handler executions are now logged with the error log level.
+
+Sensu server now adds a unique per-client subscription to client
+keepalives when missing. This is to enable built-in event silencing for
+older Sensu clients (< 0.26).
+
+### Fixes
+
+Check subdue and filter when time windows now account for GMT offsets.
+
+Non UTF-8 characters in check tokens are now removed.
+
+Fixed filter name logging when an event is filtered.
+
 ## 0.27.0 - 2017-01-26
 
 ### Features

data/README.md

@@ -1,11 +1,52 @@
 ![sensu](https://raw.github.com/sensu/sensu/master/sensu-logo.png)
 
-A monitoring framework that aims to be simple, malleable, and scalable.
+[![Build Status](https://img.shields.io/travis/sensu/sensu.png)](https://travis-ci.org/sensu/sensu)
+[![Gem Version](https://img.shields.io/gem/v/sensu.svg)](https://github.com/sensu/sensu/blob/master/CHANGELOG.md)
+![MIT Licensed](https://img.shields.io/github/license/sensu/sensu.svg)
 
-[![Build Status](https://secure.travis-ci.org/sensu/sensu.png)](https://travis-ci.org/sensu/sensu)
+# Sensu
+
+A simple, malleable, and scalable framework for composing
+the monitoring system you need.
+
+Sensu is offered in two flavors:
+
+* Sensu Core - this open source project
+* [Sensu Enterprise][1] - a full-featured commercial implementation, built on Sensu Core
+
+## Installation
+
+Sensu supports a number of Unix-like platforms, as well as Windows.
+Please see the [list of supported platforms][2] for installation instructions.
 
 ## Documentation
-  Please refer to the [Sensu Docs](http://sensuapp.org/docs/latest/overview).
+
+Please refer to the [online documentation][3] for details
+on configuring and operating Sensu.
+
+## Getting Help
+
+If you have questions not covered by the documentation, the Sensu community
+is here to help. Please check out our [chat][4] on Freenode IRC, or the
+[sensu-users][5] discussion list.
+
+Commercial support is also available. See the [support section of our website][6] for more detail.
+
+## Contributing
+
+Please observe these [guidelines on contributing][7].
+
 
 ## License
-  Sensu is released under the [MIT license](https://raw.github.com/sensu/sensu/master/MIT-LICENSE.txt).
+
+Sensu Core is released under the [MIT license][8].
+
+
+[1]: https://sensuapp.org/enterprise
+[2]: https://sensuapp.org/docs/latest/platforms/
+[3]: http://sensuapp.org/docs/latest/overview
+[4]: http://webchat.freenode.net/?channels=%23sensu
+[5]: http://groups.google.com/group/sensu-users
+[6]: https://sensuapp.org/support
+[7]: https://github.com/sensu/sensu/blob/master/CONTRIBUTING.md
+[8]: https://raw.github.com/sensu/sensu/master/MIT-LICENSE.txt

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -1,10 +1,10 @@
 require "rubygems"
 
-gem "eventmachine", "1.2.1"
+gem "eventmachine", "1.2.2"
 
 gem "sensu-json", "2.0.1"
 gem "sensu-logger", "1.2.1"
-gem "sensu-settings", "9.6.0"
+gem "sensu-settings", "9.8.0"
 gem "sensu-extension", "1.5.1"
 gem "sensu-extensions", "1.7.1"
 gem "sensu-transport", "7.0.2"
@@ -48,7 +48,10 @@ module Sensu
       @start_time = Time.now.to_i
       @state = :initializing
       @timers = {:run => []}
-      EM::set_max_timers(200000) unless EM::reactor_running?
+      unless EM::reactor_running?
+        EM::epoll
+        EM::set_max_timers(200000)
+      end
       setup_logger(options)
       load_settings(options)
       unless sensu_service_name == "api"
@@ -184,9 +187,11 @@ module Sensu
     end
 
     # Start the Sensu service and set the service state to `:running`.
-    # This method will likely be overridden by a subclass.
+    # This method will likely be overridden by a subclass. Yield if a
+    # block is provided.
     def start
       @state = :running
+      yield if block_given?
     end
 
     # Pause the Sensu service and set the service state to `:paused`.

data/lib/sensu/server/filter.rb

@@ -264,7 +264,7 @@ module Sensu
               yield(false)
             else
               event_filter(filter_name, event) do |filtered|
-                filtered ? yield(true) : EM.next_tick { filter.call(filter_list) }
+                filtered ? yield(true, filter_name) : EM.next_tick { filter.call(filter_list) }
               end
             end
           end

data/lib/sensu/server/handle.rb

@@ -26,13 +26,18 @@ module Sensu
       # `@in_progress[:events]` by `1` when the handler executes
       # successfully.
       #
+      # When the spawned process exits with status 0, its output is
+      # logged at :info level. Otherwise, its output is logged at
+      # :error level.
+      #
       # @param handler [Hash] definition.
       # @param event_data [Object] provided to the spawned handler
       #   process via STDIN.
       def pipe_handler(handler, event_data)
         options = {:data => event_data, :timeout => handler[:timeout]}
         Spawn.process(handler[:command], options) do |output, status|
-          @logger.info("handler output", {
+          log_level = status == 0 ? :info : :error
+          @logger.send(log_level, "handler output", {
             :handler => handler,
             :output => output.split("\n+")
           })

data/lib/sensu/server/process.rb

@@ -119,13 +119,19 @@ module Sensu
 
       # Update the Sensu client registry, stored in Redis. Sensu
       # client data is used to provide additional event context and
-      # enable agent health monitoring. The client registry supports
-      # client signatures, unique string identifiers used for
-      # keepalive and result source verification. If a client has a
-      # signature, all further registry updates for the client must
-      # have the same signature. A client can begin to use a signature
-      # if one was not previously configured. JSON serialization is
-      # used for the stored client data.
+      # enable agent health monitoring.
+      #
+      # To enable silencing individual clients, per-client
+      # subscriptions (`client:$CLIENT_NAME`) are added to client
+      # subscriptions automatically.
+      #
+      # The client registry supports client signatures, unique string
+      # identifiers used for keepalive and result source
+      # verification. If a client has a signature, all further
+      # registry updates for the client must have the same
+      # signature. A client can begin to use a signature if one was
+      # not previously configured. JSON serialization is used for the
+      # stored client data.
       #
       # @param client [Hash]
       # @yield [success] passes success status to optional
@@ -136,6 +142,7 @@ module Sensu
       def update_client_registry(client)
         @logger.debug("updating client registry", :client => client)
         client_key = "client:#{client[:name]}"
+        client[:subscriptions] = (client[:subscriptions] + [client_key]).uniq
         signature_key = "#{client_key}:signature"
         @redis.setnx(signature_key, client[:signature]) do |created|
           process_client_registration(client) if created
@@ -1166,10 +1173,12 @@ module Sensu
       end
 
       # Start the Sensu server process, connecting to Redis, the
-      # Transport, and calling the `bootstrap()` method.
+      # Transport, and calling the `bootstrap()` method. Yield if a
+      # block is provided.
       def start
         setup_connections do
           bootstrap
+          yield if block_given?
         end
       end
 

data/lib/sensu/utilities.rb

@@ -107,7 +107,12 @@ module Sensu
     #   and an array of unmatched tokens.
     def substitute_tokens(tokens, attributes)
       unmatched_tokens = []
-      substituted = tokens.gsub(/:::([^:].*?):::/) do
+      encoded_tokens = tokens.encode("UTF-8", "binary", {
+        :invalid => :replace,
+        :undef => :replace,
+        :replace => ""
+      })
+      substituted = encoded_tokens.gsub(/:::([^:].*?):::/) do
         token, default = $1.to_s.split("|", -1)
         path = token.split(".").map(&:to_sym)
         matched = find_attribute_value(attributes, path, default)
@@ -133,9 +138,11 @@ module Sensu
         end_time = Time.parse(condition[:end])
         if end_time < begin_time
           if Time.now < end_time
-            begin_time = Time.parse("12:00:00 AM")
+            offset = begin_time.strftime("%:z")
+            begin_time = Time.new("12:00:00 AM #{offset}")
           else
-            end_time = Time.parse("11:59:59 PM")
+            offset = end_time.strftime("%:z")
+            end_time = Time.new("11:59:59 PM #{offset}")
           end
         end
         Time.now >= begin_time && Time.now <= end_time

data/sensu.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
   s.has_rdoc    = false
 
-  s.add_dependency "eventmachine", "1.2.1"
+  s.add_dependency "eventmachine", "1.2.2"
   s.add_dependency "sensu-json", "2.0.1"
   s.add_dependency "sensu-logger", "1.2.1"
-  s.add_dependency "sensu-settings", "9.6.0"
+  s.add_dependency "sensu-settings", "9.8.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
+  version: 0.27.1
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-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.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-json
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.6.0
+        version: 9.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.6.0
+        version: 9.8.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement