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

Merge remote-tracking branch 'alfh/feature_graph_constant_color' into next

Browse Source
This commit is contained in:
Michael Tremer
2014-02-27 13:37:53 +01:00
parent 015e243b0d e06986e853
commit b18dba57de
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
config/cfgroot/graphs.pl
View File

@@ -422,12 +422,15 @@ sub updateprocessescpugraph {
push(@command,"COMMENT:".$Lang::tr{'caption'}."\\j");
my $colorIndex = 0;
foreach(@processesgraph){
my $colorIndex = 10 + $count % 15;
my $color="$color{\"color$colorIndex\"}";
chomp($_);my @name=split(/\-/,$_);chop($name[1]);
if ($count eq "0"){
push(@command,"AREA:".$name[1].random_hex_color(6)."A0:".$name[1]);
push(@command,"AREA:".$name[1].$color."A0:".$name[1]);
}else{
push(@command,"STACK:".$name[1].random_hex_color(6)."A0:".$name[1]);
push(@command,"STACK:".$name[1].$color."A0:".$name[1]);
}
$count++;
}
@@ -471,12 +474,15 @@ sub updateprocessesmemorygraph {
push(@command,"COMMENT:".$Lang::tr{'caption'}."\\j");
my $colorIndex = 0;
foreach(@processesgraph){
chomp($_);my @name=split(/\-/,$_);chop($name[1]);
my $colorIndex = 10 + $count % 15;
my $color="$color{\"color$colorIndex\"}";
if ($count eq "0"){
push(@command,"AREA:".$name[1].random_hex_color(6)."A0:".$name[1]);
push(@command,"AREA:".$name[1].$color."A0:".$name[1]);
}else{
push(@command,"STACK:".$name[1].random_hex_color(6)."A0:".$name[1]);
push(@command,"STACK:".$name[1].$color."A0:".$name[1]);
}
$count++;
}
@@ -983,17 +989,18 @@ sub updateqosgraph {
@classes = <FILE>;
close FILE;
my $colorIndex = 0;
foreach $classentry (sort @classes){
@classline = split( /\;/, $classentry );
if ( $classline[0] eq $qossettings{'DEV'} ){
$color=random_hex_color(6);
my $colorIndex = 10 + $count % 15;
$color="$color{\"color$colorIndex\"}";
push(@command, "DEF:$classline[1]=$mainsettings{'RRDLOG'}/class_$qossettings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE");
if ($count eq "1") {
push(@command, "AREA:$classline[1]$color:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8]));
} else {
push(@command, "STACK:$classline[1]$color:$Lang::tr{'Class'} $classline[1] -".sprintf("%15s",$classline[8]));
}
push(@command, "GPRINT:$classline[1]:MAX:%8.1lf %sBps"