sensu 0.25.4 → 0.25.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 395c016d81d285d4638a986ed2e74f3a57eeee12
-  data.tar.gz: b1910e9c168985868d21960ece8dc89db4827814
+  metadata.gz: 02d86ad1519a656086b16c960bbca484bb92a4ca
+  data.tar.gz: da7868c4ce10e396a97630a2888aaad5ce45014d
 SHA512:
-  metadata.gz: d019339a148fb8ddc6f5bed53c39229ef5b2007ce80f8e20c63fcd26ca246180cd52fbcefe19dc1b8526fce5284ef80d79b5e5caede41af04e4d161eece9daab
-  data.tar.gz: f33ded0aae861eedefcb2260a2d0c8fca7356511db8f101ddb4d038099ddbb929b8537e703a1be9d460abf2bb6234ce552c7ef6ad4929a7f7777da842239ff07
+  metadata.gz: 217e47e5de21cba8aba1aba6da58a56b87172f55f1ef254529cf29b17faffcff187fefc31ebd822cc92ed2fd5cdd2bf1c5b5cff565ffd39a1e0482b2d0885770
+  data.tar.gz: 8af3432ae93ab3d5282b4ab717252dbac9bd352cb1663a5f167f026671caf378df03ce2edb2506c64ae5924cd3e13ba76748f6da728d8aa94822ec266419db03

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.25.5 - 2016-07-12
+
+### Fixes
+
+Reverted the Sensu API race condition fix, it was a red herring. Desired
+behaviour has been restored.
+
+Custom check definition attributes are now included in check request
+payloads, fixing check attribute token substitution for pubsub checks.
+
+Transport connectivity issues are now handled while querying the Transport
+for pipe stats for API `/info` and `/health`.
+
 ## 0.25.4 - 2016-06-20
 
 ### Fixes

data/lib/sensu/api/process.rb

@@ -15,23 +15,13 @@ module Sensu
       def self.run(options={})
         api = self.new(options)
         EM::run do
+          api.setup_redis
+          api.setup_transport
           api.start
           api.setup_signal_traps
         end
       end
 
-      # Setup connections to redis and transport
-      #
-      # @yield [Object] a callback/block to be called after redis and
-      #   transport connections have been established.
-      def setup_connections
-        setup_redis do |redis|
-          setup_transport do |transport|
-            yield if block_given?
-          end
-        end
-      end
-
       # Start the API HTTP server. This method sets `@http_server`.
       #
       # @param bind [String] address to listen on.
@@ -56,10 +46,7 @@ module Sensu
         api = @settings[:api] || {}
         bind = api[:bind] || "0.0.0.0"
         port = api[:port] || 4567
-        setup_connections do
-          start_http_server(bind, port)
-          yield if block_given?
-        end
+        start_http_server(bind, port)
         super
       end
 
@@ -80,8 +67,11 @@ module Sensu
       # @param options [Hash]
       def self.test(options={})
         api = self.new(options)
-        api.start do
-          yield
+        api.setup_redis do
+          api.setup_transport do
+            api.start
+            yield
+          end
         end
       end
     end

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

@@ -17,13 +17,18 @@ module Sensu
               :messages => nil,
               :consumers => nil
             },
-            :connected => @transport.connected?
+            :connected => false
           }
           if @transport.connected?
             @transport.stats("keepalives") do |stats|
               info[:keepalives] = stats
-              @transport.stats("results") do |stats|
-                info[:results] = stats
+              if @transport.connected?
+                @transport.stats("results") do |stats|
+                  info[:results] = stats
+                  info[:connected] = @transport.connected?
+                  yield(info)
+                end
+              else
                 yield(info)
               end
             end

data/lib/sensu/constants.rb

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

data/lib/sensu/server/process.rb

@@ -641,22 +641,19 @@ module Sensu
       end
 
       # Publish a check request to the Transport. A check request is
-      # 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
+      # composed of a check definition (minus `:subscribers` and
+      # `:interval`) and an `:issued` timestamp. 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)
-        payload = {
-          :name => check[:name],
-          :issued => Time.now.to_i
-        }
-        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)
+        payload = check.reject do |key, value|
+          [:subscribers, :interval].include?(key)
+        end
+        payload[:issued] = Time.now.to_i
         @logger.info("publishing check request", {
           :payload => payload,
           :subscribers => check[:subscribers]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.25.4
+  version: 0.25.5
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -227,7 +227,6 @@ files:
 - exe/sensu-install
 - exe/sensu-server
 - lib/sensu.rb
-- lib/sensu/#test.json#
 - lib/sensu/api/http_handler.rb
 - lib/sensu/api/process.rb
 - lib/sensu/api/routes.rb
@@ -280,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A monitoring framework

data/lib/sensu/#test.json#

@@ -1,37 +0,0 @@
-{
-
-    "checks": {
-
-        "check_procs_slapd": {
-
-            "command": "/usr/local/nagios/libexec/check_procs -c 1:4 -w 1:4 -a libexec/slapd",
-
-            "subscribers": ["EBB_CKPRC_SLAPD", "EBB"],
-
-            "interval": 60
-
-        },
-
-        "check_procs_syslog-ng": {
-
-            "command": "/usr/local/nagios/libexec/check_procs -w 1:4 -c 1:4 -a syslog-ng",
-
-            "subscribers": ["EBB_CKPRC_SYSLOGNG", "EBB"],
-
-            "interval": 60
-
-        },
-
-        "check_procs_total_procs": {
-
-            "command": "/usr/local/nagios/libexec/check_procs -w 150 -c 250",
-
-            "subscribers": ["EBB_CKPRC_TOTAL", "EBB"],
-
-            "interval": 60
-
-        }
-
-    }
-
-}