merge with immerda/master
authorMarcel Haerry <haerry@puzzle.ch>
Thu, 4 Aug 2011 08:22:48 +0000 (10:22 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Thu, 4 Aug 2011 08:22:48 +0000 (10:22 +0200)
1  2 
manifests/plugin.pp
manifests/plugins/base.pp
manifests/snmp_collector.pp
templates/munin-node.conf.default

Simple merge
@@@ -1,50 -1,25 +1,24 @@@
  class munin::plugins::base {
-     file {
-         [ '/etc/munin/plugins', '/etc/munin/plugin-conf.d' ]:
-             source => "puppet:///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':
 -
+   # setup basic plugins
+   munin::plugin {
+     [ df, cpu, interrupts, load, memory, netstat, open_files,
+       processes, swap, uptime, users, vmstat ]:
              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
-         ]:
-             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 }
+   }
  }
@@@ -1,14 -1,14 +1,14 @@@
  class munin::snmp_collector{
 -    file {
 -        "/var/lib/puppet/modules/munin/create_snmp_links":
 -            source => "puppet:///modules/munin/create_snmp_links.sh",
 -            mode => 755, owner => root, group => 0;
 -    }
 +      file { 
 +              "/var/lib/puppet/modules/munin/create_snmp_links":
 +                      source => "puppet:///modules/munin/create_snmp_links.sh",
 +                      mode => 755, owner => root, group => 0;
 +      }
  
-       exec { "create_snmp_links":
-               command => "/var/lib/puppet/modules/munin/create_snmp_links /var/lib/puppet/modules/munin/nodes",
-               require => File["snmp_links"],
-               timeout => "2048",
-               schedule => daily
-       }
 -    exec { "create_snmp_links":
 -        command => "/var/lib/puppet/modules/munin/create_snmp_links /var/lib/puppet/modules/munin/nodes",
 -        require => File["snmp_links"],
 -        timeout => "2048",
 -        schedule => daily
 -    }
++  exec { "create_snmp_links":
++    command => "/var/lib/puppet/modules/munin/create_snmp_links /var/lib/puppet/modules/munin/nodes",
++    require => File["snmp_links"],
++    timeout => "2048",
++    schedule => daily
++  }
  }
Simple merge