commit version 22.12.12447

This commit is contained in:
2023-01-01 22:36:12 -05:00
parent af1b03d79f
commit b948283a96
744 changed files with 620715 additions and 27381 deletions

View File

@ -6,115 +6,68 @@
*
* @package observium
* @subpackage poller
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
*
*/
$table_rows = array();
$table_rows = [];
if (!isset($cache_storage)) { $cache_storage = array(); } // This cache used also in storage module
if (!isset($cache_storage)) { $cache_storage = []; } // This cache used also in storage module
$sql = "SELECT `storage`.*";
$sql .= " FROM `storage`";
//$sql .= " LEFT JOIN `storage-state` ON `storage`.storage_id = `storage-state`.storage_id";
$sql .= " WHERE `device_id` = ?";
// Cache snmpwalk by definitions
poll_cache_storage($device, $cache_storage);
foreach (dbFetchRows($sql, array($device['device_id'])) as $storage)
{
// CLEANME. Compatibility with old (incorrect) field
$object_field = get_db_version() > 468 ? 'storage_object' : 'storage_type';
$sql = "SELECT * FROM `storage` WHERE `device_id` = ?";
foreach (dbFetchRows($sql, [ $device['device_id'] ]) as $storage) {
$storage_size = $storage['storage_size']; // Memo old size
$file = $config['install_dir']."/includes/polling/storage/".strtolower($storage['storage_mib']).".inc.php";
if (is_file($file))
{
if (is_file($file)) {
// File based include
include($file);
} else {
// Check if we can poll the device ourselves with generic code using definitions.
// Table is always set when definitions add storage.
if ($storage['storage_type'] != '' && is_array($config['mibs'][$storage['storage_mib']]['storage'][$storage['storage_type']]))
{
$table_def = $config['mibs'][$storage['storage_mib']]['storage'][$storage['storage_type']];
// Definition based storage poller
// Table is always set when definitions add storage.
if (safe_empty($storage[$object_field]) || !is_array($config['mibs'][$storage['storage_mib']]['storage'][$storage[$object_field]])) {
// Unknown, so force rediscovery as there's a broken storage
force_discovery($device, 'storage');
print_r($config['mibs'][$storage['storage_mib']]['storage']);
// CLEANME. Compat, clean after 2022/09
if ($storage['storage_mib'] === 'NETAPP-MIB') {
$storage['storage_object'] = 'dfEntry';
}
}
if ($table_def['type'] == 'static')
{
if (isset($table_def['oid_perc_num'])) { $storage['perc'] = snmp_get_oid($device, $table_def['oid_perc_num']); }
else if (isset($table_def['oid_perc'])) { $storage['perc'] = snmp_get_oid($device, $table_def['oid_perc'], $storage['storage_mib']); }
if (isset($table_def['oid_free_num'])) { $storage['free'] = snmp_get_oid($device, $table_def['oid_free_num']); }
else if (isset($table_def['oid_free'])) { $storage['free'] = snmp_get_oid($device, $table_def['oid_free'], $storage['storage_mib']); }
if (isset($table_def['oid_used_num'])) { $storage['used'] = snmp_get_oid($device, $table_def['oid_used_num']); }
else if (isset($table_def['oid_used'])) { $storage['used'] = snmp_get_oid($device, $table_def['oid_used'], $storage['storage_mib']); }
if (isset($table_def['total'])) { $storage['total'] = $table_def['total']; }
else if (isset($table_def['oid_total_num'])) { $storage['total'] = snmp_get_oid($device, $table_def['oid_total_num']); }
else if (isset($table_def['oid_total'])) { $storage['total'] = snmp_get_oid($device, $table_def['oid_total'], $storage['storage_mib']); }
} else {
if (isset($table_def['oid_perc_num'])) { $storage['perc'] = snmp_get_oid($device, $table_def['oid_perc_num'].'.'.$storage['storage_index']); }
else if (isset($table_def['oid_perc'])) { $storage['perc'] = snmp_get_oid($device, $table_def['oid_perc'].'.'.$storage['storage_index'], $storage['storage_mib']); }
if (isset($table_def['oid_free_num'])) { $storage['free'] = snmp_get_oid($device, $table_def['oid_free_num'].'.'.$storage['storage_index']); }
else if (isset($table_def['oid_free'])) { $storage['free'] = snmp_get_oid($device, $table_def['oid_free'].'.'.$storage['storage_index'], $storage['storage_mib']); }
if (isset($table_def['oid_used_num'])) { $storage['used'] = snmp_get_oid($device, $table_def['oid_used_num'].'.'.$storage['storage_index']); }
else if (isset($table_def['oid_used'])) { $storage['used'] = snmp_get_oid($device, $table_def['oid_used'].'.'.$storage['storage_index'], $storage['storage_mib']); }
if (isset($table_def['total'])) { $storage['total'] = $table_def['total']; }
else if (isset($table_def['oid_total_num'])) { $storage['total'] = snmp_get_oid($device, $table_def['oid_total_num'].'.'.$storage['storage_index']); }
else if (isset($table_def['oid_total'])) { $storage['total'] = snmp_get_oid($device, $table_def['oid_total'].'.'.$storage['storage_index'], $storage['storage_mib']); }
}
// Clean not numeric symbols from snmp output
foreach (array('perc', 'free', 'used', 'total') as $param)
{
if (isset($storage[$param]))
{
// Convert strings '3.40 TB' to value
// See QNAP NAS-MIB or HIK-DEVICE-MIB
$unit = ($param != 'perc' && isset($table_def['unit'])) ? $table_def['unit'] : NULL;
$storage[$param] = snmp_fix_numeric($storage[$param], $unit);
}
}
// Merge calculated used/total/free/perc array keys into $storage variable (with additional options)
$storage = array_merge($storage, calculate_mempool_properties($storage['storage_units'], $storage['used'], $storage['total'], $storage['free'], $storage['perc'], $table_def));
$storage['size'] = $storage['total'];
} else {
// Unknown, so force rediscovery as there's a broken storage
force_discovery($device, 'storage');
}
poll_storage_definition($device, $config['mibs'][$storage['storage_mib']]['storage'][$storage[$object_field]], $storage, $cache_storage);
}
print_debug_vars($storage);
if (is_numeric($storage['used']) && $storage['size']) {
if (is_numeric($storage['perc'])) {
$percent = $storage['perc'];
} elseif (is_numeric($storage['used']) && $storage['size']) {
$percent = round(float_div($storage['used'], $storage['size']) * 100, 2);
} else {
$percent = 0;
}
if (!isset($storage['units']))
{
if (!isset($storage['units'])) {
$storage['units'] = $storage['storage_units'];
}
$hc = ($storage['storage_hc'] ? ' (HC)' : '');
// Update StatsD/Carbon
if ($config['statsd']['enable'] == TRUE)
{
if ($config['statsd']['enable'] == TRUE) {
StatsD::gauge(str_replace(".", "_", $device['hostname']).'.'.'storage'.'.' .$storage['storage_mib'] . "-" . safename($storage['storage_descr']).".used", $storage['used']);
StatsD::gauge(str_replace(".", "_", $device['hostname']).'.'.'storage'.'.' .$storage['storage_mib'] . "-" . safename($storage['storage_descr']).".free", $storage['free']);
}
// Update RRD
rrdtool_update_ng($device, 'storage', array('used' => $storage['used'], 'free' => $storage['free']), strtolower($storage['storage_mib']) . "-" . $storage['storage_descr']);
rrdtool_update_ng($device, 'storage', [ 'used' => $storage['used'], 'free' => $storage['free'] ], strtolower($storage['storage_mib']) . "-" . $storage['storage_descr']);
//if (!is_numeric($storage['storage_polled']))
//{
@ -126,15 +79,14 @@ foreach (dbFetchRows($sql, array($device['device_id'])) as $storage)
// 'storage_units' => $storage['units'],
// 'storage_perc' => $percent), 'storage-state');
//} else {
$update = dbUpdate(array('storage_polled' => time(),
'storage_used' => $storage['used'],
'storage_free' => $storage['free'],
'storage_size' => $storage['size'],
'storage_units' => $storage['units'],
'storage_perc' => $percent), 'storage', '`storage_id` = ?', array($storage['storage_id']));
if (formatStorage($storage_size) != formatStorage($storage['size']))
$update = dbUpdate([ 'storage_polled' => time(),
'storage_used' => $storage['used'],
'storage_free' => $storage['free'],
'storage_size' => $storage['size'],
'storage_units' => $storage['units'],
'storage_perc' => $percent ], 'storage', '`storage_id` = ?', [ $storage['storage_id'] ]);
if (formatStorage($storage_size) != formatStorage($storage['size'])) {
//&& (abs($storage_size - $storage['size']) / max($storage_size, $storage['size'])) > 0.0001 ) // Log only if size diff more than 0.01%
{
log_event('Storage size changed: '.formatStorage($storage_size).' -> '.formatStorage($storage['size']).' ('.$storage['storage_descr'].')', $device, 'storage', $storage['storage_id']);
}
//}
@ -156,7 +108,7 @@ foreach (dbFetchRows($sql, array($device['device_id'])) as $storage)
}
$headers = array('%WLabel%n', '%WType%n', '%WIndex%n', '%WTotal%n', '%WUsed%n', '%WFree%n', '%WPerc%n');
$headers = array('%WLabel%n', '%MIB%n', '%WIndex%n', '%WTotal%n', '%WUsed%n', '%WFree%n', '%WPerc%n');
print_cli_table($table_rows, $headers);
unset($storage, $table, $table_row, $table_rows, $unit);