Add support for :reconnect_on_error.

Added properties for both Redis and RabbitMQ types to enable support for
the new :reconnect_on_error option in Sensu 1.7.0.

Author: Jonathan Wright

lib/puppet/provider/sensu_rabbitmq_config/json.rb

@@ -28,6 +28,7 @@ def create
     self.user = resource[:user]
     self.password = resource[:password]
     self.vhost = resource[:vhost]
+    self.reconnect_on_error = resource[:reconnect_on_error] unless resource[:reconnect_on_error].nil?
   end
 
   def destroy
@@ -141,4 +142,12 @@ def vhost
   def vhost=(value)
     conf['rabbitmq']['vhost'] = value
   end
+
+  def reconnect_on_error
+    conf['rabbitmq']['reconnect_on_error']
+  end
+
+  def reconnect_on_error=(value)
+    conf['rabbitmq']['reconnect_on_error'] = (value ? true : false)
+  end
 end

lib/puppet/provider/sensu_redis_config/json.rb

@@ -20,9 +20,10 @@ def flush
 
   def create
     conf['redis'] = {}
-    self.port     = resource[:port]
-    self.host     = resource[:host]
+    self.port = resource[:port]
+    self.host = resource[:host]
     self.password = resource[:password] unless resource[:password].nil?
+    self.reconnect_on_error = resource[:reconnect_on_error] unless resource[:reconnect_on_error].nil?
   end
 
   def config_file
@@ -60,4 +61,12 @@ def password
   def password=(value)
     conf['redis']['password'] = value
   end
+
+  def reconnect_on_error
+    conf['redis']['reconnect_on_error']
+  end
+
+  def reconnect_on_error=(value)
+    conf['redis']['reconnect_on_error'] = (value ? true : false)
+  end
 end

lib/puppet/type/sensu_rabbitmq_config.rb

@@ -79,6 +79,13 @@ def initialize(*args)
     defaultto 'sensu'
   end
 
+  newproperty(:reconnect_on_error, :boolean => true) do
+    desc "Attempt to reconnect to RabbitMQ on error"
+
+    newvalues(true, false)
+    defaultto false
+  end
+
   autorequire(:package) do
     ['sensu']
   end

lib/puppet/type/sensu_redis_config.rb

@@ -47,6 +47,13 @@ def initialize(*args)
     desc "The password used to connect to Redis"
   end
 
+  newproperty(:reconnect_on_error, :boolean => true) do
+    desc "Attempt to reconnect to RabbitMQ on error"
+
+    newvalues(true, false)
+    defaultto false
+  end
+
   autorequire(:package) do
     ['sensu']
   end

manifests/init.pp

@@ -99,6 +99,7 @@
 #     rabbitmq_ssl_cert_chain are set, then this is enabled automatically.  Set rabbitmq_ssl => true
 #     without specifying a private key or cert chain to use SSL transport, but not cert auth.
 #   Defaul: false
+#   Valid values: true, false
 #
 # [*rabbitmq_ssl_private_key*]
 #   String.  Private key to be used by sensu to connect to rabbitmq
@@ -110,6 +111,12 @@
 #     If the value starts with 'puppet://' the file will be copied and used.  Absolute paths will just be used
 #   Default: undef
 #
+# [*rabbitmq_reconnect_on_error*]
+#   Boolean. In the event the connection or channel is closed by RabbitMQ, attempt to automatically
+#     reconnect when possible. Default set to fault its not guaranteed to successfully reconnect.
+#   Default: false
+#   Valid values: true, false
+#
 # [*redis_host*]
 #   String.  Hostname of redis to be used by sensu
 #   Default: localhost
@@ -122,9 +129,16 @@
 #   String.  Password to be used to connect to Redis
 #   Default: undef
 #
+# [*reddis_reconnect_on_error*]
+#   Boolean. In the event the connection or channel is closed by Reddis, attempt to automatically
+#     reconnect when possible. Default set to fault its not guaranteed to successfully reconnect.
+#   Default: false
+#   Valid values: true, false
+#
 # [*api_bind*]
 #   String.  IP to bind api service
 #   Default: 0.0.0.0
+#
 # [*api_host*]
 #   String.  Hostname of the sensu api service
 #   Default: localhost
@@ -198,56 +212,58 @@
 #   Valid values: debug, info, warn, error, fatal
 #
 class sensu (
-  $version                  = 'latest',
-  $sensu_plugin_name        = 'sensu-plugin',
-  $sensu_plugin_provider    = undef,
-  $sensu_plugin_version     = 'absent',
-  $install_repo             = true,
-  $repo                     = 'main',
-  $repo_source              = undef,
-  $repo_key_id              = '7580C77F',
-  $repo_key_source          = 'http://repos.sensuapp.org/apt/pubkey.gpg',
-  $client                   = true,
-  $server                   = false,
-  $api                      = false,
-  $manage_services          = true,
-  $manage_user              = true,
-  $manage_plugins_dir       = true,
-  $rabbitmq_port            = 5672,
-  $rabbitmq_host            = 'localhost',
-  $rabbitmq_user            = 'sensu',
-  $rabbitmq_password        = '',
-  $rabbitmq_vhost           = 'sensu',
-  $rabbitmq_ssl             = false,
-  $rabbitmq_ssl_private_key = undef,
-  $rabbitmq_ssl_cert_chain  = undef,
-  $redis_host               = 'localhost',
-  $redis_port               = 6379,
-  $redis_password           = undef,
-  $api_bind                 = '0.0.0.0',
-  $api_host                 = 'localhost',
-  $api_port                 = 4567,
-  $api_user                 = undef,
-  $api_password             = undef,
-  $subscriptions            = [],
-  $client_bind              = '127.0.0.1',
-  $client_address           = $::ipaddress,
-  $client_name              = $::fqdn,
-  $client_custom            = {},
-  $client_keepalive         = {},
-  $safe_mode                = false,
-  $plugins                  = [],
-  $plugins_dir              = undef,
-  $purge_config             = false,
-  $purge_plugins_dir        = false,
-  $use_embedded_ruby        = false,
-  $rubyopt                  = '',
-  $gem_path                 = '',
-  $log_level                = 'info',
-  $dashboard                = false,
+  $version                     = 'latest',
+  $sensu_plugin_name           = 'sensu-plugin',
+  $sensu_plugin_provider       = undef,
+  $sensu_plugin_version        = 'absent',
+  $install_repo                = true,
+  $repo                        = 'main',
+  $repo_source                 = undef,
+  $repo_key_id                 = '7580C77F',
+  $repo_key_source             = 'http://repos.sensuapp.org/apt/pubkey.gpg',
+  $client                      = true,
+  $server                      = false,
+  $api                         = false,
+  $manage_services             = true,
+  $manage_user                 = true,
+  $manage_plugins_dir          = true,
+  $rabbitmq_port               = 5672,
+  $rabbitmq_host               = 'localhost',
+  $rabbitmq_user               = 'sensu',
+  $rabbitmq_password           = '',
+  $rabbitmq_vhost              = 'sensu',
+  $rabbitmq_ssl                = false,
+  $rabbitmq_ssl_private_key    = undef,
+  $rabbitmq_ssl_cert_chain     = undef,
+  $rabbitmq_reconnect_on_error = false,
+  $redis_host                  = 'localhost',
+  $redis_port                  = 6379,
+  $redis_password              = undef,
+  $redis_reconnect_on_error    = false,
+  $api_bind                    = '0.0.0.0',
+  $api_host                    = 'localhost',
+  $api_port                    = 4567,
+  $api_user                    = undef,
+  $api_password                = undef,
+  $subscriptions               = [],
+  $client_bind                 = '127.0.0.1',
+  $client_address              = $::ipaddress,
+  $client_name                 = $::fqdn,
+  $client_custom               = {},
+  $client_keepalive            = {},
+  $safe_mode                   = false,
+  $plugins                     = [],
+  $plugins_dir                 = undef,
+  $purge_config                = false,
+  $purge_plugins_dir           = false,
+  $use_embedded_ruby           = false,
+  $rubyopt                     = '',
+  $gem_path                    = '',
+  $log_level                   = 'info',
+  $dashboard                   = false,
 ){
 
-  validate_bool($client, $server, $api, $install_repo, $purge_config, $safe_mode, $manage_services)
+  validate_bool($client, $server, $api, $install_repo, $purge_config, $safe_mode, $manage_services, $rabbitmq_reconnect_on_error, $redis_reconnect_on_error)
 
   validate_re($repo, ['^main$', '^unstable$'], "Repo must be 'main' or 'unstable'.  Found: ${repo}")
   validate_re($version, ['^absent$', '^installed$', '^latest$', '^present$', '^[\d\.\-]+$'], "Invalid package version: ${version}")

manifests/rabbitmq/config.pp

@@ -70,15 +70,16 @@
   }
 
   sensu_rabbitmq_config { $::fqdn:
-    ensure          => $ensure,
-    port            => $sensu::rabbitmq_port,
-    host            => $sensu::rabbitmq_host,
-    user            => $sensu::rabbitmq_user,
-    password        => $sensu::rabbitmq_password,
-    vhost           => $sensu::rabbitmq_vhost,
-    ssl_transport   => $enable_ssl,
-    ssl_cert_chain  => $ssl_cert_chain,
-    ssl_private_key => $ssl_private_key,
+    ensure             => $ensure,
+    port               => $sensu::rabbitmq_port,
+    host               => $sensu::rabbitmq_host,
+    user               => $sensu::rabbitmq_user,
+    password           => $sensu::rabbitmq_password,
+    vhost              => $sensu::rabbitmq_vhost,
+    ssl_transport      => $enable_ssl,
+    ssl_cert_chain     => $ssl_cert_chain,
+    ssl_private_key    => $ssl_private_key,
+    reconnect_on_error => $sensu::rabbitmq_reconnect_on_error,
   }
 
 }

manifests/redis/config.pp

@@ -22,10 +22,11 @@
   }
 
   sensu_redis_config { $::fqdn:
-    ensure   => $ensure,
-    host     => $sensu::redis_host,
-    port     => $sensu::redis_port,
-    password => $sensu::redis_password,
+    ensure             => $ensure,
+    host               => $sensu::redis_host,
+    port               => $sensu::redis_port,
+    password           => $sensu::redis_password,
+    reconnect_on_error => $sensu::redis_reconnect_on_error,
   }
 
 }