add flag to allow sensu to purge unmanaged config files

Author: jlambert121

manifests/check.pp

@@ -20,8 +20,27 @@
   $aggregate            = false,
   $config               = '',
   $config_key           = $name,
+  $purge_config         = 'false',
 ) {
 
+  # Handler config
+  case $ensure {
+    'present': {
+      $config_present = $config ? {
+        ''      => 'absent',
+        default => 'present'
+      }
+    }
+    default: {
+      $config_present = 'absent'
+    }
+  }
+
+  if $purge_config {
+    file { "/etc/sensu/conf.d/check_${name}.json": ensure => $ensure, before => sensu_check[$name] }
+    file { "/etc/sensu/conf.d/${config_key}.json": ensure => $config_present, before => sensu_check_config[$config_key] }
+  }
+
   sensu_check { $name:
     ensure              => $ensure,
     realname            => $name,
@@ -38,19 +57,6 @@
     aggregate           => $aggregate,
   }
 
-  # Handler config
-  case $ensure {
-    'present': {
-      $config_present = $config ? {
-        ''      => 'absent',
-        default => 'present'
-      }
-    }
-    default: {
-      $config_present = 'absent'
-    }
-  }
-
   sensu_check_config { $config_key:
     ensure  => $config_present,
     config  => $config,

manifests/client.pp

@@ -8,14 +8,19 @@
   $address        = $::ipaddress,
   $subscriptions  = [],
   $client_name    = $::fqdn,
-  $enabled        = 'true'
+  $enabled        = 'true',
+  $purge_config   = 'false',
 ) {
 
   $ensure = $enabled ? {
     'true'  => 'present',
     true    => 'present',
     default => 'absent'
   }
+  
+  if $purge_config {
+    file { '/etc/sensu/conf.d/client.json': ensure => $ensure }
+  }
 
   sensu_client_config { $::fqdn:
     ensure        => $ensure,

manifests/handler.pp

@@ -19,6 +19,7 @@
   # Handler specific config
   $config       = '',
   $config_key   = $name,
+  $purge_config = $sensu::purge_config,
 ) {
 
   if defined(Class['sensu::service::server']) {
@@ -48,17 +49,6 @@
     $command_real = $command
   }
 
-  sensu_handler { $name:
-    ensure      => $ensure,
-    type        => $type,
-    command     => $command_real,
-    handlers    => $handlers,
-    severities  => $severities,
-    exchange    => $exchange,
-    mutator     => $mutator,
-    notify      => $notify_services,
-  }
-
   # Handler config
   case $ensure {
     'present': {
@@ -72,6 +62,22 @@
     }
   }
 
+  if $purge_config {
+    file { "/etc/sensu/conf.d/handler_${name}.json": ensure => $ensure, before => sensu_handler[$name] }
+    file { "/etc/sensu/conf.d/${config_key}.json": ensure => $config_present, before => sensu_handler_config[$config_key] }
+  }
+
+  sensu_handler { $name:
+    ensure      => $ensure,
+    type        => $type,
+    command     => $command_real,
+    handlers    => $handlers,
+    severities  => $severities,
+    exchange    => $exchange,
+    mutator     => $mutator,
+    notify      => $notify_services,
+  }
+
   sensu_handler_config { $config_key:
     ensure  => $config_present,
     config  => $config,

manifests/init.pp

@@ -30,7 +30,8 @@
   $subscriptions            = [],
   $client_address           = $::ipaddress,
   $client_name              = $::fqdn,
-  $plugins                  = []
+  $plugins                  = [],
+  $purge_config             = false,
 ){
 
   Class['sensu::package'] ->
@@ -61,7 +62,8 @@
   class { 'sensu::package':
     version         => $version,
     install_repo    => $install_repo,
-    notify_services => $notify_services
+    notify_services => $notify_services,
+    purge_config    => $purge_config,
   }
 
   class { 'sensu::rabbitmq':
@@ -72,7 +74,8 @@
     user            => $rabbitmq_user,
     password        => $rabbitmq_password,
     vhost           => $rabbitmq_vhost,
-    notify_services => $notify_services
+    notify_services => $notify_services,
+    purge_config    => $purge_config,
   }
 
   class { 'sensu::server':
@@ -84,7 +87,8 @@
     dashboard_port      => $dashboard_port,
     dashboard_user      => $dashboard_user,
     dashboard_password  => $dashboard_password,
-    enabled             => $server
+    enabled             => $server,
+    purge_config        => $purge_config,
   }
 
   class { 'sensu::service::server': enabled => $server }
@@ -93,7 +97,8 @@
     address       => $client_address,
     subscriptions => $subscriptions,
     client_name   => $client_name,
-    enabled       => $client
+    enabled       => $client,
+    purge_config  => $purge_config,
   }
 
   class { 'sensu::service::client': enabled => $client }

manifests/package.pp

@@ -6,9 +6,10 @@
 #
 
 class sensu::package(
-  $version = 'latest',
-  $notify_services = [],
-  $install_repo = 'true'
+  $version          = 'latest',
+  $notify_services  = [],
+  $install_repo     = 'true',
+  $purge_config     = 'false',
 ) {
 
   if $install_repo == 'true' or $install_repo == true {
@@ -20,6 +21,14 @@
     notify  => $notify_services
   }
 
+  if $purge_config {
+    file { '/etc/sensu/conf.d':
+      purge   => true,
+      recurse => true,
+      force   => true,
+    }
+  }
+
   file { ['/etc/sensu/plugins', '/etc/sensu/handlers']:
     ensure  => directory,
     mode    => '0555',

manifests/rabbitmq.pp

@@ -13,7 +13,8 @@
   $user                 = 'sensu',
   $password             = '',
   $vhost                = '/sensu',
-  $notify_services      = ''
+  $notify_services      = '',
+  $purge_config         = 'false',
   ) {
 
   if !defined(Sensu_rabbitmq_config[$::fqdn]) {
@@ -66,6 +67,10 @@
       }
     }
 
+    if $purge_config {
+      file { '/etc/sensu/conf.d/rabbitmq.json': before => sensu_rabbitmq_config[$::fqdn] }
+    }
+
     sensu_rabbitmq_config { $::fqdn:
       port     => $port,
       host     => $host,

manifests/server.pp

@@ -14,15 +14,22 @@
   $dashboard_port     = '8080',
   $dashboard_user     = 'admin',
   $dashboard_password = 'secret',
-  $enabled            = 'false'
+  $enabled            = 'false',
+  $purge_config       = 'false',
 ) {
-
+  
   $ensure = $enabled ? {
     'true'  => 'present',
     true    => 'present',
     default => 'absent'
   }
 
+  if $purge_config {
+    file { '/etc/sensu/conf.d/redis.json': ensure => $ensure }
+    file { '/etc/sensu/conf.d/api.json': ensure => $ensure }
+    file { '/etc/sensu/conf.d/dashboard.json': ensure => $ensure }
+  }
+
   sensu_redis_config { $::fqdn:
     ensure => $ensure,
     host   => $redis_host,

manifests/subscription.pp

@@ -0,0 +1,19 @@
+# = Define: sensu::subscription
+#
+# Defines Sensu subscriptions
+#
+# == Parameters
+#
+
+define sensu::subscription (
+  $ensure       = 'present',
+  $purge_config = $sensu::purge_config,
+) {
+
+  if $purge_config {
+    file { "/etc/sensu/conf.d/subscription_${name}.json": ensure => $ensure, before => sensu_client_subscription[$name] }
+  }
+  
+  sensu_client_subscription { $name: ensure => $ensure }
+
+}

spec/classes/sensu_client_spec.rb

@@ -37,5 +37,11 @@
     let(:params) { { :enabled => false } }
     it { should contain_sensu_client_config('host.domain.com').with_ensure('absent') }
   end
+  
+  context 'purge_configs' do
+    let(:params) { { :purge_config => true } }
+
+    it { should contain_file('/etc/sensu/conf.d/client.json').with_ensure('present') }
+  end
 
 end

spec/classes/sensu_package_spec.rb

@@ -25,5 +25,15 @@
       'notify'  => 'Class[Sensu::Service::Server]'
     ) }
   end
+  
+  context 'purge_configs' do
+    let(:params) { { :purge_config => true } }
+
+    it { should contain_file('/etc/sensu/conf.d/').with(
+      'purge'   => 'true',
+      'recurse' => 'true',
+      'force'   => 'true'
+    ) }
+  end
 
 end

spec/classes/sensu_rabbitmq_spec.rb

@@ -57,6 +57,12 @@
       'notify'          => 'Class[sensu::service::server]'
     ) }
   end
+  
+  context 'purge_configs' do
+    let(:params) { { :purge_config => true } }
+
+    it { should contain_file('/etc/sensu/conf.d/rabbitmq.json') }
+  end
 
 end
 

spec/classes/sensu_server_spec.rb

@@ -71,4 +71,12 @@
     ) }
   end # setting params
 
+  context 'purge_configs' do
+    let(:params) { { :purge_config => true, :enabled => true } }
+
+    it { should contain_file('/etc/sensu/conf.d/redis.json').with_ensure('present') }
+    it { should contain_file('/etc/sensu/conf.d/api.json').with_ensure('present')  }
+    it { should contain_file('/etc/sensu/conf.d/dashboard.json').with_ensure('present') }
+  end
+
 end

spec/defines/sensu_check_spec.rb

@@ -61,4 +61,11 @@
     it { should contain_sensu_check_config('mycheck').with_ensure('absent') }
   end
 
+  context 'purge_configs' do
+    let(:params) { { :command => '/foo/bar', :purge_config => true, :config => { 'foo' => 'bar' } } }
+
+    it { should contain_file('/etc/sensu/conf.d/check_mycheck.json').with_ensure('present') }
+    it { should contain_file('/etc/sensu/conf.d/mycheck.json').with_ensure('present') }
+  end
+
 end

spec/defines/sensu_handler_spec.rb

@@ -67,4 +67,12 @@
     let(:params) { { :config => { 'foo' => 'bar' }, :config_key => 'configkey' } }
     it { should contain_sensu_handler_config('configkey').with_config({'foo' => 'bar'} ) }
   end
+
+  context 'purge_configs' do
+    let(:params) { { :purge_config => true, :config => { 'foo' => 'bar' } } }
+
+    it { should contain_file('/etc/sensu/conf.d/handler_myhandler.json').with_ensure('present') }
+    it { should contain_file('/etc/sensu/conf.d/myhandler.json').with_ensure('present') }
+  end
+
 end