mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Add sysDescr and hardware for oxidized overrides (#8885)
This commit is contained in:
committed by
Neil Lathwood
parent
61ee9be20d
commit
e9e30c5e98
@@ -84,7 +84,14 @@ $config['oxidized']['reload_nodes'] = true;
|
||||
|
||||
To return an override to Oxidized you can do this by providing the override key, followed by matching a lookup for a host (or hosts), and finally by defining the overriding value itself. LibreNMS does not check for the validity of these attributes but will deliver them to Oxidized as defined.
|
||||
|
||||
Matching of hosts can be done using `hostname`, `sysname`, `os` or `location` and including either a 'match' key and value, or a 'regex' key and value. The order is `hostname` is matched first, if nothing is found then `sysname` is tried, then `os`, and finally `location` is attempted.
|
||||
Matching of hosts can be done using `hostname`, `sysname`, `os`, `location`, `sysDescr` or `hardware` and including either a 'match' key and value, or a 'regex' key and value. The order of matching is:
|
||||
* `hostname`
|
||||
* `sysname`
|
||||
* `sysDescr`
|
||||
* `hardware`
|
||||
* `os`
|
||||
* `location`
|
||||
* `ip`
|
||||
|
||||
To match on the device hostnames or sysnames that contain 'lon-sw' or if the location contains 'London' then you would place the following within config.php:
|
||||
|
||||
|
@@ -1237,7 +1237,7 @@ function list_oxidized()
|
||||
$params = array($hostname);
|
||||
}
|
||||
|
||||
foreach (dbFetchRows("SELECT hostname,sysname,os,location,ip AS ip FROM `devices` LEFT JOIN devices_attribs AS `DA` ON devices.device_id = DA.device_id AND `DA`.attrib_type='override_Oxidized_disable' WHERE `disabled`='0' AND `ignore` = 0 AND (DA.attrib_value = 'false' OR DA.attrib_value IS NULL) AND (`type` NOT IN ($device_types) AND `os` NOT IN ($device_os)) $sql", $params) as $device) {
|
||||
foreach (dbFetchRows("SELECT hostname,sysname,sysDescr,hardware,os,location,ip AS ip FROM `devices` LEFT JOIN devices_attribs AS `DA` ON devices.device_id = DA.device_id AND `DA`.attrib_type='override_Oxidized_disable' WHERE `disabled`='0' AND `ignore` = 0 AND (DA.attrib_value = 'false' OR DA.attrib_value IS NULL) AND (`type` NOT IN ($device_types) AND `os` NOT IN ($device_os)) $sql", $params) as $device) {
|
||||
// Convert from packed value to human value
|
||||
$device['ip'] = inet6_ntop($device['ip']);
|
||||
|
||||
@@ -1274,6 +1274,8 @@ function list_oxidized()
|
||||
|
||||
unset($device['location']);
|
||||
unset($device['sysname']);
|
||||
unset($device['sysDescr']);
|
||||
unset($device['hardware']);
|
||||
$devices[] = $device;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user