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

fixes as @laf indications

Browse Source
This commit is contained in:
crcro
2016-09-24 17:58:16 +03:00
parent 34978945ea
commit e2a017d14f
10 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/os/ibm-amm.inc.php
View File

@@ -10,6 +10,6 @@
* the source code distribution for details. * the source code distribution for details.
*/ */
if (str_contains($sysDescr, 'BladeCenter Advanced Management Module')) { if (str_contains($sysDescr, 'BladeCenter Advanced Management Module', true)) {
$os = 'ibm-amm'; $os = 'ibm-amm';
} }

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

@@ -10,6 +10,6 @@
* the source code distribution for details. * the source code distribution for details.
*/ */
if (str_contains($sysDescr, array('IBM Networking Operating System', 'IBM Flex System Fabric', 'IBM Networking OS'))) { if (str_contains($sysDescr, array('IBM Networking Operating System', 'IBM Flex System Fabric', 'IBM Networking OS'), true)) {
$os = 'ibmnos'; $os = 'ibmnos';
} }

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

@@ -12,6 +12,6 @@
$ibmtl_snmpget = snmp_get($device, 'SML-MIB::product-Name.0', '-Oqv', ''); $ibmtl_snmpget = snmp_get($device, 'SML-MIB::product-Name.0', '-Oqv', '');
if (str_contains($ibmtl_snmpget, 'IBM System Storage TS3500 Tape Library')) { if (str_contains($ibmtl_snmpget, 'IBM System Storage TS3500 Tape Library', true)) {
$os = 'ibmtl'; $os = 'ibmtl';
} }

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

@@ -4,14 +4,6 @@ if (str_contains($sysDescr, array('Cisco Internetwork Operating System Software'
$os = 'ios'; $os = 'ios';
} }
if (str_contains($sysDescr, 'IOS-XE')) {
$os = 'iosxe';
}
if (str_contains($sysDescr, 'IOS XR')) {
$os = 'iosxr';
}
if (!empty($os)) { if (!empty($os)) {
$extra_mibs = array( $extra_mibs = array(
"ciscoAAASessionMIB" => "CISCO-AAA-SESSION-MIB", "ciscoAAASessionMIB" => "CISCO-AAA-SESSION-MIB",

5
includes/discovery/os/iosxe.inc.php Normal file
View File

@@ -0,0 +1,5 @@
<?php
if (str_contains($sysDescr, 'IOS-XE')) {
$os = 'iosxe';
}

5
includes/discovery/os/iosxr.inc.php Normal file
View File

@@ -0,0 +1,5 @@
<?php
if (str_contains($sysDescr, 'IOS XR')) {
$os = 'iosxr';
}

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

@@ -2,8 +2,6 @@
if (str_contains($sysDescr, array('JETDIRECT', 'HP ETHERNET MULTI-ENVIRONMENT'))) { if (str_contains($sysDescr, array('JETDIRECT', 'HP ETHERNET MULTI-ENVIRONMENT'))) {
$os = 'jetdirect'; $os = 'jetdirect';
} } elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.11.1')) {
if (starts_with($sysObjectId, '.1.3.6.1.4.1.11.1')) {
$os = 'jetdirect'; $os = 'jetdirect';
} }

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

@@ -2,8 +2,6 @@
if (starts_with($sysObjectId, '.1.3.6.1.4.1.2636')) { if (starts_with($sysObjectId, '.1.3.6.1.4.1.2636')) {
$os = 'junos'; $os = 'junos';
} } elseif (str_contains($sysDescr, 'kernel JUNOS', true)) {
if (str_contains($sysDescr, 'kernel JUNOS')) {
$os = 'junos'; $os = 'junos';
} }

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

@@ -2,9 +2,7 @@
if (str_contains($sysDescr, 'EMC SOHO-NAS Storage.')) { if (str_contains($sysDescr, 'EMC SOHO-NAS Storage.')) {
$os = 'lenovoemc'; $os = 'lenovoemc';
}
if (!empty($os)) {
$lenovoemc_mibs = array( $lenovoemc_mibs = array(
"fanValue" => "IOMEGANAS-MIB", "fanValue" => "IOMEGANAS-MIB",
"tempValue" => "IOMEGANAS-MIB", "tempValue" => "IOMEGANAS-MIB",

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

@@ -1,5 +1,5 @@
<?php <?php
if (str_contains($sysObjectId, '.33049.1.1.1.')) { if (starts_with($sysObjectId, '.1.3.6.1.4.1.33049.1.1.1.')) {
$os = 'mellanox'; $os = 'mellanox';
} }