sensu-redis 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4172f2d18d1dbcb45355ced74b16cc32df6a96c9
-  data.tar.gz: fc2433374afbb9479b15c0ff1865c3e2f88c26e6
+  metadata.gz: ef76ac716c9930ed28063ef1c302e1a0d3550b5c
+  data.tar.gz: b909da3d8af9bd85b400be04ebaaf8554f2bdab0
 SHA512:
-  metadata.gz: 8b6ed1d80e9a420e0e3aa3c8b89093c535edffda903cf62f02f89e04e36118c4930c5a653edaf8706d2386c5d612a5aeb4e23d20cc98c3a8866011b2902208fb
-  data.tar.gz: 741df53a52163cb744898966789ea58ec7e448d86ac2389cebf38324f5d2f190e433d6d43bff835d6dcac1c4cc7587f6f660719d67a6a0b7a8e924ffeb726dbd
+  metadata.gz: 68a4029bff88c896cd8dfb3c1e0f6e9cff4803f6a10056377a196e936622cda378d858000495d7e078c8a2c259cc2578063671ff9b2aab4d833b63e13355ccb4
+  data.tar.gz: 9d28ca4b26d1e3118b26d310455c0ff49f18f8f9e77255cd16475b995f27001844d0f6dfff8b7482a79cc3a8105c9275ff943a27b1d516c2596c7d4dc9e9da03

data/.gitignore

@@ -8,4 +8,4 @@
 /spec/reports/
 /tmp/
 dump.rdb
-sentinel.conf
+spec/configs/sentinel.conf

data/lib/sensu/redis/sentinel.rb

@@ -22,11 +22,12 @@ module Sensu
       # set the deferrable status to `:successful`, triggering any
       # queued Sentinel callback calls (e.g. `resolve()`).
       #
-      # @param host [String]
-      # @param port [Integer]
+      # @param options [Hash] containing the host and port.
       # @return [Object] Sentinel connection.
-      def connect_to_sentinel(host, port)
-        connection = EM.connect(host, port, Client)
+      def connect_to_sentinel(options={})
+        options[:host] ||= "127.0.0.1"
+        options[:port] ||= 26379
+        connection = EM.connect(options[:host], options[:port], Client, options)
         connection.callback do
           succeed
         end
@@ -39,10 +40,8 @@ module Sensu
       # @param sentinels [Array]
       # @return [Array] of Sentinel connection objects.
       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)
+        sentinels.map do |options|
+          connect_to_sentinel(options)
         end
       end
 

data/sensu-redis.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-redis
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Sean Porter
@@ -102,7 +102,6 @@ files:
 - 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
@@ -127,5 +126,4 @@ rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The Sensu Redis client library
-test_files:
-- spec/configs/sentinel.conf
+test_files: []

data/spec/configs/sentinel.conf

@@ -1,145 +0,0 @@
-# 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