Commit version 24.12.13800

This commit is contained in:
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions

View File

@ -5,61 +5,61 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage poller
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2019 Observium Limited
* @package observium
* @subpackage poller
* @copyright (C) Adam Armstrong
*
*/
// FIXME - store state data in database
$table_rows = array();
$table_rows = [];
$diskio_data = dbFetchRows("SELECT * FROM `ucd_diskio` WHERE `device_id` = ?", array($device['device_id']));
$diskio_data = dbFetchRows("SELECT * FROM `ucd_diskio` WHERE `device_id` = ?", [$device['device_id']]);
if (count($diskio_data))
{
$diskio_cache = array();
$diskio_cache = snmpwalk_cache_oid($device, "diskIOEntry", $diskio_cache, "UCD-DISKIO-MIB");
if (count($diskio_data)) {
$diskio_cache = [];
$diskio_cache = snmpwalk_cache_oid($device, "diskIOEntry", $diskio_cache, "UCD-DISKIO-MIB");
//echo("Checking UCD DiskIO MIB: ");
//echo("Checking UCD DiskIO MIB: ");
foreach ($diskio_data as $diskio)
{
$index = $diskio['diskio_index'];
foreach ($diskio_data as $diskio) {
$index = $diskio['diskio_index'];
$entry = $diskio_cache[$index];
$entry = $diskio_cache[$index];
//echo($diskio['diskio_descr'] . " ");
//echo($diskio['diskio_descr'] . " ");
if (OBS_DEBUG > 1) { print_vars($entry); }
if (OBS_DEBUG > 1) {
print_vars($entry);
}
$rrd = "ucd_diskio-" . $diskio['diskio_descr'] .".rrd";
$rrd = "ucd_diskio-" . $diskio['diskio_descr'] . ".rrd";
rrdtool_create($device, $rrd, " \
rrdtool_create($device, $rrd, " \
DS:read:DERIVE:600:0:125000000000 \
DS:written:DERIVE:600:0:125000000000 \
DS:reads:DERIVE:600:0:125000000000 \
DS:writes:DERIVE:600:0:125000000000 ");
rrdtool_update($device, $rrd, array($entry['diskIONReadX'], $entry['diskIONWrittenX'], $entry['diskIOReads'], $entry['diskIOWrites']));
rrdtool_update($device, $rrd, [$entry['diskIONReadX'], $entry['diskIONWrittenX'], $entry['diskIOReads'], $entry['diskIOWrites']]);
$table_row = array();
$table_row[] = $diskio['diskio_descr'];
$table_row[] = $diskio['diskio_index'];
$table_row[] = $entry['diskIONReadX'];
$table_row[] = $entry['diskIONWrittenX'];
$table_row[] = $entry['diskIOReads'];
$table_row[] = $entry['diskIOWrites'];
$table_rows[] = $table_row;
unset($table_row);
$table_row = [];
$table_row[] = $diskio['diskio_descr'];
$table_row[] = $diskio['diskio_index'];
$table_row[] = $entry['diskIONReadX'];
$table_row[] = $entry['diskIONWrittenX'];
$table_row[] = $entry['diskIOReads'];
$table_row[] = $entry['diskIOWrites'];
$table_rows[] = $table_row;
unset($table_row);
}
}
//echo(PHP_EOL);
//echo(PHP_EOL);
}
$headers = array('%WLabel%n', '%WIndex%n', '%WRead%n', '%WWritten%n', '%WReads%n', '%WWrites%n');
$headers = ['%WLabel%n', '%WIndex%n', '%WRead%n', '%WWritten%n', '%WReads%n', '%WWrites%n'];
print_cli_table($table_rows, $headers);
unset($diskio_data, $diskio_cache);