multi_interface.py: Adding regular expression support for the exclude_interfaces parameter

Bjoern Teipel · Bjoern Teipel · commit 7024ce0b4870 · 2013-10-06T21:21:30.000-07:00
diff --git a/network/multi_interface/conf.d/multi_interface.pyconf b/network/multi_interface/conf.d/multi_interface.pyconf
@@ -12,9 +12,9 @@ modules {
     }
 
     # Alternatively leave the interfaces list at value = "" then exclude
-    # specific interfaces e.g. dummy, lo etc. 
+    # specific interfaces by name or regular expression e.g. dummy, lo, eth[0-9]+ etc. 
     param excluded_interfaces {
-      value = "dummy0 eth0_rename tunl0 gre0"
+      value = "lo vnet[0-9]+"
     }
 
 
diff --git a/network/multi_interface/python_modules/multi_interface.py b/network/multi_interface/python_modules/multi_interface.py
@@ -113,27 +113,31 @@ def metric_cleanup():
     pass
     
 def get_interfaces(watch_interfaces, excluded_interfaces):
-	global INTERFACES
+   global INTERFACES
+   if_excluded = 0
         
-        # check if particular interfaces have been specifieid. Watch only those
-        if watch_interfaces != "":
-            INTERFACES = watch_interfaces.split(" ")
-            
-        else:
-
-	    if excluded_interfaces != "":
-		excluded_if_list = excluded_interfaces.split(" ")
-        
-            f = open(net_stats_file, "r")
-            for line in f:
-                # Find only lines with :
-                if re.search(":", line):
-                    a = line.split(":")
-                    dev_name = a[0].lstrip()
-		    if dev_name not in excluded_if_list:
-                        INTERFACES.append(dev_name)
-
-	return 0
+   # check if particular interfaces have been specifieid. Watch only those
+   if watch_interfaces != "":
+      INTERFACES = watch_interfaces.split(" ")      
+   else:
+      if excluded_interfaces != "":
+         excluded_if_list = excluded_interfaces.split(" ")
+      f = open(net_stats_file, "r")
+      for line in f:
+         # Find only lines with :
+         if re.search(":", line):
+            a = line.split(":")
+            dev_name = a[0].lstrip()
+                    
+            # Determine if interface is excluded by name or regex
+            for ex in excluded_if_list:
+               if re.match(ex,dev_name):
+                  if_excluded = 1
+
+            if not if_excluded:
+               INTERFACES.append(dev_name)
+            if_excluded = 0
+   return 0
 
 
 def get_metrics():

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ modules {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`# Alternatively leave the interfaces list at value = "" then exclude`
`15`		`- # specific interfaces e.g. dummy, lo etc.`
	`15`	`+ # specific interfaces by name or regular expression e.g. dummy, lo, eth[0-9]+ etc.`
`16`	`16`	`param excluded_interfaces {`
`17`		`- value = "dummy0 eth0_rename tunl0 gre0"`
	`17`	`+ value = "lo vnet[0-9]+"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`