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: Centralised the updating of device logo #5873 (#5874)

Browse Source
This commit is contained in:
Neil Lathwood
2017-02-14 12:56:16 +00:00
committed by GitHub
parent 1e2ab73239
commit b4da5de452
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/discovery/os.inc.php
View File

@@ -8,10 +8,4 @@ if ($os != $device['os']) {
echo "Changed OS! : $os\n";
}
$icon = getImageName($device, false);
if ($icon != $device['icon']) {
log_event('Device Icon changed ' . $device['icon'] . " => $icon", $device, 'system', 3);
$device['icon'] = $icon;
$sql = dbUpdate(array('icon' => $icon), 'devices', 'device_id=?', array($device['device_id']));
echo "Changed Icon! : $icon\n";
}
update_device_logo($device);

11
includes/functions.php
View File

@@ -1993,3 +1993,14 @@ function recordSnmpStatistic($stat, $start_time)
$snmp_stats["${stat}_sec"] += $runtime;
return $runtime;
}
function update_device_logo($device)
{
$icon = getImageName($device, false);
if ($icon != $device['icon']) {
log_event('Device Icon changed ' . $device['icon'] . " => $icon", $device, 'system', 3);
$device['icon'] = $icon;
$sql = dbUpdate(array('icon' => $icon), 'devices', 'device_id=?', array($device['device_id']));
echo "Changed Icon! : $icon\n";
}
}

5
includes/polling/os.inc.php
View File

@@ -30,10 +30,7 @@ if ($serial != $device['serial']) {
log_event('Serial -> ' . $serial, $device, 'system', 3);
}
if ($icon != $device['icon']) {
$update_array['icon'] = $icon;
log_event('Icon -> ' . $icon, $device, 'system', 3);
}
update_device_logo($device);
echo 'Hardware: ' . $hardware . PHP_EOL;
echo 'Version: ' . $version . PHP_EOL;

1
includes/polling/os/radlan.inc.php
View File

@@ -2,7 +2,6 @@
$version = snmp_get($device, 'rndBrgVersion.0', '-Ovq', 'RADLAN-MIB');
$hardware = str_replace('ATI', 'Allied Telesis', $poll_device['sysDescr']);
$icon = 'allied';
$features = snmp_get($device, 'rndBaseBootVersion.00', '-Ovq', 'RADLAN-MIB');