sensu 0.17.2-java → 0.18.0.beta.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 522c29de590fd364e34192fd4094e14c2b5b6e9c
-  data.tar.gz: b3288099fa21bb8ecaaa2ee8ce3e2d499b66fda7
+  metadata.gz: bdc41be10ee3b0602db3b6152537609e702da877
+  data.tar.gz: 51e6b5517e0f7cbceccce322c6a51ee32d8de425
 SHA512:
-  metadata.gz: 41de9b5dd4f14b50b9dcefe87f2519922852a357465dcf472953dac22ca40c156fa999e93832c69c7092146a919040e3956714e57374b071de49e7969f255977
-  data.tar.gz: 26331f426dfe948a9a2a8b92b8afbf9bf2db305fa1eb21f00259287193264117df0c015762f9a20bfc20cd0dece3e7f506463e03e0003a3edacb415a02d4b197
+  metadata.gz: d5f7d0f1224a44a79a79101719e8a3e3d1dd65550972dd49e611bd5f98b498c5d0a4eb62788c1829ce9da41305defa1549ce29459ceb568c3bfbbb24312996df
+  data.tar.gz: 78952b016c084d464dc4dc323fbb393ec820a25fdaa11cda7ba5d2bf8c5971ead2c1a5bf3530547ea0bf70f354a3f1ed3661a8397e314784239840ba6246f631

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+## 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.
+
+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
 
@@ -170,7 +175,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 +309,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 +357,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 +400,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 +454,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/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.17.2"
+    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.3.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
 
@@ -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
@@ -441,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.
@@ -457,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
@@ -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 "
@@ -574,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
@@ -616,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
@@ -670,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
 
@@ -736,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
 
@@ -759,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
@@ -769,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.3.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.17.2
+  version: 0.18.0.beta.1
 platform: java
 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-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -87,12 +87,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -283,9 +283,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.1.9