improving windows support

git-svn-id: http://www.observium.org/svn/observer/trunk@1465 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-23 17:43:38 +00:00
parent f29d26440b
commit 51098b42b7
6 changed files with 11953 additions and 51 deletions
+14 -3
View File
@@ -2,10 +2,21 @@
echo("Microsoft Windows");
if(strstr($sysDescr, "x86")) { $hardware = "Generic x86"; }
if(strstr($sysDescr, "AMD64")) { $hardware = "Generic x64"; }
if(strstr($sysDescr, "Intel64")) { $hardware = "Generic x64"; }
#sysDescr.0 = STRING: Hardware: x86 Family 6 Model 1 Stepping 9 AT/AT COMPATIBLE - Software: Windows NT Version 4.0 (Build Number: 1381 Multiprocessor Free )
#sysDescr.0 = STRING: Hardware: x86 Family 6 Model 3 Stepping 4 AT/AT COMPATIBLE - Software: Windows NT Version 3.51 (Build Number: 1057 Multiprocessor Free )
#sysDescr.0 = STRING: Hardware: x86 Family 16 Model 4 Stepping 2 AT/AT COMPATIBLE - Software: Windows 2000 Version 5.1 (Build 2600 Multiprocessor Free)
#sysDescr.0 = STRING: Hardware: x86 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows 2000 Version 5.0 (Build 2195 Multiprocessor Free)
#sysDescr.0 = STRING: Hardware: AMD64 Family 16 Model 2 Stepping 3 AT/AT COMPATIBLE - Software: Windows Version 6.0 (Build 6002 Multiprocessor Free)
#sysDescr.0 = STRING: Hardware: EM64T Family 6 Model 26 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 5.2 (Build 3790 Multiprocessor Free)
#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, "EM64")) { $hardware = "Intel x64"; }
if(strstr($sysDescr, "AMD64")) { $hardware = "AMD x64"; }
if(strstr($sysDescr, "Intel64")) { $hardware = "Intel x64"; }
if(strstr($sysDescr, "Build Number: 1057")) { $version = "NT 3.51"; }
if(strstr($sysDescr, "Build Number: 1381")) { $version = "NT 4.0"; }
if(strstr($sysDescr, "Build 2195")) { $version = "2000 (NT 5.0)"; }
if(strstr($sysDescr, "Build 2600")) { $version = "XP (NT 5.1)"; }
-5
View File
@@ -32,11 +32,6 @@
#UCD-SNMP-MIB::ssRawSwapIn.0 = Counter32: 602002
#UCD-SNMP-MIB::ssRawSwapOut.0 = Counter32: 937422
$cpu_cmd = $config['snmpget'] . " -M ".$config['mibdir']." -m UCD-SNMP-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'];
$cpu_cmd .= " $oid_ssCpuRawUser $oid_ssCpuRawSystem $oid_ssCpuRawNice $oid_ssCpuRawIdle $oid_ssCpuUser $oid_ssCpuSystem";
$cpu = `$cpu_cmd`;
list ($cpuUser, $cpuSystem, $cpuNice, $cpuIdle, $UsageUser, $UsageSystem) = explode("\n", $cpu);
$ss = snmpwalk_cache_oid($device, "systemStats", array());
$ss = $ss[$device['device_id']][0];
+48 -43
View File
@@ -13,50 +13,50 @@ $config['os']['default']['over'][1]['graph'] = "device_memory";
$config['os']['default']['over'][1]['text'] = "Memory Usage";
$os = "generic";
$config['os'][$os]['text'] = "Generic Device";
$config['os'][$os]['text'] = "Generic Device";
$os = "linux";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Linux";
$config['os'][$os]['ifXmcbc'] = 1;
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Linux";
$config['os'][$os]['ifXmcbc'] = 1;
$os = "freebsd";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "FreeBSD";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "FreeBSD";
$os = "openbsd";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "OpenBSD";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "OpenBSD";
$os = "netbsd";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "NetBSD";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "NetBSD";
$os = "dragonfly";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "DragonflyBSD";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "DragonflyBSD";
$os = "netware";
$config['os'][$os]['text'] = "Novell Netware";
$config['os'][$os]['icon'] = "novell";
$config['os'][$os]['text'] = "Novell Netware";
$config['os'][$os]['icon'] = "novell";
$os = "monowall";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "m0n0wall";
$config['os'][$os]['type'] = "firewall";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "m0n0wall";
$config['os'][$os]['type'] = "firewall";
$os = "solaris";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Sun Solaris";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Sun Solaris";
$os = "adva";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Adva";
$config['os'][$os]['ifalias'] = 1;
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Adva";
$config['os'][$os]['ifalias'] = 1;
$os = "opensolaris";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Sun OpenSolaris";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Sun OpenSolaris";
$os = "ios";
$config['os'][$os]['group'] = "ios";
@@ -71,23 +71,23 @@ $config['os'][$os]['over'][2]['graph'] = "device_memory";
$config['os'][$os]['over'][2]['text'] = "Memory Usage";
$os = "cat1900";
$config['os'][$os]['group'] = "cat1900";
$config['os'][$os]['text'] = "Cisco Catalyst 1900";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['icon'] = "catos";
$config['os'][$os]['group'] = "cat1900";
$config['os'][$os]['text'] = "Cisco Catalyst 1900";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['icon'] = "catos";
$os = "iosxe";
$config['os'][$os]['group'] = "ios";
$config['os'][$os]['text'] = "Cisco IOS-XE";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['ifXmcbc'] = 1;
$config['os'][$os]['ifXmcbc'] = 1;
$config['os'][$os]['icon'] = "ios";
$os = "iosxr";
$config['os'][$os]['group'] = "ios";
$config['os'][$os]['text'] = "Cisco IOS-XR";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['ifXmcbc'] = 1;
$config['os'][$os]['ifXmcbc'] = 1;
$config['os'][$os]['icon'] = "ios";
$os = "asa";
@@ -201,6 +201,11 @@ $os = "netopia";
$config['os'][$os]['text'] = "Motorola Netopia";
$config['os'][$os]['type'] = "network";
$os = "tranzeo";
$config['os'][$os]['text'] = "Tranzeo";
$config['os'][$os]['over'][0]['graph'] = "device_bits";
$config['os'][$os]['over'][0]['text'] = "Device Traffic";
$os = "dlink";
$config['os'][$os]['text'] = "D-Link Switch";
$config['os'][$os]['type'] = "network";
@@ -220,27 +225,27 @@ $config['os'][$os]['text'] = "AXIS Network Document Server";
$config['os'][$os]['icon'] = "axis";
$os = "gamatronicups";
$config['os'][$os]['text'] = "Gamatronic UPS Stack";
$config['os'][$os]['type'] = "power";
$config['os'][$os]['text'] = "Gamatronic UPS Stack";
$config['os'][$os]['type'] = "power";
$os = "airport";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['text'] = "Apple AirPort";
$config['os'][$os]['icon'] = "apple";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['text'] = "Apple AirPort";
$config['os'][$os]['icon'] = "apple";
$os = "windows";
$config['os'][$os]['text'] = "Microsoft Windows";
$config['os'][$os]['ifname'] = 1;
$config['os'][$os]['text'] = "Microsoft Windows";
$config['os'][$os]['ifname'] = 1;
$os = "procurve";
$config['os'][$os]['text'] = "HP ProCurve";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['icon'] = "hp";
$config['os'][$os]['text'] = "HP ProCurve";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['icon'] = "hp";
$os = "speedtouch";
$config['os'][$os]['text'] = "Thomson Speedtouch";
$config['os'][$os]['ifname'] = 1;
$config['os'][$os]['type'] = "network";
$config['os'][$os]['text'] = "Thomson Speedtouch";
$config['os'][$os]['ifname'] = 1;
$config['os'][$os]['type'] = "network";
$os = "sonicwal";
$config['os'][$os]['text'] = "SonicWALL";
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+103
View File
@@ -0,0 +1,103 @@
-- Title: TRANZEO Private MIB
-- This Private MIB supports Tranzeo Sixth Generation product line.
-- Tranzeo Wireless Technologies Inc.
-- 19473 Fraser Way
-- Pitt Meadows, BC
-- Canada V3Y 2V4
--
--
--
-- Version: 0.2
-- Date: Wednesday December 27 2006
-- Comments: This is the first private MIB created for Tranzeo. It will contain basic oid's not already included in MIB-II or 802.11 MIB.
-- iso(1).org(3).dod(6).internet(1).private(4).enterprises(24575).
-- Version Date Authors Decription
--
-- v0.1 Nov 28 MR, QA Technician
-- 2006
-- v0.2 Dec 27
-- 2006 MR, QA Technician
TRANZEO-MIB DEFINITIONS ::= BEGIN
IMPORTS
enterprises, OBJECT-TYPE
FROM RFC1155-SMI;
tranzeo OBJECT IDENTIFIER ::= { enterprises 24575 }
signal OBJECT IDENTIFIER ::= { tranzeo 1 }
rssi OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the average received signal strength on the current channel. A 0 means no wireless connection."
::= { signal 1 }
signallow OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the lowest received signal strength on the current channel. A 0 means no wireless connection."
::= { rssi 1 }
signalaverage OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the average received signal strength on the current channel. A 0 means no wireless connection."
::= { rssi 2 }
signalhigh OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the highest received signal strength on the current channel. A 0 means no wireless connection."
::= { rssi 3 }
noise OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the noise on the current channel. A 0 means no wireless connection."
::= { signal 2 }
noiselow OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the lowest noise on the current channel. A 0 means no wireless connection."
::= { noise 1 }
noiseaverage OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the average noise on the current channel. A 0 means no wireless connection."
::= { noise 2 }
noisehigh OBJECT-TYPE
SYNTAX INTEGER (-110..0)
ACCESS read-only
STATUS mandatory
DESCRIPTION
"This object represents the highest noise on the current channel. A 0 means no wireless connection."
::= { noise 3 }
END