Add redis multi instance monitor support for redis-sentinel

README.md

@@ -127,9 +127,16 @@ With adjustments:
 
 ```puppet
 class { '::redis::sentinel':
-  master_name      => 'cow',
-  redis_host       => '192.168.1.5',
-  failover_timeout => 30000,
+  sentinel_monitor => {
+    'cow' => {
+      'redis_host'             => '192.168.1.5',
+      'redis_port'             => 6379,
+      'quorum'                 => 2,
+      'parallel_sync'          => 1,
+      'down_after'             => 6000,
+      'failover_timeout'       => 30000,
+    },
+  },
 }
 ```
 

REFERENCE.md

@@ -34,7 +34,8 @@ repositories.
 ### Data types
 
 * [`Redis::LogLevel`](#redisloglevel): Specify the server verbosity level.
-* [`Redis::RedisUrl`](#redisredisurl)
+* [`Redis::RedisUrl`](#redisredisurl): 
+* [`Redis::SentinelMonitor`](#redissentinelmonitor): 
 
 ### Tasks
 
@@ -974,32 +975,44 @@ Install redis-sentinel
 
 #### Examples
 
-##### Basic inclusion
-
-```puppet
-include redis::sentinel
-```
-
 ##### Configuring options
 
 ```puppet
 class {'redis::sentinel':
-  down_after => 80000,
   log_file   => '/var/log/redis/sentinel.log',
-}
+  sentinel_monitor => {
+    'session' => {
+      redis_host       => $redis_master_ip,
+      redis_port       => 6381,
+      quorum           => 2,
+      parallel_sync    => 1,
+      down_after       => 5000,
+      failover_timeout => 12000,
+      auth_pass        => $redis_auth,
+    },
+    'cache'   => {
+      redis_host       => $redis_master_ip,
+      redis_port       => 6380,
+      quorum           => 2,
+      parallel_sync    => 1,
+      down_after       => 5000,
+      failover_timeout => 12000,
+      auth_pass        => $redis_auth,
+    }
+  }
 ```
 
 #### Parameters
 
 The following parameters are available in the `redis::sentinel` class.
 
-##### `auth_pass`
+##### `sentinel_monitor`
 
-Data type: `Optional[String[1]]`
+Data type: `Redis::SentinelMonitor`
 
-The password to use to authenticate with the master and slaves.
+Specify the sentinel monitor.
 
-Default value: ``undef``
+Default value: $redis::params::sentinel_monitor
 
 ##### `config_file`
 
@@ -1045,24 +1058,6 @@ Have Redis sentinel run as a daemon.
 
 Default value: `$redis::params::sentinel_daemonize`
 
-##### `down_after`
-
-Data type: `Integer[1]`
-
-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.
-
-Default value: `30000`
-
-##### `failover_timeout`
-
-Data type: `Integer[1]`
-
-Specify the failover timeout in milliseconds.
-
-Default value: `180000`
-
 ##### `init_script`
 
 Data type: `Optional[Stdlib::Absolutepath]`
@@ -1087,31 +1082,6 @@ Specify how much we should log.
 
 Default value: `'notice'`
 
-##### `master_name`
-
-Data type: `String[1]`
-
-Specify the name of the master redis server.
-The valid charset is A-z 0-9 and the three characters ".-_".
-
-Default value: `'mymaster'`
-
-##### `redis_host`
-
-Data type: `Stdlib::Host`
-
-Specify the bound host of the master redis server.
-
-Default value: `'127.0.0.1'`
-
-##### `redis_port`
-
-Data type: `Stdlib::Port`
-
-Specify the port of the master redis server.
-
-Default value: `6379`
-
 ##### `package_name`
 
 Data type: `String[1]`
@@ -1128,15 +1098,6 @@ Do we ensure this package.
 
 Default value: `'present'`
 
-##### `parallel_sync`
-
-Data type: `Integer[0]`
-
-How many slaves can be reconfigured at the same time to use a
-new master after a failover.
-
-Default value: `1`
-
 ##### `pid_file`
 
 Data type: `Stdlib::Absolutepath`
@@ -1145,15 +1106,6 @@ If sentinel is daemonized it will write its pid at this location.
 
 Default value: `$redis::params::sentinel_pid_file`
 
-##### `quorum`
-
-Data type: `Integer[1]`
-
-Number of sentinels that must agree that a master is down to
-signal sdown state.
-
-Default value: `2`
-
 ##### `sentinel_bind`
 
 Data type: `Variant[Undef, Stdlib::IP::Address, Array[Stdlib::IP::Address]]`
@@ -1212,29 +1164,28 @@ conflicts.
 
 Default value: `$redis::params::sentinel_working_dir`
 
-##### `notification_script`
+##### `daemonize`
+
+Data type: `Boolean`
 
-Data type: `Optional[Stdlib::Absolutepath]`
+Default value: $redis::params::sentinel_daemonize
 
-Path to the notification script
 
-Default value: ``undef``
+##### `init_template`
 
-##### `client_reconfig_script`
+Data type: `String[1]`
 
-Data type: `Optional[Stdlib::Absolutepath]`
 
-Path to the client-reconfig script
 
-Default value: ``undef``
+Default value: `'redis/redis-sentinel.init.erb'`
 
-##### `init_template`
+##### `parallel_sync`
 
-Data type: `String[1]`
+Data type: `Integer[0]`
 
 
 
-Default value: `'redis/redis-sentinel.init.erb'`
+Default value: 1
 
 ##### `service_ensure`
 
@@ -2053,6 +2004,23 @@ The Redis::RedisUrl data type.
 
 Alias of `Pattern[/(^redis:\/\/)/]`
 
+### Redis::SentinelMonitor
+
+The Redis::SentinelMonitor data type.
+
+Alias of `Hash[String, Struct[{
+  redis_host             => Stdlib::Host,
+  redis_port             => Stdlib::Port,
+  quorum                 => Integer[1],
+  down_after             => Integer[1],
+  parallel_sync          => Integer[0],
+  failover_timeout       => Integer[1],
+  monitor_name           => Optional[String],
+  auth_pass              => Optional[String],
+  notification_script    => Optional[Stdlib::Absolutepath],
+  client_reconfig_script => Optional[Stdlib::Absolutepath],
+}]]`
+
 ## Tasks
 
 ### `redis_cli`

manifests/params.pp

@@ -53,17 +53,17 @@
     }
 
     'RedHat': {
-      $ppa_repo             = undef
-      $daemonize            = false
-      $config_owner         = 'redis'
-      $config_group         = 'root'
-      $config_dir_mode      = '0755'
-      $log_dir_mode         = '0750'
-
-      $sentinel_daemonize   = false
-      $sentinel_init_script = undef
-      $sentinel_working_dir = '/tmp'
-      $sentinel_protected_mode   = true
+      $ppa_repo                = undef
+      $daemonize               = false
+      $config_owner            = 'redis'
+      $config_group            = 'root'
+      $config_dir_mode         = '0755'
+      $log_dir_mode            = '0750'
+
+      $sentinel_daemonize      = false
+      $sentinel_init_script    = undef
+      $sentinel_working_dir    = '/tmp'
+      $sentinel_protected_mode = true
 
       $scl = $redis::globals::scl
       if $scl {
@@ -205,4 +205,16 @@
       fail "Operating system ${facts['os']['name']} is not supported yet."
     }
   }
+
+  $sentinel_monitor_defaults = {
+    redis_host             => '127.0.0.1',
+    redis_port             => 6379,
+    quorum                 => 2,
+    down_after             => 30000,
+    parallel_sync          => 1,
+    failover_timeout       => 180000,
+  }
+  $sentinel_default_monitor = {
+    'mymaster' => $sentinel_monitor_defaults,
+  }
 }