diff options
| author | mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279> | 2008-04-24 11:05:25 +0000 |
|---|---|---|
| committer | mh <mh@d66ca3ae-40d7-4aa7-90d4-87d79ca94279> | 2008-04-24 11:05:25 +0000 |
| commit | a3ac1c067e22f25b6fa5643873a4a935358561f1 (patch) | |
| tree | 1f4ff98a134443989a8642e0b2556cc2a65d6c53 /manifests | |
| parent | 4ade531347d2cfef7945f2521fb9e1ae3730098c (diff) | |
fixed munin stuff
git-svn-id: https://svn/ipuppet/trunk/modules/munin@1248 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/client.pp | 3 | ||||
| -rw-r--r-- | manifests/plugin.pp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index c81e6f4..8181845 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -66,6 +66,7 @@ define munin::register() @@file { "${NODESDIR}/${name}_${munin_port_real}": ensure => present, content => template("munin/defaultclient.erb"), + tag => 'munin', } } @@ -129,7 +130,7 @@ class munin::client::debian munin::register { $fqdn: } # workaround bug in munin_node_configure - plugin { "postfix_mailvolume": ensure => absent } + munin::plugin { "postfix_mailvolume": ensure => absent } } class munin::client::gentoo diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 6eaa518..161bf88 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -149,7 +149,7 @@ class munin::plugins::interfaces inherits munin::plugins::base { $ifs = gsub(split($interfaces, " "), "(.+)", "if_\\1") $if_errs = gsub(split($interfaces, " "), "(.+)", "if_err_\\1") - plugin { + munin::plugin { $ifs: ensure => "if_"; $if_errs: ensure => "if_err_"; } @@ -157,7 +157,7 @@ class munin::plugins::interfaces inherits munin::plugins::base { class munin::plugins::linux inherits munin::plugins::base { - plugin { + munin::plugin { [ df_abs, forks, memory, processes, cpu, df_inode, irqstats, netstat, open_files, swap, df, entropy, interrupts, load, open_inodes, vmstat |