From 08156d7433c3052205a545951af7f0c5670a3a36 Mon Sep 17 00:00:00 2001
From: David Schmitt <david@dasz.at>
Date: Mon, 20 Jul 2009 10:15:15 +0200
Subject: Move interfaces fact to munin_interfaces

This is to avoid clashes with newer facter versions which bring
their own interfaces fact.
---
 manifests/plugin.pp                |  4 ++--
 plugins/facter/interfaces.rb       | 13 -------------
 plugins/facter/munin_interfaces.rb | 13 +++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100755 plugins/facter/interfaces.rb
 create mode 100755 plugins/facter/munin_interfaces.rb

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/interfaces.rb
deleted file mode 100755
index a498d64..0000000
--- a/plugins/facter/interfaces.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# return the set of active interfaces as an array
-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]
-			end
-			value
-		end.compact.sort.join(" ")
-	end
-end
diff --git a/plugins/facter/munin_interfaces.rb b/plugins/facter/munin_interfaces.rb
new file mode 100755
index 0000000..5366573
--- /dev/null
+++ b/plugins/facter/munin_interfaces.rb
@@ -0,0 +1,13 @@
+# return the set of active interfaces as an array
+Facter.add("munin_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]
+			end
+			value
+		end.compact.sort.join(" ")
+	end
+end
-- 
cgit v1.2.3