diff --git a/lib/tc.pm b/lib/tc.pm index 86cca26..82a84de 100644 --- a/lib/tc.pm +++ b/lib/tc.pm @@ -470,6 +470,9 @@ sub tc_cgi { my ($q1, $q2) = (($qdisc[$n] || "") =~ m/\s*(\S+)\s*(.*)\s*/); my $str = ($q1 || "") . ($q2 ? " $q2" : ""); if($str) { + if($tc->{map}->{$n} || "" eq $str) { + $str = $tc->{map}->{$n}; + } push(@tmpz, "LINE2:sent" . $n . $LC[$n] . ":$str"); $str = sprintf("%-15s", substr($str, 0, 15)); push(@tmp, "LINE2:sent" . $n . $LC[$n] . ":$str"); @@ -599,6 +602,9 @@ sub tc_cgi { my ($q1, $q2) = (($qdisc[$n] || "") =~ m/\s*(\S+)\s*(.*)\s*/); my $str = ($q1 || "") . ($q2 ? " $q2" : ""); if($str) { + if($tc->{map}->{$n} || "" eq $str) { + $str = $tc->{map}->{$n}; + } push(@tmpz, "LINE2:drop" . $n . $LC[$n] . ":$str"); $str = sprintf("%-15s", substr($str, 0, 15)); push(@tmp, "LINE2:drop" . $n . $LC[$n] . ":$str"); @@ -702,6 +708,9 @@ sub tc_cgi { my ($q1, $q2) = (($qdisc[$n] || "") =~ m/\s*(\S+)\s*(.*)\s*/); my $str = ($q1 || "") . ($q2 ? " $q2" : ""); if($str) { + if($tc->{map}->{$n} || "" eq $str) { + $str = $tc->{map}->{$n}; + } push(@tmpz, "LINE2:over" . $n . $LC[$n] . ":$str"); $str = sprintf("%-15s", substr($str, 0, 15)); push(@tmp, "LINE2:over" . $n . $LC[$n] . ":$str"); @@ -809,6 +818,9 @@ sub tc_cgi { my ($q1, $q2) = (($qdisc[$n] || "") =~ m/\s*(\S+)\s*(.*)\s*/); my $str = ($q1 || "") . ($q2 ? " $q2" : ""); if($str) { + if($tc->{map}->{$n} || "" eq $str) { + $str = $tc->{map}->{$n}; + } push(@tmpz, "LINE2:requ" . $n . $LC[$n] . ":$str"); $str = sprintf("%-15s", substr($str, 0, 15)); push(@tmp, "LINE2:requ" . $n . $LC[$n] . ":$str"); diff --git a/monitorix.conf b/monitorix.conf index 53bfd02..a3058b2 100644 --- a/monitorix.conf +++ b/monitorix.conf @@ -292,6 +292,8 @@ secure_log_date_format = %b %e eth0 = cbq 1, sfq 10, sfq 20, sfq 30, ingress ffff + + rigid = 0, 0, 0 limit = 1000, 1000, 1000