diff options
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/client/darwin.pp | 38 | ||||
-rw-r--r-- | manifests/plugin.pp | 2 | ||||
-rw-r--r-- | manifests/plugins/base.pp | 1 | ||||
-rw-r--r-- | manifests/snmp_collector.pp | 22 |
4 files changed, 30 insertions, 33 deletions
diff --git a/manifests/client/darwin.pp b/manifests/client/darwin.pp index 369a605..4004f74 100644 --- a/manifests/client/darwin.pp +++ b/manifests/client/darwin.pp @@ -1,21 +1,21 @@ class munin::client::darwin { - file { "/usr/share/snmp/snmpd.conf": - mode => 744, - content => template("munin/darwin_snmpd.conf.erb"), - group => 0, - owner => root, - } - delete_matching_line{"startsnmpdno": - file => "/etc/hostconfig", - pattern => "SNMPSERVER=-NO-", - } - line { "startsnmpdyes": - file => "/etc/hostconfig", - line => "SNMPSERVER=-YES-", - notify => Exec["/sbin/SystemStarter start SNMP"], - } - exec{"/sbin/SystemStarter start SNMP": - noop => false, - } - munin::register_snmp { $fqdn: } + file { "/usr/share/snmp/snmpd.conf": + mode => 744, + content => template("munin/darwin_snmpd.conf.erb"), + group => 0, + owner => root, + } + delete_matching_line{"startsnmpdno": + file => "/etc/hostconfig", + pattern => "SNMPSERVER=-NO-", + } + line { "startsnmpdyes": + file => "/etc/hostconfig", + line => "SNMPSERVER=-YES-", + notify => Exec["/sbin/SystemStarter start SNMP"], + } + exec{"/sbin/SystemStarter start SNMP": + noop => false, + } + munin::register::snmp { $fqdn: } } diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 52c77c2..69b7322 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -3,8 +3,6 @@ # See LICENSE for the full license granted to you. # adapted and improved by admin(at)immerda.ch -### defines - define munin::plugin ( $ensure = "present", $script_path_in = '', diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp index bfccae5..007579c 100644 --- a/manifests/plugins/base.pp +++ b/manifests/plugins/base.pp @@ -1,5 +1,4 @@ class munin::plugins::base { - # setup basic plugins munin::plugin { [ df, cpu, interrupts, load, memory, netstat, open_files, diff --git a/manifests/snmp_collector.pp b/manifests/snmp_collector.pp index 7bd8bba..0f8318a 100644 --- a/manifests/snmp_collector.pp +++ b/manifests/snmp_collector.pp @@ -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 + } } |