summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-07-15 20:41:39 +0200
committermh <mh@immerda.ch>2010-07-15 20:41:39 +0200
commitdab730ed6b0667d4356c0e8e21e37719ea977a93 (patch)
treea00789980ad6bb8cbf27bf41c31de8c88dfb9171 /manifests
parente7d23dabf191c5416197af0b229fc90b94539405 (diff)
fixing weird class setup
we had some weird class setup which caused some problems on 2.6 (see puppet bug #4242 for more info). This commit cleans that weird setup up and decouples a lot of things.
Diffstat (limited to 'manifests')
-rw-r--r--manifests/plugin.pp2
-rw-r--r--manifests/plugins/apache.pp8
-rw-r--r--manifests/plugins/base.pp63
-rw-r--r--manifests/plugins/debian.pp3
-rw-r--r--manifests/plugins/djbdns.pp2
-rw-r--r--manifests/plugins/dom0.pp14
-rw-r--r--manifests/plugins/gentoo.pp6
-rw-r--r--manifests/plugins/interfaces.pp32
-rw-r--r--manifests/plugins/linux.pp16
-rw-r--r--manifests/plugins/muninhost.pp5
-rw-r--r--manifests/plugins/openbsd.pp17
-rw-r--r--manifests/plugins/physical.pp8
-rw-r--r--manifests/plugins/selinux.pp5
-rw-r--r--manifests/plugins/setup.pp27
-rw-r--r--manifests/plugins/vserver.pp10
15 files changed, 104 insertions, 114 deletions
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index cdaa17d..52c77c2 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -16,6 +16,8 @@ define munin::plugin (
$plugin_src = $ensure ? { "present" => $name, default => $ensure }
$plugin = "/etc/munin/plugins/$name"
$plugin_conf = "/etc/munin/plugin-conf.d/$name.conf"
+
+ include munin::plugins::setup
case $ensure {
"absent": {
file { $plugin: ensure => absent, }
diff --git a/manifests/plugins/apache.pp b/manifests/plugins/apache.pp
index ee90de8..b3e7634 100644
--- a/manifests/plugins/apache.pp
+++ b/manifests/plugins/apache.pp
@@ -1,6 +1,4 @@
-class munin::plugins::apache inherits munin::plugins::base {
- munin::plugin{ "apache_accesses": }
- munin::plugin{ "apache_processes": }
- munin::plugin{ "apache_volume": }
- munin::plugin::deploy { "apache_activity": }
+class munin::plugins::apache {
+ munin::plugin{ [ 'apache_accesses', 'apache_processes',' apache_volume' ]: }
+ munin::plugin::deploy { "apache_activity": }
}
diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp
index 4658acc..bfccae5 100644
--- a/manifests/plugins/base.pp
+++ b/manifests/plugins/base.pp
@@ -1,50 +1,25 @@
class munin::plugins::base {
- file {
- [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
- source => "puppet://$server/modules/common/empty",
- ignore => [ '\.ignore', 'snmp_*' ],
- ensure => directory, checksum => mtime,
- recurse => true, purge => true, force => true,
- mode => 0755, owner => root, group => 0,
- notify => Service['munin-node'];
- '/etc/munin/plugin-conf.d/munin-node':
- ensure => present,
- mode => 0644, owner => root, group => 0,
- notify => Service['munin-node'],
- }
- munin::plugin {
- [ df, cpu, interrupts, load, memory, netstat, open_files,
- processes, swap, uptime, users, vmstat
- ]:
+ # setup basic plugins
+ munin::plugin {
+ [ df, cpu, interrupts, load, memory, netstat, open_files,
+ processes, swap, uptime, users, vmstat ]:
ensure => present,
- }
- include munin::plugins::interfaces
+ }
+ include munin::plugins::interfaces
- case $kernel {
- openbsd: {
- File['/etc/munin/plugin-conf.d/munin-node']{
- before => File['/var/run/munin'],
- }
- }
- default: {
- File['/etc/munin/plugin-conf.d/munin-node']{
- before => Package['munin-node'],
- }
- }
- }
- case $kernel {
- linux: {
- case $vserver {
- guest: { include munin::plugins::vserver }
- default: {
- include munin::plugins::linux
- }
- }
- }
- }
- case $virtual {
- physical: { include munin::plugins::physical }
- xen0: { include munin::plugins::dom0 }
+ case $kernel {
+ openbsd: { include munin::plugins::openbsd }
+ linux: {
+ case $vserver {
+ guest: { include munin::plugins::vserver }
+ default: { include munin::plugins::linux }
+ }
}
+ }
+
+ case $virtual {
+ physical: { include munin::plugins::physical }
+ xen0: { include munin::plugins::dom0 }
+ }
}
diff --git a/manifests/plugins/debian.pp b/manifests/plugins/debian.pp
index 6d2faef..f756150 100644
--- a/manifests/plugins/debian.pp
+++ b/manifests/plugins/debian.pp
@@ -1,2 +1 @@
-class munin::plugins::debian inherits munin::plugins::base {
-}
+class munin::plugins::debian { }
diff --git a/manifests/plugins/djbdns.pp b/manifests/plugins/djbdns.pp
index 37d8ed6..c0a5163 100644
--- a/manifests/plugins/djbdns.pp
+++ b/manifests/plugins/djbdns.pp
@@ -1,3 +1,3 @@
-class munin::plugins::djbdns inherits munin::plugins::base {
+class munin::plugins::djbdns {
munin::plugin::deploy { "tinydns": }
}
diff --git a/manifests/plugins/dom0.pp b/manifests/plugins/dom0.pp
index 8d919c3..3be3e3f 100644
--- a/manifests/plugins/dom0.pp
+++ b/manifests/plugins/dom0.pp
@@ -1,9 +1,7 @@
-class munin::plugins::dom0 inherits munin::plugins::physical {
- munin::plugin::deploy { "xen": config => "user root"}
- munin::plugin::deploy { "xen-cpu": config => "user root"}
- munin::plugin::deploy { "xen_memory": config => "user root"}
- munin::plugin::deploy { "xen_mem": config => "user root"}
- munin::plugin::deploy { "xen_vm": config => "user root"}
- munin::plugin::deploy { "xen_vbd": config => "user root"}
- munin::plugin::deploy { "xen_traffic_all": config => "user root"}
+class munin::plugins::dom0 {
+ munin::plugin::deploy {
+ [ 'xen', 'xen-cpu', 'xen_memory', 'xen_mem',
+ 'xen_vm', 'xen_vbd' 'xen_traffic_all' ]:
+ config => 'user root';
+ }
}
diff --git a/manifests/plugins/gentoo.pp b/manifests/plugins/gentoo.pp
index 81d0e6b..25c1626 100644
--- a/manifests/plugins/gentoo.pp
+++ b/manifests/plugins/gentoo.pp
@@ -1,3 +1,5 @@
-class munin::plugins::gentoo inherits munin::plugins::base {
- munin::plugin::deploy { "gentoo_lastupdated": config => "user portage\nenv.logfile /var/log/emerge.log\nenv.tail /usr/bin/tail\nenv.grep /bin/grep"}
+class munin::plugins::gentoo {
+ munin::plugin::deploy { 'gentoo_lastupdated':
+ config => "user portage\nenv.logfile /var/log/emerge.log\nenv.tail /usr/bin/tail\nenv.grep /bin/grep"
+ }
}
diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp
index df0828c..e0744a0 100644
--- a/manifests/plugins/interfaces.pp
+++ b/manifests/plugins/interfaces.pp
@@ -1,22 +1,22 @@
# handle if_ and if_err_ plugins
-class munin::plugins::interfaces inherits munin::plugins::base {
+class munin::plugins::interfaces {
- $ifs = gsub(split($interfaces, " |,"), "(.+)", "if_\\1")
- munin::plugin {
+ $ifs = gsub(split($interfaces, " |,"), "(.+)", "if_\\1")
+ munin::plugin {
$ifs: ensure => "if_";
+ }
+ case $operatingsystem {
+ openbsd: {
+ $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
+ munin::plugin{
+ $if_errs: ensure => "if_errcoll_";
+ }
}
- case $operatingsystem {
- openbsd: {
- $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1")
- munin::plugin{
- $if_errs: ensure => "if_errcoll_";
- }
- }
- default: {
- $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1")
- munin::plugin{
- $if_errs: ensure => "if_err_";
- }
- }
+ default: {
+ $if_errs = gsub(split($interfaces, " |,"), "(.+)", "if_err_\\1")
+ munin::plugin{
+ $if_errs: ensure => "if_err_";
+ }
}
+ }
}
diff --git a/manifests/plugins/linux.pp b/manifests/plugins/linux.pp
index 86696cc..30e0af6 100644
--- a/manifests/plugins/linux.pp
+++ b/manifests/plugins/linux.pp
@@ -1,10 +1,8 @@
-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;
- }
-
- include munin::plugins::interfaces
+class munin::plugins::linux {
+ munin::plugin {
+ [ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]:
+ ensure => present;
+ acpi:
+ ensure => $acpi_available;
+ }
}
diff --git a/manifests/plugins/muninhost.pp b/manifests/plugins/muninhost.pp
index 2af4897..e4fb87d 100644
--- a/manifests/plugins/muninhost.pp
+++ b/manifests/plugins/muninhost.pp
@@ -1,4 +1,3 @@
-class munin::plugins::muninhost inherits munin::plugins::base {
- munin::plugin { munin_update: }
- munin::plugin { munin_graph: }
+class munin::plugins::muninhost {
+ munin::plugin { ['munin_update', 'munin_graph']: }
}
diff --git a/manifests/plugins/openbsd.pp b/manifests/plugins/openbsd.pp
index 67cf32d..b549994 100644
--- a/manifests/plugins/openbsd.pp
+++ b/manifests/plugins/openbsd.pp
@@ -1,13 +1,6 @@
-class munin::plugins::openbsd inherits munin::plugins::base {
- munin::plugin {
- [ df, cpu, interrupts, load, memory, netstat, open_files,
- processes, swap, users, vmstat
- ]:
- ensure => present,
- }
- munin::plugin {
- [ memory_pools, memory_types ]:
- ensure => present,
- }
-
+class munin::plugins::openbsd {
+ munin::plugin {
+ [ memory_pools, memory_types ]:
+ ensure => present,
+ }
}
diff --git a/manifests/plugins/physical.pp b/manifests/plugins/physical.pp
index 6706711..ac050a5 100644
--- a/manifests/plugins/physical.pp
+++ b/manifests/plugins/physical.pp
@@ -1,5 +1,5 @@
-class munin::plugins::physical inherits munin::plugins::base {
- case $kernel {
- linux: { munin::plugin { iostat: } }
- }
+class munin::plugins::physical {
+ case $kernel {
+ linux: { munin::plugin { iostat: } }
+ }
}
diff --git a/manifests/plugins/selinux.pp b/manifests/plugins/selinux.pp
index 6affc86..faf610a 100644
--- a/manifests/plugins/selinux.pp
+++ b/manifests/plugins/selinux.pp
@@ -1,4 +1,3 @@
-class munin::plugins::selinux inherits munin::plugins::base {
- munin::plugin::deploy { "selinuxenforced": }
- munin::plugin::deploy { "selinux_avcstats": }
+class munin::plugins::selinux {
+ munin::plugin::deploy { [ 'selinuxenforced', 'selinux_avcstats' ]: }
}
diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp
new file mode 100644
index 0000000..f645f12
--- /dev/null
+++ b/manifests/plugins/setup.pp
@@ -0,0 +1,27 @@
+class munin::plugins::setup {
+ file {
+ [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
+ source => "puppet://$server/modules/common/empty",
+ ignore => [ '\.ignore', 'snmp_*' ],
+ ensure => directory, checksum => mtime,
+ recurse => true, purge => true, force => true,
+ mode => 0755, owner => root, group => 0,
+ notify => Service['munin-node'];
+ '/etc/munin/plugin-conf.d/munin-node':
+ ensure => present,
+ mode => 0644, owner => root, group => 0,
+ notify => Service['munin-node'],
+ }
+ case $kernel {
+ openbsd: {
+ File['/etc/munin/plugin-conf.d/munin-node']{
+ before => File['/var/run/munin'],
+ }
+ }
+ default: {
+ File['/etc/munin/plugin-conf.d/munin-node']{
+ before => Package['munin-node'],
+ }
+ }
+ }
+}
diff --git a/manifests/plugins/vserver.pp b/manifests/plugins/vserver.pp
index f24af07..e3eec05 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;
- }
+class munin::plugins::vserver {
+ munin::plugin {
+ [ netstat, processes ]:
+ ensure => present;
+ }
}