sensu 0.23.3 → 0.24.0.beta

data/lib/sensu/daemon.rb

@@ -2,14 +2,14 @@ require "rubygems"
 
 gem "eventmachine", "1.2.0.1"
 
-gem "sensu-json", "1.1.1"
+gem "sensu-json", "2.0.0"
 gem "sensu-logger", "1.2.0"
-gem "sensu-settings", "3.4.0"
+gem "sensu-settings", "5.1.0"
 gem "sensu-extension", "1.5.0"
 gem "sensu-extensions", "1.5.0"
-gem "sensu-transport", "5.0.0"
+gem "sensu-transport", "6.0.0"
 gem "sensu-spawn", "2.2.0"
-gem "sensu-redis", "1.3.0"
+gem "sensu-redis", "1.4.0"
 
 require "time"
 require "uri"
@@ -49,6 +49,7 @@ module Sensu
       setup_logger(options)
       load_settings(options)
       load_extensions(options)
+      setup_spawn
       setup_process(options)
     end
 
@@ -64,56 +65,78 @@ module Sensu
       @logger.setup_signal_traps
     end
 
-    # Log setting or extension loading concerns, sensitive information
+    # Log setting or extension loading notices, sensitive information
     # is redacted.
     #
-    # @param concerns [Array] to be logged.
-    # @param level [Symbol] to log the concerns at.
-    def log_concerns(concerns=[], level=:warn)
-      concerns.each do |concern|
+    # @param notices [Array] to be logged.
+    # @param level [Symbol] to log the notices at.
+    def log_notices(notices=[], level=:warn)
+      notices.each do |concern|
         message = concern.delete(:message)
         @logger.send(level, message, redact_sensitive(concern))
       end
     end
 
-    # Print the Sensu settings and immediately exit the process. This
-    # method is used while troubleshooting configuration issues,
-    # triggered by a CLI argument, e.g. `--print_config`. Sensu
-    # settings with sensitive values (e.g. passwords) are first
-    # redacted.
+    # Determine if the Sensu settings are valid, if there are load or
+    # validation errors, and immediately exit the process with the
+    # appropriate exit status code. This method is used to determine
+    # if the latest configuration changes are valid prior to
+    # restarting the Sensu service, triggered by a CLI argument, e.g.
+    # `--validate_config`.
     #
     # @param settings [Object]
-    def print_settings(settings)
+    def validate_settings!(settings)
+      if settings.errors.empty?
+        puts "configuration is valid"
+        exit
+      else
+        puts "configuration is invalid"
+        puts Sensu::JSON.dump({:errors => @settings.errors}, :pretty => true)
+        exit 2
+      end
+    end
+
+    # Print the Sensu settings (JSON) to STDOUT and immediately exit
+    # the process with the appropriate exit status code. This method
+    # is used while troubleshooting configuration issues, triggered by
+    # a CLI argument, e.g. `--print_config`. Sensu settings with
+    # sensitive values (e.g. passwords) are first redacted.
+    #
+    # @param settings [Object]
+    def print_settings!(settings)
       redacted_settings = redact_sensitive(settings.to_hash)
       @logger.warn("outputting compiled configuration and exiting")
       puts Sensu::JSON.dump(redacted_settings, :pretty => true)
-      exit
+      exit(settings.errors.empty? ? 0 : 2)
     end
 
-    # Load Sensu settings and validate them. If there are validation
-    # failures, log them (concerns), then cause the Sensu process to
-    # exit (2). This method creates the settings instance variable:
-    # `@settings`. If the `print_config` option is true, this method
-    # calls `print_settings()` to output the compiled configuration
-    # settings and then exit the process.
+    # Load Sensu settings. This method creates the settings instance
+    # variable: `@settings`. If the `validate_config` option is true,
+    # this method calls `validate_settings!()` to validate the latest
+    # compiled configuration settings and will then exit the process.
+    # If the `print_config` option is true, this method calls
+    # `print_settings!()` to output the compiled configuration
+    # settings and will then exit the process. If there are loading or
+    # validation errors, they will be logged (notices), and this
+    # method will exit(2) the process.
+    #
     #
     # https://github.com/sensu/sensu-settings
     #
     # @param options [Hash]
     def load_settings(options={})
       @settings = Settings.get(options)
-      log_concerns(@settings.warnings)
-      failures = @settings.validate
-      unless failures.empty?
-        @logger.fatal("invalid settings")
-        log_concerns(failures, :fatal)
+      validate_settings!(@settings) if options[:validate_config]
+      log_notices(@settings.warnings)
+      log_notices(@settings.errors, :fatal)
+      print_settings!(@settings) if options[:print_config]
+      unless @settings.errors.empty?
         @logger.fatal("SENSU NOT RUNNING!")
         exit 2
       end
-      print_settings(@settings) if options[:print_config]
     end
 
-    # Load Sensu extensions and log any concerns. Set the logger and
+    # Load Sensu extensions and log any notices. Set the logger and
     # settings for each extension instance. This method creates the
     # extensions instance variable: `@extensions`.
     #
@@ -123,7 +146,7 @@ module Sensu
     # @param options [Hash]
     def load_extensions(options={})
       @extensions = Extensions.get(options)
-      log_concerns(@extensions.warnings)
+      log_notices(@extensions.warnings)
       extension_settings = @settings.to_hash.dup
       @extensions.all.each do |extension|
         extension.logger = @logger
@@ -131,6 +154,20 @@ module Sensu
       end
     end
 
+    # Set up Sensu spawn, creating a worker to create, control, and
+    # limit spawned child processes. This method adjusts the
+    # EventMachine thread pool size to accommodate the concurrent
+    # process spawn limit and other Sensu process operations.
+    #
+    # https://github.com/sensu/sensu-spawn
+    def setup_spawn
+      @logger.info("configuring sensu spawn", :settings => @settings[:sensu][:spawn])
+      threadpool_size = @settings[:sensu][:spawn][:limit] + 10
+      @logger.debug("setting eventmachine threadpool size", :size => threadpool_size)
+      EM.threadpool_size = threadpool_size
+      Spawn.setup(@settings[:sensu][:spawn])
+    end
+
     # Manage the current process, optionally daemonize and/or write
     # the current process ID to a PID file.
     #

data/lib/sensu/server/filter.rb

@@ -345,14 +345,14 @@ module Sensu
         end
         if filter_message
           @logger.info(filter_message, details)
-          @handling_event_count -= 1 if @handling_event_count
+          @in_progress[:events] -= 1 if @in_progress
         else
           event_filtered?(handler, event) do |filtered|
             unless filtered
               yield(event)
             else
               @logger.info("event was filtered", details)
-              @handling_event_count -= 1 if @handling_event_count
+              @in_progress[:events] -= 1 if @in_progress
             end
           end
         end

data/lib/sensu/server/handle.rb

@@ -4,7 +4,7 @@ module Sensu
   module Server
     module Handle
       # Create a handler error callback, for logging the error and
-      # decrementing the `@handling_event_count` by `1`.
+      # decrementing the `@in_progress[:events]` by `1`.
       #
       # @param handler [Object]
       # @param event_data [Object]
@@ -16,14 +16,14 @@ module Sensu
             :event_data => event_data,
             :error => error.to_s
           })
-          @handling_event_count -= 1 if @handling_event_count
+          @in_progress[:events] -= 1 if @in_progress
         end
       end
 
       # Execute a pipe event handler, using the defined handler
       # command to spawn a process, passing it event data via STDIN.
       # Log the handler output lines and decrement the
-      # `@handling_event_count` by `1` when the handler executes
+      # `@in_progress[:events]` by `1` when the handler executes
       # successfully.
       #
       # @param handler [Hash] definition.
@@ -36,7 +36,7 @@ module Sensu
             :handler => handler,
             :output => output.split("\n+")
           })
-          @handling_event_count -= 1 if @handling_event_count
+          @in_progress[:events] -= 1 if @in_progress
         end
       end
 
@@ -47,7 +47,7 @@ module Sensu
       # `handler_error()` method is used to create the `on_error`
       # callback for the connection handler. The `on_error` callback
       # is call in the event of any error(s). The
-      # `@handling_event_count` is decremented by `1` when the data is
+      # `@in_progress[:events]` is decremented by `1` when the data is
       # transmitted successfully, `on_success`.
       #
       # @param handler [Hash] definition.
@@ -57,7 +57,7 @@ module Sensu
         begin
           EM::connect(handler[:socket][:host], handler[:socket][:port], Socket) do |socket|
             socket.on_success = Proc.new do
-              @handling_event_count -= 1 if @handling_event_count
+              @in_progress[:events] -= 1 if @in_progress
             end
             socket.on_error = on_error
             timeout = handler[:timeout] || 10
@@ -71,7 +71,7 @@ module Sensu
       end
 
       # Transmit event data to a UDP socket, then close the
-      # connection. The `@handling_event_count` is decremented by `1`
+      # connection. The `@in_progress[:events]` is decremented by `1`
       # when the data is assumed to have been transmitted.
       #
       # @param handler [Hash] definition.
@@ -81,7 +81,7 @@ module Sensu
           EM::open_datagram_socket("0.0.0.0", 0, nil) do |socket|
             socket.send_datagram(event_data.to_s, handler[:socket][:host], handler[:socket][:port])
             socket.close_connection_after_writing
-            @handling_event_count -= 1 if @handling_event_count
+            @in_progress[:events] -= 1 if @in_progress
           end
         rescue => error
           handler_error(handler, event_data).call(error)
@@ -90,7 +90,7 @@ module Sensu
 
       # Publish event data to a Sensu transport pipe. Event data that
       # is `nil` or empty will not be published, to prevent transport
-      # errors. The `@handling_event_count` is decremented by `1`,
+      # errors. The `@in_progress[:events]` is decremented by `1`,
       # even if the event data is not published.
       #
       # @param handler [Hash] definition.
@@ -105,14 +105,14 @@ module Sensu
             end
           end
         end
-        @handling_event_count -= 1 if @handling_event_count
+        @in_progress[:events] -= 1 if @in_progress
       end
 
       # Run a handler extension, within the Sensu EventMachine reactor
       # (event loop). The extension API `safe_run()` method is used to
       # guard against most errors. The `safe_run()` callback is always
       # called, logging the extension run output and status, and
-      # decrementing the `@handling_event_count` by `1`.
+      # decrementing the `@in_progress[:events]` by `1`.
       #
       # @param handler [Hash] definition.
       # @param event_data [Object] to pass to the handler extension.
@@ -123,7 +123,7 @@ module Sensu
             :output => output,
             :status => status
           })
-          @handling_event_count -= 1 if @handling_event_count
+          @in_progress[:events] -= 1 if @in_progress
         end
       end
 

data/lib/sensu/server/mutate.rb

@@ -6,7 +6,7 @@ module Sensu
       # created callback can be used for standard mutators and mutator
       # extensions. The provided callback will only be called when the
       # mutator status is `0` (OK). If the status is not `0`, an error
-      # is logged, and the `@handling_event_count` is decremented by
+      # is logged, and the `@in_progress[:events]` is decremented by
       # `1`.
       #
       # @param mutator [Object] definition or extension.
@@ -25,7 +25,7 @@ module Sensu
               :output => output,
               :status => status
             })
-            @handling_event_count -= 1 if @handling_event_count
+            @in_progress[:events] -= 1 if @in_progress
           end
         end
       end
@@ -63,7 +63,7 @@ module Sensu
       # mutator is used, unless the handler specifies another mutator.
       # If a mutator does not exist, not defined or a missing
       # extension, an error will be logged and the
-      # `@handling_event_count` is decremented by `1`. This method
+      # `@in_progress[:events]` is decremented by `1`. This method
       # first checks for the existence of a standard mutator, then
       # checks for an extension if a standard mutator is not defined.
       #
@@ -84,7 +84,7 @@ module Sensu
           @logger.error("unknown mutator", {
             :mutator_name => mutator_name
           })
-          @handling_event_count -= 1 if @handling_event_count
+          @in_progress[:events] -= 1 if @in_progress
         end
       end
     end