diff options
| author | Micah Anderson <micah@riseup.net> | 2009-12-22 19:29:23 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-12-22 19:29:23 -0500 |
| commit | 42c94b4fad526b25852c7bcaf053f441bac38c9e (patch) | |
| tree | 89a8da279ba7190a350ade72bc52cda90362c4b7 /lib | |
| parent | 577ff440b791ab67de77b20440b5e385fe1c9572 (diff) | |
| parent | 76352415fec5c2ab6975e3a8843dd4983f7cae6a (diff) | |
Merge commit '76352415fec5c2ab6975e3a8843dd4983f7cae6a'
Conflicts:
README
lib/facter/acpi_available.rb
lib/facter/interfaces.rb
lib/facter/munin_interfaces.rb
manifests/client.pp
manifests/host.pp
manifests/init.pp
manifests/plugin.pp
plugins/facter/interfaces.rb
templates/defaultclient.erb
templates/munin-node.conf.Debian.lenny
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/facter/interfaces.rb (renamed from lib/facter/munin_interfaces.rb) | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/facter/munin_interfaces.rb b/lib/facter/interfaces.rb index f7a3575..a498d64 100755 --- a/lib/facter/munin_interfaces.rb +++ b/lib/facter/interfaces.rb @@ -1,14 +1,11 @@ # return the set of active interfaces as an array -Facter.add("munin_interfaces") do +Facter.add("interfaces") do setcode do `ip -o link show`.split(/\n/).collect do |line| value = nil matches = line.match(/^\d*: ([^:]*): <(.*,)?UP(,.*)?>/) if !matches.nil? value = matches[1] - # remove superfluous "underlying interface" specification - # for VLAN interfaces - value.gsub!(/@.*/, '') end value end.compact.sort.join(" ") |