sensu 0.18.0.beta → 0.18.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3562490d63bf32fe403bb3395f673b9be6ffd4e4
-  data.tar.gz: ba043f59f239c29b9d8353d29ca892c6a3400384
+  metadata.gz: 5115ea5fab3b40df251fdcef28cb7108c84c4df4
+  data.tar.gz: a5094e790a5b5db1963da654bea369268d122f4e
 SHA512:
-  metadata.gz: 0aae29a7af64355686413c1a4d6f108a1c59276312f31755065a5901faf5a5c508a9514b04e98e9942a651877b1d375a8ab9e3a6ba75e461310dded889c35b50
-  data.tar.gz: d0cbbbd0000a734f411a4cdc5a396a40bb281cfcdbd77b009bc61365045de95eef0937a2ff169b25c76cea89b3371cb56a2779cfad31a817d04cccee0b2f57da
+  metadata.gz: ebbece50c019e3c927e52669be30c38e0be7ac1b91993bf72a4cc4d7ff19f19c161d0a55b6b4bb8ee27cff375405f0ba5c7ec7dcee84c26c97edc6584c929293
+  data.tar.gz: d0cb1a938d07ef543925234cc2c47eda1231d138e45500d1112c693f3373e1793e7d96aea078baf3c01a605f5347d09efd7a52fb6e713983c6ca2a1b246a0bf7

data/CHANGELOG.md

@@ -13,6 +13,21 @@ 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.
 
+The Sensu API now listens on TCP port `4567` by default.
+
+Sensu server leader election lock timestamps now include milliseconds to
+reduce the chance of a conflict when attempting to elect a new leader.
+
+### Other
+
+The Sensu client sockets (TCP/UDP) are now stopped/closed before the
+process is stopped.
+
+Sensu server "master" election is now "leader" election.
+
+Configuration file encoding is now forced to 8-bit ASCII and UTF-8 BOMs
+are removed if present.
+
 ## 0.17.2 - 2015-04-08
 
 ### Other

data/lib/sensu/api/process.rb

@@ -40,7 +40,7 @@ module Sensu
           setup_logger(options)
           set :logger, @logger
           load_settings(options)
-          set :api, @settings[:api]
+          set :api, @settings[:api] || {}
           set :checks, @settings[:checks]
           set :all_checks, @settings.checks
           set :cors, @settings[:cors] || {
@@ -55,8 +55,13 @@ module Sensu
 
         def start_server
           Thin::Logging.silent = true
-          bind = @settings[:api][:bind] || "0.0.0.0"
-          @thin = Thin::Server.new(bind, @settings[:api][:port], self)
+          bind = settings.api[:bind] || "0.0.0.0"
+          port = settings.api[:port] || 4567
+          @logger.info("api listening", {
+            :bind => bind,
+            :port => port
+          })
+          @thin = Thin::Server.new(bind, port, self)
           @thin.start
         end
 

data/lib/sensu/client/process.rb

@@ -22,13 +22,14 @@ module Sensu
       end
 
       # Override Daemon initialize() to support Sensu client check
-      # execution safe mode and checks in progress.
+      # execution safe mode, checks in progress, and open sockets.
       #
       # @param options [Hash]
       def initialize(options={})
         super
         @safe_mode = @settings[:client][:safe_mode] || false
         @checks_in_progress = []
+        @sockets = []
       end
 
       # Create a Sensu client keepalive payload, to be sent over the
@@ -315,18 +316,21 @@ module Sensu
       # TCP & UDP port 3030. The socket can be configured via the
       # client definition, `:socket` with `:bind` and `:port`. The
       # current instance of the Sensu logger, settings, and transport
-      # are passed to the socket handler, `Sensu::Client::Socket`.
+      # are passed to the socket handler, `Sensu::Client::Socket`. The
+      # TCP socket server signature (Fixnum) and UDP connection object
+      # are stored in `@sockets`, so that they can be managed
+      # elsewhere, eg. `close_sockets()`.
       def setup_sockets
         options = @settings[:client][:socket] || Hash.new
         options[:bind] ||= "127.0.0.1"
         options[:port] ||= 3030
         @logger.debug("binding client tcp and udp sockets", :options => options)
-        EM::start_server(options[:bind], options[:port], Socket) do |socket|
+        @sockets << EM::start_server(options[:bind], options[:port], Socket) do |socket|
           socket.logger = @logger
           socket.settings = @settings
           socket.transport = @transport
         end
-        EM::open_datagram_socket(options[:bind], options[:port], Socket) do |socket|
+        @sockets << EM::open_datagram_socket(options[:bind], options[:port], Socket) do |socket|
           socket.logger = @logger
           socket.settings = @settings
           socket.transport = @transport
@@ -352,6 +356,23 @@ module Sensu
         end
       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
+      # indicates a TCP socket server that needs to be stopped. A
+      # connection object indicates a socket connection that needs to
+      # be closed, eg. a UDP datagram socket.
+      def close_sockets
+        @logger.info("closing client tcp and udp sockets")
+        @sockets.each do |socket|
+          if socket.is_a?(Numeric)
+            EM.stop_server(socket)
+          else
+            socket.close_connection
+          end
+        end
+      end
+
       # Bootstrap the Sensu client, setting up client keepalives,
       # subscriptions, and standalone check executions. This method
       # sets the process/daemon `@state` to `:running`.
@@ -415,6 +436,7 @@ module Sensu
         pause
         @state = :stopping
         complete_checks_in_progress do
+          close_sockets
           @transport.close
           super
         end

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.18.0.beta"
+    VERSION = "0.18.0.beta.1"
 
     # 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.4.0"
+gem "sensu-settings", "1.7.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

@@ -11,7 +11,7 @@ module Sensu
       include Mutate
       include Handle
 
-      attr_reader :is_master, :handling_event_count
+      attr_reader :is_leader, :handling_event_count
 
       # Create an instance of the Sensu server process, start the
       # server within the EventMachine event loop, and set up server
@@ -26,14 +26,14 @@ module Sensu
         end
       end
 
-      # Override Daemon initialize() to support Sensu server master
+      # Override Daemon initialize() to support Sensu server leader
       # election and the handling event count.
       #
       # @param options [Hash]
       def initialize(options={})
         super
-        @is_master = false
-        @timers[:master] = Array.new
+        @is_leader = false
+        @timers[:leader] = Array.new
         @handling_event_count = 0
       end
 
@@ -481,8 +481,8 @@ module Sensu
 
       # Schedule check executions, using EventMachine periodic timers,
       # using a calculated execution splay. The timers are stored in
-      # the timers hash under `:master`, as check request publishing
-      # is a task for only the Sensu server master, so they can be
+      # the timers hash under `:leader`, as check request publishing
+      # is a task for only the Sensu server leader, so they can be
       # cancelled etc. Check requests are not published if subdued.
       #
       # @param checks [Array] of definitions.
@@ -497,9 +497,9 @@ module Sensu
           end
           execution_splay = testing? ? 0 : calculate_check_execution_splay(check)
           interval = testing? ? 0.5 : check[:interval]
-          @timers[:master] << EM::Timer.new(execution_splay) do
+          @timers[:leader] << EM::Timer.new(execution_splay) do
             create_check_request.call
-            @timers[:master] << EM::PeriodicTimer.new(interval, &create_check_request)
+            @timers[:leader] << EM::PeriodicTimer.new(interval, &create_check_request)
           end
         end
       end
@@ -615,10 +615,10 @@ module Sensu
 
       # Set up the client monitor, a periodic timer to run
       # `determine_stale_clients()` every 30 seconds. The timer is
-      # stored in the timers hash under `:master`.
+      # stored in the timers hash under `:leader`.
       def setup_client_monitor
         @logger.debug("monitoring client keepalives")
-        @timers[:master] << EM::PeriodicTimer.new(30) do
+        @timers[:leader] << EM::PeriodicTimer.new(30) do
           determine_stale_clients
         end
       end
@@ -657,52 +657,53 @@ module Sensu
       # Set up the check result aggregation pruner, using periodic
       # timer to run `prune_check_result_aggregations()` every 20
       # seconds. The timer is stored in the timers hash under
-      # `:master`.
+      # `:leader`.
       def setup_check_result_aggregation_pruner
         @logger.debug("pruning check result aggregations")
-        @timers[:master] << EM::PeriodicTimer.new(20) do
+        @timers[:leader] << EM::PeriodicTimer.new(20) do
           prune_check_result_aggregations
         end
       end
 
-      # Set up the master duties, tasks only performed by a single
+      # Set up the leader duties, tasks only performed by a single
       # Sensu server at a time. The duties include publishing check
       # requests, monitoring for stale clients, and pruning check
       # result aggregations.
-      def master_duties
+      def leader_duties
         setup_check_request_publisher
         setup_client_monitor
         setup_check_result_aggregation_pruner
       end
 
-      # Request a master election, a process to determine if the
-      # current process is the master Sensu server, with its
+      # Request a leader election, a process to determine if the
+      # current process is the leader Sensu server, with its
       # own/unique duties. A Redis key/value is used as a central
       # lock, using the "SETNX" Redis command to set the key/value if
       # it does not exist, using a timestamp for the value. If the
       # current process was able to create the key/value, it is the
-      # master, and must do the duties of the master. If the current
+      # leader, and must do the duties of the leader. If the current
       # process was not able to create the key/value, but the current
       # timestamp value is equal to or over 30 seconds ago, the
       # "GETSET" Redis command is used to set a new timestamp and
       # fetch the previous value to compare them, to determine if it
       # was set by the current process. If the current process is able
-      # to set the timestamp value, it becomes the master. The master
-      # has `@is_master` set to `true`.
-      def request_master_election
-        @redis.setnx("lock:master", Time.now.to_i) do |created|
+      # to set the timestamp value, it becomes the leader. The leader
+      # has `@is_leader` set to `true`.
+      def request_leader_election
+        @redis.setnx("lock:leader", Time.now.to_i) do |created|
           if created
-            @is_master = true
-            @logger.info("i am the master")
-            master_duties
+            @is_leader = true
+            @logger.info("i am the leader")
+            leader_duties
           else
-            @redis.get("lock:master") do |timestamp|
-              if Time.now.to_i - timestamp.to_i >= 30
-                @redis.getset("lock:master", Time.now.to_i) do |previous|
-                  if previous == timestamp
-                    @is_master = true
-                    @logger.info("i am now the master")
-                    master_duties
+            @redis.get("lock:leader") do |current_timestamp|
+              lock_timestamp = (Time.now.to_f * 1000).to_i
+              if lock_timestamp - current_timestamp.to_i >= 30000
+                @redis.getset("lock:leader", lock_timestamp) do |previous_timestamp|
+                  if previous_timestamp == current_timestamp
+                    @is_leader = true
+                    @logger.info("i am now the leader")
+                    leader_duties
                   end
                 end
               end
@@ -711,41 +712,42 @@ module Sensu
         end
       end
 
-      # Set up the master monitor. A one-time timer is used to run
-      # `request_master_exection()` in 2 seconds. A periodic timer is
-      # used to update the master lock timestamp if the current
-      # process is the master, or to run `request_master_election(),
+      # Set up the leader monitor. A one-time timer is used to run
+      # `request_leader_exection()` in 2 seconds. A periodic timer is
+      # used to update the leader lock timestamp if the current
+      # process is the leader, or to run `request_leader_election(),
       # every 10 seconds. The timers are stored in the timers hash
       # under `:run`.
-      def setup_master_monitor
+      def setup_leader_monitor
         @timers[:run] << EM::Timer.new(2) do
-          request_master_election
+          request_leader_election
         end
         @timers[:run] << EM::PeriodicTimer.new(10) do
-          if @is_master
-            @redis.set("lock:master", Time.now.to_i) do
-              @logger.debug("updated master lock timestamp")
+          if @is_leader
+            lock_timestamp = (Time.now.to_f * 1000).to_i
+            @redis.set("lock:leader", lock_timestamp) do
+              @logger.debug("updated leader lock timestamp")
             end
           else
-            request_master_election
+            request_leader_election
           end
         end
       end
 
-      # Resign as master, if the current process is the Sensu server
-      # master. This method cancels and clears the master timers,
+      # Resign as leader, if the current process is the Sensu server
+      # leader. This method cancels and clears the leader timers,
       # those with references stored in the timers hash under
-      # `:master`, and `@is_master`is set to `false`.
-      def resign_as_master
-        if @is_master
-          @logger.warn("resigning as master")
-          @timers[:master].each do |timer|
+      # `:leader`, and `@is_leader`is set to `false`.
+      def resign_as_leader
+        if @is_leader
+          @logger.warn("resigning as leader")
+          @timers[:leader].each do |timer|
             timer.cancel
           end
-          @timers[:master].clear
-          @is_master = false
+          @timers[:leader].clear
+          @is_leader = false
         else
-          @logger.debug("not currently master")
+          @logger.debug("not currently leader")
         end
       end
 
@@ -777,13 +779,13 @@ module Sensu
       end
 
       # Bootstrap the Sensu server process, setting up the keepalive
-      # and check result consumers, and attemping to become the master
+      # and check result consumers, and attemping to become the leader
       # to carry out its duties. This method sets the process/daemon
       # `@state` to `:running`.
       def bootstrap
         setup_keepalives
         setup_results
-        setup_master_monitor
+        setup_leader_monitor
         @state = :running
       end
 
@@ -800,7 +802,7 @@ module Sensu
       # set to `:pausing`, to indicate that it's in progress. All run
       # timers are cancelled, and the references are cleared. The
       # Sensu server will unsubscribe from all transport
-      # subscriptions, resign as master (if currently the master),
+      # subscriptions, resign as leader (if currently the leader),
       # then set the process/daemon `@state` to `:paused`.
       def pause
         unless @state == :pausing || @state == :paused
@@ -810,7 +812,7 @@ module Sensu
           end
           @timers[:run].clear
           unsubscribe
-          resign_as_master
+          resign_as_leader
           @state = :paused
         end
       end

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.4.0"
+  s.add_dependency "sensu-settings", "1.7.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.18.0.beta
+  version: 0.18.0.beta.1
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-28 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.4.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement