sensu 0.17.2 → 0.18.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a0fac0647fef9c4dad920c91d477e0aac3ccefe
-  data.tar.gz: f0ba6869b8a2e76e9c9a673332a87af8f9b30262
+  metadata.gz: 3562490d63bf32fe403bb3395f673b9be6ffd4e4
+  data.tar.gz: ba043f59f239c29b9d8353d29ca892c6a3400384
 SHA512:
-  metadata.gz: 10ccf9155bbda665fe9c8b590cb93bc413e1825324069d00187d58466dd9a86ad0a6d99608796aabeaa39b3c1daac6b49e3d6612c7b4bf875c1a88c5e61d5186
-  data.tar.gz: 8ece96457154d1d64fab3516afc527c5690397e84ad2d3c412ae25c1c7b1c467eba9f374da2cde8c4daa9bef1625bdc17ac7ad6b99beb469d6504b7a6db31170
+  metadata.gz: 0aae29a7af64355686413c1a4d6f108a1c59276312f31755065a5901faf5a5c508a9514b04e98e9942a651877b1d375a8ab9e3a6ba75e461310dded889c35b50
+  data.tar.gz: d0cbbbd0000a734f411a4cdc5a396a40bb281cfcdbd77b009bc61365045de95eef0937a2ff169b25c76cea89b3371cb56a2779cfad31a817d04cccee0b2f57da

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.18.0 - TBD
+
+### Features
+
+Dynamic (or JIT) client creation (in the registry) for check results for a
+nonexistent client or a check source. Sensu clients can now monitor an
+external resource on its behalf, using a check `source` to create a JIT
+client for the resource, used to store the execution history and provide
+context within event data. JIT client data in the registry can be
+managed/updated via the Sensu API, POST `/clients`.
+
+Storing the latest check result for every client/check pair. This data is
+currently exposed via the API at `/clients/:client/history` and will be
+used by several upcoming features.
+
 ## 0.17.2 - 2015-04-08
 
 ### Other

data/lib/sensu/api/process.rb

@@ -170,7 +170,9 @@ module Sensu
           begin
             data = MultiJson.load(env["rack.input"].read)
             valid = rules.all? do |key, rule|
-              data[key].is_a?(rule[:type]) || (rule[:nil_ok] && data[key].nil?)
+              value = data[key]
+              (value.is_a?(rule[:type]) || (rule[:nil_ok] && value.nil?)) &&
+                rule[:regex].nil? || (rule[:regex] && (value =~ rule[:regex]) == 0)
             end
             if valid
               callback.call(data)
@@ -302,6 +304,23 @@ module Sensu
         end
       end
 
+      apost "/clients/?" do
+        rules = {
+          :name => {:type => String, :nil_ok => false, :regex => /^[\w\.-]+$/},
+          :address => {:type => String, :nil_ok => false},
+          :subscriptions => {:type => Array, :nil_ok => false}
+        }
+        read_data(rules) do |data|
+          data[:keepalives] = false
+          data[:timestamp] = Time.now.to_i
+          settings.redis.set("client:#{data[:name]}", MultiJson.dump(data)) do
+            settings.redis.sadd("clients", data[:name]) do
+              created!(MultiJson.dump(:name => data[:name]))
+            end
+          end
+        end
+      end
+
       aget "/clients/?" do
         response = Array.new
         settings.redis.smembers("clients") do |clients|
@@ -333,22 +352,25 @@ module Sensu
 
       aget %r{/clients/([\w\.-]+)/history/?$} do |client_name|
         response = Array.new
-        settings.redis.smembers("history:#{client_name}") do |checks|
+        settings.redis.smembers("result:#{client_name}") do |checks|
           unless checks.empty?
             checks.each_with_index do |check_name, index|
-              history_key = "history:#{client_name}:#{check_name}"
+              result_key = "#{client_name}:#{check_name}"
+              history_key = "history:#{result_key}"
               settings.redis.lrange(history_key, -21, -1) do |history|
                 history.map! do |status|
                   status.to_i
                 end
-                execution_key = "execution:#{client_name}:#{check_name}"
-                settings.redis.get(execution_key) do |last_execution|
+                settings.redis.get("result:#{result_key}") do |result_json|
+                  result = MultiJson.load(result_json)
+                  last_execution = result[:executed]
                   unless history.empty? || last_execution.nil?
                     item = {
                       :check => check_name,
                       :history => history,
                       :last_execution => last_execution.to_i,
-                      :last_status => history.last
+                      :last_status => history.last,
+                      :last_result => result
                     }
                     response << item
                   end
@@ -373,18 +395,17 @@ module Sensu
               end
               EM::Timer.new(5) do
                 client = MultiJson.load(client_json)
-                settings.logger.info("deleting client", {
-                  :client => client
-                })
+                settings.logger.info("deleting client", :client => client)
                 settings.redis.srem("clients", client_name) do
                   settings.redis.del("client:#{client_name}")
                   settings.redis.del("events:#{client_name}")
-                  settings.redis.smembers("history:#{client_name}") do |checks|
+                  settings.redis.smembers("result:#{client_name}") do |checks|
                     checks.each do |check_name|
-                      settings.redis.del("history:#{client_name}:#{check_name}")
-                      settings.redis.del("execution:#{client_name}:#{check_name}")
+                      result_key = "#{client_name}:#{check_name}"
+                      settings.redis.del("result:#{result_key}")
+                      settings.redis.del("history:#{result_key}")
                     end
-                    settings.redis.del("history:#{client_name}")
+                    settings.redis.del("result:#{client_name}")
                   end
                 end
               end
@@ -428,7 +449,7 @@ module Sensu
               :subscribers => subscribers
             })
             subscribers.uniq.each do |exchange_name|
-              settings.transport.publish(:fanout, exchange_name, MultiJson.dump(payload)) do |info|
+              settings.transport.publish(:fanout, exchange_name.to_s, MultiJson.dump(payload)) do |info|
                 if info[:error]
                   settings.logger.error("failed to publish check request", {
                     :exchange_name => exchange_name,

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -4,7 +4,7 @@ gem "multi_json", "1.11.0"
 
 gem "sensu-em", "2.4.1"
 gem "sensu-logger", "1.0.0"
-gem "sensu-settings", "1.3.0"
+gem "sensu-settings", "1.4.0"
 gem "sensu-extension", "1.1.2"
 gem "sensu-extensions", "1.2.0"
 gem "sensu-transport", "2.4.0"

data/lib/sensu/server/process.rb

@@ -49,7 +49,7 @@ module Sensu
         @logger.debug("updating client registry", :client => client)
         @redis.set("client:#{client[:name]}", MultiJson.dump(client)) do
           @redis.sadd("clients", client[:name]) do
-            callback.call
+            callback.call(client)
           end
         end
       end
@@ -178,13 +178,16 @@ module Sensu
       # check execution across a number of Sensu clients. JSON
       # serialization is used for storing check result data.
       #
-      # @param result [Hash]
-      def aggregate_check_result(result)
-        @logger.debug("adding check result to aggregate", :result => result)
-        check = result[:check]
+      # @param client [Hash]
+      # @param check [Hash]
+      def aggregate_check_result(client, check)
+        @logger.debug("adding check result to aggregate", {
+          :client => client,
+          :check => check
+        })
         result_set = "#{check[:name]}:#{check[:issued]}"
         result_data = MultiJson.dump(:output => check[:output], :status => check[:status])
-        @redis.hset("aggregation:#{result_set}", result[:client], result_data) do
+        @redis.hset("aggregation:#{result_set}", client[:name], result_data) do
           SEVERITIES.each do |severity|
             @redis.hsetnx("aggregate:#{result_set}", severity, 0)
           end
@@ -199,31 +202,34 @@ module Sensu
         end
       end
 
-      # Store check result data. This method stores the 21 most recent
-      # check result statuses for a client/check pair, this history
-      # is used for event context and flap detection. The check
-      # execution timestamp is also stored, to provide an indication
-      # of how recent the data is.
+      # Store check result data. This method stores check result data
+      # and the 21 most recent check result statuses for a client/check
+      # pair, this history is used for event context and flap detection.
+      # The check execution timestamp is also stored, to provide an
+      # indication of how recent the data is.
       #
       # @param client [Hash]
       # @param check [Hash]
       # @param callback [Proc] to call when the check result data has
       #   been stored (history, etc).
       def store_check_result(client, check, &callback)
-        @redis.sadd("history:#{client[:name]}", check[:name])
+        @logger.debug("storing check result", :check => check)
+        @redis.sadd("result:#{client[:name]}", check[:name])
         result_key = "#{client[:name]}:#{check[:name]}"
-        history_key = "history:#{result_key}"
-        @redis.rpush(history_key, check[:status]) do
-          @redis.set("execution:#{result_key}", check[:executed])
-          @redis.ltrim(history_key, -21, -1)
-          callback.call
+        check_truncated = check.merge(:output => check[:output][0..256])
+        @redis.set("result:#{result_key}", MultiJson.dump(check_truncated)) do
+          history_key = "history:#{result_key}"
+          @redis.rpush(history_key, check[:status]) do
+            @redis.ltrim(history_key, -21, -1)
+            callback.call
+          end
         end
       end
 
       # Fetch the execution history for a client/check pair, the 21
       # most recent check result statuses. This method also calculates
       # the total state change percentage for the history, this value
-      # is use for check state flat detection, using a similar
+      # is use for check state flap detection, using a similar
       # algorithm to Nagios:
       # http://nagios.sourceforge.net/docs/3_0/flapping.html
       #
@@ -332,39 +338,73 @@ module Sensu
         end
       end
 
+      # Create a blank client (data) and add it to the client
+      # registry. Only the client name is known, the other client
+      # attributes must be updated via the API (POST /clients:client).
+      # Dynamically created clients and those updated via the API will
+      # have client keepalives disabled, `:keepalives` is set to
+      # `false`.
+      #
+      # @param name [Hash] to use for the client.
+      # @param callback [Proc] to be called with the dynamically
+      #   created client data.
+      def create_client(name, &callback)
+        client = {
+          :name => name,
+          :address => "unknown",
+          :subscriptions => [],
+          :keepalives => false
+        }
+        update_client_registry(client, &callback)
+      end
+
+      # Retrieve a client (data) from Redis if it exists. If a client
+      # does not already exist, create one (a blank) using the
+      # `client_key` as the client name. Dynamically create client
+      # data can be updated using the API (POST /clients/:client).
+      #
+      # @param result [Hash] data.
+      # @param callback [Proc] to be called with client data, either
+      #   retrieved from Redis, or dynamically created.
+      def retrieve_client(result, &callback)
+        client_key = result[:check][:source] || result[:client]
+        @redis.get("client:#{client_key}") do |client_json|
+          unless client_json.nil?
+            client = MultiJson.load(client_json)
+            callback.call(client)
+          else
+            create_client(client_key, &callback)
+          end
+        end
+      end
+
       # Process a check result, storing its data, inspecting its
       # contents, and taking the appropriate actions (eg. update the
       # event registry). A check result must have a valid client name,
-      # associated with a client in the registry. Results without a
-      # valid client are discarded, to keep the system "correct". If a
-      # local check definition exists for the check name, and the
-      # check result is not from a standalone check execution, it's
-      # merged with the check result for more context.
+      # associated with a client in the registry or one will be
+      # created. If a local check definition exists for the check
+      # name, and the check result is not from a standalone check
+      # execution, it's merged with the check result for more context.
       #
       # @param result [Hash] data.
       def process_check_result(result)
         @logger.debug("processing result", :result => result)
-        @redis.get("client:#{result[:client]}") do |client_json|
-          unless client_json.nil?
-            client = MultiJson.load(client_json)
-            check = case
-            when @settings.check_exists?(result[:check][:name]) && !result[:check][:standalone]
-              @settings[:checks][result[:check][:name]].merge(result[:check])
-            else
-              result[:check]
-            end
-            aggregate_check_result(result) if check[:aggregate]
-            store_check_result(client, check) do
-              check_history(client, check) do |history, total_state_change|
-                check[:history] = history
-                check[:total_state_change] = total_state_change
-                update_event_registry(client, check) do |event|
-                  process_event(event)
-                end
+        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
+          aggregate_check_result(client, check) if check[:aggregate]
+          store_check_result(client, check) do
+            check_history(client, check) do |history, total_state_change|
+              check[:history] = history
+              check[:total_state_change] = total_state_change
+              update_event_registry(client, check) do |event|
+                process_event(event)
               end
             end
-          else
-            @logger.warn("client not in registry", :client => result[:client])
           end
         end
       end
@@ -549,6 +589,7 @@ module Sensu
             @redis.get("client:#{client_name}") do |client_json|
               unless client_json.nil?
                 client = MultiJson.load(client_json)
+                next if client[:keepalives] == false
                 check = create_keepalive_check(client)
                 time_since_last_keepalive = Time.now.to_i - client[:timestamp]
                 check[:output] = "No keepalive sent from client for "

data/sensu.gemspec

@@ -19,7 +19,7 @@ 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.3.0"
+  s.add_dependency "sensu-settings", "1.4.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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0.beta
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-17 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.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   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