sensu 0.26.5 → 0.27.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdb46ea98930b412a16b3b6a8fe28a1be80aaf7e
-  data.tar.gz: eed3df0997bf545992189584dfb67a8b879160b9
+  metadata.gz: 889fe13d5be50c9cb7fb891ee70290c5da0815f5
+  data.tar.gz: ee86423e7b3d8837b869904dbb7ae050e58dce15
 SHA512:
-  metadata.gz: 6fedf552bf9910550c52cf47f3902c9610aa0bbd29645eb96be00f48c49d2ccf3a9f823543bb851478872ede49dc83cc525c736cafb78e72b80eefb1a88e52ac
-  data.tar.gz: 1ef5a2bdd720ba5371334f4c194dedecb2bc485c4081eb75e5afab31896c002f4f54853dbb1c79425e00fea4082854e836237b551a1ffe03974d13865079bae0
+  metadata.gz: ac0100bdec9cba408c27ef4bae7c2b511e5260aec4868881b0754a128a94871a029a3747bdee653a2a6d229ed32ca5e5c9a780b0fc140a3454ef29290d953b19
+  data.tar.gz: b84039c62794fa94cdcb2cc44beec273fa1d89fe8514ae8d289b698db7a1afd00ae0c9e22f2582290ee25dc0764a69e8604d653c521fa96523c3117430a325d7

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.26.4 - 2016-10-12
+## 0.26.5 - 2016-10-12
 
 ### Fixes
 

data/lib/sensu/api/routes.rb

@@ -53,6 +53,7 @@ module Sensu
         [RESULTS_CLIENT_URI, :get_results_client],
         [RESULT_URI, :get_result],
         [SILENCED_URI, :get_silenced],
+        [SILENCED_ID_URI, :get_silenced_id],
         [SILENCED_SUBSCRIPTION_URI, :get_silenced_subscription],
         [SILENCED_CHECK_URI, :get_silenced_check]
       ]

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

@@ -3,6 +3,7 @@ module Sensu
     module Routes
       module Silenced
         SILENCED_URI = /^\/silenced$/
+        SILENCED_ID_URI = /^\/silenced\/ids\/([\w\.\-\*\:]+)$/
         SILENCED_SUBSCRIPTION_URI = /^\/silenced\/subscriptions\/([\w\.\-:]+)$/
         SILENCED_CHECK_URI = /^\/silenced\/checks\/([\w\.\-]+)$/
         SILENCED_CLEAR_URI = /^\/silenced\/clear$/
@@ -45,7 +46,7 @@ module Sensu
         # POST /silenced
         def post_silenced
           rules = {
-            :subscription => {:type => String, :nil_ok => true},
+            :subscription => {:type => String, :nil_ok => true, :regex => /\A[\w\.\-\:]+\z/},
             :check => {:type => String, :nil_ok => true, :regex => /\A[\w\.-]+\z/},
             :expire => {:type => Integer, :nil_ok => true},
             :reason => {:type => String, :nil_ok => true},
@@ -109,6 +110,25 @@ module Sensu
           end
         end
 
+        # GET /silenced/ids/:id
+        def get_silenced_id
+          id = parse_uri(SILENCED_ID_URI).first
+          @redis.smembers("silenced") do |silenced_keys|
+            silenced_keys.select! do |key|
+              key =~ /#{id.gsub('*', '\*')}$/
+            end
+            silenced_keys = pagination(silenced_keys)
+            fetch_silenced(silenced_keys) do |silenced|
+              if silenced.empty?
+                not_found!
+              else
+                @response_content = silenced.last
+                respond
+              end
+            end
+          end
+        end
+
         # GET /silenced/checks/:check
         def get_silenced_check
           check_name = parse_uri(SILENCED_CHECK_URI).first

data/lib/sensu/client/process.rb

@@ -496,8 +496,11 @@ module Sensu
       # deregistration check result if configured to do so.
       def stop
         @logger.warn("stopping")
+        last_state = @state
         pause
-        deregister if @settings[:client][:deregister] == true
+        if @settings[:client][:deregister] == true && last_state != :initializing
+          deregister
+        end
         @state = :stopping
         complete_checks_in_progress do
           close_sockets

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -2,14 +2,14 @@ require "rubygems"
 
 gem "eventmachine", "1.2.0.1"
 
-gem "sensu-json", "2.0.0"
-gem "sensu-logger", "1.2.0"
-gem "sensu-settings", "9.2.1"
-gem "sensu-extension", "1.5.0"
-gem "sensu-extensions", "1.7.0"
-gem "sensu-transport", "6.0.0"
-gem "sensu-spawn", "2.2.0"
-gem "sensu-redis", "1.6.0"
+gem "sensu-json", "2.0.1"
+gem "sensu-logger", "1.2.1"
+gem "sensu-settings", "9.2.2"
+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"
 
 require "time"
 require "uri"
@@ -286,6 +286,7 @@ module Sensu
     #   connection object to the callback/block.
     def setup_redis
       @logger.debug("connecting to redis", :settings => @settings[:redis])
+      Redis.logger = @logger
       Redis.connect(@settings[:redis]) do |connection|
         @redis = connection
         @redis.on_error do |error|

data/lib/sensu/server/filter.rb

@@ -180,13 +180,14 @@ module Sensu
       #   parameter to indicate if the event was filtered.
       # @yieldparam filtered [TrueClass,FalseClass] indicating if the
       #   event was filtered.
+      # @yieldparam filter_name [String] name of the filter being evaluated
       def native_filter(filter_name, event)
         filter = @settings[:filters][filter_name]
         if in_filter_time_windows?(filter)
           matched = filter_attributes_match?(event, filter[:attributes])
-          yield(filter[:negate] ? matched : !matched)
+          yield(filter[:negate] ? matched : !matched, filter_name)
         else
-          yield(false)
+          yield(false, filter_name)
         end
       end
 
@@ -198,14 +199,15 @@ module Sensu
       #   parameter to indicate if the event was filtered.
       # @yieldparam filtered [TrueClass,FalseClass] indicating if the
       #   event was filtered.
+      # @yieldparam filter_name [String] name of the filter being evaluated
       def extension_filter(filter_name, event)
         extension = @extensions[:filters][filter_name]
         if in_filter_time_windows?(extension.definition)
           extension.safe_run(event) do |output, status|
-            yield(status == 0)
+            yield(status == 0, filter_name)
           end
         else
-          yield(false)
+          yield(false, filter_name)
         end
       end
 
@@ -223,19 +225,20 @@ module Sensu
       #   parameter to indicate if the event was filtered.
       # @yieldparam filtered [TrueClass,FalseClass] indicating if the
       #   event was filtered.
+      # @yieldparam filter_name [String] name of the filter being evaluated
       def event_filter(filter_name, event)
         case
         when @settings.filter_exists?(filter_name)
           native_filter(filter_name, event) do |filtered|
-            yield(filtered)
+            yield(filtered, filter_name)
           end
         when @extensions.filter_exists?(filter_name)
           extension_filter(filter_name, event) do |filtered|
-            yield(filtered)
+            yield(filtered, filter_name)
           end
         else
           @logger.error("unknown filter", :filter_name => filter_name)
-          yield(false)
+          yield(false, filter_name)
         end
       end
 
@@ -298,10 +301,11 @@ module Sensu
           @logger.info(filter_message, details)
           @in_progress[:events] -= 1 if @in_progress
         else
-          event_filtered?(handler, event) do |filtered|
+          event_filtered?(handler, event) do |filtered, filter_name|
             unless filtered
               yield(event)
             else
+              details[:filter] = filter_name
               @logger.info("event was filtered", details)
               @in_progress[:events] -= 1 if @in_progress
             end

data/sensu.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |s|
   s.has_rdoc    = false
 
   s.add_dependency "eventmachine", "1.2.0.1"
-  s.add_dependency "sensu-json", "2.0.0"
-  s.add_dependency "sensu-logger", "1.2.0"
-  s.add_dependency "sensu-settings", "9.2.1"
-  s.add_dependency "sensu-extension", "1.5.0"
-  s.add_dependency "sensu-extensions", "1.7.0"
-  s.add_dependency "sensu-transport", "6.0.0"
-  s.add_dependency "sensu-spawn", "2.2.0"
-  s.add_dependency "sensu-redis", "1.6.0"
+  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-extension", "1.5.1"
+  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 "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.26.5
+  version: 0.27.0.alpha
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -31,112 +31,112 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: sensu-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: sensu-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.2.1
+        version: 9.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.2.1
+        version: 9.2.2
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: sensu-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: sensu-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: sensu-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: sensu-redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: em-http-server
   requirement: !ruby/object:Gem::Requirement
@@ -275,12 +275,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A monitoring framework