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

refactor: Update ucd-diskio discovery to use index + descr as unique identifies #4670 (#6270)

Browse Source
This commit is contained in:
Neil Lathwood
2017-03-28 07:42:56 +01:00
committed by Tony Murray
parent c4672f8b37
commit a776ad5c8a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/discovery/ucd-diskio.inc.php
View File

@@ -7,7 +7,7 @@ if (is_array($diskio_array)) {
if ($entry['diskIONRead'] > '0' || $entry['diskIONWritten'] > '0') {
d_echo("$index ".$entry['diskIODevice']."\n");
if (dbFetchCell('SELECT COUNT(*) FROM `ucd_diskio` WHERE `device_id` = ? AND `diskio_index` = ?', array($device['device_id'], $index)) == '0') {
if (dbFetchCell('SELECT COUNT(*) FROM `ucd_diskio` WHERE `device_id` = ? AND `diskio_index` = ? and `diskio_descr` = ?', array($device['device_id'], $index, $entry['diskIODevice'])) == '0') {
$inserted = dbInsert(array('device_id' => $device['device_id'], 'diskio_index' => $index, 'diskio_descr' => $entry['diskIODevice']), 'ucd_diskio');
echo '+';
d_echo($sql." - $inserted inserted ");
@@ -16,7 +16,7 @@ if (is_array($diskio_array)) {
// FIXME Need update code here!
}
$valid_diskio[$index] = 1;
$valid_diskio[$index] = $entry['diskIODevice'];
} //end if
} //end foreach
} //end if
@@ -29,7 +29,7 @@ d_echo($valid_diskio);
foreach (dbFetchRows($sql) as $test) {
d_echo($test['diskio_index'].' -> '.$test['diskio_descr']."\n");
if (!$valid_diskio[$test['diskio_index']]) {
if ($valid_diskio[$test['diskio_index']] !== $test['diskio_descr']) {
echo '-';
dbDelete('ucd_diskio', '`diskio_id` = ?', array($test['diskio_id']));
}