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

passing all tests

Browse Source
This commit is contained in:
crcro
2016-09-22 03:58:29 +03:00
parent 631d26563e
commit eadcde9ac0
7 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/discovery/os/watchguard.inc.php
View File

@@ -1,5 +1,5 @@
<?php
if (starts_with($sysDescr, array('WatchGuard', '1.3.6.1.4.1.3097.1.5'))) {
if (starts_with('WatchGuard Fireware', $sysDescr) || starts_with('.1.3.6.1.4.1.3097.1.5', $sysObjectId)) {
$os = 'firebox';
}
}

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

@@ -1,7 +1,9 @@
<?php
if (starts_with('1.3.6.1.4.1.311.1.1.3', $sysObjectId)) {
$os = 'windows';
} elseif (str_contains('Windows', $sysDescr)) {
if (starts_with('.1.3.6.1.4.1.311.1.1.3', $sysObjectId)) {
$os = 'windows';
}
if (str_contains($sysDescr, array('Windows'))) {
$os = 'windows';
}

6
includes/discovery/os/wxgoos.inc.php
View File

@@ -1,5 +1,9 @@
<?php
if (str_contains('NETOS 6.0', $sysDescr) && starts_with($sysObjectId, array('.1.3.6.1.4.1.901.1', '.1.3.6.1.4.1.17373'))) {
if (str_contains('NETOS 6.0', $sysDescr)) {
$os = 'wxgoos';
}
if (starts_with($sysObjectId, array('.1.3.6.1.4.1.901.1', '.1.3.6.1.4.1.17373'))) {
$os = 'wxgoos';
}

6
includes/discovery/os/xirrus.inc.php
View File

@@ -1,7 +1,5 @@
<?php
if (str_contains('Xirrus', $sysDescr)) {
if (str_contains('ArrayOS', $sysDescr)) {
$os = 'xirrus_aos';
}
if (str_contains($sysDescr, array('Xirrus', 'ArrayOS'))) {
$os = 'xirrus_aos';
}

6
includes/discovery/os/zxr10.inc.php
View File

@@ -1,7 +1,5 @@
<?php
if (starts_with('ZXR10', $sysDescr)) {
if (str_contains($sysDescr, array('ZXR10', 'ZTE Ethernet Switch'))) {
$os = 'zxr10';
} elseif (str_contains('ZTE Ethernet Switch', $sysDescr)) {
$os = 'zxr10';
}
}

2
includes/discovery/os/zynos.inc.php
View File

@@ -1,5 +1,5 @@
<?php
if (str_contains('.1.3.6.1.4.1.890', $sysObjectId) && (starts_with($sysDescr, array('EG', 'GS')))) {
if (starts_with('.1.3.6.1.4.1.890', $sysObjectId) && starts_with($sysDescr, array('ES', 'GS'))) {
$os = 'zynos';
}

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

@@ -1,7 +1,9 @@
<?php
if (str_contains('ZyWALL', $sysDescr)) {
$os = 'zywall';
} elseif (starts_with('.1.3.6.1.4.1.890.1.15', $sysObjectId)) {
if (starts_with('ZyWALL 2X', $sysDescr)) {
$os = 'zywall';
}
if (strstr($sysObjectId, '.1.3.6.1.4.1.890.1.15')) {
$os = 'zywall';
}