Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Tidy up mibs V-Z #4979

Merged
merged 1 commit into from Nov 17, 2016
Merged

refactor: Tidy up mibs V-Z #4979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 24 additions & 6 deletions includes/definitions.inc.php
View file
Open in desktop
Expand Up @@ -93,6 +93,7 @@
$config['os'][$os]['over'][0]['text'] = 'Device Traffic';
$config['os'][$os]['over'][1]['graph'] = 'device_processor';
$config['os'][$os]['over'][1]['text'] = 'Processor Usage';
$config['os'][$os]['group'] = 'viprinet';

$os = 'edgeos';
$config['os'][$os]['text'] = 'EdgeOS';
Expand Down Expand Up @@ -1289,6 +1290,18 @@
$config['os'][$os]['text'] = 'Gamatronic UPS Stack';
$config['os'][$os]['type'] = 'power';

$os = 'eatonups';
$config['os'][$os]['text'] = 'Eaton UPS';
$config['os'][$os]['type'] = 'power';
$config['os'][$os]['icon'] = 'eaton';
$config['os'][$os]['over'][0]['graph'] = 'device_voltage';
$config['os'][$os]['over'][0]['text'] = 'Voltage';
$config['os'][$os]['over'][1]['graph'] = 'device_current';
$config['os'][$os]['over'][1]['text'] = 'Current';
$config['os'][$os]['over'][2]['graph'] = 'device_frequency';
$config['os'][$os]['over'][2]['text'] = 'Frequencies';
$config['os'][$os]['mib_dir'][] = 'ups';

$os = 'powerware';
$config['os'][$os]['text'] = 'Powerware UPS';
$config['os'][$os]['type'] = 'power';
Expand All @@ -1299,6 +1312,7 @@
$config['os'][$os]['over'][1]['text'] = 'Current';
$config['os'][$os]['over'][2]['graph'] = 'device_frequency';
$config['os'][$os]['over'][2]['text'] = 'Frequencies';
$config['os'][$os]['mib_dir'][] = 'ups';

$os = 'deltaups';
$config['os'][$os]['text'] = 'Delta UPS';
Expand Down Expand Up @@ -1779,6 +1793,7 @@
$config['os'][$os]['over'][1]['graph'] = 'device_processor';
$config['os'][$os]['over'][1]['text'] = 'CPU Usage';
$config['os'][$os]['icon'] = 'watchguard';
$config['os'][$os]['group'] = 'watchguard';

$os = 'fireware';
$config['os'][$os]['text'] = 'Watchguard Fireware';
Expand All @@ -1788,6 +1803,7 @@
$config['os'][$os]['over'][1]['graph'] = 'device_processor';
$config['os'][$os]['over'][1]['text'] = 'CPU Usage';
$config['os'][$os]['icon'] = 'watchguard';
$config['os'][$os]['group'] = 'watchguard';

$os = 'panos';
$config['os'][$os]['text'] = 'PanOS';
Expand Down Expand Up @@ -1824,18 +1840,20 @@

// Canopy / Cambium support
$os = 'cambium';
$config['os'][$os]['text'] = 'Cambium';
$config['os'][$os]['type'] = 'wireless';
$config['os'][$os]['icon'] = 'cambium';
$config['os'][$os]['text'] = 'Cambium';
$config['os'][$os]['type'] = 'wireless';
$config['os'][$os]['icon'] = 'cambium';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Device Traffic';
$config['os'][$os]['group'] = 'cambium';

$os = 'canopy';
$config['os'][$os]['text'] = 'Canopy';
$config['os'][$os]['type'] = 'wireless';
$config['os'][$os]['icon'] = 'cambium';
$config['os'][$os]['text'] = 'Canopy';
$config['os'][$os]['type'] = 'wireless';
$config['os'][$os]['icon'] = 'cambium';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Device Traffic';
$config['os'][$os]['group'] = 'cambium';

$os = 'datacom';
$config['os'][$os]['text'] = 'Datacom';
Expand Down
2 changes: 1 addition & 1 deletion includes/discovery/processors/watchguard.inc.php
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
echo 'Watchguard Firebox : ';

$descr = 'Processor';
$usage = snmp_get($device, '.1.3.6.1.4.1.3097.6.3.78.0', '-OQUvs', 'WATCHGUARD-SYSTEM-STATISTICS-MIB', 'watchguard');
$usage = snmp_get($device, '.1.3.6.1.4.1.3097.6.3.78.0', '-OQUvs', 'WATCHGUARD-SYSTEM-STATISTICS-MIB');

if (is_numeric($usage)) {
discover_processor($valid['processor'], $device, '1.3.6.1.4.1.3097.6.3.78.0', '0', 'firebox-fixed', $descr, '100', $usage, null, null);
Expand Down
0 ...es/discovery/sensors/current/xups.inc.php → ...scovery/sensors/current/powerware.inc.php
View file
Open in desktop
File renamed without changes.
0 ...iscovery/sensors/frequencies/xups.inc.php → ...ery/sensors/frequencies/powerware.inc.php
View file
Open in desktop
File renamed without changes.
0 ...scovery/sensors/temperatures/xups.inc.php → ...ry/sensors/temperatures/powerware.inc.php
View file
Open in desktop
File renamed without changes.
0 ...s/discovery/sensors/voltages/xups.inc.php → ...covery/sensors/voltages/powerware.inc.php
View file
Open in desktop
File renamed without changes.
18 changes: 17 additions & 1 deletion includes/snmp.inc.php
View file
Open in desktop
Expand Up @@ -50,9 +50,25 @@ function get_mib_dir($device)
$extra[] = $config['mib_dir'] . '/' . $device['os'];
}

if (file_exists($config['mib_dir'] . '/' . $device['os_group'])) {
if (isset($device['os_group']) && file_exists($config['mib_dir'] . '/' . $device['os_group'])) {
$extra[] = $config['mib_dir'] . '/' . $device['os_group'];
}

if (isset($config['os_groups'][$device['os_group']]['mib_dir'])) {
if (is_array($config['os_groups'][$device['os_group']]['mib_dir'])) {
foreach ($config['os_groups'][$device['os_group']]['mib_dir'] as $k => $dir) {
$extra[] = $config['mib_dir'] . '/' . $dir;
}
}
}

if (isset($config['os'][$device['os']]['mib_dir'])) {
if (is_array($config['os'][$device['os']]['mib_dir'])) {
foreach ($config['os'][$device['os']]['mib_dir'] as $k => $dir) {
$extra[] = $config['mib_dir'] . '/' . $dir;
}
}
}

return $extra;
}
Expand Down