nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes to new poller

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2233 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-03 21:46:25 +00:00
parent f1d6744ea1
commit 00121fd3f8
28 changed files with 126 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/discovery/ports-stack.inc.php
+2
View File
@@ -35,4 +35,6 @@ foreach($stack_poll_array as $interface_id_high => $entry_high)
}
}
echo("\n");
?>
includes/polling/os.inc.php
+25
View File
@@ -15,5 +15,30 @@
echo("Generic :(\n");
}
if ($version && $device['version'] != $version)
{
$device['db_update'] .= ", `version` = '".mres($version)."'";
log_event("OS Version -> ".$version, $device, 'system');
}
if ($features != $device['features'])
{
$device['db_update'] .= ", `features` = '".mres($features)."'";
log_event("OS Features -> ".$features, $device, 'system');
}
if ($hardware && $hardware != $device['hardware'])
{
$device['db_update'] .= ", `hardware` = '".mres($hardware)."'";
log_event("Hardware -> ".$hardware, $device, 'system');
}
if ($serial && $serial != $device['serial'])
{
$device['db_update'] .= ", `serial` = '".mres($serial)."'";
log_event("serial -> ".$serial, $device, 'system');
}
echo("Hardware: ".$hardware." Version: ".$version." Features: ".$features."\n");
?>
includes/polling/os/allied.inc.php
+1 -1
View File
@@ -28,7 +28,7 @@ if (!$hardware && !$version && !$features)
#Allied Telesyn AT-8948 version 2.7.4-02 22-Aug-2005
list($a,$b,$c,$d,$e,$f) = explode(" ", $sysDescr);
list($a,$b,$c,$d,$e,$f) = explode(" ", $poll_device[sysDescr]);
if (!$hardware && !$version && !$features)
{
includes/polling/os/aos.inc.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
list(,$hardware,$version) = explode(' ',$sysDescr);
list(,$hardware,$version) = explode(' ',$poll_device[sysDescr]);
?>
includes/polling/os/arista_eos.inc.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
$version = preg_replace("/.+ version (.+) running on .+ (\S+)$/", "\\1||\\2", $sysDescr);
$version = preg_replace("/.+ version (.+) running on .+ (\S+)$/", "\\1||\\2", $poll_device[sysDescr]);
list($version,$hardware) = explode("||", $version);
?>
includes/polling/os/bnt.inc.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
preg_match('/Blade Network Technologies (.*)$/', $sysDescr, $store);
preg_match('/Blade Network Technologies (.*)$/', $poll_device[sysDescr], $store);
if (isset($store[1]))
{
includes/polling/os/cat1900.inc.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
list(,$version) = explode(',',$sysDescr,2);
list(,$version) = explode(',',$poll_device[sysDescr],2);
$hardware = "1900";
?>
includes/polling/os/catos.inc.php
+3 -3
View File
@@ -15,10 +15,10 @@ if (!strstr($ciscomodel, " ") && strlen($ciscomodel) >= '3')
$hardware = $ciscomodel;
}
$sysDescr = str_replace(", Inc.", "", $sysDescr); ## Make the two formats the same
$sysDescr = str_replace("\n", " ", $sysDescr);
$poll_device[sysDescr] = str_replace(", Inc.", "", $poll_device[sysDescr]); ## Make the two formats the same
$poll_device[sysDescr] = str_replace("\n", " ", $poll_device[sysDescr]);
list(,,$hardware,,,,,,,$version,,,$features) = explode(" ", $sysDescr);
list(,,$hardware,,,,,,,$version,,,$features) = explode(" ", $poll_device[sysDescr]);
list(,$features) = explode("-", $features);
?>
includes/polling/os/dell-laser.inc.php
+1 -1
View File
@@ -13,7 +13,7 @@ foreach ($dellinfo as $dellinf)
$hardware = $dell_laser['MDL'];
list(,$version) = explode('Engine ',$sysDescr);
list(,$version) = explode('Engine ',$poll_device[sysDescr]);
$version = "Engine " . trim($version,')');
includes/polling/os/extremeware.inc.php
+3 -3
View File
@@ -9,10 +9,10 @@ echo("Doing Extreme: ");
#Summit48(Yonetan) - Version 4.1.19 (Build 2) by Release_Master Wed 08/09/2000 6:09p
#Alpine3808 - Version 7.2.0 (Build 33) by Release_Master 07/09/04 14:05:12
if (!strpos($sysDescr, "XOS"))
if (!strpos($poll_device[sysDescr], "XOS"))
{
echo(" Extremeware \n");
list(, $datas) = explode(" - ", $sysDescr);
list(, $datas) = explode(" - ", $poll_device[sysDescr]);
$datas = str_replace("(","", $datas);
$datas = str_replace(")","", $datas);
list($a,$b,$c,$d,$e,$f,$g,$h) = explode(" ", $datas);
@@ -28,7 +28,7 @@ else
#ExtremeWare XOS version 11.5.2.10 v1152b10 by release-manager on Thu Oct 26 09:53:04 PDT 2006
echo(" XOS \n");
list($a,$b,$c,$d,$e,$f,$g,$h,$i,$j,$k,$l,$m) = explode(" ", str_replace("ExtremeWare XOS", "ExtremeXOS", $sysDescr));
list($a,$b,$c,$d,$e,$f,$g,$h,$i,$j,$k,$l,$m) = explode(" ", str_replace("ExtremeWare XOS", "ExtremeXOS", $poll_device[sysDescr]));
if ($b == "version")
{
$version = $c;
includes/polling/os/ies.inc.php
+1 -1
View File
@@ -2,7 +2,7 @@
$version = trim(snmp_get($device, "accessSwitchFWVersion.0", "-OQv", "ZYXEL-AS-MIB"),'"');
preg_match("/IES-(\d)*/",$sysDescr, $matches);
preg_match("/IES-(\d)*/",$poll_device[sysDescr], $matches);
$hardware = $matches[0];
?>
includes/polling/os/ios.inc.php
+6 -5
View File
@@ -1,7 +1,8 @@
<?php
$sysDescr = str_replace("IOS (tm)", "IOS (tm),", $sysDescr);
list(,$features,$version) = explode(",", $sysDescr);
$poll_device['sysDescr'] = str_replace("IOS (tm)", "IOS (tm),", $poll_device['sysDescr']);
list(,$features,$version) = explode(",", $poll_device['sysDescr']);
$version = str_replace(" Version ", "", $version);
list(,$features) = explode("(", $features);
list(,$features) = explode("-", $features);
@@ -34,12 +35,12 @@ list($version) = explode(",", $version);
# $ciscomodel = str_replace("\"","",$ciscomodel);
# if ($ciscomodel) { $hardware = $ciscomodel; unset($ciscomodel); }
# if (strpos($sysDescr, "IOS XR")) {
# list(,$version) = explode(",", $sysDescr);
# if (strpos($poll_device['sysDescr'], "IOS XR")) {
# list(,$version) = explode(",", $poll_device['sysDescr']);
# $version = trim($version);
# list(,$version) = explode(" ", $version);
# list($version) = explode("\n", $version);
# trim($version);
# }
?>
?>
includes/polling/os/junos.inc.php
+1 -1
View File
@@ -2,7 +2,7 @@
$jun_ver = snmp_get($device, ".1.3.6.1.2.1.25.6.3.1.2.2", "-Oqv", "HOST-RESOURCES-MIB");
if (strpos($sysDescr, "olive"))
if (strpos($poll_device[sysDescr], "olive"))
{
$hardware = "Olive";
$serial = "";
includes/polling/os/junose.inc.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
if (strpos($sysDescr, "olive"))
if (strpos($poll_device[sysDescr], "olive"))
{
$hardware = "Olive";
$serial = "";
includes/polling/os/powerconnect.inc.php
+1 -1
View File
@@ -9,7 +9,7 @@ list($hardware, $version, $features) = explode("\n", shell_exec($snmp_cmd));
if (strstr($hardware,"No Such Object available"))
{
$hardware = $sysDescr;
$hardware = $poll_device[sysDescr];
}
?>
includes/polling/os/procurve.inc.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
list($hardware, $version, $features) = explode(",", str_replace(", ", ",", $sysDescr));
list($hardware, $version, $features) = explode(",", str_replace(", ", ",", $poll_device[sysDescr]));
list($features) = explode("(", $version);
$fdb_rrd_file = $config['rrd_dir'] . "/" . $device['hostname'] . "/fdb_count.rrd";
includes/polling/os/radlan.inc.php
+2 -2
View File
@@ -1,6 +1,6 @@
<?php
if ($sysDescr == "Neyland 24T")
if ($poll_device[sysDescr] == "Neyland 24T")
{
#$hardware = snmp_get($device, "productIdentificationVendor.0", "-Ovq", "Dell-Vendor-MIB");
$hardware = "Dell ".snmp_get($device, "productIdentificationDisplayName.0", "-Ovq", "Dell-Vendor-MIB");
@@ -9,7 +9,7 @@ if ($sysDescr == "Neyland 24T")
else
{
$version = snmp_get($device, "rndBrgVersion.0", "-Ovq", "RADLAN-MIB");
$hardware = str_replace("ATI", "Allied Telesis", $sysDescr);
$hardware = str_replace("ATI", "Allied Telesis", $poll_device[sysDescr]);
}
$features = snmp_get($device, "rndBaseBootVersion.00", "-Ovq", "RADLAN-MIB");
includes/polling/os/screenos.inc.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
$version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "\\1||\\2||\\3||\\4", $sysDescr);
$version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "\\1||\\2||\\3||\\4", $poll_device[sysDescr]);
list($hardware,$version,$serial,$features) = explode("||", $version);
$sessrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/screenos_sessions.rrd";
includes/polling/os/snom.inc.php
+4 -4
View File
@@ -7,10 +7,10 @@ echo("Polling SNOM device...\n");
## FIXME - This needs a good cleanup...
$cmd = "snmpget -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " 1.3.6.1.2.1.7526.2.4";
$sysDescr = `$cmd`;
$sysDescr = str_replace("-", " ", $sysDescr);
$sysDescr = str_replace("\"", "", $sysDescr);
list($hardware, $features, $version) = explode(" ", $sysDescr);
$poll_device[sysDescr] = `$cmd`;
$poll_device[sysDescr] = str_replace("-", " ", $poll_device[sysDescr]);
$poll_device[sysDescr] = str_replace("\"", "", $poll_device[sysDescr]);
list($hardware, $features, $version) = explode(" ", $poll_device[sysDescr]);
// Get data for calls and network from SNOM specific SNMP OIDs.
includes/polling/os/speedtouch.inc.php
+1 -1
View File
@@ -2,7 +2,7 @@
$serial = "";
#list(,$hardware,) = explode(" ", $hardware);
$hardware = $sysDescr;
$hardware = $poll_device[sysDescr];
$features = "";
includes/polling/os/tranzeo.inc.php
+1 -1
View File
@@ -7,7 +7,7 @@
# Tranzeo TR6CPQ, OS 6.3.34(1019), FW TR6-2.0.12CPQ, 2.4GHz, 15dBi int. antenna
# Tranzeo TR900Rt, OS 6.8.0(1024), FW TR900-3.3.3Rt, 900MHz, 17dBi ext. antenna
list($hardware, $version, $features, $hardware_antenna) = explode(", ", $sysDescr);
list($hardware, $version, $features, $hardware_antenna) = explode(", ", $poll_device[sysDescr]);
list(,$version) = explode(" ", $version);
list($version) = explode("(", $version);
includes/polling/os/unix.inc.php
+18 -18
View File
@@ -2,15 +2,15 @@
if ($device['os'] == "linux")
{
list(,,$version) = explode (" ", $sysDescr);
if (strstr($sysDescr, "386")|| strstr($sysDescr, "486")||strstr($sysDescr, "586")||strstr($sysDescr, "686")) { $hardware = "Generic x86"; }
else if (strstr($sysDescr, "x86_64")) { $hardware = "Generic x86 64-bit"; }
else if (strstr($sysDescr, "sparc32")) { $hardware = "Generic SPARC 32-bit"; }
else if (strstr($sysDescr, "sparc64")) { $hardware = "Generic SPARC 64-bit"; }
else if (strstr($sysDescr, "armv5")) { $hardware = "Generic ARMv5"; }
else if (strstr($sysDescr, "armv6")) { $hardware = "Generic ARMv6"; }
else if (strstr($sysDescr, "armv7")) { $hardware = "Generic ARMv7"; }
else if (strstr($sysDescr, "armv")) { $hardware = "Generic ARM"; }
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"; }
# Distro "extend" support
$features = snmp_get($device, ".1.3.6.1.4.1.2021.7890.1.3.1.1.6.100.105.115.116.114.111", "-Oqv", "UCD-SNMP-MIB");
@@ -30,33 +30,33 @@ if ($device['os'] == "linux")
}
elseif ($device['os'] == "freebsd")
{
$sysDescr = str_replace(" 0 ", " ", $sysDescr);
list(,,$version) = explode (" ", $sysDescr);
if(strstr($sysDescr, "i386")) { $hardware = "i386"; }
else if(strstr($sysDescr, "amd64")) { $hardware = "amd64"; }
$poll_device[sysDescr] = str_replace(" 0 ", " ", $poll_device[sysDescr]);
list(,,$version) = explode (" ", $poll_device[sysDescr]);
if(strstr($poll_device[sysDescr], "i386")) { $hardware = "i386"; }
else if(strstr($poll_device[sysDescr], "amd64")) { $hardware = "amd64"; }
else { $hardware = "i386"; }
$features = "GENERIC";
}
elseif ($device['os'] == "dragonfly")
{
list(,,$version,,,$features,,$hardware) = explode (" ", $sysDescr);
list(,,$version,,,$features,,$hardware) = explode (" ", $poll_device[sysDescr]);
}
elseif ($device['os'] == "netbsd")
{
list(,,$version,,,$features) = explode (" ", $sysDescr);
list(,,$version,,,$features) = explode (" ", $poll_device[sysDescr]);
$features = str_replace("(", "", $features);
$features = str_replace(")", "", $features);
list(,,$hardware) = explode ("$features", $sysDescr);
list(,,$hardware) = explode ("$features", $poll_device[sysDescr]);
}
elseif ($device['os'] == "openbsd" || $device['os'] == "solaris" || $device['os'] == "opensolaris")
{
list(,,$version,$features,$hardware) = explode (" ", $sysDescr);
list(,,$version,$features,$hardware) = explode (" ", $poll_device[sysDescr]);
$features = str_replace("(", "", $features);
$features = str_replace(")", "", $features);
}
elseif ($device['os'] == "monowall" || $device['os'] == "Voswall")
{
list(,,$version,$hardware,$freebsda, $freebsdb, $arch) = explode(" ", $sysDescr);
list(,,$version,$hardware,$freebsda, $freebsdb, $arch) = explode(" ", $poll_device[sysDescr]);
$features = $freebsda . " " . $freebsdb;
$hardware = "$hardware ($arch)";
$hardware = str_replace("\"", "", $hardware);
includes/polling/os/vrp.inc.php
+1 -1
View File
@@ -2,7 +2,7 @@
$hardware = trim(snmp_get($device, ".1.3.6.1.4.1.2011.2.33.20.1.1.1.3.0", "-OQv"),'"');
preg_match("/Version .*\n/",$sysDescr, $matches);
preg_match("/Version .*\n/",$poll_device[sysDescr], $matches);
$version = trim(str_replace("Version ","",$matches[0]));
?>
includes/polling/os/windows.inc.php
+30 -30
View File
@@ -9,48 +9,48 @@
#sysDescr.0 = STRING: Hardware: Intel64 Family 6 Model 23 Stepping 6 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7600 Multiprocessor Free)
#sysDescr.0 = STRING: Hardware: AMD64 Family 16 Model 8 Stepping 0 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7600 Multiprocessor Free)
if (strstr($sysDescr, "x86")) { $hardware = "Generic x86"; }
if (strstr($sysDescr, "ia64")) { $hardware = "Intel Itanium IA64"; }
if (strstr($sysDescr, "EM64")) { $hardware = "Intel x64"; }
if (strstr($sysDescr, "AMD64")) { $hardware = "AMD x64"; }
if (strstr($sysDescr, "Intel64")) { $hardware = "Intel x64"; }
if (strstr($poll_device[sysDescr], "x86")) { $hardware = "Generic x86"; }
if (strstr($poll_device[sysDescr], "ia64")) { $hardware = "Intel Itanium IA64"; }
if (strstr($poll_device[sysDescr], "EM64")) { $hardware = "Intel x64"; }
if (strstr($poll_device[sysDescr], "AMD64")) { $hardware = "AMD x64"; }
if (strstr($poll_device[sysDescr], "Intel64")) { $hardware = "Intel x64"; }
if($sysObjectID == ".1.3.6.1.4.1.311.1.1.3.1.1") { ## Workstation
if (strstr($sysDescr, "Build Number: 1057")) { $version = "NT 3.51 Workstation"; }
if (strstr($sysDescr, "Build Number: 1381")) { $version = "NT 4.0 Workstation"; }
if (strstr($sysDescr, "Build 2195")) { $version = "2000 (NT 5.0)"; }
if (strstr($sysDescr, "Build 2600")) { $version = "XP (NT 5.1)"; }
if (strstr($sysDescr, "Build 3790")) { $version = "XP x64 (NT 5.2)"; }
if (strstr($sysDescr, "Build 6000")) { $version = "Vista (NT 6.0)"; }
if (strstr($sysDescr, "Build 6001")) { $version = "Vista SP1 (NT 6.0)"; }
if (strstr($sysDescr, "Build 6002")) { $version = "Vista SP2 (NT 6.0)"; }
if (strstr($sysDescr, "Build 7600")) { $version = "7 (NT 6.1)"; }
if (strstr($poll_device[sysDescr], "Build Number: 1057")) { $version = "NT 3.51 Workstation"; }
if (strstr($poll_device[sysDescr], "Build Number: 1381")) { $version = "NT 4.0 Workstation"; }
if (strstr($poll_device[sysDescr], "Build 2195")) { $version = "2000 (NT 5.0)"; }
if (strstr($poll_device[sysDescr], "Build 2600")) { $version = "XP (NT 5.1)"; }
if (strstr($poll_device[sysDescr], "Build 3790")) { $version = "XP x64 (NT 5.2)"; }
if (strstr($poll_device[sysDescr], "Build 6000")) { $version = "Vista (NT 6.0)"; }
if (strstr($poll_device[sysDescr], "Build 6001")) { $version = "Vista SP1 (NT 6.0)"; }
if (strstr($poll_device[sysDescr], "Build 6002")) { $version = "Vista SP2 (NT 6.0)"; }
if (strstr($poll_device[sysDescr], "Build 7600")) { $version = "7 (NT 6.1)"; }
} elseif ($sysObjectID == ".1.3.6.1.4.1.311.1.1.3.1.2") { ## Server
if (strstr($sysDescr, "Build Number: 1057")) { $version = "NT Server 3.51"; }
if (strstr($sysDescr, "Build Number: 1381")) { $version = "NT Server 4.0"; }
if (strstr($sysDescr, "Build 2195")) { $version = "2000 Server (NT 5.0)"; }
if (strstr($sysDescr, "Build 3790")) { $version = "Server 2003 (NT 5.2)"; }
if (strstr($sysDescr, "Build 6001")) { $version = "Server 2008 (NT 6.0)"; }
if (strstr($sysDescr, "Build 6002")) { $version = "Server 2008 SP2 (NT 6.0)"; }
if (strstr($sysDescr, "Build 7600")) { $version = "Server 2008 R2(NT 6.1)"; }
if (strstr($poll_device[sysDescr], "Build Number: 1057")) { $version = "NT Server 3.51"; }
if (strstr($poll_device[sysDescr], "Build Number: 1381")) { $version = "NT Server 4.0"; }
if (strstr($poll_device[sysDescr], "Build 2195")) { $version = "2000 Server (NT 5.0)"; }
if (strstr($poll_device[sysDescr], "Build 3790")) { $version = "Server 2003 (NT 5.2)"; }
if (strstr($poll_device[sysDescr], "Build 6001")) { $version = "Server 2008 (NT 6.0)"; }
if (strstr($poll_device[sysDescr], "Build 6002")) { $version = "Server 2008 SP2 (NT 6.0)"; }
if (strstr($poll_device[sysDescr], "Build 7600")) { $version = "Server 2008 R2(NT 6.1)"; }
} elseif ($sysObjectID == ".1.3.6.1.4.1.311.1.1.3.1.3") { ## Datacentre Server
if (strstr($sysDescr, "Build Number: 1057")) { $version = "NT Datacenter 3.51"; }
if (strstr($sysDescr, "Build Number: 1381")) { $version = "NT Datacenter 4.0"; }
if (strstr($sysDescr, "Build 2195")) { $version = "2000 Datacenter Server (NT 5.0)"; }
if (strstr($sysDescr, "Build 3790")) { $version = "Server 2003 Datacenter (NT 5.2)"; }
if (strstr($sysDescr, "Build 6001")) { $version = "Server 2008 Datacenter (NT 6.0)"; }
if (strstr($sysDescr, "Build 6002")) { $version = "Server 2008 Datacenter SP2 (NT 6.0)"; }
if (strstr($sysDescr, "Build 7600")) { $version = "Server 2008 Datacenter R2 (NT 6.1)"; }
if (strstr($poll_device[sysDescr], "Build Number: 1057")) { $version = "NT Datacenter 3.51"; }
if (strstr($poll_device[sysDescr], "Build Number: 1381")) { $version = "NT Datacenter 4.0"; }
if (strstr($poll_device[sysDescr], "Build 2195")) { $version = "2000 Datacenter Server (NT 5.0)"; }
if (strstr($poll_device[sysDescr], "Build 3790")) { $version = "Server 2003 Datacenter (NT 5.2)"; }
if (strstr($poll_device[sysDescr], "Build 6001")) { $version = "Server 2008 Datacenter (NT 6.0)"; }
if (strstr($poll_device[sysDescr], "Build 6002")) { $version = "Server 2008 Datacenter SP2 (NT 6.0)"; }
if (strstr($poll_device[sysDescr], "Build 7600")) { $version = "Server 2008 Datacenter R2 (NT 6.1)"; }
}
if (strstr($sysDescr, "Uniprocessor")) { $features = "Uniprocessor"; }
if (strstr($sysDescr, "Multiprocessor")) { $features = "Multiprocessor"; }
if (strstr($poll_device[sysDescr], "Uniprocessor")) { $features = "Uniprocessor"; }
if (strstr($poll_device[sysDescr], "Multiprocessor")) { $features = "Multiprocessor"; }
### Detect processor type? : I.E. x86 Family 15 Model 2 Stepping 7
includes/polling/os/zywall.inc.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
$hardware = $sysDescr;
$hardware = $poll_device[sysDescr];
?>
includes/polling/os/zyxelnwa.inc.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
$hardware = $sysDescr;
$hardware = $poll_device[sysDescr];
?>
includes/polling/system.inc.php
+14 -40
View File
@@ -25,8 +25,8 @@
if ($hrSystemUptime != "" && !strpos($hrSystemUptime, "No") && ($device['os'] != "windows"))
{
echo("Using hrSystemUptime\n");
$agent_uptime = $poll_device['uptime']; ## Move uptime into agent_uptime
echo("Using hrSystemUptime (".$hrSystemUptime.")\n");
$agent_uptime = $uptime; ## Move uptime into agent_uptime
#HOST-RESOURCES-MIB::hrSystemUptime.0 = Timeticks: (63050465) 7 days, 7:08:24.65
$hrSystemUptime = str_replace("(", "", $hrSystemUptime);
$hrSystemUptime = str_replace(")", "", $hrSystemUptime);
@@ -35,25 +35,25 @@
$hours = $hours + ($days * 24);
$mins = $mins + ($hours * 60);
$secs = $secs + ($mins * 60);
$poll_device['uptime'] = $secs;
$uptime = $secs;
} else {
echo("Using Agent Uptime\n");
echo("Using Agent Uptime (".$poll_device['sysUpTime'].")\n");
#SNMPv2-MIB::sysUpTime.0 = Timeticks: (2542831) 7:03:48.31
$sysUpTime = str_replace("(", "", $sysUpTime);
$sysUpTime = str_replace(")", "", $sysUpTime);
list($days, $hours, $mins, $secs) = explode(":", $sysUpTime);
$poll_device['sysUpTime'] = str_replace("(", "", $poll_device['sysUpTime']);
$poll_device['sysUpTime'] = str_replace(")", "", $poll_device['sysUpTime']);
list($days, $hours, $mins, $secs) = explode(":", $poll_device['sysUpTime']);
list($secs, $microsecs) = explode(".", $secs);
$hours = $hours + ($days * 24);
$mins = $mins + ($hours * 60);
$secs = $secs + ($mins * 60);
$poll_device['uptime'] = $secs;
$uptime = $secs;
}
if (is_numeric($poll_device['uptime']))
if (is_numeric($uptime))
{
if ($poll_device['uptime'] < $device['uptime'])
if ($uptime < $device['uptime'])
{
notify($device,"Device rebooted: " . $device['hostname'], "Device Rebooted : " . $device['hostname'] . " " . formatUptime($poll_device['uptime']) . " ago.");
notify($device,"Device rebooted: " . $device['hostname'], "Device Rebooted : " . $device['hostname'] . " " . formatUptime($uptime) . " ago.");
log_event('Device rebooted after '.formatUptime($device['uptime']), $device, 'reboot', $device['uptime']);
}
@@ -63,26 +63,18 @@
{
rrdtool_create ($uptime_rrd, "DS:uptime:GAUGE:600:0:U RRA:AVERAGE:0.5:1:600 RRA:AVERAGE:0.5:6:700 RRA:AVERAGE:0.5:24:775 RRA:AVERAGE:0.5:288:797");
}
rrdtool_update($uptime_rrd, "N:".$poll_device['uptime']);
rrdtool_update($uptime_rrd, "N:".$uptime);
$graphs['uptime'] = TRUE;
echo("Uptime: ".formatUptime($poll_device['uptime'])."\n");
echo("Uptime: ".formatUptime($uptime)."\n");
$device['db_update'] .= ", `uptime` = '".mres($poll_device['uptime'])."'";
$device['db_update'] .= ", `uptime` = '".mres($uptime)."'";
}
echo("Hardware: ".$poll_device['hardware']." Version: ".$poll_device['version']." Features: ".$poll_device['features']."\n");
$poll_device['sysLocation'] = str_replace("\"","", $poll_device['sysLocation']);
$poll_device['sysContact'] = str_replace("\"","", $poll_device['sysContact']);
if ($poll_device['serial'] && $poll_device['serial'] != $device['serial'])
{
$device['db_update'] .= ", `serial` = '".mres($poll_device['serial'])."'";
log_event("Serial -> ".$poll_device['serial'], $device, 'system');
}
if ($poll_device['sysContact'] && $poll_device['sysContact'] != $device['sysContact'])
{
$device['db_update'] .= ", `sysContact` = '".mres($poll_device['sysContact'])."'";
@@ -110,22 +102,4 @@
log_event("Location -> ".$poll_device['sysLocation'], $device, 'system');
}
if ($poll_device['version'] && $device['version'] != $poll_device['version'])
{
$device['db_update'] .= ", `version` = '".mres($poll_device['version'])."'";
log_event("OS Version -> ".$poll_device['version'], $device, 'system');
}
if ($poll_device['features'] != $device['features'])
{
$device['db_update'] .= ", `features` = '".mres($poll_device['features'])."'";
log_event("OS Features -> ".$poll_device['features'], $device, 'system');
}
if ($poll_device['hardware'] && $poll_device['hardware'] != $device['hardware'])
{
$device['db_update'] .= ", `hardware` = '".mres($poll_device['hardware'])."'";
log_event("Hardware -> ".$poll_device['hardware'], $device, 'system');
}
?>
includes/static-config.php
+2 -2
View File
@@ -10,8 +10,8 @@
## List of poller modules. Need to be in the array to be
## considered for execution.
#$config['poller_modules']['system'] = 1;
#$config['poller_modules']['os'] = 1;
$config['poller_modules']['system'] = 1;
$config['poller_modules']['os'] = 1;
$config['poller_modules']['ipmi'] = 1;
$config['poller_modules']['sensors'] = 1;
$config['poller_modules']['processors'] = 1;