sensu 0.26.1 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66ab7c472c9b66a469abcc8847ef6577f4ca1576
-  data.tar.gz: 4af5803bfa67bfb2bf208b199792e9b72af86190
+  metadata.gz: 49342309f09127069c61915d616297e647fa069a
+  data.tar.gz: bbb10e038647d660014b1fc8164d1194718313c0
 SHA512:
-  metadata.gz: 78013ade42f67c4b9782fd7a9b2c67923146912b5af2648a878c478145c124c858ab190dd5d289fa09e732ce40d56f336be120014945c2ea832d825d2a9bf234
-  data.tar.gz: 455c50d9fedb67eae71ca80923689e0ee8b5f801cf2b62a69b77400429e10b5dfe3f59829c1f5c5ed6fe43806169aff0db63e5551a5961a18cc10b65d9539deb
+  metadata.gz: baa7cd64f72f96dc80b9d36f15c227345d812601f7ec28cc03cfc53b898f0a8ca700e7c9fde46c2acb18e75ad0f68a5ce72eb5dd50a05719b4a004b2f3746fc5
+  data.tar.gz: 2ec35d738afa9ac97d9af1a3cbefbc9facc5617e5061906b6de716b86fc07053392f93313d6e69e828ab9f906f05b640d21f402f18ab61855664844f3125d5c5

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 0.26.2 - 2016-09-20
+
+### Fixes
+
+Added logic to ensure proxy clients receive a per-client subscription upon
+creation so that they can be silenced via /silenced API.
+
+Updated API publish_check_result helper to address a condition where
+events could not be successfully deleted for clients configured with a
+signature.
+
+Fixed regexp in API which prevented retrieval of silence entries when
+requesting subscriptions containing a colon (e.g. `client:foo`,
+`roundrobin:bar`) on the `/silenced/subscriptions/:subscription` endpoint.
+
+Fixed a condition where processing check results with an invalid signature
+failed to complete. This often manifest as timeouts when waiting for
+sensu-server processes to terminate.
+
+### Changes
+
+Default value for `client` settings has changed from `nil` to `{}`.
+
 ## 0.26.1 - 2016-09-07
 
 ### Fixes

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

@@ -3,7 +3,7 @@ module Sensu
     module Routes
       module Silenced
         SILENCED_URI = /^\/silenced$/
-        SILENCED_SUBSCRIPTION_URI = /^\/silenced\/subscriptions\/([\w\.-]+)$/
+        SILENCED_SUBSCRIPTION_URI = /^\/silenced\/subscriptions\/([\w\.-:]+)$/
         SILENCED_CHECK_URI = /^\/silenced\/checks\/([\w\.-]+)$/
         SILENCED_CLEAR_URI = /^\/silenced\/clear$/
 

data/lib/sensu/api/utilities/publish_check_result.rb

@@ -20,13 +20,16 @@ module Sensu
             :client => client_name,
             :check => check
           }
-          @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
-              })
+          @redis.get("client:#{client_name}:signature") do |signature|
+            payload[:signature] = signature unless signature.nil?
+            @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

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -4,7 +4,7 @@ gem "eventmachine", "1.2.0.1"
 
 gem "sensu-json", "2.0.0"
 gem "sensu-logger", "1.2.0"
-gem "sensu-settings", "9.1.1"
+gem "sensu-settings", "9.2.0"
 gem "sensu-extension", "1.5.0"
 gem "sensu-extensions", "1.7.0"
 gem "sensu-transport", "6.0.0"

data/lib/sensu/server/process.rb

@@ -575,7 +575,7 @@ module Sensu
         {
           :name => name,
           :address => "unknown",
-          :subscriptions => [],
+          :subscriptions => ["client:#{name}"],
           :keepalives => false,
           :version => VERSION
         }
@@ -606,6 +606,7 @@ module Sensu
                   :client => client
                 })
                 @logger.warn("not retrieving client from the registry", :result => result)
+                yield(nil)
               end
             else
               yield(client)
@@ -645,23 +646,28 @@ module Sensu
         @in_progress[:check_results] += 1
         @logger.debug("processing result", :result => result)
         retrieve_client(result) do |client|
-          check = case
-          when @settings.check_exists?(result[:check][:name]) && !result[:check][:standalone]
-            @settings[:checks][result[:check][:name]].merge(result[:check])
-          else
-            result[:check]
-          end
-          check[:type] ||= STANDARD_CHECK_TYPE
-          check[:origin] = result[:client] if check[:source]
-          aggregate_check_result(client, check) if check[:aggregates] || check[:aggregate]
-          store_check_result(client, check) do
-            create_event(client, check) do |event|
-              event_bridges(event)
-              update_event_registry(event) do |process|
-                process_event(event) if process
-                @in_progress[:check_results] -= 1
+          unless client.nil?
+            check = case
+            when @settings.check_exists?(result[:check][:name]) && !result[:check][:standalone]
+              @settings[:checks][result[:check][:name]].merge(result[:check])
+            else
+              result[:check]
+            end
+            check[:type] ||= STANDARD_CHECK_TYPE
+            check[:origin] = result[:client] if check[:source]
+            aggregate_check_result(client, check) if check[:aggregates] || check[:aggregate]
+            store_check_result(client, check) do
+              create_event(client, check) do |event|
+                event_bridges(event)
+                update_event_registry(event) do |process|
+                  process_event(event) if process
+                  @in_progress[:check_results] -= 1
+                end
               end
             end
+          else
+            @logger.warn("halting result processing", :result => result)
+            @in_progress[:check_results] -= 1
           end
         end
       end

data/sensu.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   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.1.1"
+  s.add_dependency "sensu-settings", "9.2.0"
   s.add_dependency "sensu-extension", "1.5.0"
   s.add_dependency "sensu-extensions", "1.7.0"
   s.add_dependency "sensu-transport", "6.0.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.1.1
+        version: 9.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.1.1
+        version: 9.2.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A monitoring framework