Merge branch 'master' into leap

Conflicts:
	README
	README.pnp4nagios
	manifests/defaults/pnp4nagios.pp
	manifests/munin.pp
	manifests/pnp4nagios.pp
	manifests/pnp4nagios/popup.pp

1 files changed, 1 insertions, 21 deletions

diff --git a/README b/README
index 7fd1f02..90a97c6 100644
--- a/README
+++ b/README
@@ -185,30 +185,10 @@ For the irc_bot class:
                   'notice' if you would prefer them to be sent as IRC
                   NOTICE messages.
 
-
-PNP4Nagios Nagios Grapher integration
-=====================================
-
-see README.pnp4nagios
-
 PNP4Nagios integration
 ======================
-Currently, there are no pnp4nagios debian packages - you need to install pnp4nagios 
-from source. See http://docs.pnp4nagios.org/pnp-0.6/start for installation notes.
-Integration in the nagios/icinga webinterface is configured by including either the 
-nagios::pnp4nagios or the nagios::pnp4nagios::popup class, the later one includes 
-fancy popups when you hoover over the extra service action image.
-For hosts you need to use the host-pnp definition, for services the srv-pnp def.
-i.e. 
-
-    @@nagios_service { "ping_example_node":
-        use => "generic-service,srv-pnp",
-        ...
-
-    nagios_host { 'example_node':
-            use => 'generic-host,host-pnp',
-            ...
 
+For PNP4Nagios integration information, please see README.pnp4nagios
 
 Examples
 ========