diff options
| author | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-03-25 00:01:54 -0400 |
| commit | 5218993abef2a8bf79278d4d84123843279735c5 (patch) | |
| tree | 8fe859ba86b83e4b9782ac19a37c89bf5cf5f0ba /manifests/plugins | |
| parent | b3e29447187e289c60a4a9f7830032f1b10fae2f (diff) | |
| parent | e7d23dabf191c5416197af0b229fc90b94539405 (diff) | |
Merge commit 'e7d23dabf191c5416197af0b229fc90b94539405'
Conflicts:
manifests/client.pp
manifests/client/base.pp
manifests/client/darwin.pp
manifests/client/debian.pp
manifests/client/gentoo.pp
manifests/client/openbsd.pp
manifests/client/package.pp
manifests/host.pp
manifests/init.pp
manifests/plugin.pp
manifests/plugin/scriptpaths.pp
manifests/plugins/interfaces.pp
manifests/plugins/linux.pp
manifests/plugins/vserver.pp
manifests/register.pp
manifests/register_snmp.pp
manifests/remoteplugin.pp
manifests/snmp_collector.pp
Diffstat (limited to 'manifests/plugins')
| -rw-r--r-- | manifests/plugins/interfaces.pp | 6 | ||||
| -rw-r--r-- | manifests/plugins/vserver.pp | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp index de4b75b..03ed0e7 100644 --- a/manifests/plugins/interfaces.pp +++ b/manifests/plugins/interfaces.pp @@ -2,9 +2,9 @@ class munin::plugins::interfaces inherits munin::plugins::base { $ifs = gsub(split($interfaces, " |,"), "(.+)", "if_\\1") - + munin::plugin { $ifs: ensure => "if_"; } - + case $operatingsystem { openbsd: { $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1") @@ -15,7 +15,7 @@ class munin::plugins::interfaces inherits munin::plugins::base { default: { $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1") munin::plugin{ - $if_errs: ensure => "if_err_"; + $if_errs: ensure => "if_err_"; } } } diff --git a/manifests/plugins/vserver.pp b/manifests/plugins/vserver.pp index ffc4b0a..42a9bf4 100644 --- a/manifests/plugins/vserver.pp +++ b/manifests/plugins/vserver.pp @@ -1,9 +1,8 @@ class munin::plugins::vserver inherits munin::plugins::base { - munin::plugin { - [ netstat, processes ]: - ensure => present; - } - + munin::plugin { + [ netstat, processes ]: + ensure => present; + } } |