sensu-redis 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a5fe4263828e812171b362cc7a11a466839cc4b
-  data.tar.gz: 78557360f3335c18cbc2e9d82ad9ebbaa880a1d8
+  metadata.gz: d9953079714c141b83f7e59b50a9d75fa0474bab
+  data.tar.gz: 96880d16d145c74b1769a8efb02805f7c04b5fee
 SHA512:
-  metadata.gz: 71cc90ae64b3cd072fea5de5c56a91a45316bb9d0471f449652d26e60abe12ab6f37e42cb4aa43f87ae57eac8157004421f7bd2fc88a8d37f798089719c8b339
-  data.tar.gz: 3db7761ab479b605a602af2aaf09a9bbb76a090d7d672866251d71e025e95e05a0e2a67f414a987016ed88a7e96132a5f5eca13b5f79d0c3069ed28013f4f074
+  metadata.gz: b0c05605ee8d75b1a1922942ef34df14669bac9ddaf319bad36afd29f8002ecd8a1051151139f9a397aa0f245d42739b69578d5d2b6725054958a26f26231515
+  data.tar.gz: f7b6d0486645d5170d41331a04fa198fbacd300c8690d93c1493a7945e7e3d415d363abd879c486416f3da8adf47a83ce4cbbb83e7cbd386b49dc0285fb4b701

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+dump.rdb

data/lib/sensu/redis.rb

@@ -1,5 +1,6 @@
 require "rubygems"
 require "sensu/redis/client"
+require "sensu/redis/sentinel"
 require "eventmachine"
 require "uri"
 
@@ -19,16 +20,36 @@ module Sensu
         end
       end
 
-      def connect(options={})
+      def connect_via_sentinel(options, &block)
+        sentinel = Sentinel.new(options)
+        sentinel.callback do
+          sentinel.resolve do |host, port|
+            block.call(EM.connect(host, port, Client, options))
+          end
+        end
+        sentinel.errback do
+          EM::Timer.new(3) do
+            connect_via_sentinel(options, &block)
+          end
+        end
+      end
+
+      def connect_direct(options, &block)
+        block.call(EM.connect(options[:host], options[:port], Client, options))
+      end
+
+      def connect(options={}, &block)
         case options
         when String
           options = parse_url(options)
         when nil
           options = {}
         end
-        options[:host] ||= "127.0.0.1"
-        options[:port] = (options[:port] || 6379).to_i
-        EM.connect(options[:host], options[:port], Sensu::Redis::Client, options)
+        if options[:sentinels].is_a?(Array)
+          connect_via_sentinel(options, &block)
+        else
+          connect_direct(options, &block)
+        end
       end
     end
   end

data/lib/sensu/redis/client.rb

@@ -11,9 +11,9 @@ module Sensu
       # and setting the default connection options and callbacks.
       def initialize(options={})
         create_command_methods!
-        @host = options[:host]
-        @port = options[:port]
-        @db = (options[:db] || 0).to_i
+        @host = options[:host] || "127.0.0.1"
+        @port = options[:port] || 6379
+        @db = options[:db]
         @password = options[:password]
         @auto_reconnect = options.fetch(:auto_reconnect, true)
         @reconnect_on_error = options.fetch(:reconnect_on_error, true)

data/lib/sensu/redis/sentinel.rb

@@ -0,0 +1,48 @@
+require "sensu/redis/client"
+require "eventmachine"
+
+module Sensu
+  module Redis
+    class Sentinel
+      include EM::Deferrable
+
+      def initialize(options={})
+        @options = options
+        @master_name = options[:host] || "mymaster"
+        @sentinels = connect_to_sentinels(@options[:sentinels])
+      end
+
+      def connect_to_sentinel(host, port)
+        connection = EM.connect(host, port, Client)
+        connection.callback do
+          succeed
+        end
+      end
+
+      def connect_to_sentinels(sentinels)
+        sentinels.map do |sentinel|
+          host = sentinel[:host] || "127.0.0.1"
+          port = sentinel[:port] || 26379
+          connect_to_sentinel(host, port)
+        end
+      end
+
+      def select_a_sentinel
+        @sentinels.select { |sentinel| sentinel.connected? }.shuffle.first
+      end
+
+      def resolve
+        sentinel = select_a_sentinel
+        if sentinel.nil?
+          fail
+        else
+          sentinel.callback do
+            sentinel.send_command("sentinel", "get-master-addr-by-name", @master_name) do |host, port|
+              yield(host, port)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sensu-redis.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-redis"
-  spec.version       = "0.1.8"
+  spec.version       = "0.1.9"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu Redis client library"

data/spec/configs/sentinel.conf

@@ -0,0 +1,145 @@
+# port <sentinel-port>
+# The port that this sentinel instance will run on
+port 63800
+
+# sentinel monitor <master-name> <ip> <redis-port> <quorum>
+#
+# Tells Sentinel to monitor this master, and to consider it in O_DOWN
+# (Objectively Down) state only if at least <quorum> sentinels agree.
+#
+# Note that whatever is the ODOWN quorum, a Sentinel will require to
+# be elected by the majority of the known Sentinels in order to
+# start a failover, so no failover can be performed in minority.
+#
+# Note: master name should not include special characters or spaces.
+# The valid charset is A-z 0-9 and the three characters ".-_".
+sentinel monitor mymaster 127.0.0.1 6379 2
+
+sentinel auth-pass mymaster secret
+#
+# Set the password to use to authenticate with the master and slaves.
+# Useful if there is a password set in the Redis instances to monitor.
+#
+# Note that the master password is also used for slaves, so it is not
+# possible to set a different password in masters and slaves instances
+# if you want to be able to monitor these instances with Sentinel.
+#
+# However you can have Redis instances without the authentication enabled
+# mixed with Redis instances requiring the authentication (as long as the
+# password set is the same for all the instances requiring the password) as
+# the AUTH command will have no effect in Redis instances with authentication
+# switched off.
+#
+# Example:
+#
+# sentinel auth-pass mymaster MySUPER--secret-0123passw0rd
+
+# sentinel down-after-milliseconds <master-name> <milliseconds>
+#
+# Number of milliseconds the master (or any attached slave or sentinel) should
+# be unreachable (as in, not acceptable reply to PING, continuously, for the
+# specified period) in order to consider it in S_DOWN state (Subjectively
+# Down).
+#
+# Default is 30 seconds.
+sentinel config-epoch mymaster 0
+
+# sentinel parallel-syncs <master-name> <numslaves>
+#
+# How many slaves we can reconfigure to point to the new slave simultaneously
+# during the failover. Use a low number if you use the slaves to serve query
+# to avoid that all the slaves will be unreachable at about the same
+# time while performing the synchronization with the master.
+sentinel known-slave mymaster 127.0.0.1 6380
+
+# sentinel failover-timeout <master-name> <milliseconds>
+#
+# Specifies the failover timeout in milliseconds. It is used in many ways:
+#
+# - The time needed to re-start a failover after a previous failover was
+#   already tried against the same master by a given Sentinel, is two
+#   times the failover timeout.
+#
+# - The time needed for a slave replicating to a wrong master according
+#   to a Sentinel current configuration, to be forced to replicate
+#   with the right master, is exactly the failover timeout (counting since
+#   the moment a Sentinel detected the misconfiguration).
+#
+# - The time needed to cancel a failover that is already in progress but
+#   did not produced any configuration change (SLAVEOF NO ONE yet not
+#   acknowledged by the promoted slave).
+#
+# - The maximum time a failover in progress waits for all the slaves to be
+#   reconfigured as slaves of the new master. However even after this time
+#   the slaves will be reconfigured by the Sentinels anyway, but not with
+#   the exact parallel-syncs progression as specified.
+#
+# Default is 3 minutes.
+sentinel known-sentinel mymaster 127.0.0.1 63810 c0e485ef82e667ba43b7bffedd7b7c2f080248a8
+
+# SCRIPTS EXECUTION
+#
+# sentinel notification-script and sentinel reconfig-script are used in order
+# to configure scripts that are called to notify the system administrator
+# or to reconfigure clients after a failover. The scripts are executed
+# with the following rules for error handling:
+#
+# If script exists with "1" the execution is retried later (up to a maximum
+# number of times currently set to 10).
+#
+# If script exists with "2" (or an higher value) the script execution is
+# not retried.
+#
+# If script terminates because it receives a signal the behavior is the same
+# as exit code 1.
+#
+# A script has a maximum running time of 60 seconds. After this limit is
+# reached the script is terminated with a SIGKILL and the execution retried.
+
+# NOTIFICATION SCRIPT
+#
+# sentinel notification-script <master-name> <script-path>
+#
+# Call the specified notification script for any sentinel event that is
+# generated in the WARNING level (for instance -sdown, -odown, and so forth).
+# This script should notify the system administrator via email, SMS, or any
+# other messaging system, that there is something wrong with the monitored
+# Redis systems.
+#
+# The script is called with just two arguments: the first is the event type
+# and the second the event description.
+#
+# The script must exist and be executable in order for sentinel to start if
+# this option is provided.
+#
+# Example:
+#
+# sentinel notification-script mymaster /var/redis/notify.sh
+
+# CLIENTS RECONFIGURATION SCRIPT
+#
+# sentinel client-reconfig-script <master-name> <script-path>
+#
+# When the master changed because of a failover a script can be called in
+# order to perform application-specific tasks to notify the clients that the
+# configuration has changed and the master is at a different address.
+#
+# The following arguments are passed to the script:
+#
+# <master-name> <role> <state> <from-ip> <from-port> <to-ip> <to-port>
+#
+# <state> is currently always "failover"
+# <role> is either "leader" or "observer"
+#
+# The arguments from-ip, from-port, to-ip, to-port are used to communicate
+# the old address of the master and the new address of the elected slave
+# (now a master).
+#
+# This script should be resistant to multiple invocations.
+#
+# Example:
+#
+# sentinel client-reconfig-script mymaster /var/redis/reconfig.sh
+# Generated by CONFIG REWRITE
+dir "/home/portertech/projects/sensu/sensu-redis/spec/configs"
+sentinel known-sentinel mymaster 127.0.0.1 63790 092d28f730ac45be8f18569fefa12b0ebd7b230b

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-redis
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -100,7 +100,9 @@ files:
 - lib/sensu/redis/client.rb
 - lib/sensu/redis/client/constants.rb
 - lib/sensu/redis/client/errors.rb
+- lib/sensu/redis/sentinel.rb
 - sensu-redis.gemspec
+- spec/configs/sentinel.conf
 homepage: https://github.com/sensu/sensu-redis
 licenses:
 - MIT
@@ -125,4 +127,5 @@ rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The Sensu Redis client library
-test_files: []
+test_files:
+- spec/configs/sentinel.conf