diff options
| author | David Schmitt <david@dasz.at> | 2009-07-20 10:15:15 +0200 |
|---|---|---|
| committer | David Schmitt <david@dasz.at> | 2009-07-20 10:15:15 +0200 |
| commit | 08156d7433c3052205a545951af7f0c5670a3a36 (patch) | |
| tree | e8124773caade7e83f815f43b7261c013f3be349 | |
| parent | 1868c2508f01c6b85f9086ddac00998521067fbc (diff) | |
Move interfaces fact to munin_interfaces
This is to avoid clashes with newer facter versions which bring
their own interfaces fact.
| -rw-r--r-- | manifests/plugin.pp | 4 | ||||
| -rwxr-xr-x | plugins/facter/munin_interfaces.rb (renamed from plugins/facter/interfaces.rb) | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 85fa444..87259f7 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -88,8 +88,8 @@ class munin::plugins::base { # handle if_ and if_err_ plugins class munin::plugins::interfaces inherits munin::plugins::base { - $ifs = gsub(split($interfaces, " "), "(.+)", "if_\\1") - $if_errs = gsub(split($interfaces, " "), "(.+)", "if_err_\\1") + $ifs = gsub(split($munin_interfaces, " "), "(.+)", "if_\\1") + $if_errs = gsub(split($munin_interfaces, " "), "(.+)", "if_err_\\1") plugin { $ifs: ensure => "if_"; $if_errs: ensure => "if_err_"; diff --git a/plugins/facter/interfaces.rb b/plugins/facter/munin_interfaces.rb index a498d64..5366573 100755 --- a/plugins/facter/interfaces.rb +++ b/plugins/facter/munin_interfaces.rb @@ -1,5 +1,5 @@ # return the set of active interfaces as an array -Facter.add("interfaces") do +Facter.add("munin_interfaces") do setcode do `ip -o link show`.split(/\n/).collect do |line| value = nil |