From 280d1656978291d1fd9cab6280af64677973a4fb Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 13 Jan 2015 22:26:13 +0100
Subject: don't remove fontconfig-config package cause pnp4nagios depends on it
 (#6615)

Change-Id: If6c0d88e83b52588ee908edfa81451d37794a4b4
---
 puppet/modules/site_config/manifests/packages/base.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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',
-- 
cgit v1.2.3


From f683cb19ead4ce0fadd047b78ce596ae2e9fab2f Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 13 Jan 2015 22:26:29 +0100
Subject: added pnp4nagios graphing support (#1539)

Change-Id: I5c7bcfe2e6dca2276c03bd4985b0fb1e4852a9df
---
 puppet/modules/site_nagios/files/configs/Debian/nagios.cfg | 11 +++++++++++
 puppet/modules/site_nagios/manifests/server.pp             |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3