diff options
| author | Micah Anderson <micah@leap.se> | 2015-01-13 17:55:45 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2015-01-13 17:55:45 -0500 |
| commit | a4b2d20314b421685f567c4c0bf5f3724f7d44e0 (patch) | |
| tree | 78fb2f3b6cc6b9d4f206e5184f5fce30de19c40d /puppet/modules/site_nagios/manifests | |
| parent | 4802464729299be48757e7d793da8f85dfdc09bd (diff) | |
| parent | f683cb19ead4ce0fadd047b78ce596ae2e9fab2f (diff) | |
Merge remote-tracking branch 'varacgitlab/pnp4nagios' into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |