Add redis multi instance monitor support for redis-sentinel

manifests/params.pp

@@ -200,4 +200,18 @@
       fail "Operating system ${facts['os']['name']} is not supported yet."
     }
   }
+
+  $sentinel_master_name = {
+      'mymaster' => {
+        redis_host             => '127.0.0.1',
+        redis_port             => 6379,
+        quorum                 => 2,
+        down_after             => 30000,
+        parallel_sync          => 1,
+        failover_timeout       => 180000,
+        auth_pass              => undef,
+        notification_script    => undef,
+        client_reconfig_script => undef,
+      },
+  }
 }

manifests/sentinel.pp

@@ -1,7 +1,42 @@
 # @summary Install redis-sentinel
 #
-# @param auth_pass
-#   The password to use to authenticate with the master and slaves.
+# @param master_name
+#   Specify the name of the master redis server.
+#   The valid charset is A-z 0-9 and the three characters ".-_".
+#   Hash with following Keys:
+#     @key auth_pass
+#       The password to use to authenticate with the master and slaves.
+#
+#     @key redis_host
+#       Specify the bound host of the master redis server.
+#
+#     @key redis_port
+#       Specify the port of the master redis server.
+#
+#     @key daemonize
+#       Have Redis sentinel run as a daemon.
+#
+#     @key down_after
+#       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.
+#
+#     @key failover_timeout
+#       Specify the failover timeout in milliseconds.
+#
+#     @key parallel_sync
+#       How many slaves can be reconfigured at the same time to use a
+#       new master after a failover.
+#
+#     @key quorum
+#       Number of sentinels that must agree that a master is down to
+#       signal sdown state.
+#
+#     @key notification_script
+#       Path to the notification script
+#
+#     @key client_reconfig_script
+#       Path to the client-reconfig script
 #
 # @param config_file
 #   The location and name of the sentinel config file.
@@ -19,17 +54,6 @@
 # @param conf_template
 #   Define which template to use.
 #
-# @param daemonize
-#   Have Redis sentinel run as a daemon.
-#
-# @param down_after
-#   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.
-#
-# @param failover_timeout
-#   Specify the failover timeout in milliseconds.
-#
 # @param init_script
 #   Specifiy the init script that will be created for sentinel.
 #
@@ -43,29 +67,15 @@
 #   Specify the name of the master redis server.
 #   The valid charset is A-z 0-9 and the three characters ".-_".
 #
-# @param redis_host
-#   Specify the bound host of the master redis server.
-#
-# @param redis_port
-#   Specify the port of the master redis server.
-#
 # @param package_name
 #   The name of the package that installs sentinel.
 #
 # @param package_ensure
 #   Do we ensure this package.
 #
-# @param parallel_sync
-#   How many slaves can be reconfigured at the same time to use a
-#   new master after a failover.
-#
 # @param pid_file
 #   If sentinel is daemonized it will write its pid at this location.
 #
-# @param quorum
-#   Number of sentinels that must agree that a master is down to
-#   signal sdown state.
-#
 # @param sentinel_bind
 #   Allow optional sentinel server ip binding.  Can help overcome
 #   issues arising from protect-mode added Redis 3.2
@@ -89,42 +99,49 @@
 #   The directory into which sentinel will change to avoid mount
 #   conflicts.
 #
-# @param notification_script
-#   Path to the notification script
-#
-# @param client_reconfig_script
-#   Path to the client-reconfig script
-#
 # @example Basic inclusion
 #   include redis::sentinel
 #
 # @example Configuring options
 #   class {'redis::sentinel':
-#     down_after => 80000,
-#     log_file   => '/var/log/redis/sentinel.log',
+#     log_file   => '/var/log/redis/sentinel.log',    
+#     master_name   => {
+#       'session_6381' => {
+#         redis_host       => $redis_master_ip,
+#         redis_port       => 6381,
+#         quorum           => 2,
+#         parallel_sync    => 1,
+#         down_after       => 5000,
+#         failover_timeout => 12000,
+#         auth_pass        => $redis_auth,
+#       },
+#       'cache_6380'   => {
+#         redis_host       => $redis_master_ip,
+#         redis_port       => 6380,
+#         quorum           => 2,
+#         parallel_sync    => 1,
+#         down_after       => 5000,
+#         failover_timeout => 12000,
+#         auth_pass        => $redis_auth,
+#       }
+#     }
 #   }
 #
 class redis::sentinel (
-  Optional[String[1]] $auth_pass = undef,
   Stdlib::Absolutepath $config_file = $redis::params::sentinel_config_file,
   Stdlib::Absolutepath $config_file_orig = $redis::params::sentinel_config_file_orig,
   Stdlib::Filemode $config_file_mode = '0644',
   String[1] $conf_template = 'redis/redis-sentinel.conf.erb',
   Boolean $daemonize = $redis::params::sentinel_daemonize,
-  Integer[1] $down_after = 30000,
-  Integer[1] $failover_timeout = 180000,
   Optional[Stdlib::Absolutepath] $init_script = $redis::params::sentinel_init_script,
   String[1] $init_template = 'redis/redis-sentinel.init.erb',
   Redis::LogLevel $log_level = 'notice',
   Stdlib::Absolutepath $log_file = $redis::params::sentinel_log_file,
-  String[1] $master_name  = 'mymaster',
-  Stdlib::Host $redis_host = '127.0.0.1',
-  Stdlib::Port $redis_port = 6379,
+  Redis::MasterName $master_name = $redis::params::sentinel_master_name,
   String[1] $package_name = $redis::params::sentinel_package_name,
   String[1] $package_ensure = 'present',
   Integer[0] $parallel_sync = 1,
   Stdlib::Absolutepath $pid_file = $redis::params::sentinel_pid_file,
-  Integer[1] $quorum = 2,
   Variant[Undef, Stdlib::IP::Address, Array[Stdlib::IP::Address]] $sentinel_bind = undef,
   Stdlib::Port $sentinel_port = 26379,
   String[1] $service_group = 'redis',
@@ -133,34 +150,65 @@
   Boolean $service_enable = true,
   String[1] $service_user = 'redis',
   Stdlib::Absolutepath $working_dir = $redis::params::sentinel_working_dir,
-  Optional[Stdlib::Absolutepath] $notification_script = undef,
-  Optional[Stdlib::Absolutepath] $client_reconfig_script = undef,
 ) inherits redis::params {
 
   require 'redis'
 
   if $facts['os']['family'] == 'Debian' {
     package { $package_name:
       ensure => $package_ensure,
-      before => File[$config_file_orig],
+      before => Concat[$config_file_orig],
     }
 
     if $init_script {
       Package[$package_name] -> File[$init_script]
     }
   }
 
-  file { $config_file_orig:
-    ensure  => file,
-    owner   => $service_user,
-    group   => $service_group,
-    mode    => $config_file_mode,
-    content => template($conf_template),
+  Concat {
+    owner => $service_user,
+    group => $service_group,
+    mode  => $config_file_mode,
+  }
+
+  concat { $config_file_orig:
+    ensure => present,
+  }
+
+  concat::fragment { 'sentinel_conf_header':
+    target  => $config_file_orig,
+    order   => 10,
+    content => template('redis/sentinel/redis-sentinel.conf_header.erb'),
+  }
+
+  $master_name.each |String $master, Hash $params| {
+    concat::fragment { "sentinel_conf_master_${master}" :
+      target  => $config_file_orig,
+      order   => 20,
+      content => epp('redis/sentinel/redis-sentinel.conf_master.epp', {
+        master_name            => $master,
+        redis_host             => $params['redis_host'],
+        redis_port             => $params['redis_port'],
+        quorum                 => $params['quorum'],
+        down_after             => $params['down_after'],
+        parallel_sync          => $params['parallel_sync'],
+        failover_timeout       => $params['failover_timeout'],
+        auth_pass              => $params['auth_pass'],
+        notification_script    => $params['notification_script'],
+        client_reconfig_script => $params['client_reconfig_script'],
+      }),
+    }
+  }
+
+  concat::fragment { 'sentinel_conf_footer':
+    target  => $config_file_orig,
+    order   => 30,
+    content => template('redis/sentinel/redis-sentinel.conf_footer.erb'),
   }
 
   exec { "cp -p ${config_file_orig} ${config_file}":
     path        => '/usr/bin:/bin',
-    subscribe   => File[$config_file_orig],
+    subscribe   => Concat[$config_file_orig],
     notify      => Service[$service_name],
     refreshonly => true,
   }

spec/acceptance/suites/default/redis_sentinel_one_node_spec.rb

@@ -11,9 +11,19 @@
   it 'runs successfully' do
     pp = <<-EOS
     class { 'redis::sentinel':
-      master_name      => 'mymaster',
-      redis_host       => '127.0.0.1',
-      failover_timeout => 10000,
+      master_name   => {
+        'mymaster' => {
+          redis_host             => '127.0.0.1',
+          redis_port             => 6379,
+          quorum                 => 2,
+          parallel_sync          => 1,
+          down_after             => 30000,
+          failover_timeout       => 180000,
+          auth_pass              => 'mymastertest',
+          notification_script    => '/path/to/bar.sh',
+          client_reconfig_script => '/path/to/foo.sh',
+        },
+      },
     }
     EOS
 

spec/classes/redis_sentinel_spec.rb

@@ -73,15 +73,22 @@
       describe 'with custom parameters' do
         let(:params) do
           {
-            auth_pass: 'password',
+            master_name: {
+              'cow' => {
+                'redis_host'             => '127.0.0.1',
+                'redis_port'             => 6379,
+                'quorum'                 => 2,
+                'parallel_sync'          => 1,
+                'auth_pass'              => 'password',
+                'down_after'             => 6000,
+                'failover_timeout'       => 28_000,
+                'notification_script'    => '/path/to/bar.sh',
+                'client_reconfig_script' => '/path/to/foo.sh'
+              }
+            },
             sentinel_bind: '192.0.2.10',
-            master_name: 'cow',
-            down_after: 6000,
             working_dir: '/tmp/redis',
-            log_file: '/tmp/barn-sentinel.log',
-            failover_timeout: 28_000,
-            notification_script: '/path/to/bar.sh',
-            client_reconfig_script: '/path/to/foo.sh'
+            log_file: '/tmp/barn-sentinel.log'
           }
         end
 

templates/sentinel/redis-sentinel.conf_footer.erb

@@ -0,0 +1,3 @@
+
+loglevel <%= @log_level %>
+logfile <%= @log_file %>

templates/sentinel/redis-sentinel.conf_header.erb

@@ -0,0 +1,7 @@
+<% if @sentinel_bind -%>
+bind <%= @sentinel_bind %>
+<% end -%>
+port <%= @sentinel_port %>
+dir <%= @working_dir %>
+daemonize <%= @daemonize ? 'yes' : 'no' %>
+pidfile <%= @pid_file %>

templates/sentinel/redis-sentinel.conf_master.epp

@@ -0,0 +1,26 @@
+<%- | 
+      $master_name,
+      $redis_host,
+      $redis_port,
+      $quorum,
+      $down_after,
+      $parallel_sync,
+      $failover_timeout,
+      $auth_pass,
+      $notification_script,
+      $client_reconfig_script,
+| -%>
+
+sentinel monitor <%= $master_name %> <%= $redis_host %> <%= $redis_port %> <%= $quorum %>
+sentinel down-after-milliseconds <%= $master_name %> <%= $down_after %>
+sentinel parallel-syncs <%= $master_name %> <%= $parallel_sync %>
+sentinel failover-timeout <%= $master_name %> <%= $failover_timeout %>
+<% if $auth_pass { -%>
+sentinel auth-pass <%= $master_name %> <%= $auth_pass %>
+<% } -%>
+<% if $notification_script { -%>
+sentinel notification-script <%= $master_name %> <%= $notification_script %>
+<% } -%>
+<% if $client_reconfig_script { -%>
+sentinel client-reconfig-script <%= $master_name %> <%= $client_reconfig_script %>
+<% } -%>

types/mastername.pp

@@ -0,0 +1,11 @@
+type Redis::MasterName = 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],
+  Optional[auth_pass]              => String,
+  Optional[notification_script]    => Stdlib::Absolutepath,
+  Optional[client_reconfig_script] => Stdlib::Absolutepath,}
+],1]