diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-13 19:19:53 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-13 19:19:53 +0100 |
| commit | 4f6007861e1b6a440ba1b48af0120678c63fa3c4 (patch) | |
| tree | 3e875e4e116ab09e93b413aa8d3c0bbda2a1a6e3 /package/rrdcollect/files | |
| parent | 5b706112c14789bccff4805189b8c65c938c9d32 (diff) | |
update package, simplify
Diffstat (limited to 'package/rrdcollect/files')
| -rw-r--r-- | package/rrdcollect/files/rrdcollect.conf | 26 | ||||
| -rw-r--r-- | package/rrdcollect/files/rrdcollect.init | 9 |
2 files changed, 14 insertions, 21 deletions
diff --git a/package/rrdcollect/files/rrdcollect.conf b/package/rrdcollect/files/rrdcollect.conf index e34c9bff7..392661e87 100644 --- a/package/rrdcollect/files/rrdcollect.conf +++ b/package/rrdcollect/files/rrdcollect.conf @@ -1,5 +1,5 @@ step = 360 -directory = /var/lib/rrdcollect/rrd +directory = /var/lib/rrdcollect file:///proc/stat "cpu0 %d %d %d %d" SYS.rrd:cu,cn,cs,ci @@ -14,20 +14,20 @@ file:///proc/meminfo file:///proc/loadavg "%f %f %f %d/%d %*d" SYS.rrd:l1,l2,l3,pr,pt -exec:///bin/df -"/dev/mtdblock/4 %*d %d %d" SYS.rrd:us,av +#exec:///bin/df +#"/dev/mtdblock/4 %*d %d %d" SYS.rrd:us,av # 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 +#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 -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/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 +#file:///proc/interrupts +#" 4: %d MIPS eth1" SYS.rrd:irw +#" 5: %d MIPS eth0" SYS.rrd:ire diff --git a/package/rrdcollect/files/rrdcollect.init b/package/rrdcollect/files/rrdcollect.init index 5c83ae013..478150e90 100644 --- a/package/rrdcollect/files/rrdcollect.init +++ b/package/rrdcollect/files/rrdcollect.init @@ -4,11 +4,6 @@ . /etc/rc.conf -LIB_D=/var/lib/rrdcollect -CGI_S=$LIB_D/rrd.cgi -RRD_D=$LIB_D/rrd -RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null) - case $1 in autostop) ;; autostart) @@ -16,9 +11,7 @@ autostart) exec sh $0 start ;; start) - [ -d $LIB_D/img ] || mkdir -p $LIB_D/img - [ -n "$RRD_F" ] || /usr/bin/rrd.sh init - [ -x $CGI_S ] || /usr/bin/rrd.sh cgi + [ -d /var/lib/rrdcollect ] || mkdir -p /var/lib/rrdcollect rrdcollect ;; stop) |