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

removed the graph_mode option and fixed layouts

This commit is contained in:
Jordi Sanfeliu 2013-06-13 11:32:58 +02:00
parent 234f5a2acb
commit c95ba30878
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/wowza.pm
View File

@ -350,7 +350,6 @@ sub wowza_cgi {
my $n;
my $n2;
my $str;
my $stack;
my $err;
my @AC = (
"#FFA500",
@ -522,24 +521,14 @@ sub wowza_cgi {
foreach my $w (split(',', $wowza->{desc}->{$url})) {
$w = trim($w);
$str = sprintf("%-25s", substr($w, 0, 25));
$stack = "";
if(lc($wowza->{graph_mode}) eq "s") {
$stack = ":STACK";
}
push(@tmp, "AREA:wms" . $e . "_a$n" . $AC[$n] . ":$str" . $stack);
push(@tmpz, "AREA:wms" . $e . "_a$n" . $AC[$n] . ":$w" . $stack);
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\\:%4.0lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":AVERAGE: Average\\:%4.0lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":MIN: Min\\:%4.0lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":MAX: Max\\:%4.0lf\\n");
$n++;
}
if(lc($wowza->{graph_mode}) ne "s") {
foreach my $w (split(',', $wowza->{desc}->{$url})) {
push(@tmp, "LINE1:wms" . $e . "_a$n" . $LC[$n]);
push(@tmpz, "LINE2:wms" . $e . "_a$n" . $LC[$n]);
}
}
if($title) {
print(" <tr>\n");
@ -591,9 +580,7 @@ sub wowza_cgi {
"DEF:wms" . $e . "_a5=$rrd:wms" . $e . "_a5_conncur:AVERAGE",
"DEF:wms" . $e . "_a6=$rrd:wms" . $e . "_a6_conncur:AVERAGE",
"DEF:wms" . $e . "_a7=$rrd:wms" . $e . "_a7_conncur:AVERAGE",
@tmpz,
"COMMENT: \\n",
$uptimeline);
@tmpz);
$err = RRDs::error;
print("ERROR: while graphing $PNG_DIR" . "$PNGz[$e * 5]: $err\n") if $err;
}
@ -735,9 +722,9 @@ sub wowza_cgi {
$n = 0;
foreach my $w (split(',', $wowza->{desc}->{$url})) {
$w = trim($w);
$str = sprintf("%-10s", substr($w, 0, 10));
$str = sprintf("%-9s", substr($w, 0, 9));
push(@tmp, "LINE2:wms" . $e . "_a$n" . $LC[$n] . ":$str");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":LAST:\\:%3.2lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":LAST:\\:%4.1lf");
if(!(($n + 1) % 2)) {
push(@tmp, "COMMENT: \\n");
} else {
@ -824,9 +811,9 @@ sub wowza_cgi {
$n = 0;
foreach my $w (split(',', $wowza->{desc}->{$url})) {
$w = trim($w);
$str = sprintf("%-10s", substr($w, 0, 10));
$str = sprintf("%-9s", substr($w, 0, 9));
push(@tmp, "LINE2:wms" . $e . "_a$n" . $LC[$n] . ":$str");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":LAST:\\:%3.0lf");
push(@tmp, "GPRINT:wms" . $e . "_a$n" . ":LAST:\\:%4.1lf");
if(!(($n + 1) % 2)) {
push(@tmp, "COMMENT: \\n");
} else {

1
monitorix.conf
View File

@ -443,7 +443,6 @@ secure_log_date_format = %b %e
<desc>
http://localhost:8086/connectioncounts = channel1, channel2
</desc>
graph_mode = r
rigid = 0, 0, 0, 0, 0
limit = 100, 100, 100, 100, 100
</wowza>