clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 10:58:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

recognise mikrotic ram/cpu in HOST-RESOURCES-MIB

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1447 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2010-07-20 20:44:23 +00:00
parent 73f8e3c7a8
commit 5c19f8dffa
3 changed files with 1134 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/discovery/mempools-hrstorage.inc.php
View File

@ -14,6 +14,7 @@ if(is_array($storage_array)) {
$deny = 1;
if ($fstype == "hrStorageVirtualMemory" || $fstype == "hrStorageRam") { $deny = 0; }
if ($device['os'] == "routeros" && $descr == "main memory") { $deny = 0; }
if(strstr($descr, "MALLOC") || strstr($descr, "UMA")) { $deny = 1; } ## Ignore FreeBSD INSANITY

17
includes/discovery/processors/hrdevice.inc.php
View File

@ -2,7 +2,7 @@
global $valid_processor;
if ($device['os_group'] == "unix" || $device['os'] == "windows")
if ($device['os_group'] == "unix" || $device['os'] == "windows" || $device['os'] == "routeros")
{
echo("hrDevice ");
$hrDevice_oids = array('hrDevice','hrProcessorLoad');
@ -16,17 +16,18 @@ if ($device['os_group'] == "unix" || $device['os'] == "windows")
$usage_oid = ".1.3.6.1.2.1.25.3.3.1.2." . $index;
$usage = $entry['hrProcessorLoad'];
$descr = $entry['hrDeviceDescr'];
#### What is this for? I have forgotten. What has : in its hrDeviceDescr?
#### Set description to that found in hrDeviceDescr, first part only if containing a :
$descr_array = explode(":",$entry['hrDeviceDescr']);
if($descr_array['1']) { $descr = $descr_array['1']; } else { $descr = $descr_array['0']; }
$descr_array = explode(":",$entry['hrDeviceDescr']);
### Workaround to set fake description for Mikrotik who don't populate hrDeviceDescr
if($device['os'] == "routeros" && !isset($entry['hrDeviceDescr'])) { $descr = "Processor";}
if($descr_array['1']) { $descr = $descr_array['1']; } else { $descr = $descr_array['0']; }
$descr = str_replace("CPU ", "", $descr);
$descr = str_replace("CPU ", "", $descr);
$descr = str_replace("(TM)", "", $descr);
$descr = str_replace("(R)", "", $descr);
$old_rrd = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("hrProcessor-" . $index . ".rrd");
$new_rrd = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("processor-hr-" . $index . ".rrd");
@ -35,7 +36,7 @@ if ($device['os_group'] == "unix" || $device['os'] == "windows")
rename($old_rrd,$new_rrd);
echo("Moved RRD ");
}
if(!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" && $descr != "An electronic chip that makes the computer work.")
if(isset($descr) && $descr != "An electronic chip that makes the computer work.")
{
discover_processor($valid_processor, $device, $usage_oid, $index, "hr", $descr, "1", $usage, NULL, $hrDeviceIndex);
}

1124
mibs/mikrotik/Mikrotik.mib Normal file
View File

File diff suppressed because it is too large Load Diff