From 3e187eafe5e0e905b55517e9f2b0e696aa2a8c6c Mon Sep 17 00:00:00 2001 From: david Date: Tue, 7 Aug 2007 18:40:25 +0000 Subject: more munin enhancements git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@181 f03ff2f1-f02d-0410-970d-b9634babeaa1 --- files/facter/acpi_available.rb | 10 ++++++++++ manifests/plugin.pp | 14 +++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 files/facter/acpi_available.rb diff --git a/files/facter/acpi_available.rb b/files/facter/acpi_available.rb new file mode 100644 index 0000000..45e5288 --- /dev/null +++ b/files/facter/acpi_available.rb @@ -0,0 +1,10 @@ +# return whether acpi is available -- used for desiding whether to install the munin plugin +Facter.add("acpi_available") do + setcode do + if `acpi -t -B -A 2>/dev/null`.match(/\d/).nil? + "false" + else + "true" + end + end +end diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 3b1e80a..e875ddb 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -81,9 +81,13 @@ class munin::plugins::base { notify => Service[munin-node]; } - puppet::fact{ interfaces: - source => "puppet://$servername/munin/facter/interfaces.rb", - require => Package[iproute], + puppet::fact{ + interfaces: + source => "puppet://$servername/munin/facter/interfaces.rb", + require => Package[iproute]; + acpi_available: + source => "puppet://$servername/munin/facter/acpi_available.rb", + require => Package[acpi]; } } @@ -110,6 +114,10 @@ class munin::plugins::linux inherits munin::plugins::base { ensure => present; } + if $acpi_available { + plugin { acpi: } + } + include munin::plugins::interfaces } -- cgit v1.2.3