Index: includes/definitions/os.inc.php
===================================================================
--- includes/definitions/os.inc.php (revision 7357)
+++ includes/definitions/os.inc.php (working copy)
@@ -89,11 +89,24 @@
$os_group = "printer";
$config['os_group'][$os_group]['type'] = "printer";
$config['os_group'][$os_group]['graphs'][] = "device_toner";
+$config['os_group'][$os_group]['remote_access'] = array('http');
$config['os_group'][$os_group]['mibs'][] = "Printer-MIB";
$config['os_group'][$os_group]['mib_blacklist'][] = "CISCO-CDP-MIB";
$config['os_group'][$os_group]['mib_blacklist'][] = "PW-STD-MIB";
$config['os_group'][$os_group]['mib_blacklist'][] = "BGP4-MIB";
+$config['os_group'][$os_group]['mib_blacklist'][] = "Q-BRIDGE-MIB";
+$os_group = "environment";
+$config['os_group'][$os_group]['type'] = "environment";
+$config['os_group'][$os_group]['remote_access'] = array('http');
+$config['os_group'][$os_group]['mib_blacklist'][] = "BGP4-MIB";
+$config['os_group'][$os_group]['mib_blacklist'][] = "PW-STD-MIB";
+$config['os_group'][$os_group]['mib_blacklist'][] = "Q-BRIDGE-MIB";
+
+$os_group = "ups";
+$config['os_group'][$os_group]['type'] = "power";
+$config['os_group'][$os_group]['remote_access'] = array('http');
+
$os_group = "cisco";
$config['os_group'][$os_group]['vendor'] = "Cisco";
$config['os_group'][$os_group]['type'] = "network";
@@ -349,6 +362,11 @@
$config['os'][$os]['icon'] = "sensatronics";
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.16174.1";
+$os = "servsensor";
+$config['os'][$os]['text'] = "BlackBox ServSensor";
+$config['os'][$os]['group'] = "environment";
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.3854.1";
+
// Other Unix-based OSes here please.
$os = "ibmi";
@@ -438,6 +456,7 @@
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['discovery_os'] = "solaris";
$config['os'][$os]['type'] = "server";
+$config['os'][$os]['graphs'][] = "device_bits";
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.42.2.1.1";
$os = "opensolaris";
@@ -535,6 +554,8 @@
$config['os'][$os]['type'] = "storage";
$config['os'][$os]['discovery_os'] = "freebsd";
$config['os'][$os]['vendor'] = "Dell";
+$config['os'][$os]['graphs'][] = "device_bits";
+$config['os'][$os]['graphs'][] = "device_temperature";
// $config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.8072.3.2.8"; // sysObjectID matches FreeBSD
$config['os'][$os]['sysDescr'][] = "/COMPELLENT/i";
$config['os'][$os]['mib_dirs'][] = "dell";
@@ -1903,7 +1924,11 @@
$config['os'][$os]['text'] = "Dell iDRAC";
$config['os'][$os]['type'] = "management";
$config['os'][$os]['icon'] = "dell";
+$config['os'][$os]['graphs'][] = "device_bits";
+$config['os'][$os]['graphs'][] = "device_temperature";
+$config['os'][$os]['graphs'][] = "device_fanspeed";
$config['os'][$os]['ports_unignore_descr'] = TRUE;
+$config['os'][$os]['remote_access'] = array('http');
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10892.2";
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10892.5";
$config['os'][$os]['mib_dirs'][] = "dell";
@@ -2257,9 +2282,11 @@
$os = "deltaups";
$config['os'][$os]['text'] = "Delta UPS";
-$config['os'][$os]['type'] = "power";
+$config['os'][$os]['group'] = "ups";
$config['os'][$os]['icon'] = "delta";
+$config['os'][$os]['graphs'][] = "device_voltage";
$config['os'][$os]['graphs'][] = "device_current";
+$config['os'][$os]['graphs'][] = "device_frequency";
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.2254.2.4";
$config['os'][$os]['mibs'][] = "DeltaUPS-MIB";
@@ -2281,7 +2308,7 @@
$os = "liebert";
$config['os'][$os]['vendor'] = "Emerson";
$config['os'][$os]['text'] = "Liebert";
-$config['os'][$os]['type'] = "power";
+$config['os'][$os]['group'] = "ups";
$config['os'][$os]['graphs'][] = "device_current";
$config['os'][$os]['graphs'][] = "device_voltage";
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.476.1.42";
@@ -2558,6 +2585,9 @@
$config['os'][$os]['icon'] = "hp";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.11.2.51";
+$config['os'][$os]['mib_blacklist'][] = "HOST-RESOURCES-MIB";
+$config['os'][$os]['mib_blacklist'][] = "ENTITY-MIB";
+$config['os'][$os]['mib_blacklist'][] = "UCD-SNMP-MIB";
$os = "hpilo";
$config['os'][$os]['text'] = "HP iLO Management";
@@ -2748,6 +2778,7 @@
$config['os'][$os]['graphs'][] = "device_power";
$config['os'][$os]['graphs'][] = "device_temperature";
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.318";
+$config['os'][$os]['remote_access'] = array('http');
$config['os'][$os]['mibs'][] = "PowerNet-MIB";
$config['os'][$os]['mib_blacklist'][] = "BGP4-MIB";
$config['os'][$os]['mib_blacklist'][] = "HOST-RESOURCES-MIB";
@@ -3630,6 +3661,9 @@
$config['os'][$os]['text'] = "Riverbed Steelhead";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['icon'] = "riverbed";
+$config['os'][$os]['graphs'][] = "device_bits";
+$config['os'][$os]['graphs'][] = "device_processor";
+$config['os'][$os]['graphs'][] = "device_mempool";
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.17163.1.1"; // Steelhead
$config['os'][$os]['mibs'][] = "STEELHEAD-MIB";
Index: includes/polling/os/hpstorage.inc.php
===================================================================
--- includes/polling/os/hpstorage.inc.php (nonexistent)
+++ includes/polling/os/hpstorage.inc.php (working copy)
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Observium
+ *
+ * This file is part of Observium.
+ *
+ * @package observium
+ * @subpackage poller
+ * @copyright (C) 2006-2015 Adam Armstrong
+ *
+ */
+
+$hardware = $poll_device['sysDescr'];
+$serial = snmp_get($device, 'cpqSiSysSerialNum.0', '-OQv', 'CPQSINFO-MIB', mib_dirs('hp'));
+
+// EOF
Index: includes/polling/os/powerconnect-radlan.inc.php
===================================================================
--- includes/polling/os/powerconnect-radlan.inc.php (revision 7357)
+++ includes/polling/os/powerconnect-radlan.inc.php (working copy)
@@ -16,6 +16,12 @@
// Dell-Vendor-MIB::productIdentificationVersion.0 = STRING: 2.0.1.3
// Dell-Vendor-MIB::productIdentificationServiceTag.1 = STRING: 8D4XY51
$hardware = "Dell ".snmp_get($device, "productIdentificationDisplayName.0", "-Ovq", "Dell-Vendor-MIB", mib_dirs('dell'));
+if (strpos($hardware, 'Ethernet Switch') !== FALSE) // Sometimes DisplayName and Description is switched
+{
+ // Dell-Vendor-MIB::productIdentificationDisplayName.0 = STRING: Ethernet Switch
+ // Dell-Vendor-MIB::productIdentificationDescription.0 = STRING: PowerConnect 5448
+ $hardware = "Dell ".snmp_get($device, "productIdentificationDescription.0", "-Ovq", "Dell-Vendor-MIB", mib_dirs('dell'));
+}
$version = snmp_get($device, "productIdentificationVersion.0", "-Ovq", "Dell-Vendor-MIB", mib_dirs('dell'));
$serial = implode(", ",explode("\n",snmp_walk($device, "productIdentificationServiceTag", "-Ovq", "Dell-Vendor-MIB", mib_dirs('dell'))));
$icon = 'dell';
@@ -22,8 +28,4 @@
$features = snmp_get($device, "rndBaseBootVersion.00", "-Ovq", "RADLAN-MIB", mib_dirs('radlan'));
-$version = trim($version,'"');
-$features = trim($features,'"');
-$hardware = trim($hardware,'"');
-
// EOF