mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed the code to treat MessagesInBytesRate and MessagesOutBytesRate as gauge values. #86

This commit is contained in:
Jordi Sanfeliu 2015-03-26 17:07:05 +01:00
parent 4000488da2
commit 2509300d28
1 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/wowza.pm
View File

@ -323,16 +323,12 @@ sub wowza_update {
$config->{wowza_hist}->{$str} = $entry->{ConnectionsTotalRejected};
$str = $e . $e2 . "msginbytes";
$msginbytes = $entry->{MessagesInBytesRate} - ($config->{wowza_hist}->{$str} || 0);
$msginbytes = 0 unless $msginbytes != $entry->{MessagesInBytesRate};
$msginbytes /= 60;
$config->{wowza_hist}->{$str} = $entry->{MessagesInBytesRate};
$msginbytes = $entry->{MessagesInBytesRate};
# $msginbytes /= 60;
$str = $e . $e2 . "msgoutbytes";
$msgoutbytes = $entry->{MessagesOutBytesRate} - ($config->{wowza_hist}->{$str} || 0);
$msgoutbytes = 0 unless $msgoutbytes != $entry->{MessagesOutBytesRate};
$msgoutbytes /= 60;
$config->{wowza_hist}->{$str} = $entry->{MessagesOutBytesRate};
$msgoutbytes = $entry->{MessagesOutBytesRate};
# $msgoutbytes /= 60;
$rrdata .= ":" . $entry->{TimeRunning};
$rrdata .= ":" . $entry->{ConnectionsTotal};
@ -403,8 +399,6 @@ sub wowza_cgi {
my @tmp;
my @tmpz;
my @CDEF;
my $T = "B";
my $vlabel = "bytes/s";
my $e;
my $e2;
my $n;
@ -441,11 +435,6 @@ sub wowza_cgi {
$title = !$silent ? $title : "";
if(lc($config->{netstats_in_bps}) eq "y") {
$T = "b";
$vlabel = "bits/s";
}
# text mode
#
@ -581,9 +570,9 @@ sub wowza_cgi {
push(@tmp, "AREA:wms" . $e . "_a$n" . $AC[$n] . ":$str:STACK");
push(@tmpz, "AREA:wms" . $e . "_a$n" . $AC[$n] . ":$w:STACK");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":LAST: Current\\:%3.0lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":AVERAGE: Average\\:%3.0lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":MIN: Min\\:%3.0lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":MAX: Max\\:%3.0lf\\n");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":AVERAGE: Average\\:%3.0lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":MIN: Min\\:%3.0lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":MAX: Max\\:%3.0lf\\n");
$n++;
}
@ -680,17 +669,12 @@ sub wowza_cgi {
$str = sprintf("%-25s", substr($w, 0, 25));
push(@tmp, "LINE2:B_wms" . $e . "_a$n" . $LC[$n] . ":$str");
push(@tmpz, "LINE2:B_wms" . $e . "_a$n" . $LC[$n] . ":$w");
push(@tmp, "GPRINT:K_wms" . $e . "_a$n" . ":LAST: Cur\\:%3.0lfK$T/s");
push(@tmp, "GPRINT:K_wms" . $e . "_a$n" . ":AVERAGE: Avg\\:%3.0lfK$T/s");
push(@tmp, "GPRINT:K_wms" . $e . "_a$n" . ":MIN: Min\\:%3.0lfK$T/s");
push(@tmp, "GPRINT:K_wms" . $e . "_a$n" . ":MAX: Max\\:%3.0lfK$T/s\\n");
if(lc($config->{netstats_in_bps}) eq "y") {
push(@CDEF, "CDEF:wms" . $e . "_a$n=wms" . $e . "_a$n" . "i,wms" . $e . "_a$n" . "o,+");
push(@CDEF, "CDEF:B_wms" . $e . "_a$n=wms" . $e . "_a$n,8,*");
} else {
push(@CDEF, "CDEF:wms" . $e . "_a$n=wms" . $e . "_a$n" . "i,wms" . $e . "_a$n" . "o,+");
push(@CDEF, "CDEF:B_wms" . $e . "_a$n=wms" . $e . "_a$n");
}
push(@tmp, "GPRINT:K_wms" . $e . "_a$n" . ":LAST: Cur\\:%4.0lfKB");
push(@tmp, "GPRINT:K_wms" . $e . "_a$n" . ":AVERAGE: Avg\\:%4.0lfKB");
push(@tmp, "GPRINT:K_wms" . $e . "_a$n" . ":MIN: Min\\:%4.0lfKB");
push(@tmp, "GPRINT:K_wms" . $e . "_a$n" . ":MAX: Max\\:%4.0lfKB\\n");
push(@CDEF, "CDEF:wms" . $e . "_a$n=wms" . $e . "_a$n" . "i,wms" . $e . "_a$n" . "o,+");
push(@CDEF, "CDEF:B_wms" . $e . "_a$n=wms" . $e . "_a$n");
push(@CDEF, "CDEF:K_wms" . $e . "_a$n=B_wms" . $e . "_a$n,1024,/");
$n++;
}
@ -704,7 +688,7 @@ sub wowza_cgi {
"--title=$config->{graphs}->{_wowza2} ($tf->{nwhen}$tf->{twhen})",
"--start=-$tf->{nwhen}$tf->{twhen}",
"--imgformat=PNG",
"--vertical-label=$vlabel",
"--vertical-label=bytes",
"--width=$width",
"--height=$height",
@riglim,
@ -738,7 +722,7 @@ sub wowza_cgi {
"--title=$config->{graphs}->{_wowza2} ($tf->{nwhen}$tf->{twhen})",
"--start=-$tf->{nwhen}$tf->{twhen}",
"--imgformat=PNG",
"--vertical-label=$vlabel",
"--vertical-label=bytes",
"--width=$width",
"--height=$height",
@riglim,