Commit version 24.12.13800
This commit is contained in:
@ -5,33 +5,36 @@
|
||||
*
|
||||
* This file is part of Observium.
|
||||
*
|
||||
* @package observium
|
||||
* @subpackage graphs
|
||||
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
|
||||
* @package observium
|
||||
* @subpackage graphs
|
||||
* @copyright (C) Adam Armstrong
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
$dir = ($vars['dir'] == 'egress' ? 'egress' : 'ingress');
|
||||
$queue = (is_numeric($vars['queue']) ? $vars['queue'] : 1);
|
||||
$dir = ($vars['dir'] == 'egress' ? 'egress' : 'ingress');
|
||||
$queue = (is_numeric($vars['queue']) ? $vars['queue'] : 1);
|
||||
|
||||
$metrics = array('FwdInProfOcts',
|
||||
'FwdOutProfOcts',
|
||||
'FwdInProfPkts',
|
||||
'FwdOutProfPkts',
|
||||
'DroInProfOcts',
|
||||
'DroOutProfOcts',
|
||||
'DroInProfPkts',
|
||||
'DroOutProfPkts');
|
||||
$metrics = ['FwdInProfOcts',
|
||||
'FwdOutProfOcts',
|
||||
'FwdInProfPkts',
|
||||
'FwdOutProfPkts',
|
||||
'DroInProfOcts',
|
||||
'DroOutProfOcts',
|
||||
'DroInProfPkts',
|
||||
'DroOutProfPkts'];
|
||||
|
||||
if(in_array($vars['ds'], $metrics)) { $ds = $vars['ds']; } else { $ds = array_pop($metrics); }
|
||||
if (in_array($vars['ds'], $metrics)) {
|
||||
$ds = $vars['ds'];
|
||||
} else {
|
||||
$ds = array_pop($metrics);
|
||||
}
|
||||
|
||||
if(strstr("Octs", $ds))
|
||||
{
|
||||
if (strstr("Octs", $ds)) {
|
||||
$multiplier = 8;
|
||||
}
|
||||
|
||||
$rows = dbFetchRows("SELECT * FROM `entity_attribs` WHERE `attrib_type` = 'sros_".$dir."_queues'");
|
||||
$rows = dbFetchRows("SELECT * FROM `entity_attribs` WHERE `attrib_type` = 'sros_" . $dir . "_queues'");
|
||||
|
||||
//print_r($rows);
|
||||
|
||||
@ -39,27 +42,25 @@ $rows = dbFetchRows("SELECT * FROM `entity_attribs` WHERE `attrib_type` = 'sros_
|
||||
|
||||
//print_r($queues);
|
||||
|
||||
foreach ($rows as $row)
|
||||
{
|
||||
foreach ($rows as $row) {
|
||||
|
||||
$queues = json_decode($row['attrib_value']);
|
||||
$queues = json_decode($row['attrib_value']);
|
||||
|
||||
if(in_array($queue, $queues))
|
||||
{
|
||||
if (in_array($queue, $queues)) {
|
||||
|
||||
$port = get_port_by_id_cache($row['entity_id']);
|
||||
$device = device_by_id_cache($port['device_id']);
|
||||
$port = get_port_by_id_cache($row['entity_id']);
|
||||
$device = device_by_id_cache($port['device_id']);
|
||||
|
||||
$rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.'port-'.get_port_rrdindex($port).'-'.$queue.'-sros_'.$dir.'_qstat.rrd';
|
||||
$rrd_list[] = array ('filename' => $rrd_filename,
|
||||
'descr' => $device['hostname'] . ' ' . $port['port_label_short'],
|
||||
'ds' => $ds);
|
||||
}
|
||||
$rrd_filename = $config['rrd_dir'] . '/' . $device['hostname'] . '/' . 'port-' . get_port_rrdindex($port) . '-' . $queue . '-sros_' . $dir . '_qstat.rrd';
|
||||
$rrd_list[] = ['filename' => $rrd_filename,
|
||||
'descr' => $device['hostname'] . ' ' . $port['port_label_short'],
|
||||
'ds' => $ds];
|
||||
}
|
||||
}
|
||||
|
||||
//print_r($rrd_list);
|
||||
|
||||
$colours = 'mixed';
|
||||
|
||||
include($config['html_dir']."/includes/graphs/generic_multi_simplex_separated.inc.php");
|
||||
include($config['html_dir'] . "/includes/graphs/generic_multi_simplex_separated.inc.php");
|
||||
|
||||
|
Reference in New Issue
Block a user