From 124754b2fe6cfcc88b4f4c02ca690f141511bae2 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 23 Oct 2010 02:55:17 +0200 Subject: basic pnp4nagios grapher integration --- manifests/defaults/pnp4nagios.pp | 27 +++++++++++++++++++++++++++ manifests/pnp4nagios.pp | 17 +++++++++++++++++ manifests/pnp4nagios/popup.pp | 17 +++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 manifests/defaults/pnp4nagios.pp create mode 100644 manifests/pnp4nagios.pp create mode 100644 manifests/pnp4nagios/popup.pp (limited to 'manifests') diff --git a/manifests/defaults/pnp4nagios.pp b/manifests/defaults/pnp4nagios.pp new file mode 100644 index 0000000..f6556c9 --- /dev/null +++ b/manifests/defaults/pnp4nagios.pp @@ -0,0 +1,27 @@ +class nagios::defaults::pnp4nagios { + # performance data cmds + # http://docs.pnp4nagios.org/de/pnp-0.6/config#bulk_mode_mit_npcd + nagios_command { + 'process-service-perfdata-file-pnp4nagios-bulk-npcd': + command_line => '/bin/mv /var/lib/nagios3/service-perfdata /var/spool/pnp4nagios/npcd/service-perfdata.$TIMET$'; + 'process-host-perfdata-file-pnp4nagios-bulk-npcd': + command_line => '/bin/mv /var/lib/nagios3/host-perfdata /var/spool/pnp4nagios/npcd/host-perfdata.$TIMET$' + } + + # nagios host templates + # 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, + # #ensure => absent; + #} + + #nagios_service { 'service-pnp': + # #naginatorname => 'service-pnp', + # action_url => '/pnp4nagios/index.php/graph?host=$HOSTNAME$&srv=$SERVICEDESC$', + # register => 0, + # ensure => absent; + #} +} diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp new file mode 100644 index 0000000..051bad8 --- /dev/null +++ b/manifests/pnp4nagios.pp @@ -0,0 +1,17 @@ +class nagios::pnp4nagios { + include nagios::defaults::pnp4nagios + + package { [php5, php5-gd, rrdcollect, rrdtool, librrdp-perl, librrds-perl ]: + ensure => installed } + + + # unfortunatly i didn't find a way to use nagios_host and nagios_service definition, because + # imho puppet can't handle the "name" variable needed in these 2 definitions + # so we need to copy a file here. + + file { 'pnp4nagios-templates.cfg': + path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ] + } +} diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp new file mode 100644 index 0000000..372fe3b --- /dev/null +++ b/manifests/pnp4nagios/popup.pp @@ -0,0 +1,17 @@ +class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { + File['pnp4nagios-templates.cfg']{ + path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] + } + + file { "/usr/share/$nagios::nagios_packagename/htdocs/ssi": + ensure => directory } + + file { 'status-header.ssi': + path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", + source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", + "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ] + } + +} -- cgit v1.2.3 From e412a2f09450c2ed19034619ae7d75c32d58b436 Mon Sep 17 00:00:00 2001 From: nadir Date: Sat, 23 Oct 2010 16:28:19 +0200 Subject: possibility to deploy a custom pnp4nagios apache config --- manifests/pnp4nagios.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 051bad8..9fa4d63 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -14,4 +14,14 @@ class nagios::pnp4nagios { source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ] } + + file { 'apache.conf': + path => "/etc/pnp4nagios/apache.conf", + source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", + "puppet:///modules/nagios/configs/apache.conf" + ], + notify => Service['apache'], + } + + } -- cgit v1.2.3 From 2924e23b6ed826bf22877978c6b9a430a6407a4b Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 18:34:10 +0200 Subject: corrected path to pnp4nagios apache.conf --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 9fa4d63..3971f36 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -18,7 +18,7 @@ class nagios::pnp4nagios { file { 'apache.conf': path => "/etc/pnp4nagios/apache.conf", source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/configs/apache.conf" + "puppet:///modules/nagios/pnp4nagios/apache.conf" ], notify => Service['apache'], } -- cgit v1.2.3 From cfd48e24151d232a76461acea18795cb8725ca00 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 18:52:22 +0200 Subject: package pnp4nagios available now, fix permissions for config files --- manifests/pnp4nagios.pp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 3971f36..9026d3e 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,7 +1,7 @@ class nagios::pnp4nagios { include nagios::defaults::pnp4nagios - package { [php5, php5-gd, rrdcollect, rrdtool, librrdp-perl, librrds-perl ]: + package { pnp4nagios: ensure => installed } @@ -12,14 +12,15 @@ class nagios::pnp4nagios { file { 'pnp4nagios-templates.cfg': path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ] + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], + mode => 0644, owner => root, group => root; } file { 'apache.conf': path => "/etc/pnp4nagios/apache.conf", source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/pnp4nagios/apache.conf" - ], + "puppet:///modules/nagios/pnp4nagios/apache.conf" ], + mode => 0644, owner => root, group => root; notify => Service['apache'], } -- cgit v1.2.3 From 17db655f6589ecf4d673b723f59dd04e5c22b170 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:00:31 +0200 Subject: typo --- manifests/pnp4nagios.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 9026d3e..f0df1ff 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -20,8 +20,8 @@ class nagios::pnp4nagios { path => "/etc/pnp4nagios/apache.conf", source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", "puppet:///modules/nagios/pnp4nagios/apache.conf" ], - mode => 0644, owner => root, group => root; - notify => Service['apache'], + mode => 0644, owner => root, group => root, + notify => Service['apache']; } -- cgit v1.2.3 From 3304733fa0b9bb1ddf49908c4d656fb472caa42c Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:41:20 +0200 Subject: configure pnp4nagios npcd --- manifests/pnp4nagios.pp | 65 +++++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 24 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index f0df1ff..6ab6986 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,28 +1,45 @@ class nagios::pnp4nagios { - include nagios::defaults::pnp4nagios - - package { pnp4nagios: - ensure => installed } - - - # unfortunatly i didn't find a way to use nagios_host and nagios_service definition, because - # imho puppet can't handle the "name" variable needed in these 2 definitions - # so we need to copy a file here. - - file { 'pnp4nagios-templates.cfg': - path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", - source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], - mode => 0644, owner => root, group => root; - } - - file { 'apache.conf': - path => "/etc/pnp4nagios/apache.conf", - source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/pnp4nagios/apache.conf" ], - mode => 0644, owner => root, group => root, - notify => Service['apache']; - } + include nagios::defaults::pnp4nagios + package { pnp4nagios: + ensure => installed } + + + # unfortunatly i didn't find a way to use nagios_host and nagios_service definition, because + # imho puppet can't handle the "name" variable needed in these 2 definitions + # so we need to copy a file here. + + file { 'pnp4nagios-templates.cfg': + path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], + mode => 0644, owner => root, group => root; + } + + file { 'apache.conf': + path => "/etc/pnp4nagios/apache.conf", + source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", + "puppet:///modules/nagios/pnp4nagios/apache.conf" ], + mode => 0644, owner => root, group => root, + notify => Service['apache']; + } + + # run npcd as daemon + + file { '/etc/default/npcd': + path => "/etc/default/npcd", + source => [ "puppet:///modules/site-nagios/pnp4nagios/npcd", + "puppet:///modules/nagios/pnp4nagios/npcd" ], + mode => 0644, owner => root, group => root, + notify => Service['npcd']; + } + + service { 'npcd': + ensure => running, + enable => true, + hasstatus => true, + require => Package['npcd'], + } + } -- cgit v1.2.3 From 8d902141925b7890bb5c5d706ba7034cb0e42754 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:49:01 +0200 Subject: depend on pnp4nagios instead of npcd --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 6ab6986..dd9b0c6 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -38,7 +38,7 @@ class nagios::pnp4nagios { ensure => running, enable => true, hasstatus => true, - require => Package['npcd'], + require => Package['pnp4nagios'], } -- cgit v1.2.3 From bc2068ee8514e7e90641d5016bf12bd1b4ce48c0 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:49:51 +0200 Subject: resolve nagios_cfgdir variable --- manifests/pnp4nagios/popup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 372fe3b..46b346b 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,6 +1,6 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ - path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] } -- cgit v1.2.3 From 579b622e8f276b01ff0bc85c7828fb3dfb0b70ae Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:54:14 +0200 Subject: fixed conf file permissions, notify services --- manifests/pnp4nagios.pp | 1 + manifests/pnp4nagios/popup.pp | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index dd9b0c6..d97bb1e 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -14,6 +14,7 @@ class nagios::pnp4nagios { source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], mode => 0644, owner => root, group => root; + notify => Service['nagios'], } file { 'apache.conf': diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 46b346b..bfbfae7 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,17 +1,20 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { - File['pnp4nagios-templates.cfg']{ - path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", - source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] - } + File['pnp4nagios-templates.cfg']{ + path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", + source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] + mode => 0644, owner => root, group => root; + notify => Service['nagios'], + } - file { "/usr/share/$nagios::nagios_packagename/htdocs/ssi": - ensure => directory } - - file { 'status-header.ssi': - path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", - source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", - "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ] - } + file { "/usr/share/$nagios::nagios_packagename/htdocs/ssi": + ensure => directory } + file { 'status-header.ssi': + path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", + source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", + "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ] + mode => 0644, owner => root, group => root; + notify => Service['nagios'], + } } -- cgit v1.2.3 From 3e58bf7e96fe1910fbf30b7a72c022ed02ec0e2e Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 20:10:33 +0200 Subject: typo --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index d97bb1e..837c447 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -13,7 +13,7 @@ class nagios::pnp4nagios { path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], - mode => 0644, owner => root, group => root; + mode => 0644, owner => root, group => root, notify => Service['nagios'], } -- cgit v1.2.3 From ab52e4a72985268419b8b04a487442975d51aca3 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 20:16:05 +0200 Subject: typos again --- manifests/pnp4nagios/popup.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index bfbfae7..7921a29 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -2,8 +2,8 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] - mode => 0644, owner => root, group => root; + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ], + mode => 0644, owner => root, group => root, notify => Service['nagios'], } @@ -13,8 +13,8 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { file { 'status-header.ssi': path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", - "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ] - mode => 0644, owner => root, group => root; + "puppet:///modules/nagios/pnp4nagios/status-header.ssi"], + mode => 0644, owner => root, group => root, notify => Service['nagios'], } } -- cgit v1.2.3 From bc4532eaa4450bcf84288c95f06ab7ae978ad072 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 22:46:00 +0200 Subject: use a graph style icon for action.gif --- manifests/pnp4nagios.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 837c447..1eb2bf7 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -42,5 +42,15 @@ class nagios::pnp4nagios { require => Package['pnp4nagios'], } + # modify action.gif + + file { '/usr/share/nagios3/htdocs/images/action.gif': + path => "/usr/share/nagios3/htdocs/images/action.gif", + source => [ "puppet:///modules/site-nagios/pnp4nagios/action.gif", + "puppet:///modules/nagios/pnp4nagios/action.gif" ], + mode => 0644, owner => root, group => root, + notify => Service['nagios']; + } + } -- cgit v1.2.3 From 715ea7b4473da8c44982ae866278da1654543d4d Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 18 Sep 2012 10:22:09 +0200 Subject: require pnp4nagios package for config file --- manifests/pnp4nagios.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 1eb2bf7..0f86d2a 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -22,7 +22,8 @@ class nagios::pnp4nagios { source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", "puppet:///modules/nagios/pnp4nagios/apache.conf" ], mode => 0644, owner => root, group => root, - notify => Service['apache']; + notify => Service['apache'], + require => Package['pnp4nagios'], } # run npcd as daemon -- cgit v1.2.3 From a9d74682007addd6c1a24efc7ee074a04c4bee99 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 18 Sep 2012 21:44:37 +0200 Subject: no ::nagios_packagename variable anymore --- manifests/pnp4nagios/popup.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 7921a29..b0da18b 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,4 +1,5 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { + notify {"${nagios::defaults::vars::int_nagios_cfgdir}":} File['pnp4nagios-templates.cfg']{ path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", @@ -7,11 +8,11 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { notify => Service['nagios'], } - file { "/usr/share/$nagios::nagios_packagename/htdocs/ssi": + file { "/usr/share/nagios3/htdocs/ssi": ensure => directory } file { 'status-header.ssi': - path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", + path => "/usr/share/nagios3/htdocs/ssi/status-header.ssi", source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", "puppet:///modules/nagios/pnp4nagios/status-header.ssi"], mode => 0644, owner => root, group => root, -- cgit v1.2.3 From 9aebb810f9c6a5bd211c4fbcb8322a41e5f9a17b Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 25 Sep 2012 21:29:31 +0200 Subject: fix proper deployment of pnp4nagios-templates.cfg --- manifests/pnp4nagios.pp | 2 +- manifests/pnp4nagios/popup.pp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 0f86d2a..efa8681 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -10,7 +10,7 @@ class nagios::pnp4nagios { # so we need to copy a file here. file { 'pnp4nagios-templates.cfg': - path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + path => "{nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], mode => 0644, owner => root, group => root, diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index b0da18b..a8de7c7 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,11 +1,7 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { - notify {"${nagios::defaults::vars::int_nagios_cfgdir}":} File['pnp4nagios-templates.cfg']{ - path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ], - mode => 0644, owner => root, group => root, - notify => Service['nagios'], } file { "/usr/share/nagios3/htdocs/ssi": -- cgit v1.2.3 From 0911d9cb17f4c02aa42f2da4cd95f8323a239cdd Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 25 Sep 2012 23:47:42 +0200 Subject: forgot $ --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index efa8681..7c960a7 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -10,7 +10,7 @@ class nagios::pnp4nagios { # so we need to copy a file here. file { 'pnp4nagios-templates.cfg': - path => "{nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", + path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], mode => 0644, owner => root, group => root, -- cgit v1.2.3 From bab19af527a21d689324a95aa9a0134c9aadb863 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 23 Oct 2010 02:55:17 +0200 Subject: basic pnp4nagios grapher integration --- manifests/defaults/pnp4nagios.pp | 27 +++++++++++++++++++++++++++ manifests/pnp4nagios.pp | 17 +++++++++++++++++ manifests/pnp4nagios/popup.pp | 17 +++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 manifests/defaults/pnp4nagios.pp create mode 100644 manifests/pnp4nagios.pp create mode 100644 manifests/pnp4nagios/popup.pp (limited to 'manifests') diff --git a/manifests/defaults/pnp4nagios.pp b/manifests/defaults/pnp4nagios.pp new file mode 100644 index 0000000..f6556c9 --- /dev/null +++ b/manifests/defaults/pnp4nagios.pp @@ -0,0 +1,27 @@ +class nagios::defaults::pnp4nagios { + # performance data cmds + # http://docs.pnp4nagios.org/de/pnp-0.6/config#bulk_mode_mit_npcd + nagios_command { + 'process-service-perfdata-file-pnp4nagios-bulk-npcd': + command_line => '/bin/mv /var/lib/nagios3/service-perfdata /var/spool/pnp4nagios/npcd/service-perfdata.$TIMET$'; + 'process-host-perfdata-file-pnp4nagios-bulk-npcd': + command_line => '/bin/mv /var/lib/nagios3/host-perfdata /var/spool/pnp4nagios/npcd/host-perfdata.$TIMET$' + } + + # nagios host templates + # 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, + # #ensure => absent; + #} + + #nagios_service { 'service-pnp': + # #naginatorname => 'service-pnp', + # action_url => '/pnp4nagios/index.php/graph?host=$HOSTNAME$&srv=$SERVICEDESC$', + # register => 0, + # ensure => absent; + #} +} diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp new file mode 100644 index 0000000..051bad8 --- /dev/null +++ b/manifests/pnp4nagios.pp @@ -0,0 +1,17 @@ +class nagios::pnp4nagios { + include nagios::defaults::pnp4nagios + + package { [php5, php5-gd, rrdcollect, rrdtool, librrdp-perl, librrds-perl ]: + ensure => installed } + + + # unfortunatly i didn't find a way to use nagios_host and nagios_service definition, because + # imho puppet can't handle the "name" variable needed in these 2 definitions + # so we need to copy a file here. + + file { 'pnp4nagios-templates.cfg': + path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ] + } +} diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp new file mode 100644 index 0000000..372fe3b --- /dev/null +++ b/manifests/pnp4nagios/popup.pp @@ -0,0 +1,17 @@ +class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { + File['pnp4nagios-templates.cfg']{ + path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] + } + + file { "/usr/share/$nagios::nagios_packagename/htdocs/ssi": + ensure => directory } + + file { 'status-header.ssi': + path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", + source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", + "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ] + } + +} -- cgit v1.2.3 From 3daee03641834a17818d323258f7b80179b7f0d6 Mon Sep 17 00:00:00 2001 From: nadir Date: Sat, 23 Oct 2010 16:28:19 +0200 Subject: possibility to deploy a custom pnp4nagios apache config --- manifests/pnp4nagios.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 051bad8..9fa4d63 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -14,4 +14,14 @@ class nagios::pnp4nagios { source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ] } + + file { 'apache.conf': + path => "/etc/pnp4nagios/apache.conf", + source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", + "puppet:///modules/nagios/configs/apache.conf" + ], + notify => Service['apache'], + } + + } -- cgit v1.2.3 From 4bd3595f84d6c8aa304a4048b3a082a82d911910 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 18:34:10 +0200 Subject: corrected path to pnp4nagios apache.conf --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 9fa4d63..3971f36 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -18,7 +18,7 @@ class nagios::pnp4nagios { file { 'apache.conf': path => "/etc/pnp4nagios/apache.conf", source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/configs/apache.conf" + "puppet:///modules/nagios/pnp4nagios/apache.conf" ], notify => Service['apache'], } -- cgit v1.2.3 From 64e2b42f925d263a11ff6b6b39a6c42511007ed1 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 18:52:22 +0200 Subject: package pnp4nagios available now, fix permissions for config files --- manifests/pnp4nagios.pp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 3971f36..9026d3e 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,7 +1,7 @@ class nagios::pnp4nagios { include nagios::defaults::pnp4nagios - package { [php5, php5-gd, rrdcollect, rrdtool, librrdp-perl, librrds-perl ]: + package { pnp4nagios: ensure => installed } @@ -12,14 +12,15 @@ class nagios::pnp4nagios { file { 'pnp4nagios-templates.cfg': path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ] + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], + mode => 0644, owner => root, group => root; } file { 'apache.conf': path => "/etc/pnp4nagios/apache.conf", source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/pnp4nagios/apache.conf" - ], + "puppet:///modules/nagios/pnp4nagios/apache.conf" ], + mode => 0644, owner => root, group => root; notify => Service['apache'], } -- cgit v1.2.3 From 09ea320fc19e872012d88fb748e2d784e360afa4 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:00:31 +0200 Subject: typo --- manifests/pnp4nagios.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 9026d3e..f0df1ff 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -20,8 +20,8 @@ class nagios::pnp4nagios { path => "/etc/pnp4nagios/apache.conf", source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", "puppet:///modules/nagios/pnp4nagios/apache.conf" ], - mode => 0644, owner => root, group => root; - notify => Service['apache'], + mode => 0644, owner => root, group => root, + notify => Service['apache']; } -- cgit v1.2.3 From c35d053d62ff363a53b797aca10e254bd4a405e2 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:41:20 +0200 Subject: configure pnp4nagios npcd --- manifests/pnp4nagios.pp | 65 +++++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 24 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index f0df1ff..6ab6986 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,28 +1,45 @@ class nagios::pnp4nagios { - include nagios::defaults::pnp4nagios - - package { pnp4nagios: - ensure => installed } - - - # unfortunatly i didn't find a way to use nagios_host and nagios_service definition, because - # imho puppet can't handle the "name" variable needed in these 2 definitions - # so we need to copy a file here. - - file { 'pnp4nagios-templates.cfg': - path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", - source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], - mode => 0644, owner => root, group => root; - } - - file { 'apache.conf': - path => "/etc/pnp4nagios/apache.conf", - source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/pnp4nagios/apache.conf" ], - mode => 0644, owner => root, group => root, - notify => Service['apache']; - } + include nagios::defaults::pnp4nagios + package { pnp4nagios: + ensure => installed } + + + # unfortunatly i didn't find a way to use nagios_host and nagios_service definition, because + # imho puppet can't handle the "name" variable needed in these 2 definitions + # so we need to copy a file here. + + file { 'pnp4nagios-templates.cfg': + path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], + mode => 0644, owner => root, group => root; + } + + file { 'apache.conf': + path => "/etc/pnp4nagios/apache.conf", + source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", + "puppet:///modules/nagios/pnp4nagios/apache.conf" ], + mode => 0644, owner => root, group => root, + notify => Service['apache']; + } + + # run npcd as daemon + + file { '/etc/default/npcd': + path => "/etc/default/npcd", + source => [ "puppet:///modules/site-nagios/pnp4nagios/npcd", + "puppet:///modules/nagios/pnp4nagios/npcd" ], + mode => 0644, owner => root, group => root, + notify => Service['npcd']; + } + + service { 'npcd': + ensure => running, + enable => true, + hasstatus => true, + require => Package['npcd'], + } + } -- cgit v1.2.3 From bb37870bc5cd38e0d7e5480c941aebe7dd9589de Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:49:01 +0200 Subject: depend on pnp4nagios instead of npcd --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 6ab6986..dd9b0c6 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -38,7 +38,7 @@ class nagios::pnp4nagios { ensure => running, enable => true, hasstatus => true, - require => Package['npcd'], + require => Package['pnp4nagios'], } -- cgit v1.2.3 From 49c433284cc069984535b452ba5c36446de8cda3 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:49:51 +0200 Subject: resolve nagios_cfgdir variable --- manifests/pnp4nagios/popup.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 372fe3b..46b346b 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,6 +1,6 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ - path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] } -- cgit v1.2.3 From 11925952cbe29b25c776941a35ae921f43882359 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 19:54:14 +0200 Subject: fixed conf file permissions, notify services --- manifests/pnp4nagios.pp | 1 + manifests/pnp4nagios/popup.pp | 29 ++++++++++++++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index dd9b0c6..d97bb1e 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -14,6 +14,7 @@ class nagios::pnp4nagios { source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], mode => 0644, owner => root, group => root; + notify => Service['nagios'], } file { 'apache.conf': diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 46b346b..bfbfae7 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,17 +1,20 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { - File['pnp4nagios-templates.cfg']{ - path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", - source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] - } + File['pnp4nagios-templates.cfg']{ + path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", + source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] + mode => 0644, owner => root, group => root; + notify => Service['nagios'], + } - file { "/usr/share/$nagios::nagios_packagename/htdocs/ssi": - ensure => directory } - - file { 'status-header.ssi': - path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", - source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", - "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ] - } + file { "/usr/share/$nagios::nagios_packagename/htdocs/ssi": + ensure => directory } + file { 'status-header.ssi': + path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", + source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", + "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ] + mode => 0644, owner => root, group => root; + notify => Service['nagios'], + } } -- cgit v1.2.3 From 6c60742df8e27c855352cfe4d5539c644d832e0c Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 20:10:33 +0200 Subject: typo --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index d97bb1e..837c447 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -13,7 +13,7 @@ class nagios::pnp4nagios { path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], - mode => 0644, owner => root, group => root; + mode => 0644, owner => root, group => root, notify => Service['nagios'], } -- cgit v1.2.3 From 2900c2406015e39420d922d0067ec69926d73667 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 20:16:05 +0200 Subject: typos again --- manifests/pnp4nagios/popup.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index bfbfae7..7921a29 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -2,8 +2,8 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ] - mode => 0644, owner => root, group => root; + "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ], + mode => 0644, owner => root, group => root, notify => Service['nagios'], } @@ -13,8 +13,8 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { file { 'status-header.ssi': path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", - "puppet:///modules/nagios/pnp4nagios/status-header.ssi" ] - mode => 0644, owner => root, group => root; + "puppet:///modules/nagios/pnp4nagios/status-header.ssi"], + mode => 0644, owner => root, group => root, notify => Service['nagios'], } } -- cgit v1.2.3 From 54695b64c2ac83962a461cefd91c79c2fd5775ab Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 17 Sep 2012 22:46:00 +0200 Subject: use a graph style icon for action.gif --- manifests/pnp4nagios.pp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 837c447..1eb2bf7 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -42,5 +42,15 @@ class nagios::pnp4nagios { require => Package['pnp4nagios'], } + # modify action.gif + + file { '/usr/share/nagios3/htdocs/images/action.gif': + path => "/usr/share/nagios3/htdocs/images/action.gif", + source => [ "puppet:///modules/site-nagios/pnp4nagios/action.gif", + "puppet:///modules/nagios/pnp4nagios/action.gif" ], + mode => 0644, owner => root, group => root, + notify => Service['nagios']; + } + } -- cgit v1.2.3 From 139e8fd42661848da4765b8c4f65fe85a54a2d9f Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 18 Sep 2012 10:22:09 +0200 Subject: require pnp4nagios package for config file --- manifests/pnp4nagios.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 1eb2bf7..0f86d2a 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -22,7 +22,8 @@ class nagios::pnp4nagios { source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", "puppet:///modules/nagios/pnp4nagios/apache.conf" ], mode => 0644, owner => root, group => root, - notify => Service['apache']; + notify => Service['apache'], + require => Package['pnp4nagios'], } # run npcd as daemon -- cgit v1.2.3 From 52ee95453998f64bb7a97dfff31d6e35c8e31b88 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 18 Sep 2012 21:44:37 +0200 Subject: no ::nagios_packagename variable anymore --- manifests/pnp4nagios/popup.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 7921a29..b0da18b 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,4 +1,5 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { + notify {"${nagios::defaults::vars::int_nagios_cfgdir}":} File['pnp4nagios-templates.cfg']{ path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", @@ -7,11 +8,11 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { notify => Service['nagios'], } - file { "/usr/share/$nagios::nagios_packagename/htdocs/ssi": + file { "/usr/share/nagios3/htdocs/ssi": ensure => directory } file { 'status-header.ssi': - path => "/usr/share/$nagios::nagios_packagename/htdocs/ssi/status-header.ssi", + path => "/usr/share/nagios3/htdocs/ssi/status-header.ssi", source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", "puppet:///modules/nagios/pnp4nagios/status-header.ssi"], mode => 0644, owner => root, group => root, -- cgit v1.2.3 From 1c2981ae2f82b80d49fcc9349a959f1152b6b9ab Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 25 Sep 2012 21:29:31 +0200 Subject: fix proper deployment of pnp4nagios-templates.cfg --- manifests/pnp4nagios.pp | 2 +- manifests/pnp4nagios/popup.pp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 0f86d2a..efa8681 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -10,7 +10,7 @@ class nagios::pnp4nagios { # so we need to copy a file here. file { 'pnp4nagios-templates.cfg': - path => "$nagios::nagios_cfgdir/conf.d/pnp4nagios-templates.cfg", + path => "{nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], mode => 0644, owner => root, group => root, diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index b0da18b..a8de7c7 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,11 +1,7 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { - notify {"${nagios::defaults::vars::int_nagios_cfgdir}":} File['pnp4nagios-templates.cfg']{ - path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ], - mode => 0644, owner => root, group => root, - notify => Service['nagios'], } file { "/usr/share/nagios3/htdocs/ssi": -- cgit v1.2.3 From c1ef04bf0bd3dad921c27a0d8ad3c7f6e06977fa Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 25 Sep 2012 23:47:42 +0200 Subject: forgot $ --- manifests/pnp4nagios.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index efa8681..7c960a7 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -10,7 +10,7 @@ class nagios::pnp4nagios { # so we need to copy a file here. file { 'pnp4nagios-templates.cfg': - path => "{nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", + path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], mode => 0644, owner => root, group => root, -- cgit v1.2.3 From e72f4b51dbc9f183d60251de44e80149d88a1da3 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 14 Feb 2013 18:47:26 -0500 Subject: lintian of pnp4nagios commits --- manifests/defaults/pnp4nagios.pp | 4 +-- manifests/pnp4nagios.pp | 68 ++++++++++++++++++++++------------------ manifests/pnp4nagios/popup.pp | 16 +++++----- 3 files changed, 48 insertions(+), 40 deletions(-) (limited to 'manifests') diff --git a/manifests/defaults/pnp4nagios.pp b/manifests/defaults/pnp4nagios.pp index f6556c9..2ad8767 100644 --- a/manifests/defaults/pnp4nagios.pp +++ b/manifests/defaults/pnp4nagios.pp @@ -10,8 +10,8 @@ class nagios::defaults::pnp4nagios { # nagios host templates # http://docs.pnp4nagios.org/de/pnp-0.6/webfe - - # this doesn't work, see manifests/pnp4nagios.pp + + # this doesn't work, see manifests/pnp4nagios.pp #nagios_host { 'host-pnp': # action_url => '/pnp4nagios/index.php/graph?host=$HOSTNAME$&srv=_HOST_', # register => 0, diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 7c960a7..e7d2be1 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -1,57 +1,63 @@ class nagios::pnp4nagios { include nagios::defaults::pnp4nagios - package { pnp4nagios: + package { 'pnp4nagios': ensure => installed } - # unfortunatly i didn't find a way to use nagios_host and nagios_service definition, because - # imho puppet can't handle the "name" variable needed in these 2 definitions - # so we need to copy a file here. + # unfortunatly i didn't find a way to use nagios_host and nagios_service + # definition, because imho puppet can't handle the "name" variable + # needed in these 2 definitions so we need to copy a file here. file { 'pnp4nagios-templates.cfg': - path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", - source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg" ], - mode => 0644, owner => root, group => root, - notify => Service['nagios'], + path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", + source => [ 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg', + 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ], + mode => '0644', + owner => root, + group => root, + notify => Service['nagios'], } - + file { 'apache.conf': - path => "/etc/pnp4nagios/apache.conf", - source => [ "puppet:///modules/site-nagios/pnp4nagios/apache.conf", - "puppet:///modules/nagios/pnp4nagios/apache.conf" ], - mode => 0644, owner => root, group => root, - notify => Service['apache'], + path => '/etc/pnp4nagios/apache.conf', + source => [ 'puppet:///modules/site-nagios/pnp4nagios/apache.conf', + 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], + mode => '0644', + owner => root, + group => root, + notify => Service['apache'], require => Package['pnp4nagios'], } # run npcd as daemon file { '/etc/default/npcd': - path => "/etc/default/npcd", - source => [ "puppet:///modules/site-nagios/pnp4nagios/npcd", - "puppet:///modules/nagios/pnp4nagios/npcd" ], - mode => 0644, owner => root, group => root, + path => '/etc/default/npcd', + source => [ 'puppet:///modules/site-nagios/pnp4nagios/npcd', + 'puppet:///modules/nagios/pnp4nagios/npcd' ], + mode => '0644', + owner => root, + group => root, notify => Service['npcd']; } service { 'npcd': - ensure => running, - enable => true, - hasstatus => true, - require => Package['pnp4nagios'], + ensure => running, + enable => true, + hasstatus => true, + require => Package['pnp4nagios'], } - + # modify action.gif - + file { '/usr/share/nagios3/htdocs/images/action.gif': - path => "/usr/share/nagios3/htdocs/images/action.gif", - source => [ "puppet:///modules/site-nagios/pnp4nagios/action.gif", - "puppet:///modules/nagios/pnp4nagios/action.gif" ], - mode => 0644, owner => root, group => root, + path => '/usr/share/nagios3/htdocs/images/action.gif', + source => [ 'puppet:///modules/site-nagios/pnp4nagios/action.gif', + 'puppet:///modules/nagios/pnp4nagios/action.gif' ], + mode => '0644', + owner => root, + group => root, notify => Service['nagios']; } - - } diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index a8de7c7..80f8def 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,17 +1,19 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ - source => [ "puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg", - "puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg" ], + source => [ 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', + 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg' ], } - file { "/usr/share/nagios3/htdocs/ssi": + file { '/usr/share/nagios3/htdocs/ssi': ensure => directory } file { 'status-header.ssi': - path => "/usr/share/nagios3/htdocs/ssi/status-header.ssi", - source => [ "puppet:///modules/site-nagios/pnp4nagios/status-header.ssi", - "puppet:///modules/nagios/pnp4nagios/status-header.ssi"], - mode => 0644, owner => root, group => root, + path => '/usr/share/nagios3/htdocs/ssi/status-header.ssi', + source => [ 'puppet:///modules/site-nagios/pnp4nagios/status-header.ssi', + 'puppet:///modules/nagios/pnp4nagios/status-header.ssi' ], + mode => '0644', + owner => root, + group => root, notify => Service['nagios'], } } -- cgit v1.2.3 From 2bf3d8f17fae838982fcfa7a7c9e1833e65aec18 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 14 Feb 2013 18:50:00 -0500 Subject: make site_nagios source primary, but allow fall-back to site-nagios --- manifests/pnp4nagios.pp | 12 ++++++++---- manifests/pnp4nagios/popup.pp | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index e7d2be1..d8ee85e 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -11,7 +11,8 @@ class nagios::pnp4nagios { file { 'pnp4nagios-templates.cfg': path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", - source => [ 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-templates.cfg', + 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg', 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ], mode => '0644', owner => root, @@ -21,7 +22,8 @@ class nagios::pnp4nagios { file { 'apache.conf': path => '/etc/pnp4nagios/apache.conf', - source => [ 'puppet:///modules/site-nagios/pnp4nagios/apache.conf', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/apache.conf', + 'puppet:///modules/site-nagios/pnp4nagios/apache.conf', 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], mode => '0644', owner => root, @@ -34,7 +36,8 @@ class nagios::pnp4nagios { file { '/etc/default/npcd': path => '/etc/default/npcd', - source => [ 'puppet:///modules/site-nagios/pnp4nagios/npcd', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/npcd', + 'puppet:///modules/site-nagios/pnp4nagios/npcd', 'puppet:///modules/nagios/pnp4nagios/npcd' ], mode => '0644', owner => root, @@ -53,7 +56,8 @@ class nagios::pnp4nagios { file { '/usr/share/nagios3/htdocs/images/action.gif': path => '/usr/share/nagios3/htdocs/images/action.gif', - source => [ 'puppet:///modules/site-nagios/pnp4nagios/action.gif', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/action.gif', + 'puppet:///modules/site-nagios/pnp4nagios/action.gif', 'puppet:///modules/nagios/pnp4nagios/action.gif' ], mode => '0644', owner => root, diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index 80f8def..b90f163 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,6 +1,7 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ - source => [ 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', + 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg' ], } @@ -9,7 +10,8 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { file { 'status-header.ssi': path => '/usr/share/nagios3/htdocs/ssi/status-header.ssi', - source => [ 'puppet:///modules/site-nagios/pnp4nagios/status-header.ssi', + source => [ 'puppet:///modules/site_nagios/pnp4nagios/status-header.ssi', + 'puppet:///modules/site-nagios/pnp4nagios/status-header.ssi', 'puppet:///modules/nagios/pnp4nagios/status-header.ssi' ], mode => '0644', owner => root, -- cgit v1.2.3 From 4cc87a364640b8c15b16fcddf1ffdc75b0dfa649 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 22 Feb 2013 16:12:20 -0500 Subject: remove site-nagios source lines, we decided that it is better not to carry that old baggage around --- manifests/pnp4nagios.pp | 4 ---- manifests/pnp4nagios/popup.pp | 2 -- 2 files changed, 6 deletions(-) (limited to 'manifests') diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index d8ee85e..0c920eb 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -12,7 +12,6 @@ class nagios::pnp4nagios { file { 'pnp4nagios-templates.cfg': path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-templates.cfg', - 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-templates.cfg', 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-templates.cfg' ], mode => '0644', owner => root, @@ -23,7 +22,6 @@ class nagios::pnp4nagios { file { 'apache.conf': path => '/etc/pnp4nagios/apache.conf', source => [ 'puppet:///modules/site_nagios/pnp4nagios/apache.conf', - 'puppet:///modules/site-nagios/pnp4nagios/apache.conf', 'puppet:///modules/nagios/pnp4nagios/apache.conf' ], mode => '0644', owner => root, @@ -37,7 +35,6 @@ class nagios::pnp4nagios { file { '/etc/default/npcd': path => '/etc/default/npcd', source => [ 'puppet:///modules/site_nagios/pnp4nagios/npcd', - 'puppet:///modules/site-nagios/pnp4nagios/npcd', 'puppet:///modules/nagios/pnp4nagios/npcd' ], mode => '0644', owner => root, @@ -57,7 +54,6 @@ class nagios::pnp4nagios { file { '/usr/share/nagios3/htdocs/images/action.gif': path => '/usr/share/nagios3/htdocs/images/action.gif', source => [ 'puppet:///modules/site_nagios/pnp4nagios/action.gif', - 'puppet:///modules/site-nagios/pnp4nagios/action.gif', 'puppet:///modules/nagios/pnp4nagios/action.gif' ], mode => '0644', owner => root, diff --git a/manifests/pnp4nagios/popup.pp b/manifests/pnp4nagios/popup.pp index b90f163..0dc04b0 100644 --- a/manifests/pnp4nagios/popup.pp +++ b/manifests/pnp4nagios/popup.pp @@ -1,7 +1,6 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { File['pnp4nagios-templates.cfg']{ source => [ 'puppet:///modules/site_nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', - 'puppet:///modules/site-nagios/pnp4nagios/pnp4nagios-popup-templates.cfg', 'puppet:///modules/nagios/pnp4nagios/pnp4nagios-popup-templates.cfg' ], } @@ -11,7 +10,6 @@ class nagios::pnp4nagios::popup inherits nagios::pnp4nagios { file { 'status-header.ssi': path => '/usr/share/nagios3/htdocs/ssi/status-header.ssi', source => [ 'puppet:///modules/site_nagios/pnp4nagios/status-header.ssi', - 'puppet:///modules/site-nagios/pnp4nagios/status-header.ssi', 'puppet:///modules/nagios/pnp4nagios/status-header.ssi' ], mode => '0644', owner => root, -- cgit v1.2.3 From cfb91ce97243e743f5af0c417851aa730ab96f41 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 27 Feb 2013 19:47:14 +0100 Subject: delete commented nagios_host and -service template definitions --- manifests/defaults/pnp4nagios.pp | 18 ------------------ manifests/pnp4nagios.pp | 6 +++--- 2 files changed, 3 insertions(+), 21 deletions(-) (limited to 'manifests') diff --git a/manifests/defaults/pnp4nagios.pp b/manifests/defaults/pnp4nagios.pp index ff918b6..662d13b 100644 --- a/manifests/defaults/pnp4nagios.pp +++ b/manifests/defaults/pnp4nagios.pp @@ -7,22 +7,4 @@ class nagios::defaults::pnp4nagios { 'process-host-perfdata-file-pnp4nagios-bulk-npcd': command_line => '/bin/mv /var/lib/nagios3/host-perfdata /var/spool/pnp4nagios/npcd/host-perfdata.$TIMET$' } - - # nagios host templates - # 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, - # #ensure => absent; - #} - - #nagios_service { 'service-pnp': - # #naginatorname => 'service-pnp', - # action_url => '/pnp4nagios/index.php/graph?host=$HOSTNAME$&srv=$SERVICEDESC$', - # register => 0, - # ensure => absent; - #} } diff --git a/manifests/pnp4nagios.pp b/manifests/pnp4nagios.pp index 0c920eb..5ade74f 100644 --- a/manifests/pnp4nagios.pp +++ b/manifests/pnp4nagios.pp @@ -5,9 +5,9 @@ class nagios::pnp4nagios { ensure => installed } - # unfortunatly i didn't find a way to use nagios_host and nagios_service - # definition, because imho puppet can't handle the "name" variable - # needed in these 2 definitions so we need to copy a file here. + # unfortunatly we can't use the nagios_host and nagios_service + # definition to define templates, so we need to copy a file here. + # see http://projects.reductivelabs.com/issues/1180 for this limitation file { 'pnp4nagios-templates.cfg': path => "${nagios::defaults::vars::int_cfgdir}/conf.d/pnp4nagios-templates.cfg", -- cgit v1.2.3 From 27f0c77945444e14d77866fcd497eb21ecc662e4 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Wed, 17 Oct 2012 14:49:15 -0400 Subject: Fix munin plugins the basic path for nagiosstats is wrong/hardcoded. that binary comes in with the nagios3 package in Debian. set the default value to the right path under Debian and make it possible to override the path with an environment variable. Signed-off-by: Gabriel Filion --- manifests/munin.pp | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) (limited to 'manifests') diff --git a/manifests/munin.pp b/manifests/munin.pp index 92a389f..dc5cc4c 100644 --- a/manifests/munin.pp +++ b/manifests/munin.pp @@ -1,28 +1,19 @@ -class nagios::munin inherits munin::plugins::base { +class nagios::munin { + include munin::plugins::base - munin::plugin::deploy { - nagios_hosts: - source => 'nagios/munin/nagios_hosts', - config => 'user root'; - nagios_svc: - source => 'nagios/munin/nagios_svc', - config => 'user root'; - nagios_perf_hosts: - source => 'nagios/munin/nagios_perf', - config => 'user root'; - nagios_perf_svc: - source => 'nagios/munin/nagios_perf', - config => 'user root'; - } - - exec { 'munin_nagios2stats_link': - command => 'ln -s /usr/sbin/nagios2stats /usr/local/sbin/nagiostats', - onlyif => ["test ! -e /usr/local/sbin/nagiostats", "test -e /usr/sbin/nagios2stats"], - } - - exec { 'munin_nagios3stats_link': - command => 'ln -s /usr/sbin/nagios3stats /usr/local/sbin/nagiostats', - onlyif => ["test ! -e /usr/local/sbin/nagiostats", "test -e /usr/sbin/nagios3stats"], - } + munin::plugin::deploy { + 'nagios_hosts': + source => 'nagios/munin/nagios_hosts', + config => 'user nagios'; + 'nagios_svc': + source => 'nagios/munin/nagios_svc', + config => 'user nagios'; + 'nagios_perf_hosts': + source => 'nagios/munin/nagios_perf', + config => 'user nagios'; + 'nagios_perf_svc': + source => 'nagios/munin/nagios_perf', + config => 'user nagios'; + } } -- cgit v1.2.3 From a814cdad2b1ff47066df4c8b5d948f22210c0832 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 25 Jan 2013 21:22:43 -0200 Subject: Update nagios::headless to use parametrized class --- manifests/headless.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'manifests') diff --git a/manifests/headless.pp b/manifests/headless.pp index cccfce7..ba8af8f 100644 --- a/manifests/headless.pp +++ b/manifests/headless.pp @@ -1,4 +1,5 @@ class nagios::headless { - $nagios_httpd = 'absent' - include nagios + class { 'nagios': + httpd => 'absent', + } } -- cgit v1.2.3