From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 21 Jan 2016 20:26:38 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~5
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=218c57128f2e54960133cff3e774b5ef9944068a;hp=778a6720a300cf549f5bcca9c22a3ef09d97f16f

Merge branch 'collectd-5.4' into collectd-5.5
---

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 689677c9..07d66cd7 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -484,7 +484,6 @@
 #	FSType "ext3"
 #	IgnoreSelected false
 #	ReportByDevice false
-#	ReportReserved false
 #	ReportInodes false
 #	ValuesAbsolute true
 #	ValuesPercentage false
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 42ade4ee..7a66c818 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -2513,6 +2513,23 @@ do that: By setting B<IgnoreSelected> to I<true> the effect of
 B<Interface> is inverted: All selected interfaces are ignored and all
 other interfaces are collected.
 
+It is possible to use regular expressions to match interface names, if the
+name is surrounded by I</.../> and collectd was compiled with support for
+regexps. This is useful if there's a need to collect (or ignore) data
+for a group of interfaces that are similarly named, without the need to
+explicitly list all of them (especially useful if the list is dynamic).
+Example:
+
+ Interface "lo"
+ Interface "/^veth/"
+ Interface "/^tun[0-9]+/"
+ IgnoreSelected "true"
+
+This will ignore the loopback interface, all interfaces with names starting
+with I<veth> and all interfaces with names starting with I<tun> followed by
+at least one digit.
+
+
 =back
 
 =head2 Plugin C<ipmi>
diff --git a/src/df.c b/src/df.c
index ef9e4130..53bc4a89 100644
--- a/src/df.c
+++ b/src/df.c
@@ -53,7 +53,6 @@ static const char *config_keys[] =
 	"FSType",
 	"IgnoreSelected",
 	"ReportByDevice",
-	"ReportReserved",
 	"ReportInodes",
 	"ValuesAbsolute",
 	"ValuesPercentage"
diff --git a/src/virt.c b/src/virt.c
index 663555b9..c9355c4a 100644
--- a/src/virt.c
+++ b/src/virt.c
@@ -327,8 +327,8 @@ lv_init (void)
 {
     if (virInitialize () != 0)
         return -1;
-
-	return 0;
+    else
+        return 0;
 }
 
 static int