Modify

Opened 12 years ago

Closed 12 years ago

Last modified 4 years ago

#221 closed defect (invalid)

rrdcollect with libpcre

Reported by: David <weese@…> Owned by: olli
Priority: normal Milestone: Barrier Breaker 14.07
Component: packages Version: 2.0
Keywords: rrdcollect libpcre Cc:

Description

I would like rrdcollect to support regular expressions.

This can easily be done by compiling it with --with-libpcre enabled and automatically select libpcre when selecting rrdcollect in "make menuconfig". I have made necessary changes, successfully tested it and made a patch which also includes the application of step 1-2 of ticket #220:

Index: rrdcollect/files/rrdcollect.conf
===================================================================
--- rrdcollect/files/rrdcollect.conf	(Revision 2985)
+++ rrdcollect/files/rrdcollect.conf	(Arbeitskopie)
@@ -19,15 +19,15 @@
 
 # LAN: vlan0, WAN: vlan1, WIFI: eth1
 file:///proc/net/dev
-"vlan0: %d %d %*d %*d %*d %*d %*d %*d %d %d"    IF.rrd:Labi,Lapi,Labo,Lapo
-"vlan1: %d %d %*d %*d %*d %*d %*d %*d %d %d"    IF.rrd:Wabi,Wapi,Wabo,Wapo
-"eth1: %d %d %*d %*d %*d %*d %*d %*d %d %d"     IF.rrd:Wibi,Wipi,Wibo,Wipo
-#"tun0: %d %d %*d %*d %*d %*d %*d %*d %d %d"	 IF.rrd:tbi,tpi,tbo,tpo
+" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d"     IF.rrd:Labi,Lapi,Labo,Lapo
+" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d"     IF.rrd:Wabi,Wapi,Wabo,Wapo
+" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d"      IF.rrd:Wibi,Wipi,Wibo,Wipo
+#" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d"	 IF.rrd:tbi,tpi,tbo,tpo
 
 file:///proc/slabinfo
 "ip_conntrack  %d %*d %*d %*d %*d %*d"		 SYS.rrd:con
 "arp_cache     %d %*d %*d %*d %*d %*d"           SYS.rrd:arp
 
 file:///proc/interrupts
-"4: %d MIPS  eth1"				 SYS.rrd:irw
-"5: %d MIPS  eth0"				 SYS.rrd:ire
+"  4: %d MIPS  eth1"				 SYS.rrd:irw
+"  5: %d MIPS  eth0"				 SYS.rrd:ire
Index: rrdcollect/ipkg/rrdcollect.control
===================================================================
--- rrdcollect/ipkg/rrdcollect.control	(Revision 2985)
+++ rrdcollect/ipkg/rrdcollect.control	(Arbeitskopie)
@@ -1,7 +1,7 @@
 Package: rrdcollect
 Priority: optional
 Section: admin
-Depends: librrd | librrd1
+Depends: libpcre, librrd | librrd1
 Description: Round-Robin Database (RRD) collecting daemon
  RRDcollect is a daemon which polls certain files in /proc/
  directory, gathering data and storing it inside RRDtool's
Index: rrdcollect/Config.in
===================================================================
--- rrdcollect/Config.in	(Revision 2985)
+++ rrdcollect/Config.in	(Arbeitskopie)
@@ -3,6 +3,7 @@
 	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_LIBRRD || BR2_PACKAGE_LIBRRD1
+	select BR2_PACKAGE_LIBPCRE
 	help
 	  RRDcollect is a daemon which polls ceratin files in /proc/
 	  directory, gathering data and storing it inside RRDtool's
Index: rrdcollect/Makefile
===================================================================
--- rrdcollect/Makefile	(Revision 2985)
+++ rrdcollect/Makefile	(Arbeitskopie)
@@ -18,6 +18,12 @@
 RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng
 endif
 
+ifneq ($(BR2_PACKAGE_LIBPCRE),)
+LIBPCRE:=--with-libpcre
+else
+LIBPCRE:=--without-libpcre
+endif
+
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,RRDCOLLECT,rrdcollect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@@ -57,7 +63,7 @@
 			--enable-exec \
 			--without-rrdtool \
 			--with-librrd \
-			--without-libpcre \
+			$(LIBPCRE) \
 			--without-libpcap \
 	);
 	touch $@

Attachments (0)

Change History (3)

comment:1 Changed 12 years ago by olli

  • Milestone set to 2.0
  • Owner changed from developers to olli
  • severity changed from blocker to normal
  • Version set to 2.0

comment:2 Changed 12 years ago by olli

  • Resolution set to invalid
  • Status changed from new to closed

comment:3 Changed 4 years ago by jow

  • Milestone changed from Attitude Adjustment 12.09 to Barrier Breaker 14.07

Milestone Attitude Adjustment 12.09 deleted

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.