sensu 0.18.1 → 0.19.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4b6e88fad200ce4a66173e385728a6107d62cc
-  data.tar.gz: de4f574f36b4e060a6c8135afbd5186e4a9ef96b
+  metadata.gz: 4b4319c7b86de73fef4f4649e98a5d44639d195b
+  data.tar.gz: 5bbd3e47ec44b43845edfdd0fd4eac1c07b3b4d5
 SHA512:
-  metadata.gz: 187cf3e05aeb12dfacdad053acb5433aa5d41c402d7627b14212fa30ecd34138d2df793c8bdb580ca9bb5190cabb2f6014469ceebfd42ab68b08af554b8aa297
-  data.tar.gz: 0dbe79dbbfdb6138ebf0faa47d3a5e22a704011c99fbd05699cec64f9496213ec0d729c26ba83666cc6390642655e1428ffa4599508242c57b70ab85585f89dd
+  metadata.gz: 2aad30b0391244ae28bab870fda5fd5f830fba3765eed6eb74648a504a2cb0317b195c427ebe4a191b73f7b54cabbb7c10331ffb17b5ff5356ac31a961b17ed3
+  data.tar.gz: 9a870dcc2e466b4c0865c72c78552115dbd71059812ec4d8026461adfb7635d027de16ad297fe5d175791e990c41304e7ac569b4a504b5c60a8f11ea1d7e6a2b

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 0.19.0 - TBD
+
+### Features
+
+Redis Sensu transport, a built-in alternative to the default RabbitMQ
+transport. The Redis transport is currently considered experimental.
+Configuring the transport name to be `redis` will enable the Redis
+transport instead of RabbitMQ, e.g. `{"transport": {"name": "redis"}}`.
+
+Round-robin client subscriptions, allowing check requests to be sent to a
+single client in a subscription in a round-robin fashion. To create a
+round-robin subscription, start its name with `roundrobin:` to specify the
+type, e.g. "roundrobin:elasticsearch". Any check that targets the
+"roundrobin:elasticsearch" subscription will have its check requests sent
+to clients in a round-robin fashion.
+
+Stale check result detection, using a defined check `ttl` and stored check
+results. Sensu is now able to monitor check results, ensuring that checks
+with a defined TTL (time to live) continue to be executed by clients. For
+example, a standalone check could have an interval of 30 seconds and a ttl
+of 50 seconds, Sensu would expect a result at least once every 50 seconds.
+
+Check results API routes/endpoints: `/results`, `/results/:client`, and
+`/results/:client/:check`. These new check result API routes/endpoints
+enable new tooling, such as green light dashboards.
+
 ## 0.18.1 - 2015-05-11
 
 ### Other

data/lib/sensu/api/process.rb

@@ -725,6 +725,67 @@ module Sensu
           end
         end
       end
+
+      aget "/results/?" do
+        response = Array.new
+        settings.redis.smembers("clients") do |clients|
+          unless clients.empty?
+            clients.each_with_index do |client_name, client_index|
+              settings.redis.smembers("result:#{client_name}") do |checks|
+                unless checks.empty?
+                  checks.each_with_index do |check_name, check_index|
+                    result_key = "result:#{client_name}:#{check_name}"
+                    settings.redis.get(result_key) do |result_json|
+                      check = MultiJson.load(result_json)
+                      response << {:client => client_name, :check => check}
+                      if client_index == clients.size - 1 && check_index == checks.size - 1
+                        body MultiJson.dump(response)
+                      end
+                    end
+                  end
+                else
+                  body MultiJson.dump(response)
+                end
+              end
+            end
+          else
+            body MultiJson.dump(response)
+          end
+        end
+      end
+
+      aget %r{^/results?/([\w\.-]+)/?$} do |client_name|
+        response = Array.new
+        settings.redis.smembers("result:#{client_name}") do |checks|
+          unless checks.empty?
+            checks.each_with_index do |check_name, check_index|
+              result_key = "result:#{client_name}:#{check_name}"
+              settings.redis.get(result_key) do |result_json|
+                check = MultiJson.load(result_json)
+                response << {:client => client_name, :check => check}
+                if check_index == checks.size - 1
+                  body MultiJson.dump(response)
+                end
+              end
+            end
+          else
+            not_found!
+          end
+        end
+      end
+
+      aget %r{^/results?/([\w\.-]+)/([\w\.-]+)/?$} do |client_name, check_name|
+        result_key = "result:#{client_name}:#{check_name}"
+        settings.redis.get(result_key) do |result_json|
+          unless result_json.nil?
+            check = MultiJson.load(result_json)
+            response = {:client => client_name, :check => check}
+            body MultiJson.dump(response)
+          else
+            not_found!
+          end
+        end
+      end
     end
   end
 end

data/lib/sensu/client/process.rb

@@ -233,20 +233,42 @@ module Sensu
         end
       end
 
+      # Determine the Sensu transport subscribe options for a
+      # subscription. If a subscription begins with a transport pipe
+      # type, either "direct:" or "roundrobin:", the subscription uses
+      # a direct transport pipe, and the subscription name is used for
+      # both the pipe and the funnel names. If a subscription does not
+      # specify a transport pipe type, a fanout transport pipe is
+      # used, the subscription name is used for the pipe, and a unique
+      # funnel is created for the Sensu client. The unique funnel name
+      # for the Sensu client is created using a combination of the
+      # client name, the Sensu version, and the process start time
+      # (epoch).
+      #
+      # @param subscription [String]
+      # @return [Array] containing the transport subscribe options:
+      #   the transport pipe type, pipe, and funnel.
+      def transport_subscribe_options(subscription)
+        _, raw_type = subscription.split(":", 2).reverse
+        case raw_type
+        when "direct", "roundrobin"
+          [:direct, subscription, subscription]
+        else
+          funnel = [@settings[:client][:name], VERSION, start_time].join("-")
+          [:fanout, subscription, funnel]
+        end
+      end
+
       # Set up Sensu client subscriptions. Subscriptions determine the
-      # kinds of check requests the client will receive. A unique
-      # transport funnel is created for the Sensu client, using a
-      # combination of it's name, the Sensu version, and the current
-      # timestamp (epoch). The unique funnel is bound to each
-      # transport pipe, named after the client subscription. The Sensu
+      # kinds of check requests the client will receive. The Sensu
       # client will receive JSON serialized check requests from its
-      # funnel, that get parsed and processed.
+      # subscriptions, that get parsed and processed.
       def setup_subscriptions
         @logger.debug("subscribing to client subscriptions")
         @settings[:client][:subscriptions].each do |subscription|
           @logger.debug("subscribing to a subscription", :subscription => subscription)
-          funnel = [@settings[:client][:name], VERSION, Time.now.to_i].join("-")
-          @transport.subscribe(:fanout, subscription, funnel) do |message_info, message|
+          options = transport_subscribe_options(subscription)
+          @transport.subscribe(*options) do |message_info, message|
             begin
               check = MultiJson.load(message)
               @logger.info("received check request", :check => check)

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -4,10 +4,10 @@ gem "multi_json", "1.11.0"
 
 gem "sensu-em", "2.4.1"
 gem "sensu-logger", "1.0.0"
-gem "sensu-settings", "1.8.0"
+gem "sensu-settings", "1.9.0"
 gem "sensu-extension", "1.1.2"
 gem "sensu-extensions", "1.2.0"
-gem "sensu-transport", "2.4.0"
+gem "sensu-transport", "3.0.0"
 gem "sensu-spawn", "1.1.0"
 
 require "time"
@@ -31,13 +31,16 @@ module Sensu
   module Daemon
     include Utilities
 
-    # Initialize the Sensu process. Set the initial service state, set
-    # up the logger, load settings, load extensions, and optionally
-    # daemonize the process and/or create a PID file. A subclass may
-    # override this method.
+    attr_reader :start_time
+
+    # Initialize the Sensu process. Set the start time, initial
+    # service state, set up the logger, load settings, load
+    # extensions, and optionally daemonize the process and/or create a
+    # PID file. A subclass may override this method.
     #
     # @param options [Hash]
     def initialize(options={})
+      @start_time = Time.now.to_i
       @state = :initializing
       @timers = {:run => []}
       setup_logger(options)

data/lib/sensu/redis.rb

@@ -1,6 +1,6 @@
-gem "em-redis-unified", "0.6.0"
+gem "em-redis-unified", "1.0.0"
 
-require "em-redis"
+require "em-redis-unified"
 
 module Sensu
   class Redis

data/lib/sensu/server/process.rb

@@ -436,6 +436,26 @@ module Sensu
         end
       end
 
+      # Determine the Sensu transport publish options for a
+      # subscription. If a subscription begins with a transport pipe
+      # type, either "direct:" or "roundrobin:", the subscription uses
+      # a direct transport pipe. If a subscription does not specify a
+      # transport pipe type, a fanout transport pipe is used.
+      #
+      # @param subscription [String]
+      # @return [Array] containing the transport publish options:
+      #   the transport pipe type, pipe, and the message to be
+      #   published.
+      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
+
       # 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
@@ -456,7 +476,8 @@ module Sensu
           :subscribers => check[:subscribers]
         })
         check[:subscribers].each do |subscription|
-          @transport.publish(:fanout, subscription, MultiJson.dump(payload)) do |info|
+          options = transport_publish_options(subscription, MultiJson.dump(payload))
+          @transport.publish(*options) do |info|
             if info[:error]
               @logger.error("failed to publish check request", {
                 :subscription => subscription,
@@ -527,11 +548,11 @@ module Sensu
       # serialization is used when publishing the check result payload
       # to the transport pipe. Transport errors are logged.
       #
-      # @param client [Hash]
+      # @param client_name [String]
       # @param check [Hash]
-      def publish_check_result(client, check)
+      def publish_check_result(client_name, check)
         payload = {
-          :client => client[:name],
+          :client => client_name,
           :check => check
         }
         @logger.debug("publishing check result", :payload => payload)
@@ -606,7 +627,7 @@ module Sensu
                   check[:output] << "#{time_since_last_keepalive} seconds ago"
                   check[:status] = 0
                 end
-                publish_check_result(client, check)
+                publish_check_result(client[:name], check)
               end
             end
           end
@@ -623,6 +644,50 @@ module Sensu
         end
       end
 
+      # Determine stale check results, those that have not executed in
+      # a specified amount of time (check TTL). This method iterates
+      # through the client registry and check results for checks with
+      # a defined TTL value (in seconds). If a check result has a
+      # defined TTL, the time since last check execution (in seconds)
+      # is calculated. If the time since last execution is equal to or
+      # greater than the check TTL, a warning check result is
+      # published with the appropriate check output.
+      def determine_stale_check_results
+        @logger.info("determining stale check results")
+        @redis.smembers("clients") do |clients|
+          clients.each do |client_name|
+            @redis.smembers("result:#{client_name}") do |checks|
+              checks.each do |check_name|
+                result_key = "#{client_name}:#{check_name}"
+                @redis.get("result:#{result_key}") do |result_json|
+                  unless result_json.nil?
+                    check = MultiJson.load(result_json)
+                    next unless check[:ttl] && check[:executed]
+                    time_since_last_execution = Time.now.to_i - check[:executed]
+                    if time_since_last_execution >= check[:ttl]
+                      check[:output] = "Last check execution was "
+                      check[:output] << "#{time_since_last_execution} seconds ago"
+                      check[:status] = 1
+                      publish_check_result(client_name, check)
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
+      # Set up the check result monitor, a periodic timer to run
+      # `determine_stale_check_results()` every 30 seconds. The timer
+      # is stored in the timers hash under `:leader`.
+      def setup_check_result_monitor
+        @logger.debug("monitoring check results")
+        @timers[:leader] << EM::PeriodicTimer.new(30) do
+          determine_stale_check_results
+        end
+      end
+
       # Prune check result aggregations (aggregates). Sensu only
       # stores the 20 latest aggregations for a check, to keep the
       # amount of data stored to a minimum.
@@ -672,6 +737,7 @@ module Sensu
       def leader_duties
         setup_check_request_publisher
         setup_client_monitor
+        setup_check_result_monitor
         setup_check_result_aggregation_pruner
       end
 

data/sensu.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.add_dependency "eventmachine", "1.0.3"
   s.add_dependency "sensu-em", "2.4.1"
   s.add_dependency "sensu-logger", "1.0.0"
-  s.add_dependency "sensu-settings", "1.8.0"
+  s.add_dependency "sensu-settings", "1.9.0"
   s.add_dependency "sensu-extension", "1.1.2"
   s.add_dependency "sensu-extensions", "1.2.0"
-  s.add_dependency "sensu-transport", "2.4.0"
+  s.add_dependency "sensu-transport", "3.0.0"
   s.add_dependency "sensu-spawn", "1.1.0"
-  s.add_dependency "em-redis-unified", "0.6.0"
+  s.add_dependency "em-redis-unified", "1.0.0"
   s.add_dependency "sinatra", "1.4.6"
   s.add_dependency "async_sinatra", "1.2.0"
   s.add_dependency "thin", "1.5.0" unless RUBY_PLATFORM =~ /java/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0.beta
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sensu-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -297,9 +297,9 @@ 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.2.2