projects / mirror / dsa-puppet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
restart stale icinga automatically
[mirror/dsa-puppet.git] / modules / nagios / manifests / server.pp
diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 5cdbc43..a634220 100644 (file)
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -1,81 +1,113 @@
-class nagios::server inherits nagios::client {
-       package {
-               nagios3: ensure => installed;
-               nagios-nrpe-plugin: ensure => installed;
-               nagios-plugins: ensure => installed;
-               nagios-images: ensure => installed;
-       }
-
-       file {
-               "/etc/nagios-plugins/config/local-dsa-checkcommands.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/checkcommands.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-
-               "/etc/nagios3/cgi.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/cgi.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/nagios.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/nagios.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
+class nagios::server {
 
-               "/etc/nagios3/puppetconf.d":
-                       mode    => 755,
-                       require => Package["nagios3"],
-                       ensure  => directory;
+       package { [
+                       'nagios3',
+                       'nagios-nrpe-plugin',
+                       'nagios-plugins',
+                       'nagios-images'
+               ]:
+               ensure => installed
+       }
 
-               "/etc/nagios3/puppetconf.d/contacts.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/contacts.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/generic-host.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-host.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/generic-service.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/generic-service.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/timeperiods.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/static/conf.d/timeperiods.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
+       file { '/etc/init.d/nagios3':
+               source  => 'puppet:///modules/nagios/nagios3.init',
+               mode    => '0755',
+               require => Package['nagios3'],
+               before  => Service['nagios3'],
+       }
 
-               "/etc/nagios3/puppetconf.d/auto-dependencies.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-dependencies.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostextinfo.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-hostgroups.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hostgroups.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-hosts.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-hosts.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-serviceextinfo.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-servicegroups.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-servicegroups.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
-               "/etc/nagios3/puppetconf.d/auto-services.cfg":
-                       source  => [ "puppet:///nagios/dsa-nagios/generated/auto-services.cfg" ],
-                       require => Package["nagios3"],
-                       notify  => Exec["nagios3 reload"];
+       service { 'nagios3':
+               ensure  => running,
+               require => Package['nagios3'],
+       }
 
+       file { '/etc/nagios-plugins/config':
+               ensure  => directory,
+               recurse => remote,
+               source  => 'puppet:///files/empty/',
+               require => Package['nagios3'],
+               notify  => Service['nagios3'],
+       }
+       file { '/etc/nagios3':
+               ensure  => directory,
+               recurse => remote,
+               source  => 'puppet:///files/empty/',
+               require => Package['nagios3'],
+               notify  => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d':
+               ensure => directory,
+               recurse => remote,
+               source  => 'puppet:///files/empty/',
+               require => Package['nagios3'],
+               notify  => Service['nagios3'],
+       }
+       file { '/etc/nagios-plugins/config/local-dsa-checkcommands.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/checkcommands.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios-plugins/config/local-dsa-eventhandlers.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/eventhandlers.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/cgi.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/cgi.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/nagios.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/nagios.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/contacts.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/contacts.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/generic-host.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-host.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/generic-service.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/generic-service.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/timeperiods.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/static/conf.d/timeperiods.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-dependencies.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-dependencies.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostextinfo.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-hostgroups.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hostgroups.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-hosts.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-hosts.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-serviceextinfo.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-servicegroups.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-servicegroups.cfg',
+               notify => Service['nagios3'],
+       }
+       file { '/etc/nagios3/puppetconf.d/auto-services.cfg':
+               source => 'puppet:///modules/nagios/dsa-nagios/generated/auto-services.cfg',
+               notify => Service['nagios3'],
        }
 
-       exec { "nagios3 reload":
-               path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-               refreshonly => true,
+       concat::fragment { 'dsa-puppet-stuff--nagios--restart-stale-icinga':
+               target => '/etc/cron.d/dsa-puppet-stuff',
+               order  => '010',
+               content  => @(EOF)
+                       */15 * * * * root find /var/lib/icinga/status.dat -mmin +20 | grep -q . && service icinga restart
+                       | EOF
        }
 }
Unnamed repository; edit this file 'description' to name the repository.