diff options
author | mh <mh@immerda.ch> | 2010-07-01 04:43:09 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2010-07-01 04:43:09 +0200 |
commit | e7d23dabf191c5416197af0b229fc90b94539405 (patch) | |
tree | bf9d1f220eb8c0ef176529e2ab18717618e4ee14 /manifests/plugins | |
parent | d63bc7ba3edc39e2fe7dbbefd87edac45176b13b (diff) | |
parent | f1586a7fbcc79fee6542790b1f4c930929af7e04 (diff) |
merge with lavamind
Diffstat (limited to 'manifests/plugins')
-rw-r--r-- | manifests/plugins/debian.pp | 2 | ||||
-rw-r--r-- | manifests/plugins/interfaces.pp | 6 | ||||
-rw-r--r-- | manifests/plugins/linux.pp | 8 | ||||
-rw-r--r-- | manifests/plugins/nagios.pp | 20 | ||||
-rw-r--r-- | manifests/plugins/vserver.pp | 4 |
5 files changed, 9 insertions, 31 deletions
diff --git a/manifests/plugins/debian.pp b/manifests/plugins/debian.pp index f239989..6d2faef 100644 --- a/manifests/plugins/debian.pp +++ b/manifests/plugins/debian.pp @@ -1,4 +1,2 @@ class munin::plugins::debian inherits munin::plugins::base { - munin::plugin { apt_all: ensure => present; } } - diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp index 99b85ba..df0828c 100644 --- a/manifests/plugins/interfaces.pp +++ b/manifests/plugins/interfaces.pp @@ -8,14 +8,14 @@ class munin::plugins::interfaces inherits munin::plugins::base { case $operatingsystem { openbsd: { $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1") - munin::plugin{ + munin::plugin{ $if_errs: ensure => "if_errcoll_"; } } default: { $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1") - munin::plugin{ - $if_errs: ensure => "if_err_"; + munin::plugin{ + $if_errs: ensure => "if_err_"; } } } diff --git a/manifests/plugins/linux.pp b/manifests/plugins/linux.pp index c7beb59..86696cc 100644 --- a/manifests/plugins/linux.pp +++ b/manifests/plugins/linux.pp @@ -1,9 +1,9 @@ class munin::plugins::linux inherits munin::plugins::base { munin::plugin { - [ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]: - ensure => present; - acpi: - ensure => $acpi_available; + [ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]: + ensure => present; + acpi: + ensure => $acpi_available; } include munin::plugins::interfaces diff --git a/manifests/plugins/nagios.pp b/manifests/plugins/nagios.pp deleted file mode 100644 index c07e99d..0000000 --- a/manifests/plugins/nagios.pp +++ /dev/null @@ -1,20 +0,0 @@ -class munin::plugins::nagios inherits munin::plugins::base { - - munin::plugin::deploy { - nagios_hosts: config => 'user root'; - nagios_svc: config => 'user root'; - nagios_perf_hosts: ensure => nagios_perf_, config => 'user root'; - nagios_perf_svc: ensure => 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"], - } - -} diff --git a/manifests/plugins/vserver.pp b/manifests/plugins/vserver.pp index bce28a1..f24af07 100644 --- a/manifests/plugins/vserver.pp +++ b/manifests/plugins/vserver.pp @@ -1,7 +1,7 @@ class munin::plugins::vserver inherits munin::plugins::base { munin::plugin { - [ netstat, processes ]: - ensure => present; + [ netstat, processes ]: + ensure => present; } } |