sensu 0.24.1 → 0.25.0.beta

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

@@ -0,0 +1,29 @@
+require "sensu/api/utilities/publish_check_result"
+
+module Sensu
+  module API
+    module Utilities
+      module ResolveEvent
+        include PublishCheckResult
+
+        # Resolve an event. This method publishes a check result with
+        # a check status of `0` (OK) to resolve the event. The
+        # published check result uses `force_resolve` to ensure the
+        # event is resolved and removed from the registry, even if the
+        # current event has an event action of `flapping` etc.
+        #
+        # @param event_json [String] JSON formatted event data.
+        def resolve_event(event_json)
+          event = Sensu::JSON.load(event_json)
+          check = event[:check].merge(
+            :output => "Resolving on request of the API",
+            :status => 0,
+            :force_resolve => true
+          )
+          check.delete(:history)
+          publish_check_result(event[:client][:name], check)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Sensu
+  module API
+    module Utilities
+      module TransportInfo
+        # Retreive the Sensu Transport info, if the API is connected
+        # to it, keepalive messages and consumers, and results
+        # messages and consumers.
+        #
+        # @yield [Hash] passes Transport info to the callback/block.
+        def transport_info
+          info = {
+            :keepalives => {
+              :messages => nil,
+              :consumers => nil
+            },
+            :results => {
+              :messages => nil,
+              :consumers => nil
+            },
+            :connected => @transport.connected?
+          }
+          if @transport.connected?
+            @transport.stats("keepalives") do |stats|
+              info[:keepalives] = stats
+              @transport.stats("results") do |stats|
+                info[:results] = stats
+                yield(info)
+              end
+            end
+          else
+            yield(info)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sensu/client/process.rb

@@ -373,6 +373,31 @@ module Sensu
         end
       end
 
+      # Create a check result intended for deregistering a client.
+      # Client definitions may contain `:deregistration` configuration,
+      # containing custom attributes and handler information. By
+      # default, the deregistration check result sets the `:handler` to
+      # `deregistration`. If the client provides its own `:deregistration`
+      # configuration, it's deep merged with the defaults. The
+      # check `:name`, `:output`, `:status`, `:issued`, and
+      # `:executed` values are always overridden to guard against
+      # an invalid definition.
+      def deregister
+        check = {:handler => "deregistration", :interval => 1}
+        if @settings[:client].has_key?(:deregistration)
+          check = deep_merge(check, @settings[:client][:deregistration])
+        end
+        timestamp = Time.now.to_i
+        overrides = {
+          :name => "deregistration",
+          :output => "client initiated deregistration",
+          :status => 1,
+          :issued => timestamp,
+          :executed => timestamp
+        }
+        publish_check_result(check.merge(overrides))
+      end
+
       # Close the Sensu client TCP and UDP sockets. This method
       # iterates through `@sockets`, which contains socket server
       # signatures (Fixnum) and connection objects. A signature
@@ -448,10 +473,12 @@ module Sensu
       # Stop the Sensu client process, pausing it, completing check
       # executions in progress, closing the transport connection, and
       # exiting the process (exit 0). After pausing the process, the
-      # process/daemon `@state` is set to `:stopping`.
+      # process/daemon `@state` is set to `:stopping`.  Also sends
+      # deregistration check result if configured to do so.
       def stop
         @logger.warn("stopping")
         pause
+        deregister if @settings[:client][:deregister] == true
         @state = :stopping
         complete_checks_in_progress do
           close_sockets

data/lib/sensu/client/socket.rb

@@ -244,7 +244,7 @@ module Sensu
           when :udp
             process_data(data)
           when :tcp
-            if EM.reactor_running?
+            if EM::reactor_running?
               reset_watchdog
             end
             @data_buffer << data

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -37,9 +37,10 @@ module Sensu
     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.
+    # service state, set up the logger, and load settings. This method
+    # will load extensions and setup Sensu Spawn if the Sensu process
+    # is not the Sensu API. This method can and optionally daemonize
+    # the process and/or create a PID file.
     #
     # @param options [Hash]
     def initialize(options={})
@@ -48,8 +49,10 @@ module Sensu
       @timers = {:run => []}
       setup_logger(options)
       load_settings(options)
-      load_extensions(options)
-      setup_spawn
+      unless sensu_service_name == "api"
+        load_extensions(options)
+        setup_spawn
+      end
       setup_process(options)
     end
 
@@ -164,7 +167,7 @@ module Sensu
       @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
+      EM::threadpool_size = threadpool_size
       Spawn.setup(@settings[:sensu][:spawn])
     end
 
@@ -264,7 +267,7 @@ module Sensu
           @logger.info("reconnected to transport")
           resume
         end
-        yield(@transport)
+        yield(@transport) if block_given?
       end
     end
 
@@ -295,12 +298,19 @@ module Sensu
           @logger.info("reconnected to redis")
           resume
         end
-        yield(@redis)
+        yield(@redis) if block_given?
       end
     end
 
     private
 
+    # Get the Sensu service name.
+    #
+    # @return [String] Sensu service name.
+    def sensu_service_name
+      File.basename($0).split("-").last
+    end
+
     # Write the current process ID (PID) to a file (PID file). This
     # method will cause the Sensu service to exit (2) if the PID file
     # cannot be written to.

data/lib/sensu/server/process.rb

@@ -619,15 +619,16 @@ module Sensu
         end
       end
 
-      # Determine the Sensu transport publish options for a
-      # subscription. If a subscription begins with a transport pipe
+      # 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.
+      # 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
+      # @param message [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
@@ -639,13 +640,13 @@ module Sensu
         end
       end
 
-      # Publish a check request to the transport. A check request is
+      # 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
+      # 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.
+      # payload to the Transport pipes. Transport errors are logged.
       #
       # @param check [Hash] definition.
       def publish_check_request(check)
@@ -727,12 +728,12 @@ module Sensu
         schedule_check_executions(standard_checks + extension_checks)
       end
 
-      # Publish a check result to the transport for processing. A
+      # Publish a check result to the Transport for processing. A
       # check result is composed of a client name and a check
       # definition, containing check `:output` and `:status`. A client
       # signature is added to the check result payload if one is
       # registered for the client. JSON serialization is used when
-      # publishing the check result payload to the transport pipe.
+      # publishing the check result payload to the Transport pipe.
       # Transport errors are logged.
       #
       # @param client_name [String]
@@ -1076,7 +1077,7 @@ module Sensu
       end
 
       # Start the Sensu server process, connecting to Redis, the
-      # transport, and calling the `bootstrap()` method.
+      # Transport, and calling the `bootstrap()` method.
       def start
         setup_connections do
           bootstrap

data/sensu.gemspec

@@ -4,7 +4,6 @@ require File.join(File.dirname(__FILE__), "lib", "sensu", "constants")
 Gem::Specification.new do |s|
   s.name        = "sensu"
   s.version     = Sensu::VERSION
-  s.platform    = RUBY_PLATFORM =~ /java/ ? Gem::Platform::JAVA : Gem::Platform::RUBY
   s.authors     = ["Sean Porter", "Justin Kolberg"]
   s.email       = ["portertech@gmail.com", "amdprophet@gmail.com"]
   s.homepage    = "http://sensuapp.org"
@@ -22,9 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sensu-transport", "6.0.0"
   s.add_dependency "sensu-spawn", "2.2.0"
   s.add_dependency "sensu-redis", "1.4.0"
-  s.add_dependency "sinatra", "1.4.6"
-  s.add_dependency "async_sinatra", "1.2.0"
-  s.add_dependency "thin", "1.6.4" unless RUBY_PLATFORM =~ /java/
+  s.add_dependency "em-http-server", "0.1.8"
 
   s.add_development_dependency "rake", "10.5.0"
   s.add_development_dependency "rspec", "~> 3.0.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0.beta
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -138,47 +138,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: em-http-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.6
-- !ruby/object:Gem::Dependency
-  name: async_sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +227,23 @@ files:
 - exe/sensu-install
 - exe/sensu-server
 - lib/sensu.rb
+- lib/sensu/api/http_handler.rb
 - lib/sensu/api/process.rb
+- lib/sensu/api/routes.rb
+- lib/sensu/api/routes/aggregates.rb
+- lib/sensu/api/routes/checks.rb
+- lib/sensu/api/routes/clients.rb
+- lib/sensu/api/routes/events.rb
+- lib/sensu/api/routes/health.rb
+- lib/sensu/api/routes/info.rb
+- lib/sensu/api/routes/request.rb
+- lib/sensu/api/routes/resolve.rb
+- lib/sensu/api/routes/results.rb
+- lib/sensu/api/routes/stashes.rb
+- lib/sensu/api/utilities/publish_check_request.rb
+- lib/sensu/api/utilities/publish_check_result.rb
+- lib/sensu/api/utilities/resolve_event.rb
+- lib/sensu/api/utilities/transport_info.rb
 - lib/sensu/api/validators.rb
 - lib/sensu/cli.rb
 - lib/sensu/client/process.rb
@@ -285,9 +273,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.6.3