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

newdevice: Changed Solaris and Allied discovery to yaml (#6900)

Browse Source 
Add SunOS to callback sanitize
This commit is contained in:
Tony Murray
2017-06-28 01:53:25 -05:00
committed by Neil Lathwood
parent 092f6922a9
commit d47b58bf6d
12 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/callback.php
View File

@@ -79,8 +79,8 @@ if ($enabled == 1) {
// sanitize sysDescr
$device_info = array_map(function ($entry) {
// remove hostnames from linux and macosx
$entry['sysDescr'] = preg_replace_callback('/^(Linux |Darwin |FreeBSD )[A-Za-z0-9._\-]+ ([0-9.]{3,9})/', function ($matches) {
// remove hostnames from linux, macosx, and SunOS
$entry['sysDescr'] = preg_replace_callback('/^(Linux |Darwin |FreeBSD |SunOS )[A-Za-z0-9._\-]+ ([0-9.]{3,9})/', function ($matches) {
return $matches[1] . 'hostname ' .$matches[2];
}, $entry['sysDescr']);

4
includes/definitions/allied.yaml
View File

@@ -4,3 +4,7 @@ type: network
ifname: 1
over:
- { graph: device_bits, text: Traffic }
discovery:
-
sysObjectId: .1.3.6.1.4.1.207.
sysObjectId_except: .1.3.6.1.4.1.207.1.4.126

4
includes/definitions/openindiana.yaml
View File

@@ -6,3 +6,7 @@ processor_stacked: 1
over:
- { graph: device_processor, text: 'Processor Usage' }
- { graph: device_ucd_memory, text: 'Memory Usage' }
discovery:
-
sysObjectId: .1.3.6.1.4.1.8072.3.2.3
sysDescr_regex: '/^SunOS oi_.* 5\.11/'

4
includes/definitions/opensolaris.yaml
View File

@@ -6,3 +6,7 @@ processor_stacked: 1
over:
- { graph: device_processor, text: 'Processor Usage' }
- { graph: device_ucd_memory, text: 'Memory Usage' }
discovery:
-
sysObjectId: .1.3.6.1.4.1.8072.3.2.3
sysDescr_regex: '/^SunOS .+ 5\.11 [^1]/'

8
includes/definitions/solaris.yaml
View File

@@ -6,3 +6,11 @@ processor_stacked: 1
over:
- { graph: device_processor, text: 'Processor Usage' }
- { graph: device_ucd_memory, text: 'Memory Usage' }
discovery:
- sysObjectId: .1.3.6.1.4.1.42.2.1.1
-
sysObjectId: .1.3.6.1.4.1.8072.3.2.3
sysDescr_regex: '/^SunOS .+ 5\.10/'
-
sysObjectId: .1.3.6.1.4.1.8072.3.2.3
sysDescr_regex: '/^SunOS .+ 5\.11 11/'

5
includes/discovery/os/allied.inc.php
View File

@@ -1,5 +0,0 @@
<?php
if (starts_with($sysObjectId, '.1.3.6.1.4.1.207') && !starts_with($sysObjectId, '.1.3.6.1.4.1.207.1.4.126')) {
$os = 'allied';
}

15
includes/discovery/os/openindiana.inc.php
View File

@@ -1,15 +0,0 @@
<?php
if (starts_with($sysDescr, 'SunOS')) {
list(,,$version) = explode(' ', $sysDescr);
if (version_compare($version, '5.10', '>')) {
if (str_contains($sysDescr, 'oi_')) {
$os = 'openindiana';
}
}
}
if (starts_with($sysObjectId, '.1.3.6.1.4.1.42.2.1.1')) {
$os = 'solaris';
}

11
includes/discovery/os/opensolaris.inc.php
View File

@@ -1,11 +0,0 @@
<?php
if (starts_with($sysDescr, 'SunOS')) {
list(,,$version) = explode(' ', $sysDescr);
if (version_compare($version, '5.10', '>')) {
if (!str_contains($sysDescr, 'oi_')) {
$os = 'opensolaris';
}
}
}

14
includes/discovery/os/solaris.inc.php
View File

@@ -1,14 +0,0 @@
<?php
if (starts_with($sysDescr, 'SunOS')) {
$os = 'solaris';
list(,,$version) = explode(' ', $sysDescr);
if (version_compare($version, '5.10', '>')) {
unset($os);
}
}
if (starts_with($sysObjectId, '.1.3.6.1.4.1.42.2.1.1')) {
$os = 'solaris';
}

1
tests/snmpsim/openindiana.snmprec
View File

@@ -1 +1,2 @@
1.3.6.1.2.1.1.1.0|4|SunOS oi_ 5.11
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.3

2
tests/snmpsim/solaris.snmprec
View File

@@ -1,2 +1,2 @@
1.3.6.1.2.1.1.1.0|4|SunOS Something 5.10
1.3.6.1.2.1.1.1.0|4|SunOS host-name 5.10 Generic_144488-06 sun4u
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.3

2
tests/snmpsim/solaris_11.snmprec Normal file
View File

@@ -0,0 +1,2 @@
1.3.6.1.2.1.1.1.0|4|SunOS hostname 5.11 11.3 i86pc
1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.3