diff options
| author | Marcel Haerry <haerry@puzzle.ch> | 2008-04-29 10:00:06 +0200 |
|---|---|---|
| committer | Marcel Haerry <haerry@puzzle.ch> | 2008-04-29 10:00:06 +0200 |
| commit | 78d0392d004986fbed9938e0ad994165fb8d51dd (patch) | |
| tree | 2af64fd794dc3c9a1a2587db18669dc848339228 /manifests | |
| parent | 65fb027d8cf639c565b0f9fb53b5fbe9ee25dc7b (diff) | |
| parent | a043afef5e8fb14385f59b4fee558f7f9618b050 (diff) | |
merged with upstream
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/client.pp | 13 | ||||
| -rw-r--r-- | manifests/plugin.pp | 6 |
2 files changed, 12 insertions, 7 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 69e9f2e..8305bf0 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -1,6 +1,7 @@ # client.pp - configure a munin node # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # See LICENSE for the full license granted to you. +# Adapted and improved by admin(at)immerda.ch class munin::client { @@ -54,12 +55,12 @@ class munin::client::base { hasrestart => true, require => Package[munin-node], } - file { - "/etc/munin/": + file {"/etc/munin/": ensure => directory, mode => 0755, owner => root, group => 0; - "/etc/munin/munin-node.conf": - content => template("munin/munin-node.conf.$operatingsystem.$lsbdistrelease"), + } + file {"/etc/munin/munin-node.conf": + content => template("munin/munin-node.conf.$operatingsystem"), mode => 0644, owner => root, group => 0, # this has to be installed before the package, so the postinst can # boot the munin-node without failure! @@ -99,6 +100,9 @@ class munin::client::debian inherits munin::client::base { # sarge's munin-node init script has no status hasstatus => $lsbdistcodename ? { sarge => false, default => true } } + File["/etc/munin/munin-node.conf"]{ + content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"), + } # workaround bug in munin_node_configure plugin { "postfix_mailvolume": ensure => absent } include munin::plugins::debian @@ -111,6 +115,7 @@ class munin::client::gentoo inherits munin::client::base { name => 'munin', category => 'net-analyzer', } + include munin::plugins::gentoo } diff --git a/manifests/plugin.pp b/manifests/plugin.pp index a2f8231..6a92c56 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -143,7 +143,7 @@ class munin::plugins::base { } } } - case $kernel { + case $kernel { linux: { case $vserver { guest: { include munin::plugins::vserver } @@ -165,7 +165,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_"; } @@ -173,7 +173,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 |