diff options
| author | Micah Anderson <micah@riseup.net> | 2013-02-14 19:32:00 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-02-14 19:32:00 -0500 |
| commit | 27052f33d329118e116d5ce1cffb994ff18d773c (patch) | |
| tree | 89681f81b143783704f2e6701b491fc53ea56de8 | |
| parent | db5987a9a1c85371d6028cf375409ffed5be0cf0 (diff) | |
| parent | 0911d9cb17f4c02aa42f2da4cd95f8323a239cdd (diff) | |
Merge branch 'add_pnp4nagios' of ssh://code.leap.se/puppet_nagios into add_pnp4nagios
Conflicts:
README.pnp4nagios
manifests/defaults/pnp4nagios.pp
manifests/pnp4nagios.pp
manifests/pnp4nagios/popup.pp
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | images/nagiosgraph.gif | bin | 0 -> 1252 bytes | |||
| -rw-r--r-- | manifests/defaults/pnp4nagios.pp | 1 |
3 files changed, 1 insertions, 1 deletions
@@ -198,7 +198,6 @@ PNP4Nagios integration For PNP4Nagios integration information, please see README.pnp4nagios - Examples ======== diff --git a/images/nagiosgraph.gif b/images/nagiosgraph.gif Binary files differnew file mode 100644 index 0000000..068082a --- /dev/null +++ b/images/nagiosgraph.gif diff --git a/manifests/defaults/pnp4nagios.pp b/manifests/defaults/pnp4nagios.pp index 2ad8767..ff918b6 100644 --- a/manifests/defaults/pnp4nagios.pp +++ b/manifests/defaults/pnp4nagios.pp @@ -12,6 +12,7 @@ class nagios::defaults::pnp4nagios { # http://docs.pnp4nagios.org/de/pnp-0.6/webfe # this doesn't work, see manifests/pnp4nagios.pp + #nagios_host { 'host-pnp': # action_url => '/pnp4nagios/index.php/graph?host=$HOSTNAME$&srv=_HOST_', # register => 0, |
