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

tings, yo.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2662 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-10-07 17:59:12 +00:00
parent 2eaa272624
commit 7eb42ecefc
7 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
html/images/os/endian.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 981 B

BIN
html/images/os/vyatta.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 90 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

2
html/includes/graphs/application/nginx_req.inc.php
View File

@@ -15,7 +15,7 @@ $rrd_options .= ' DEF:a='.$rrd_filename.':Requests:AVERAGE ';
$rrd_options .= 'COMMENT:"Requests Current Average Maximum\n" ';
$rrd_options .= "LINE2:a#22FF22:Requests\ \ ";
$rrd_options .= "LINE2:a#22FF22:'Requests '";
$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n" ';

2
html/includes/graphs/device/smokeping_all_common.inc.php
View File

@@ -19,7 +19,7 @@ if($width > "500")
{
$descr_len = 18;
} else {
$descr_len = 12 + round(($width - 250) / 8);
$descr_len = 12 + round(($width - 275) / 8);
}
if($width > "500")

1
includes/discovery/os/linux.inc.php
View File

@@ -13,6 +13,7 @@ if (!$os)
if (strpos($entPhysicalMfgName, "QNAP") !== FALSE) { $os = "qnap";}
elseif(strstr($sysObjectId, ".1.3.6.1.4.1.5528.100.20.10.2014")) { $os = "netbotz"; }
elseif(strstr($sysDescr, "endian")) { $os = "endian"; }
}

12
includes/polling/os/unix.inc.php
View File

@@ -67,5 +67,17 @@ elseif ($device['os'] == "qnap")
$version = snmp_get($device, "ENTITY-MIB::entPhysicalFirmwareRev.1", "-Osqnv");
$serial = snmp_get($device, "ENTITY-MIB::entPhysicalSerial.1", "-Osqnv");
}
elseif ($device['os'] == "endian")
{
list(,,$version) = explode (" ", $poll_device[sysDescr]);
if (strstr($poll_device[sysDescr], "386")|| strstr($poll_device[sysDescr], "486")||strstr($poll_device[sysDescr], "586")||strstr($poll_device[sysDescr], "686")) { $hardware = "Generic x86"; }
else if (strstr($poll_device[sysDescr], "x86_64")) { $hardware = "Generic x86 64-bit"; }
else if (strstr($poll_device[sysDescr], "sparc32")) { $hardware = "Generic SPARC 32-bit"; }
else if (strstr($poll_device[sysDescr], "sparc64")) { $hardware = "Generic SPARC 64-bit"; }
else if (strstr($poll_device[sysDescr], "armv5")) { $hardware = "Generic ARMv5"; }
else if (strstr($poll_device[sysDescr], "armv6")) { $hardware = "Generic ARMv6"; }
else if (strstr($poll_device[sysDescr], "armv7")) { $hardware = "Generic ARMv7"; }
else if (strstr($poll_device[sysDescr], "armv")) { $hardware = "Generic ARM"; }
}
?>

14
includes/static-config.php
View File

@@ -33,6 +33,7 @@ $config['os'][$os]['over'][1]['text'] = "Processor Usage";
$config['os'][$os]['over'][2]['graph'] = "device_mempool";
$config['os'][$os]['over'][2]['text'] = "Memory Usage";
### Linux-based OSes here please.
$os = "linux";
@@ -53,6 +54,19 @@ $config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "QNAP TurboNAS";
$config['os'][$os]['ifXmcbc'] = 1;
$os = "endian";
$config['os'][$os]['text'] = "Endian";
$config['os'][$os]['type'] = "firewall";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['ifname'] = 1;
$config['os'][$os]['over'][0]['graph'] = "device_bits";
$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]['over'][2]['graph'] = "device_mempool";
$config['os'][$os]['over'][2]['text'] = "Memory Usage";
### Other Unix-based OSes here please.
$os = "freebsd";