sensu 0.29.0 → 1.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31731ea9a2311f9aecc12057e03442fb2dffca7e
-  data.tar.gz: ee7b95c65a89a73693717c5220bf7a515ee54634
+  metadata.gz: b1bd5a84798800c4931deb2ea2d3c1683f9759a7
+  data.tar.gz: c6c83bcba2fbac47d21e3979b3f10299b42b1ec4
 SHA512:
-  metadata.gz: b1a0e54b2e28998c7653b78f54278ec6f28c2a716fedfc8ab24b59108d33ff9998d60b77776c05e48e556b1decf43c15a2c95ee06842528ae3671cbd7957349a
-  data.tar.gz: d7ed4d7d2cb4794ab2933237d383eb37331dda2adaed120117c25ce36cacb7d4a4cd6e8249439d5f08c1ed52e2e63b5e48e2594603078bcf9f120ca6a52d936b
+  metadata.gz: 1957e35b7dd9c97401d94862937a44d2fa6c92e78355088c45612a095185f692575fe8593b3edb9245e6ce904b7f6d78cb5bde4abd5a4c1b256b9b8879368fde
+  data.tar.gz: 672728ffed2a8e2760d7708b61e400b4fbf217996551d32ac87a647f33a764809169d7965e99204a8bd3429af659966cf897d3e92ddb3e9813d92a25eb7de2c5

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.0.0 - TBD
+
+### Other
+
+Improved Sensu client keepalive configuration validation, now including
+coverage for low/high flap thresholds etc.
+
+Improved Sensu client socket check result validation, now including
+coverage for low/high flap thresholds etc.
+
+The `sensu-install` tool now notifies users when it is unable to
+successfully install an extension, when the environment variable
+EMBEDDED_RUBY is set to `false`.
+
+Added the Sensu `RELEASE_INFO` constant, containing information about the
+Sensu release, used by the API `/info` endpoint and Server registration.
+
+### Fixes
+
+Sensu handler severities filtering now accounts for flapping events.
+
+Fixed Sensu Redis connection on error reconnect, no longer reusing the
+existing EventMachine connection handler.
+
 ## 0.29.0 - 2017-03-29
 
 ### Features

data/exe/sensu-install

@@ -148,6 +148,11 @@ module Sensu
       end
 
       def install_extensions(extensions, options={})
+        if ENV["EMBEDDED_RUBY"] == "false"
+          log "EMBEDDED_RUBY must be set to true in order to install extensions"
+          log "failed to install extensions: #{extensions}"
+          exit 2
+        end
         log "installing Sensu extensions ..."
         log "provided Sensu extensions: #{extensions}" if options[:verbose]
         extension_gems = extensions.map do |extension|

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

@@ -14,13 +14,13 @@ module Sensu
         def get_info
           transport_info do |transport|
             servers_info do |servers|
+              sensu = RELEASE_INFO.merge(
+                :settings => {
+                  :hexdigest => @settings.hexdigest
+                }
+              )
               @response_content = {
-                :sensu => {
-                  :version => VERSION,
-                  :settings => {
-                    :hexdigest => @settings.hexdigest
-                  }
-                },
+                :sensu => sensu,
                 :transport => transport,
                 :redis => {
                   :connected => @redis.connected?

data/lib/sensu/client/utils.rb

@@ -1,18 +1,18 @@
 require "sensu/json"
+require "sensu/client/validators/check"
 
 module Sensu
   module Client
     module CheckUtils
       class DataError < StandardError; end
+
       # Validate check result attributes.
       #
       # @param [Hash] check result to validate.
       def validate_check_result(check)
-        unless check[:name] =~ /\A[\w\.-]+\z/
-          raise DataError, "check name must be a string and cannot contain spaces or special characters"
-        end
-        unless check[:source].nil? || check[:source] =~ /\A[\w\.-]+\z/
-          raise DataError, "check source must be a string and cannot contain spaces or special characters"
+        validator = Validators::Check.new
+        unless validator.valid?(check)
+          raise DataError, validator.failures.first[:message]
         end
         unless check[:output].is_a?(String)
           raise DataError, "check output must be a string"
@@ -23,9 +23,6 @@ module Sensu
         unless check[:executed].is_a?(Integer)
           raise DataError, "check executed timestamp must be an integer"
         end
-        unless check[:ttl].nil? || (check[:ttl].is_a?(Integer) && check[:ttl] > 0)
-          raise DataError, "check ttl must be an integer greater than 0"
-        end
       end
 
       # Process a check result. Set check result attribute defaults,

data/lib/sensu/client/validators/check.rb

@@ -0,0 +1,46 @@
+require "sensu/settings/rules"
+require "sensu/settings/validators/check"
+
+module Sensu
+  module Client
+    module Validators
+      class Check
+        # Include Sensu Settings rules and check validator.
+        include Sensu::Settings::Rules
+        include Sensu::Settings::Validators::Check
+
+        attr_reader :failures
+
+        def initialize
+          @failures = []
+        end
+
+        # Determine if a check definition is valid.
+        #
+        # @param client [Hash]
+        # @return [TrueClass, FalseClass]
+        def valid?(check)
+          validate_check_name(check)
+          validate_check_source(check) if check[:source]
+          validate_check_handling(check)
+          validate_check_ttl(check) if check[:ttl]
+          validate_check_aggregate(check)
+          validate_check_flap_detection(check)
+          @failures.empty?
+        end
+
+        private
+
+        # This method is called when `validate_check()` encounters an
+        # invalid definition object. This method adds definition
+        # validation failures to `@failures`.
+        def invalid(object, message)
+          @failures << {
+            :object => object,
+            :message => message
+          }
+        end
+      end
+    end
+  end
+end

data/lib/sensu/constants.rb

@@ -1,7 +1,12 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.29.0".freeze
+    VERSION = "1.0.0.alpha.1".freeze
+
+    # Sensu release information.
+    RELEASE_INFO = {
+      :version => VERSION
+    }
 
     # Sensu check severities.
     SEVERITIES = %w[ok warning critical unknown].freeze

data/lib/sensu/daemon.rb

@@ -4,12 +4,12 @@ gem "eventmachine", "1.2.2"
 
 gem "sensu-json", "2.1.0"
 gem "sensu-logger", "1.2.1"
-gem "sensu-settings", "10.0.0"
+gem "sensu-settings", "10.2.0"
 gem "sensu-extension", "1.5.1"
 gem "sensu-extensions", "1.9.0"
 gem "sensu-transport", "7.0.2"
 gem "sensu-spawn", "2.2.1"
-gem "sensu-redis", "2.1.1"
+gem "sensu-redis", "2.2.0"
 
 require "time"
 require "uri"

data/lib/sensu/server/filter.rb

@@ -38,8 +38,11 @@ module Sensu
       # handle, using the definition attribute `:severities`. The
       # possible severities are "ok", "warning", "critical", and
       # "unknown". Handler severity filtering is bypassed when the
-      # event `:action` is `:resolve`, if the check history contains
-      # one of the specified severities since the last OK result.
+      # event `:action` is `:resolve` and a previous check history
+      # status identifies a severity specified in the handler
+      # definition. It's possible for a check history status of 0 to
+      # have had the flapping action, so we are unable to consider
+      # every past 0 to indicate a resolution.
       #
       # @param handler [Hash] definition.
       # @param event [Hash]
@@ -48,10 +51,7 @@ module Sensu
         if handler.has_key?(:severities)
           case event[:action]
           when :resolve
-            event[:check][:history].reverse[1..-1].any? do |status|
-              if status.to_i == 0
-                break false
-              end
+            event[:check][:history].any? do |status|
               severity = SEVERITIES[status.to_i] || "unknown"
               handler[:severities].include?(severity)
             end

data/lib/sensu/server/process.rb

@@ -434,11 +434,18 @@ module Sensu
       # @return [TrueClass, FalseClass]
       def check_flapping?(stored_event, check)
         if check.has_key?(:low_flap_threshold) && check.has_key?(:high_flap_threshold)
-          was_flapping = stored_event && stored_event[:action] == EVENT_FLAPPING_ACTION
-          if was_flapping
-            check[:total_state_change] > check[:low_flap_threshold]
+          if check[:low_flap_threshold].is_a?(Integer) && check[:high_flap_threshold].is_a?(Integer)
+            was_flapping = stored_event && stored_event[:action] == EVENT_FLAPPING_ACTION
+            if was_flapping
+              check[:total_state_change] > check[:low_flap_threshold]
+            else
+              check[:total_state_change] >= check[:high_flap_threshold]
+            end
           else
-            check[:total_state_change] >= check[:high_flap_threshold]
+            details = {:check => check}
+            details[:client] = stored_event[:client] if stored_event
+            @logger.error("invalid check flap thresholds", details)
+            false
           end
         else
           false
@@ -1290,6 +1297,11 @@ module Sensu
       def update_server_registry
         @logger.debug("updating the server registry")
         process_cpu_times do |cpu_user, cpu_system, _, _|
+          sensu = RELEASE_INFO.merge(
+            :settings => {
+              :hexdigest => @settings.hexdigest
+            }
+          )
           info = {
             :id => server_id,
             :hostname => system_hostname,
@@ -1301,12 +1313,7 @@ module Sensu
                 :system => cpu_system
               }
             },
-            :sensu => {
-              :version => VERSION,
-              :settings => {
-                :hexdigest => @settings.hexdigest
-              }
-            },
+            :sensu => sensu,
             :timestamp => Time.now.to_i
           }
           @redis.sadd("servers", server_id)

data/sensu.gemspec

@@ -15,12 +15,12 @@ Gem::Specification.new do |s|
   s.add_dependency "eventmachine", "1.2.2"
   s.add_dependency "sensu-json", "2.1.0"
   s.add_dependency "sensu-logger", "1.2.1"
-  s.add_dependency "sensu-settings", "10.0.0"
+  s.add_dependency "sensu-settings", "10.2.0"
   s.add_dependency "sensu-extension", "1.5.1"
   s.add_dependency "sensu-extensions", "1.9.0"
   s.add_dependency "sensu-transport", "7.0.2"
   s.add_dependency "sensu-spawn", "2.2.1"
-  s.add_dependency "sensu-redis", "2.1.1"
+  s.add_dependency "sensu-redis", "2.2.0"
   s.add_dependency "em-http-server", "0.1.8"
   s.add_dependency "parse-cron", "0.1.4"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 1.0.0.alpha.1
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 10.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 10.2.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.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: em-http-server
   requirement: !ruby/object:Gem::Requirement
@@ -269,6 +269,7 @@ files:
 - lib/sensu/client/process.rb
 - lib/sensu/client/socket.rb
 - lib/sensu/client/utils.rb
+- lib/sensu/client/validators/check.rb
 - lib/sensu/constants.rb
 - lib/sensu/daemon.rb
 - lib/sensu/sandbox.rb
@@ -294,12 +295,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.3
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A monitoring framework