[hobbit] rrd-data.log

[Henrik Stoerner]

On Wed, Aug 02, 2006 at 12:23:53PM +0200, Beau Olivier wrote:
>  
> I'm having "Internal error: Duplicate match ignored" in my rrd-data.log,
> what could cause this ?

Turns out to be a couple of bad regular expressions in the interface
statistics code. This patch should fix it for both the AIX and Linux
systems you've reported this on.


Regards,
Henrik

-------------- next part --------------
--- hobbitd/rrd/do_ifstat.c	2006/08/01 21:32:37	1.7
+++ hobbitd/rrd/do_ifstat.c	2006/08/02 15:25:48
@@ -20,7 +20,7 @@
 /* eth0   Link encap:                                                 */
 /*        RX bytes: 1829192 (265.8 MiB)  TX bytes: 1827320 (187.7 MiB */
 static const char *ifstat_linux_exprs[] = {
-	"^([a-z]+[0-9]+)\\s",
+	"^([a-z]+[0123456789.:]+)\\s",
 	"^\\s+RX bytes:([0-9]+) .*TX bytes.([0-9]+) "
 };
 
@@ -73,7 +73,7 @@
 */
 static const char *ifstat_aix_exprs[] = {
 	"^ETHERNET STATISTICS \\(([a-z0-9]+)\\) :",
-	"^Bytes:\\s+(\\d+)\\s+(\\d+)"
+	"^Bytes:\\s+(\\d+)\\s+Bytes:\\s+(\\d+)"
 };