mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Poller perf: add per device average (#14940)

Browse Source 
* Poller perf: add per device
Fix min, avg, and current values

* Fix up previous

* Fix style

* Rename to device average, we don't calculate min and max, but rather the min/max of the average.
This commit is contained in:
Tony Murray
2023-04-07 13:27:12 -05:00
committed by GitHub
parent 93f270155f
commit 3380122733
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
includes/html/graphs/global/poller_perf.inc.php
View File

@@ -40,6 +40,7 @@ foreach (Device::pluck('hostname') as $index => $hostname) {
$rrd_options .= " DEF:pollerRaw$index=$rrd_filename:poller:AVERAGE";
// change undefined to 0
$rrd_options .= " CDEF:poller$index=pollerRaw$index,UN,0,pollerRaw$index,IF";
$rrd_options .= " CDEF:datapresent$index=pollerRaw$index,UN,0,1,IF";
$cdef[] = 'poller' . $index . $suffix;
$suffix = ',+';
if ($graph_params->visible('previous')) {
@@ -47,25 +48,44 @@ foreach (Device::pluck('hostname') as $index => $hostname) {
// change undefined to 0
$rrd_options .= " CDEF:pollerX$index=pollerRawX$index,UN,0,pollerRawX$index,IF";
$rrd_options .= " SHIFT:pollerX$index:$period";
$rrd_options .= " CDEF:datapresentX$index=pollerRawX$index,UN,0,1,IF";
$rrd_options .= " SHIFT:datapresentX$index:$period";
$cdefX[] = 'pollerX' . $index . $suffixX;
$suffixX = ',+';
}
}
}
$rrd_options .= ' CDEF:poller=' . implode(',', $cdef);
$rrd_options .= ' CDEF:avgpol=poller,' . count($cdef) . ',/';
$rrd_options .= " 'COMMENT:Seconds Cur Min Max Avg Avg device\\n'";
$rrd_options .= ' LINE1.25:poller#36393D:Poller';
$rrd_options .= ' GPRINT:poller:LAST:%6.2lf GPRINT:poller:MIN:%6.2lf';
$rrd_options .= ' GPRINT:poller:MAX:%6.2lf GPRINT:poller:AVERAGE:%6.2lf';
$rrd_options .= " 'GPRINT:avgpol:AVERAGE:%6.2lf\\n'";
$total_color = \LibreNMS\Config::get('graph_colours.mixed.2', '36393D');
$device_color = \LibreNMS\Config::get('graph_colours.mixed.6', 'CCCCCC');
// sum all the poll times
$poler_cdef = implode(',', $cdef);
$rrd_options .= ' CDEF:poller=' . $poler_cdef;
// sum the data present value to get a count
$rrd_options .= ' CDEF:datacount=' . str_replace('poller', 'datapresent', $poler_cdef);
// if no data for interval, push unknowns
$rrd_options .= ' CDEF:pollerundef=datacount,0,EQ,UNKN,poller,IF';
$rrd_options .= ' CDEF:datacountundef=datacount,0,EQ,UNKN,datacount,IF';
// divide by count of datas to get accurate average
$rrd_options .= ' CDEF:avgpol=poller,datacountundef,/';
// legend
$rrd_options .= " 'COMMENT:Seconds Cur Min Max Avg\\n'";
$rrd_options .= ' LINE1.25:pollerundef#' . $total_color . ":'Total '";
$rrd_options .= ' AREA:pollerundef#' . $total_color . '70';
$rrd_options .= ' GPRINT:pollerundef:LAST:%8.2lf GPRINT:pollerundef:MIN:%8.2lf';
$rrd_options .= ' GPRINT:pollerundef:MAX:%8.2lf GPRINT:pollerundef:AVERAGE:%8.2lf\\n';
$rrd_options .= ' LINE1.25:avgpol#' . $device_color . ":'Device Avg '";
$rrd_options .= ' AREA:avgpol#' . $device_color . '70';
$rrd_options .= ' GPRINT:avgpol:LAST:%8.2lf GPRINT:avgpol:MIN:%8.2lf';
$rrd_options .= ' GPRINT:avgpol:MAX:%8.2lf GPRINT:avgpol:AVERAGE:%8.2lf\\n';
if ($graph_params->visible('previous')) {
$rrd_options .= " COMMENT:' \\n'";
$rrd_options .= ' CDEF:pollerX=' . implode(',', $cdefX);
$rrd_options .= ' CDEF:avgpolX=pollerX,' . count($cdefX) . ',/';
$rrd_options .= " LINE1.25:pollerX#CCCCCC:'Prev Poller'\t";
$rrd_options .= ' GPRINT:pollerX:MIN:%6.2lf';
$rrd_options .= ' GPRINT:pollerX:MAX:%6.2lf GPRINT:pollerX:AVERAGE:%6.2lf';
$rrd_options .= " 'GPRINT:avgpolX:AVERAGE:%6.2lf\\n'";
$pollerX_cdef = implode(',', $cdefX);
$rrd_options .= ' CDEF:pollerX=' . $pollerX_cdef;
$rrd_options .= ' CDEF:datacountX=' . str_replace('pollerX', 'datapresentX', $pollerX_cdef);
$rrd_options .= ' CDEF:pollerundefX=datacountX,0,EQ,UNKN,pollerX,IF';
$rrd_options .= " LINE1.25:pollerundefX#46494D:'Prev Poller'";
$rrd_options .= ' GPRINT:pollerundefX:LAST:%8.2lf GPRINT:pollerundefX:MIN:%8.2lf';
$rrd_options .= ' GPRINT:pollerundefX:MAX:%8.2lf GPRINT:pollerundefX:AVERAGE:%8.2lf\\n';
}