webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed qos to collectd less data and smaller rrds

Browse Source 
Updated ntfs collectd samba and mpd
This commit is contained in:
Maniacikarus
2008-08-29 07:16:45 +02:00
parent dae27b6b91
commit e19fc87f1d
14 changed files with 27 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/qos/RRD-func.pl
View File

@@ -33,14 +33,6 @@ my $heartbeat=$STEP*2;
my @rrd_data_sources =
("-s", $STEP,
"DS:bytes:COUNTER:$heartbeat:0:U",
"DS:bits:COUNTER:$heartbeat:0:U",
"DS:pkts:COUNTER:$heartbeat:0:U",
"DS:dropped:COUNTER:$heartbeat:0:U",
"DS:overlimits:COUNTER:$heartbeat:0:U",
"DS:lended:COUNTER:$heartbeat:0:U",
"DS:borrowed:COUNTER:$heartbeat:0:U",
"DS:giants:COUNTER:$heartbeat:0:U",
"DS:backlog:GAUGE:$heartbeat:0:U",
"RRA:AVERAGE:0.5:1:43200",
"RRA:AVERAGE:0.5:7:8640",
"RRA:AVERAGE:0.5:31:8640",

13
config/qos/event-func.pl
View File

@@ -25,19 +25,6 @@
##
##########################################
our $event_file_all = "${event_datadir}changes.evt";
sub get_filename_event($) {
my $class_device = "$_[0]";
my $filename = "${event_datadir}class_${class_device}.evt";
return $filename;
}
sub get_filename_bandwidth_info($) {
my $class_device = "$_[0]";
my $filename = "${event_datadir}class_${class_device}_bandwidth.evt";
return $filename;
}
sub update_event_file($$$) {
my $filename = $_[0];
my $information = $_[1];

63
config/qos/parse-func.pl
View File

@@ -210,27 +210,6 @@ sub parse_class($) {
$classes_data{$hash}{last_update} = $timestamp;
update_counter( $hash, $timestamp, "bytes" , $bytes);
#(yes I know its bad/redundant, but it makes in easier elsewhere)
update_counter( $hash, $timestamp, "bits" , $bytes*8);
update_counter( $hash, $timestamp, "pkts" , $pkts);
update_counter( $hash, $timestamp, "dropped" , $dropped);
update_counter( $hash, $timestamp, "overlimits", $overlimits);
update_counter( $hash, $timestamp, "lended" , $lended);
update_counter( $hash, $timestamp, "borrowed" , $borrowed);
update_counter( $hash, $timestamp, "giants" , $giants);
# Not a counter value...
$classes_data{$hash}{backlog} = $backlog;
# Update the info data
# (remember to update the "type" first)
update_info( $hash, $timestamp, "type" , $type);
update_info( $hash, $timestamp, "parent", $parent);
update_info( $hash, $timestamp, "leaf" , $leaf);
update_info( $hash, $timestamp, "prio" , $prio);
update_info( $hash, $timestamp, "rate" , $rate);
update_info( $hash, $timestamp, "ceil" , $ceil);
update_info( $hash, $timestamp, "burst" , $burst);
update_info( $hash, $timestamp, "cburst", $cburst);
#print "\n";
}
@@ -259,15 +238,11 @@ sub parse_class($) {
my $upperlimit_m2 = $18;
#print "\nType: $type\n";
my ($bytes, $pkts, $dropped, $overlimits);
my $bytes;
if ($tc_output[$i + 1] =~ m/Sent (\d+) bytes (\d+) pkts \(dropped (\d+), overlimits (\d+)\)/ ) {
$bytes = $1;
$pkts = $2;
$dropped = $3;
$overlimits = $4;
#print "bytes: $bytes\n"."pkts: $pkts\n";
#print "dropped: $dropped\n"."overlimits: $overlimits\n";
} else {
} else {
print "$timestamp: ERROR(+1) - Unable to parse (class ${class}_$device): ";
print "\"$tc_output[$i + 1]\"\n";
$return_val="";
@@ -316,40 +291,6 @@ sub parse_class($) {
# (need a function call for error checking)
$classes_data{$hash}{last_update} = $timestamp;
update_counter( $hash, $timestamp, "bytes" , $bytes);
#(yes I know its bad/redundant, but it makes in easier elsewhere)
update_counter( $hash, $timestamp, "bits" , $bytes*8);
update_counter( $hash, $timestamp, "pkts" , $pkts);
update_counter( $hash, $timestamp, "dropped" , $dropped);
update_counter( $hash, $timestamp, "overlimits", $overlimits);
# Not a counter value...
$classes_data{$hash}{backlog} = $backlog;
#
# Extra HFSC counters
$classes_data{$hash}{hfsc_period} = $period;
update_counter( $hash, $timestamp, "hfsc_work" , $work);
update_counter( $hash, $timestamp, "hfsc_rtwork" , $rtwork);
# HFSC - Update the info data
# (remember to update the "type" first)
update_info( $hash, $timestamp, "type" , $type);
update_info( $hash, $timestamp, "parent", $parent);
update_info( $hash, $timestamp, "leaf" , $leaf);
#
# Extra HFSC information
update_info( $hash, $timestamp, "level" , $level);
update_info( $hash, $timestamp, "realtime_m1", $realtime_m1);
update_info( $hash, $timestamp, "realtime_d" , $realtime_d);
update_info( $hash, $timestamp, "realtime_m2", $realtime_m2);
update_info( $hash, $timestamp, "linkshare_m1", $linkshare_m1);
update_info( $hash, $timestamp, "linkshare_d" , $linkshare_d);
update_info( $hash, $timestamp, "linkshare_m2", $linkshare_m2);
update_info( $hash, $timestamp, "upperlimit_m1", $upperlimit_m1);
update_info( $hash, $timestamp, "upperlimit_d" , $upperlimit_d);
update_info( $hash, $timestamp, "upperlimit_m2", $upperlimit_m2);
}

4
config/rootfiles/common/ntfs-3g
View File

@@ -2,8 +2,8 @@ bin/ntfs-3g
#lib/libntfs-3g.a
#lib/libntfs-3g.la
lib/libntfs-3g.so
lib/libntfs-3g.so.34
lib/libntfs-3g.so.34.0.0
lib/libntfs-3g.so.36
lib/libntfs-3g.so.36.0.0
sbin/mount.ntfs-3g
#usr/include/ntfs-3g
#usr/include/ntfs-3g/attrib.h

4
config/rootfiles/core/16/files
View File

@@ -3,10 +3,6 @@ etc/ppp/ip-up
var/ipfire/outgoing/bin/outgoingfw.pl
var/ipfire/urlfilter/autoupdate/autoupdate.urls
usr/sbin/redirect_wrapper
bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.34
lib/libntfs-3g.so.34.0.0
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/backup.cgi
srv/web/ipfire/cgi-bin/outgoingfw.cgi

4
config/rootfiles/core/17/files
View File

@@ -3,3 +3,7 @@ etc/init.d/connectd
usr/lib/squid
usr/sbin/squid
srv/web/ipfire/cgi-bin/updatexlrator.cgi
bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.36
lib/libntfs-3g.so.36.0.0

4
config/rootfiles/updater/filelists/core16
View File

@@ -3,10 +3,6 @@ etc/ppp/ip-up
var/ipfire/outgoing/bin/outgoingfw.pl
var/ipfire/urlfilter/autoupdate/autoupdate.urls
usr/sbin/redirect_wrapper
bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.34
lib/libntfs-3g.so.34.0.0
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/backup.cgi
srv/web/ipfire/cgi-bin/outgoingfw.cgi

4
config/rootfiles/updater/filelists/core19
View File

@@ -1,2 +1,6 @@
srv/web/ipfire/cgi-bin/updatexlrator.cgi
etc/rc.d/init.d/connectd
bin/ntfs-3g
lib/libntfs-3g.so
lib/libntfs-3g.so.36
lib/libntfs-3g.so.36.0.0

8
doc/packages-list.txt
View File

@@ -63,7 +63,7 @@
* centerim-4.22.1
* clamav-0.93.3
* cmake-2.4.8
* collectd-4.4.1
* collectd-4.4.2
* coreutils-5.96
* cpio-2.6
* cpufrequtils-004
@@ -196,7 +196,7 @@
* mldonkey-2.9.2
* module-init-tools-3.2.2
* mpc-0.12.1
* mpd-0.13.1
* mpd-0.13.2
* mpeg2dec-0.4.0b
* mpfire-ipfire
* mtd-CVS-20070507
@@ -213,7 +213,7 @@
* nfs-utils-1.1.1
* nmap-4.03
* noip_updater_v1.6
* ntfs-3g-1.2712
* ntfs-3g-1.2812
* ntp-4.2.2
* ocaml-3.09.2
* oinkmaster-2.0
@@ -249,7 +249,7 @@
* rrdtool-1.2.15
* rsync-2.6.9
* rtorrent-0.7.9
* samba-3.0.30
* samba-3.0.32
* sane-1.0.19
* sane-1.0.19-kmod
* screen-4.0.3

6
lfs/collectd
View File

@@ -25,7 +25,7 @@
include Config
PKG_NAME = collectd
VER = 4.4.1
VER = 4.4.2
THISAPP = collectd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 176880c32a06bee9d5e6e2e7c76751a3
$(DL_FILE)_MD5 = faee2bb6e38da1051fdd31762bdf3ab7
install : $(TARGET)
@@ -85,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
--enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
--enable-{tcpconns,unixsock,users,wireless} \
--with-rrdtool=/usr/share/rrdtool-1.2.15 --enable-debug
--with-rrdtool=/usr/share/rrdtool-1.2.15
cd $(DIR_APP) && make install
cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/
ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd

6
lfs/mpd
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.13.1
VER = 0.13.2
THISAPP = mpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd
PAK_VER = 2
PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = dbd219c8ba773bc9270e27bfafc798b5
$(DL_FILE)_MD5 = b461896369949ff3cff955692ead9f8b
install : $(TARGET)

4
lfs/ntfs-3g
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.2712
VER = 1.2812
THISAPP = ntfs-3g-$(VER)
DL_FILE = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9e50dac71261dbb401511be4e9020def
$(DL_FILE)_MD5 = b250a8d6603dc8c5411ee50bea444ccb
install : $(TARGET)

6
lfs/samba
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.0.30
VER = 3.0.32
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 7
PAK_VER = 8
DEPS = "cups cyrus-sasl"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d647ec1f34414fa8691f74536dcccfb5
$(DL_FILE)_MD5 = be13b8dbe2785212dba49e7ced352f30
install : $(TARGET)

3
src/scripts/qosd
View File

@@ -88,7 +88,6 @@ $SIG{PIPE} = 'IGNORE';
our %classes_data;
our %classes_info;
require "$include_dir/parse-func.pl";
require "$include_dir/event-func.pl";
require "$include_dir/RRD-func.pl";
until ($time_to_die) {
@@ -105,8 +104,6 @@ until ($time_to_die) {
# print " Error updating RRDs: \"$res\"\n";
#}
process_events();
# my $timestamp = time;
# print "$timestamp\n";