summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-01-13 17:55:45 -0500
committerMicah Anderson <micah@leap.se>2015-01-13 17:55:45 -0500
commita4b2d20314b421685f567c4c0bf5f3724f7d44e0 (patch)
tree78fb2f3b6cc6b9d4f206e5184f5fce30de19c40d /puppet
parent4802464729299be48757e7d793da8f85dfdc09bd (diff)
parentf683cb19ead4ce0fadd047b78ce596ae2e9fab2f (diff)
Merge remote-tracking branch 'varacgitlab/pnp4nagios' into develop
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/packages/base.pp2
-rw-r--r--puppet/modules/site_nagios/files/configs/Debian/nagios.cfg11
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp3
3 files changed, 14 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/packages/base.pp b/puppet/modules/site_config/manifests/packages/base.pp
index ae47963c..f20d04a4 100644
--- a/puppet/modules/site_config/manifests/packages/base.pp
+++ b/puppet/modules/site_config/manifests/packages/base.pp
@@ -7,7 +7,7 @@ class site_config::packages::base {
}
# base set of packages that we want to remove everywhere
- package { [ 'acpi', 'acpid', 'acpi-support-base', 'eject', 'ftp', 'fontconfig-config',
+ package { [ 'acpi', 'acpid', 'acpi-support-base', 'eject', 'ftp',
'laptop-detect', 'lpr', 'nfs-common', 'nfs-kernel-server',
'portmap', 'pppconfig', 'pppoe', 'pump', 'qstat', 'rpcbind',
'samba-common', 'samba-common-bin', 'smbclient', 'tcl8.5',
diff --git a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg
index e46ebf62..0d729b8c 100644
--- a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg
+++ b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg
@@ -1273,4 +1273,15 @@ debug_file=/var/lib/nagios3/nagios.debug
max_debug_file_size=1000000
+process_performance_data=1
+service_perfdata_file=/var/lib/nagios3/service-perfdata
+service_perfdata_file_template=DATATYPE::SERVICEPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tSERVICEDESC::$SERVICEDESC$\tSERVICEPERFDATA::$SERVICEPERFDATA$\tSERVICECHECKCOMMAND::$SERVICECHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$\tSERVICESTATE::$SERVICESTATE$\tSERVICESTATETYPE::$SERVICESTATETYPE$
+service_perfdata_file_mode=a
+service_perfdata_file_processing_interval=15
+service_perfdata_file_processing_command=process-service-perfdata-file-pnp4nagios-bulk-npcd
+host_perfdata_file=/var/lib/nagios3/host-perfdata
+host_perfdata_file_template=DATATYPE::HOSTPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tHOSTPERFDATA::$HOSTPERFDATA$\tHOSTCHECKCOMMAND::$HOSTCHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$
+host_perfdata_file_mode=a
+host_perfdata_file_processing_interval=15
+host_perfdata_file_processing_command=process-host-perfdata-file-pnp4nagios-bulk-npcd
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index 092ca503..ae266c36 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -13,7 +13,8 @@ class site_nagios::server inherits nagios::base {
include nagios::defaults::commands
include nagios::defaults::templates
include nagios::defaults::timeperiods
- include nagios::defaults::plugins
+ include nagios::pnp4nagios
+ include nagios::pnp4nagios::popup
class { 'nagios':
# don't manage apache class from nagios, cause we already include