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

many bugs fixed #167

This commit is contained in:
Jordi Sanfeliu 2019-05-02 11:10:16 +02:00
parent a4ff4bc200
commit 87c102098f
1 changed files with 176 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

343
lib/phpfpm.pm
View File

@ -154,6 +154,12 @@ sub phpfpm_update {
foreach my $pfg (sort keys %{$phpfpm->{group}}) {
my @pfl = split(',', $phpfpm->{list}->{$pfg});
if(!scalar(@pfl)) {
for($n = 0; $n < 8; $n++) {
$rrdata .= ":0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0";
}
next;
}
for($n = 0; $n < 8; $n++) {
my $uptim = 0;
my $aconn = 0;
@ -167,11 +173,6 @@ sub phpfpm_update {
my $ssl = "";
my $pool = trim($pfl[$n] || "");
if(!$pool) {
$rrdata .= ":0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0";
next;
}
my $url = $phpfpm->{desc}->{$pool} || "";
if(!$url) {
logger("$myself: ERROR: the pool '$pool' don't has an associated URL.");
@ -310,6 +311,9 @@ sub phpfpm_cgi {
push(@output, " <pre style='font-size: 12px; color: $colors->{fg_color}';>\n");
push(@output, " ");
foreach my $pfg (sort keys %{$phpfpm->{group}}) {
if(!scalar(my @pfl = split(',', $phpfpm->{list}->{$pfg}))) {
next;
}
$line1 = " ";
$line2 .= " ";
$line3 .= " ";
@ -322,10 +326,8 @@ sub phpfpm_cgi {
$line3 .= " aconn lqueue mlqueu idproc acproc macpro mchild slwreq";
$line4 .= "---------------------------------------------------------------";
}
if($line1) {
my $i = length($line1);
push(@output, sprintf(sprintf("%${i}s", sprintf("%s", trim($phpfpm->{group}->{$pfg})))));
}
my $i = length($line1);
push(@output, sprintf("%${i}s", sprintf("%s", trim($phpfpm->{group}->{$pfg}))));
}
push(@output, "\n");
push(@output, " $line2\n");
@ -344,6 +346,9 @@ sub phpfpm_cgi {
push(@output, sprintf(" %2d$tf->{tc} ", $time));
$n3 = 0;
foreach my $pfg (sort keys %{$phpfpm->{group}}) {
if(!scalar(my @pfl = split(',', $phpfpm->{list}->{$pfg}))) {
next;
}
for($n2 = 0; $n2 < scalar(my @pfl = split(',', $phpfpm->{list}->{$pfg})); $n2++) {
$from = $n2 * 18 + ($n3 * 144);
$to = $from + 18;
@ -406,10 +411,13 @@ sub phpfpm_cgi {
$uptimeline = "COMMENT:uptime: " . uptime2str($uptime) . "\\c";
}
$e = 0;
$e = $n2 = 0;
foreach my $pfg (sort keys %{$phpfpm->{group}}) {
# skip empty lists
next if !$phpfpm->{list}->{$pfg};
if(!scalar(my @pfl = split(',', $phpfpm->{list}->{$pfg}))) {
$n2++;
next;
}
if($e) {
push(@output, " <br>\n");
@ -427,12 +435,12 @@ sub phpfpm_cgi {
$str = trim($pfl[$n]);
$str = $phpfpm->{map}->{$str} ? $phpfpm->{map}->{$str} : $str;
my $dstr = sprintf("%-25s", substr($str, 0, 25));
push(@tmp, "LINE2:acon" . $e . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:acon" . $e . "_$n" . $LC[$n] . ":$str");
push(@tmp, "GPRINT:acon" . $e . "_$n" . ":LAST: Cur\\:%5.2lf");
push(@tmp, "GPRINT:acon" . $e . "_$n" . ":AVERAGE: Avg\\:%5.2lf");
push(@tmp, "GPRINT:acon" . $e . "_$n" . ":MIN: Min\\:%5.2lf");
push(@tmp, "GPRINT:acon" . $e . "_$n" . ":MAX: Max\\:%5.2lf\\n");
push(@tmp, "LINE2:acon" . $n2 . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:acon" . $n2 . "_$n" . $LC[$n] . ":$str");
push(@tmp, "GPRINT:acon" . $n2 . "_$n" . ":LAST: Cur\\:%5.2lf");
push(@tmp, "GPRINT:acon" . $n2 . "_$n" . ":AVERAGE: Avg\\:%5.2lf");
push(@tmp, "GPRINT:acon" . $n2 . "_$n" . ":MIN: Min\\:%5.2lf");
push(@tmp, "GPRINT:acon" . $n2 . "_$n" . ":MAX: Max\\:%5.2lf\\n");
}
if($title) {
@ -459,15 +467,15 @@ sub phpfpm_cgi {
$zoom,
@{$cgi->{version12}},
@{$colors->{graph_colors}},
"DEF:acon" . $e . "_0=$rrd:phpfpm" . $e . "_aconn0:AVERAGE",
"DEF:acon" . $e . "_1=$rrd:phpfpm" . $e . "_aconn1:AVERAGE",
"DEF:acon" . $e . "_2=$rrd:phpfpm" . $e . "_aconn2:AVERAGE",
"DEF:acon" . $e . "_3=$rrd:phpfpm" . $e . "_aconn3:AVERAGE",
"DEF:acon" . $e . "_4=$rrd:phpfpm" . $e . "_aconn4:AVERAGE",
"DEF:acon" . $e . "_5=$rrd:phpfpm" . $e . "_aconn5:AVERAGE",
"DEF:acon" . $e . "_6=$rrd:phpfpm" . $e . "_aconn6:AVERAGE",
"DEF:acon" . $e . "_7=$rrd:phpfpm" . $e . "_aconn7:AVERAGE",
"CDEF:allvalues=acon" . $e . "_0,acon" . $e . "_1,acon" . $e . "_2,acon" . $e . "_3,acon" . $e . "_4,acon" . $e . "_5,acon" . $e . "_6,acon" . $e . "_7,+,+,+,+,+,+,+",
"DEF:acon" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aconn0:AVERAGE",
"DEF:acon" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_aconn1:AVERAGE",
"DEF:acon" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_aconn2:AVERAGE",
"DEF:acon" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_aconn3:AVERAGE",
"DEF:acon" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_aconn4:AVERAGE",
"DEF:acon" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_aconn5:AVERAGE",
"DEF:acon" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_aconn6:AVERAGE",
"DEF:acon" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_aconn7:AVERAGE",
"CDEF:allvalues=acon" . $n2 . "_0,acon" . $n2 . "_1,acon" . $n2 . "_2,acon" . $n2 . "_3,acon" . $n2 . "_4,acon" . $n2 . "_5,acon" . $n2 . "_6,acon" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmp,
$uptimeline);
@ -486,15 +494,15 @@ sub phpfpm_cgi {
$zoom,
@{$cgi->{version12}},
@{$colors->{graph_colors}},
"DEF:acon" . $e . "_0=$rrd:phpfpm" . $e . "_aconn0:AVERAGE",
"DEF:acon" . $e . "_1=$rrd:phpfpm" . $e . "_aconn1:AVERAGE",
"DEF:acon" . $e . "_2=$rrd:phpfpm" . $e . "_aconn2:AVERAGE",
"DEF:acon" . $e . "_3=$rrd:phpfpm" . $e . "_aconn3:AVERAGE",
"DEF:acon" . $e . "_4=$rrd:phpfpm" . $e . "_aconn4:AVERAGE",
"DEF:acon" . $e . "_5=$rrd:phpfpm" . $e . "_aconn5:AVERAGE",
"DEF:acon" . $e . "_6=$rrd:phpfpm" . $e . "_aconn6:AVERAGE",
"DEF:acon" . $e . "_7=$rrd:phpfpm" . $e . "_aconn7:AVERAGE",
"CDEF:allvalues=acon" . $e . "_0,acon" . $e . "_1,acon" . $e . "_2,acon" . $e . "_3,acon" . $e . "_4,acon" . $e . "_5,acon" . $e . "_6,acon" . $e . "_7,+,+,+,+,+,+,+",
"DEF:acon" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aconn0:AVERAGE",
"DEF:acon" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_aconn1:AVERAGE",
"DEF:acon" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_aconn2:AVERAGE",
"DEF:acon" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_aconn3:AVERAGE",
"DEF:acon" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_aconn4:AVERAGE",
"DEF:acon" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_aconn5:AVERAGE",
"DEF:acon" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_aconn6:AVERAGE",
"DEF:acon" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_aconn7:AVERAGE",
"CDEF:allvalues=acon" . $n2 . "_0,acon" . $n2 . "_1,acon" . $n2 . "_2,acon" . $n2 . "_3,acon" . $n2 . "_4,acon" . $n2 . "_5,acon" . $n2 . "_6,acon" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmpz);
$err = RRDs::error;
@ -528,12 +536,12 @@ sub phpfpm_cgi {
$str = trim($pfl[$n]);
$str = $phpfpm->{map}->{$str} ? $phpfpm->{map}->{$str} : $str;
my $dstr = sprintf("%-25s", substr($str, 0, 25));
push(@tmp, "LINE2:aproc" . $e . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:aproc" . $e . "_$n" . $LC[$n] . ":$str");
push(@tmp, "GPRINT:aproc" . $e . "_$n" . ":LAST: Cur\\:%5.2lf");
push(@tmp, "GPRINT:aproc" . $e . "_$n" . ":AVERAGE: Avg\\:%5.2lf");
push(@tmp, "GPRINT:aproc" . $e . "_$n" . ":MIN: Min\\:%5.2lf");
push(@tmp, "GPRINT:aproc" . $e . "_$n" . ":MAX: Max\\:%5.2lf\\n");
push(@tmp, "LINE2:aproc" . $n2 . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:aproc" . $n2 . "_$n" . $LC[$n] . ":$str");
push(@tmp, "GPRINT:aproc" . $n2 . "_$n" . ":LAST: Cur\\:%5.2lf");
push(@tmp, "GPRINT:aproc" . $n2 . "_$n" . ":AVERAGE: Avg\\:%5.2lf");
push(@tmp, "GPRINT:aproc" . $n2 . "_$n" . ":MIN: Min\\:%5.2lf");
push(@tmp, "GPRINT:aproc" . $n2 . "_$n" . ":MAX: Max\\:%5.2lf\\n");
}
if(lc($config->{show_gaps}) eq "y") {
push(@tmp, "AREA:wrongdata#$colors->{gap}:");
@ -555,15 +563,15 @@ sub phpfpm_cgi {
$zoom,
@{$cgi->{version12}},
@{$colors->{graph_colors}},
"DEF:aproc" . $e . "_0=$rrd:phpfpm" . $e . "_aproc0:AVERAGE",
"DEF:aproc" . $e . "_1=$rrd:phpfpm" . $e . "_aproc1:AVERAGE",
"DEF:aproc" . $e . "_2=$rrd:phpfpm" . $e . "_aproc2:AVERAGE",
"DEF:aproc" . $e . "_3=$rrd:phpfpm" . $e . "_aproc3:AVERAGE",
"DEF:aproc" . $e . "_4=$rrd:phpfpm" . $e . "_aproc4:AVERAGE",
"DEF:aproc" . $e . "_5=$rrd:phpfpm" . $e . "_aproc5:AVERAGE",
"DEF:aproc" . $e . "_6=$rrd:phpfpm" . $e . "_aproc6:AVERAGE",
"DEF:aproc" . $e . "_7=$rrd:phpfpm" . $e . "_aproc7:AVERAGE",
"CDEF:allvalues=aproc" . $e . "_0,aproc" . $e . "_1,aproc" . $e . "_2,aproc" . $e . "_3,aproc" . $e . "_4,aproc" . $e . "_5,aproc" . $e . "_6,aproc" . $e . "_7,+,+,+,+,+,+,+",
"DEF:aproc" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aproc0:AVERAGE",
"DEF:aproc" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_aproc1:AVERAGE",
"DEF:aproc" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_aproc2:AVERAGE",
"DEF:aproc" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_aproc3:AVERAGE",
"DEF:aproc" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_aproc4:AVERAGE",
"DEF:aproc" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_aproc5:AVERAGE",
"DEF:aproc" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_aproc6:AVERAGE",
"DEF:aproc" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_aproc7:AVERAGE",
"CDEF:allvalues=aproc" . $n2 . "_0,aproc" . $n2 . "_1,aproc" . $n2 . "_2,aproc" . $n2 . "_3,aproc" . $n2 . "_4,aproc" . $n2 . "_5,aproc" . $n2 . "_6,aproc" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmp);
$err = RRDs::error;
@ -581,15 +589,15 @@ sub phpfpm_cgi {
$zoom,
@{$cgi->{version12}},
@{$colors->{graph_colors}},
"DEF:aproc" . $e . "_0=$rrd:phpfpm" . $e . "_aproc0:AVERAGE",
"DEF:aproc" . $e . "_1=$rrd:phpfpm" . $e . "_aproc1:AVERAGE",
"DEF:aproc" . $e . "_2=$rrd:phpfpm" . $e . "_aproc2:AVERAGE",
"DEF:aproc" . $e . "_3=$rrd:phpfpm" . $e . "_aproc3:AVERAGE",
"DEF:aproc" . $e . "_4=$rrd:phpfpm" . $e . "_aproc4:AVERAGE",
"DEF:aproc" . $e . "_5=$rrd:phpfpm" . $e . "_aproc5:AVERAGE",
"DEF:aproc" . $e . "_6=$rrd:phpfpm" . $e . "_aproc6:AVERAGE",
"DEF:aproc" . $e . "_7=$rrd:phpfpm" . $e . "_aproc7:AVERAGE",
"CDEF:allvalues=aproc" . $e . "_0,aproc" . $e . "_1,aproc" . $e . "_2,aproc" . $e . "_3,aproc" . $e . "_4,aproc" . $e . "_5,aproc" . $e . "_6,aproc" . $e . "_7,+,+,+,+,+,+,+",
"DEF:aproc" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aproc0:AVERAGE",
"DEF:aproc" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_aproc1:AVERAGE",
"DEF:aproc" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_aproc2:AVERAGE",
"DEF:aproc" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_aproc3:AVERAGE",
"DEF:aproc" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_aproc4:AVERAGE",
"DEF:aproc" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_aproc5:AVERAGE",
"DEF:aproc" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_aproc6:AVERAGE",
"DEF:aproc" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_aproc7:AVERAGE",
"CDEF:allvalues=aproc" . $n2 . "_0,aproc" . $n2 . "_1,aproc" . $n2 . "_2,aproc" . $n2 . "_3,aproc" . $n2 . "_4,aproc" . $n2 . "_5,aproc" . $n2 . "_6,aproc" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmpz);
$err = RRDs::error;
@ -628,8 +636,8 @@ sub phpfpm_cgi {
$str = trim($pfl[$n]);
$str = $phpfpm->{map}->{$str} ? $phpfpm->{map}->{$str} : $str;
my $dstr = substr($str, 0, 25);
push(@tmp, "LINE2:lqueue" . $e . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:lqueue" . $e . "_$n" . $LC[$n] . ":$str\\g");
push(@tmp, "LINE2:lqueue" . $n2 . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:lqueue" . $n2 . "_$n" . $LC[$n] . ":$str\\g");
}
if(lc($config->{show_gaps}) eq "y") {
push(@tmp, "AREA:wrongdata#$colors->{gap}:");
@ -649,15 +657,15 @@ sub phpfpm_cgi {
@{$cgi->{version12}},
@{$cgi->{version12_small}},
@{$colors->{graph_colors}},
"DEF:lqueue" . $e . "_0=$rrd:phpfpm" . $e . "_lqueu0:AVERAGE",
"DEF:lqueue" . $e . "_1=$rrd:phpfpm" . $e . "_lqueu1:AVERAGE",
"DEF:lqueue" . $e . "_2=$rrd:phpfpm" . $e . "_lqueu2:AVERAGE",
"DEF:lqueue" . $e . "_3=$rrd:phpfpm" . $e . "_lqueu3:AVERAGE",
"DEF:lqueue" . $e . "_4=$rrd:phpfpm" . $e . "_lqueu4:AVERAGE",
"DEF:lqueue" . $e . "_5=$rrd:phpfpm" . $e . "_lqueu5:AVERAGE",
"DEF:lqueue" . $e . "_6=$rrd:phpfpm" . $e . "_lqueu6:AVERAGE",
"DEF:lqueue" . $e . "_7=$rrd:phpfpm" . $e . "_lqueu7:AVERAGE",
"CDEF:allvalues=lqueue" . $e . "_0,lqueue" . $e . "_1,lqueue" . $e . "_2,lqueue" . $e . "_3,lqueue" . $e . "_4,lqueue" . $e . "_5,lqueue" . $e . "_6,lqueue" . $e . "_7,+,+,+,+,+,+,+",
"DEF:lqueue" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_lqueu0:AVERAGE",
"DEF:lqueue" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_lqueu1:AVERAGE",
"DEF:lqueue" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_lqueu2:AVERAGE",
"DEF:lqueue" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_lqueu3:AVERAGE",
"DEF:lqueue" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_lqueu4:AVERAGE",
"DEF:lqueue" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_lqueu5:AVERAGE",
"DEF:lqueue" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_lqueu6:AVERAGE",
"DEF:lqueue" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_lqueu7:AVERAGE",
"CDEF:allvalues=lqueue" . $n2 . "_0,lqueue" . $n2 . "_1,lqueue" . $n2 . "_2,lqueue" . $n2 . "_3,lqueue" . $n2 . "_4,lqueue" . $n2 . "_5,lqueue" . $n2 . "_6,lqueue" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmp);
$err = RRDs::error;
@ -676,15 +684,15 @@ sub phpfpm_cgi {
@{$cgi->{version12}},
@{$cgi->{version12_small}},
@{$colors->{graph_colors}},
"DEF:lqueue" . $e . "_0=$rrd:phpfpm" . $e . "_lqueu0:AVERAGE",
"DEF:lqueue" . $e . "_1=$rrd:phpfpm" . $e . "_lqueu1:AVERAGE",
"DEF:lqueue" . $e . "_2=$rrd:phpfpm" . $e . "_lqueu2:AVERAGE",
"DEF:lqueue" . $e . "_3=$rrd:phpfpm" . $e . "_lqueu3:AVERAGE",
"DEF:lqueue" . $e . "_4=$rrd:phpfpm" . $e . "_lqueu4:AVERAGE",
"DEF:lqueue" . $e . "_5=$rrd:phpfpm" . $e . "_lqueu5:AVERAGE",
"DEF:lqueue" . $e . "_6=$rrd:phpfpm" . $e . "_lqueu6:AVERAGE",
"DEF:lqueue" . $e . "_7=$rrd:phpfpm" . $e . "_lqueu7:AVERAGE",
"CDEF:allvalues=lqueue" . $e . "_0,lqueue" . $e . "_1,lqueue" . $e . "_2,lqueue" . $e . "_3,lqueue" . $e . "_4,lqueue" . $e . "_5,lqueue" . $e . "_6,lqueue" . $e . "_7,+,+,+,+,+,+,+",
"DEF:lqueue" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_lqueu0:AVERAGE",
"DEF:lqueue" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_lqueu1:AVERAGE",
"DEF:lqueue" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_lqueu2:AVERAGE",
"DEF:lqueue" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_lqueu3:AVERAGE",
"DEF:lqueue" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_lqueu4:AVERAGE",
"DEF:lqueue" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_lqueu5:AVERAGE",
"DEF:lqueue" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_lqueu6:AVERAGE",
"DEF:lqueue" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_lqueu7:AVERAGE",
"CDEF:allvalues=lqueue" . $n2 . "_0,lqueue" . $n2 . "_1,lqueue" . $n2 . "_2,lqueue" . $n2 . "_3,lqueue" . $n2 . "_4,lqueue" . $n2 . "_5,lqueue" . $n2 . "_6,lqueue" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmpz);
$err = RRDs::error;
@ -739,30 +747,30 @@ sub phpfpm_cgi {
@{$cgi->{version12}},
@{$cgi->{version12_small}},
@{$colors->{graph_colors}},
"DEF:iproc" . $e . "_0=$rrd:phpfpm" . $e . "_iproc0:AVERAGE",
"DEF:iproc" . $e . "_1=$rrd:phpfpm" . $e . "_iproc1:AVERAGE",
"DEF:iproc" . $e . "_2=$rrd:phpfpm" . $e . "_iproc2:AVERAGE",
"DEF:iproc" . $e . "_3=$rrd:phpfpm" . $e . "_iproc3:AVERAGE",
"DEF:iproc" . $e . "_4=$rrd:phpfpm" . $e . "_iproc4:AVERAGE",
"DEF:iproc" . $e . "_5=$rrd:phpfpm" . $e . "_iproc5:AVERAGE",
"DEF:iproc" . $e . "_6=$rrd:phpfpm" . $e . "_iproc6:AVERAGE",
"DEF:iproc" . $e . "_7=$rrd:phpfpm" . $e . "_iproc7:AVERAGE",
"DEF:aproc" . $e . "_0=$rrd:phpfpm" . $e . "_aproc0:AVERAGE",
"DEF:aproc" . $e . "_1=$rrd:phpfpm" . $e . "_aproc1:AVERAGE",
"DEF:aproc" . $e . "_2=$rrd:phpfpm" . $e . "_aproc2:AVERAGE",
"DEF:aproc" . $e . "_3=$rrd:phpfpm" . $e . "_aproc3:AVERAGE",
"DEF:aproc" . $e . "_4=$rrd:phpfpm" . $e . "_aproc4:AVERAGE",
"DEF:aproc" . $e . "_5=$rrd:phpfpm" . $e . "_aproc5:AVERAGE",
"DEF:aproc" . $e . "_6=$rrd:phpfpm" . $e . "_aproc6:AVERAGE",
"DEF:aproc" . $e . "_7=$rrd:phpfpm" . $e . "_aproc7:AVERAGE",
"CDEF:tproc0=iproc" . $e . "_0,aproc" . $e . "_0,+",
"CDEF:tproc1=iproc" . $e . "_1,aproc" . $e . "_1,+",
"CDEF:tproc2=iproc" . $e . "_2,aproc" . $e . "_2,+",
"CDEF:tproc3=iproc" . $e . "_3,aproc" . $e . "_3,+",
"CDEF:tproc4=iproc" . $e . "_4,aproc" . $e . "_4,+",
"CDEF:tproc5=iproc" . $e . "_5,aproc" . $e . "_5,+",
"CDEF:tproc6=iproc" . $e . "_6,aproc" . $e . "_6,+",
"CDEF:tproc7=iproc" . $e . "_7,aproc" . $e . "_6,+",
"DEF:iproc" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_iproc0:AVERAGE",
"DEF:iproc" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_iproc1:AVERAGE",
"DEF:iproc" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_iproc2:AVERAGE",
"DEF:iproc" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_iproc3:AVERAGE",
"DEF:iproc" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_iproc4:AVERAGE",
"DEF:iproc" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_iproc5:AVERAGE",
"DEF:iproc" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_iproc6:AVERAGE",
"DEF:iproc" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_iproc7:AVERAGE",
"DEF:aproc" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aproc0:AVERAGE",
"DEF:aproc" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_aproc1:AVERAGE",
"DEF:aproc" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_aproc2:AVERAGE",
"DEF:aproc" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_aproc3:AVERAGE",
"DEF:aproc" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_aproc4:AVERAGE",
"DEF:aproc" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_aproc5:AVERAGE",
"DEF:aproc" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_aproc6:AVERAGE",
"DEF:aproc" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_aproc7:AVERAGE",
"CDEF:tproc0=iproc" . $n2 . "_0,aproc" . $n2 . "_0,+",
"CDEF:tproc1=iproc" . $n2 . "_1,aproc" . $n2 . "_1,+",
"CDEF:tproc2=iproc" . $n2 . "_2,aproc" . $n2 . "_2,+",
"CDEF:tproc3=iproc" . $n2 . "_3,aproc" . $n2 . "_3,+",
"CDEF:tproc4=iproc" . $n2 . "_4,aproc" . $n2 . "_4,+",
"CDEF:tproc5=iproc" . $n2 . "_5,aproc" . $n2 . "_5,+",
"CDEF:tproc6=iproc" . $n2 . "_6,aproc" . $n2 . "_6,+",
"CDEF:tproc7=iproc" . $n2 . "_7,aproc" . $n2 . "_6,+",
"CDEF:allvalues=tproc0,tproc1,tproc2,tproc3,tproc4,tproc5,tproc6,tproc7,+,+,+,+,+,+,+",
@CDEF,
@tmp);
@ -782,30 +790,30 @@ sub phpfpm_cgi {
@{$cgi->{version12}},
@{$cgi->{version12_small}},
@{$colors->{graph_colors}},
"DEF:iproc" . $e . "_0=$rrd:phpfpm" . $e . "_iproc0:AVERAGE",
"DEF:iproc" . $e . "_1=$rrd:phpfpm" . $e . "_iproc1:AVERAGE",
"DEF:iproc" . $e . "_2=$rrd:phpfpm" . $e . "_iproc2:AVERAGE",
"DEF:iproc" . $e . "_3=$rrd:phpfpm" . $e . "_iproc3:AVERAGE",
"DEF:iproc" . $e . "_4=$rrd:phpfpm" . $e . "_iproc4:AVERAGE",
"DEF:iproc" . $e . "_5=$rrd:phpfpm" . $e . "_iproc5:AVERAGE",
"DEF:iproc" . $e . "_6=$rrd:phpfpm" . $e . "_iproc6:AVERAGE",
"DEF:iproc" . $e . "_7=$rrd:phpfpm" . $e . "_iproc7:AVERAGE",
"DEF:aproc" . $e . "_0=$rrd:phpfpm" . $e . "_aproc0:AVERAGE",
"DEF:aproc" . $e . "_1=$rrd:phpfpm" . $e . "_aproc1:AVERAGE",
"DEF:aproc" . $e . "_2=$rrd:phpfpm" . $e . "_aproc2:AVERAGE",
"DEF:aproc" . $e . "_3=$rrd:phpfpm" . $e . "_aproc3:AVERAGE",
"DEF:aproc" . $e . "_4=$rrd:phpfpm" . $e . "_aproc4:AVERAGE",
"DEF:aproc" . $e . "_5=$rrd:phpfpm" . $e . "_aproc5:AVERAGE",
"DEF:aproc" . $e . "_6=$rrd:phpfpm" . $e . "_aproc6:AVERAGE",
"DEF:aproc" . $e . "_7=$rrd:phpfpm" . $e . "_aproc7:AVERAGE",
"CDEF:tproc0=iproc" . $e . "_0,aproc" . $e . "_0,+",
"CDEF:tproc1=iproc" . $e . "_1,aproc" . $e . "_1,+",
"CDEF:tproc2=iproc" . $e . "_2,aproc" . $e . "_2,+",
"CDEF:tproc3=iproc" . $e . "_3,aproc" . $e . "_3,+",
"CDEF:tproc4=iproc" . $e . "_4,aproc" . $e . "_4,+",
"CDEF:tproc5=iproc" . $e . "_5,aproc" . $e . "_5,+",
"CDEF:tproc6=iproc" . $e . "_6,aproc" . $e . "_6,+",
"CDEF:tproc7=iproc" . $e . "_7,aproc" . $e . "_6,+",
"DEF:iproc" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_iproc0:AVERAGE",
"DEF:iproc" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_iproc1:AVERAGE",
"DEF:iproc" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_iproc2:AVERAGE",
"DEF:iproc" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_iproc3:AVERAGE",
"DEF:iproc" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_iproc4:AVERAGE",
"DEF:iproc" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_iproc5:AVERAGE",
"DEF:iproc" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_iproc6:AVERAGE",
"DEF:iproc" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_iproc7:AVERAGE",
"DEF:aproc" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_aproc0:AVERAGE",
"DEF:aproc" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_aproc1:AVERAGE",
"DEF:aproc" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_aproc2:AVERAGE",
"DEF:aproc" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_aproc3:AVERAGE",
"DEF:aproc" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_aproc4:AVERAGE",
"DEF:aproc" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_aproc5:AVERAGE",
"DEF:aproc" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_aproc6:AVERAGE",
"DEF:aproc" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_aproc7:AVERAGE",
"CDEF:tproc0=iproc" . $n2 . "_0,aproc" . $n2 . "_0,+",
"CDEF:tproc1=iproc" . $n2 . "_1,aproc" . $n2 . "_1,+",
"CDEF:tproc2=iproc" . $n2 . "_2,aproc" . $n2 . "_2,+",
"CDEF:tproc3=iproc" . $n2 . "_3,aproc" . $n2 . "_3,+",
"CDEF:tproc4=iproc" . $n2 . "_4,aproc" . $n2 . "_4,+",
"CDEF:tproc5=iproc" . $n2 . "_5,aproc" . $n2 . "_5,+",
"CDEF:tproc6=iproc" . $n2 . "_6,aproc" . $n2 . "_6,+",
"CDEF:tproc7=iproc" . $n2 . "_7,aproc" . $n2 . "_6,+",
"CDEF:allvalues=tproc0,tproc1,tproc2,tproc3,tproc4,tproc5,tproc6,tproc7,+,+,+,+,+,+,+",
@CDEF,
@tmpz);
@ -840,8 +848,8 @@ sub phpfpm_cgi {
$str = trim($pfl[$n]);
$str = $phpfpm->{map}->{$str} ? $phpfpm->{map}->{$str} : $str;
my $dstr = substr($str, 0, 25);
push(@tmp, "LINE2:mchild" . $e . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:mchild" . $e . "_$n" . $LC[$n] . ":$str\\g");
push(@tmp, "LINE2:mchild" . $n2 . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:mchild" . $n2 . "_$n" . $LC[$n] . ":$str\\g");
}
if(lc($config->{show_gaps}) eq "y") {
push(@tmp, "AREA:wrongdata#$colors->{gap}:");
@ -861,15 +869,15 @@ sub phpfpm_cgi {
@{$cgi->{version12}},
@{$cgi->{version12_small}},
@{$colors->{graph_colors}},
"DEF:mchild" . $e . "_0=$rrd:phpfpm" . $e . "_mchil0:AVERAGE",
"DEF:mchild" . $e . "_1=$rrd:phpfpm" . $e . "_mchil1:AVERAGE",
"DEF:mchild" . $e . "_2=$rrd:phpfpm" . $e . "_mchil2:AVERAGE",
"DEF:mchild" . $e . "_3=$rrd:phpfpm" . $e . "_mchil3:AVERAGE",
"DEF:mchild" . $e . "_4=$rrd:phpfpm" . $e . "_mchil4:AVERAGE",
"DEF:mchild" . $e . "_5=$rrd:phpfpm" . $e . "_mchil5:AVERAGE",
"DEF:mchild" . $e . "_6=$rrd:phpfpm" . $e . "_mchil6:AVERAGE",
"DEF:mchild" . $e . "_7=$rrd:phpfpm" . $e . "_mchil7:AVERAGE",
"CDEF:allvalues=mchild" . $e . "_0,mchild" . $e . "_1,mchild" . $e . "_2,mchild" . $e . "_3,mchild" . $e . "_4,mchild" . $e . "_5,mchild" . $e . "_6,mchild" . $e . "_7,+,+,+,+,+,+,+",
"DEF:mchild" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_mchil0:AVERAGE",
"DEF:mchild" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_mchil1:AVERAGE",
"DEF:mchild" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_mchil2:AVERAGE",
"DEF:mchild" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_mchil3:AVERAGE",
"DEF:mchild" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_mchil4:AVERAGE",
"DEF:mchild" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_mchil5:AVERAGE",
"DEF:mchild" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_mchil6:AVERAGE",
"DEF:mchild" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_mchil7:AVERAGE",
"CDEF:allvalues=mchild" . $n2 . "_0,mchild" . $n2 . "_1,mchild" . $n2 . "_2,mchild" . $n2 . "_3,mchild" . $n2 . "_4,mchild" . $n2 . "_5,mchild" . $n2 . "_6,mchild" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmp);
$err = RRDs::error;
@ -888,15 +896,15 @@ sub phpfpm_cgi {
@{$cgi->{version12}},
@{$cgi->{version12_small}},
@{$colors->{graph_colors}},
"DEF:mchild" . $e . "_0=$rrd:phpfpm" . $e . "_mchil0:AVERAGE",
"DEF:mchild" . $e . "_1=$rrd:phpfpm" . $e . "_mchil1:AVERAGE",
"DEF:mchild" . $e . "_2=$rrd:phpfpm" . $e . "_mchil2:AVERAGE",
"DEF:mchild" . $e . "_3=$rrd:phpfpm" . $e . "_mchil3:AVERAGE",
"DEF:mchild" . $e . "_4=$rrd:phpfpm" . $e . "_mchil4:AVERAGE",
"DEF:mchild" . $e . "_5=$rrd:phpfpm" . $e . "_mchil5:AVERAGE",
"DEF:mchild" . $e . "_6=$rrd:phpfpm" . $e . "_mchil6:AVERAGE",
"DEF:mchild" . $e . "_7=$rrd:phpfpm" . $e . "_mchil7:AVERAGE",
"CDEF:allvalues=mchild" . $e . "_0,mchild" . $e . "_1,mchild" . $e . "_2,mchild" . $e . "_3,mchild" . $e . "_4,mchild" . $e . "_5,mchild" . $e . "_6,mchild" . $e . "_7,+,+,+,+,+,+,+",
"DEF:mchild" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_mchil0:AVERAGE",
"DEF:mchild" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_mchil1:AVERAGE",
"DEF:mchild" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_mchil2:AVERAGE",
"DEF:mchild" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_mchil3:AVERAGE",
"DEF:mchild" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_mchil4:AVERAGE",
"DEF:mchild" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_mchil5:AVERAGE",
"DEF:mchild" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_mchil6:AVERAGE",
"DEF:mchild" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_mchil7:AVERAGE",
"CDEF:allvalues=mchild" . $n2 . "_0,mchild" . $n2 . "_1,mchild" . $n2 . "_2,mchild" . $n2 . "_3,mchild" . $n2 . "_4,mchild" . $n2 . "_5,mchild" . $n2 . "_6,mchild" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmpz);
$err = RRDs::error;
@ -930,8 +938,8 @@ sub phpfpm_cgi {
$str = trim($pfl[$n]);
$str = $phpfpm->{map}->{$str} ? $phpfpm->{map}->{$str} : $str;
my $dstr = substr($str, 0, 25);
push(@tmp, "LINE2:slwreq" . $e . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:slwreq" . $e . "_$n" . $LC[$n] . ":$str\\g");
push(@tmp, "LINE2:slwreq" . $n2 . "_$n" . $LC[$n] . ":$dstr");
push(@tmpz, "LINE2:slwreq" . $n2 . "_$n" . $LC[$n] . ":$str\\g");
}
if(lc($config->{show_gaps}) eq "y") {
push(@tmp, "AREA:wrongdata#$colors->{gap}:");
@ -951,15 +959,15 @@ sub phpfpm_cgi {
@{$cgi->{version12}},
@{$cgi->{version12_small}},
@{$colors->{graph_colors}},
"DEF:slwreq" . $e . "_0=$rrd:phpfpm" . $e . "_slreq0:AVERAGE",
"DEF:slwreq" . $e . "_1=$rrd:phpfpm" . $e . "_slreq1:AVERAGE",
"DEF:slwreq" . $e . "_2=$rrd:phpfpm" . $e . "_slreq2:AVERAGE",
"DEF:slwreq" . $e . "_3=$rrd:phpfpm" . $e . "_slreq3:AVERAGE",
"DEF:slwreq" . $e . "_4=$rrd:phpfpm" . $e . "_slreq4:AVERAGE",
"DEF:slwreq" . $e . "_5=$rrd:phpfpm" . $e . "_slreq5:AVERAGE",
"DEF:slwreq" . $e . "_6=$rrd:phpfpm" . $e . "_slreq6:AVERAGE",
"DEF:slwreq" . $e . "_7=$rrd:phpfpm" . $e . "_slreq7:AVERAGE",
"CDEF:allvalues=slwreq" . $e . "_0,slwreq" . $e . "_1,slwreq" . $e . "_2,slwreq" . $e . "_3,slwreq" . $e . "_4,slwreq" . $e . "_5,slwreq" . $e . "_6,slwreq" . $e . "_7,+,+,+,+,+,+,+",
"DEF:slwreq" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_slreq0:AVERAGE",
"DEF:slwreq" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_slreq1:AVERAGE",
"DEF:slwreq" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_slreq2:AVERAGE",
"DEF:slwreq" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_slreq3:AVERAGE",
"DEF:slwreq" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_slreq4:AVERAGE",
"DEF:slwreq" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_slreq5:AVERAGE",
"DEF:slwreq" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_slreq6:AVERAGE",
"DEF:slwreq" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_slreq7:AVERAGE",
"CDEF:allvalues=slwreq" . $n2 . "_0,slwreq" . $n2 . "_1,slwreq" . $n2 . "_2,slwreq" . $n2 . "_3,slwreq" . $n2 . "_4,slwreq" . $n2 . "_5,slwreq" . $n2 . "_6,slwreq" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmp);
$err = RRDs::error;
@ -978,15 +986,15 @@ sub phpfpm_cgi {
@{$cgi->{version12}},
@{$cgi->{version12_small}},
@{$colors->{graph_colors}},
"DEF:slwreq" . $e . "_0=$rrd:phpfpm" . $e . "_slreq0:AVERAGE",
"DEF:slwreq" . $e . "_1=$rrd:phpfpm" . $e . "_slreq1:AVERAGE",
"DEF:slwreq" . $e . "_2=$rrd:phpfpm" . $e . "_slreq2:AVERAGE",
"DEF:slwreq" . $e . "_3=$rrd:phpfpm" . $e . "_slreq3:AVERAGE",
"DEF:slwreq" . $e . "_4=$rrd:phpfpm" . $e . "_slreq4:AVERAGE",
"DEF:slwreq" . $e . "_5=$rrd:phpfpm" . $e . "_slreq5:AVERAGE",
"DEF:slwreq" . $e . "_6=$rrd:phpfpm" . $e . "_slreq6:AVERAGE",
"DEF:slwreq" . $e . "_7=$rrd:phpfpm" . $e . "_slreq7:AVERAGE",
"CDEF:allvalues=slwreq" . $e . "_0,slwreq" . $e . "_1,slwreq" . $e . "_2,slwreq" . $e . "_3,slwreq" . $e . "_4,slwreq" . $e . "_5,slwreq" . $e . "_6,slwreq" . $e . "_7,+,+,+,+,+,+,+",
"DEF:slwreq" . $n2 . "_0=$rrd:phpfpm" . $n2 . "_slreq0:AVERAGE",
"DEF:slwreq" . $n2 . "_1=$rrd:phpfpm" . $n2 . "_slreq1:AVERAGE",
"DEF:slwreq" . $n2 . "_2=$rrd:phpfpm" . $n2 . "_slreq2:AVERAGE",
"DEF:slwreq" . $n2 . "_3=$rrd:phpfpm" . $n2 . "_slreq3:AVERAGE",
"DEF:slwreq" . $n2 . "_4=$rrd:phpfpm" . $n2 . "_slreq4:AVERAGE",
"DEF:slwreq" . $n2 . "_5=$rrd:phpfpm" . $n2 . "_slreq5:AVERAGE",
"DEF:slwreq" . $n2 . "_6=$rrd:phpfpm" . $n2 . "_slreq6:AVERAGE",
"DEF:slwreq" . $n2 . "_7=$rrd:phpfpm" . $n2 . "_slreq7:AVERAGE",
"CDEF:allvalues=slwreq" . $n2 . "_0,slwreq" . $n2 . "_1,slwreq" . $n2 . "_2,slwreq" . $n2 . "_3,slwreq" . $n2 . "_4,slwreq" . $n2 . "_5,slwreq" . $n2 . "_6,slwreq" . $n2 . "_7,+,+,+,+,+,+,+",
@CDEF,
@tmpz);
$err = RRDs::error;
@ -1027,6 +1035,7 @@ sub phpfpm_cgi {
push(@output, main::graph_footer());
}
$e++;
$n2++;
}
push(@output, " <br>\n");
return @output;