Index: mibs/dell/Dell-Vendor-MIB
===================================================================
--- mibs/dell/Dell-Vendor-MIB (revision 5765)
+++ mibs/dell/Dell-Vendor-MIB (working copy)
@@ -6,14 +6,14 @@
MODULE-IDENTITY, OBJECT-TYPE, Unsigned32, Integer32, IpAddress,
NOTIFICATION-TYPE
FROM SNMPv2-SMI
- DisplayString, RowStatus, TEXTUAL-CONVENTION
+ DisplayString, RowStatus, DateAndTime, TEXTUAL-CONVENTION
FROM SNMPv2-TC;
-- Dell MIB tree
dell OBJECT IDENTIFIER ::= { enterprises 674 }
--- Dell PowerConnect MIB tree
+-- Dell Networking MIB tree
dellLan OBJECT IDENTIFIER ::= { dell 10895 }
--- Dell standard MIB tree for all future PowerConnect product. There
+-- Dell standard MIB tree for all future Networking products. There
-- are already some earlier objects registered under 10895 so that it
-- is necessary to carve out this subtree under dellLan.5000 in order
-- to prevent conflict with existing MIB objects.
@@ -24,13 +24,12 @@
dellLanExtension OBJECT IDENTIFIER ::= { dellLanStandard 2 }
powerConnectVendorMIB MODULE-IDENTITY
- LAST-UPDATED "200501150000Z"
- ORGANIZATION "Dell Inc."
- CONTACT-INFO
- "support.dell.com"
+ LAST-UPDATED "201304120000Z" -- 12 Apr 2013 12:00:00 GMT
+ ORGANIZATION "Dell, Inc."
+ CONTACT-INFO ""
DESCRIPTION
- "The private MIB module definition for the Dell PowerConnect
- Devices. This MIB allows PowerConnect devices to be
+ "The private MIB module definition for the Dell Networking
+ Devices. This MIB allows Dell Networking devices to be
integrated into Dell ITA management system."
::= { dellLan 3000 }
@@ -212,20 +211,6 @@
::= { productIdentificationPerUnitEntry 6 }
-productIdentificationBannerMotd OBJECT-TYPE
- SYNTAX DisplayString (SIZE (0..1500))
- MAX-ACCESS read-write
- STATUS current
- DESCRIPTION "Use to assign CLI attention banner. The banner should support 1500 characters."
-
-
-
-
-
-
-
- ::= { productIdentification 9 }
-
productIdentificationBannerMotdAckMode OBJECT-TYPE
SYNTAX INTEGER {
enable(1),
@@ -233,8 +218,15 @@
}
MAX-ACCESS read-write
STATUS current
- DESCRIPTION "If enable is selected, user will be required to acknowledge the banner displayed on the console. The user would have to type y or n to continue to the login prompt. If n is typed, the session is terminated and no further communication is allowed on that session. However, serial connection will not get terminated if user does not enter y. Use disable option to disable banner acknowledge."
- ::= { productIdentification 10 }
+ DESCRIPTION "If enable is selected, user will be required to acknowledge
+ the banner displayed on the console. The user would have
+ to type 'y' or 'n' to continue to the login prompt.
+ If n is typed, the session is terminated and no future
+ communication is allowed on that session.
+ However, serial connection will not get terminated
+ if user does not enter 'y'.
+ Use disable option to disable banner acknowledge."
+ ::= { productIdentification 9}
--
-- productStatus
@@ -336,7 +328,8 @@
SEQUENCE {
envMonFanStatusIndex INTEGER,
envMonFanStatusDescr DisplayString,
- envMonFanState EnvMonState
+ envMonFanState EnvMonState,
+ envMonFanSpeed INTEGER
}
envMonFanStatusIndex OBJECT-TYPE
@@ -372,6 +365,14 @@
Not Supported by Dell Modular Blade Server switches."
::= { envMonFanStatusEntry 3 }
+envMonFanSpeed OBJECT-TYPE
+ SYNTAX INTEGER (1..2147483647)
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Speed of the fan being instrumented. Not
+ Supported by Dell Modular Blade Server switches."
+ ::= { envMonFanStatusEntry 4 }
envMonSupplyStatusTable OBJECT-TYPE
@@ -401,6 +402,9 @@
envMonSupplyStatusIndex INTEGER ,
envMonSupplyStatusDescr DisplayString,
envMonSupplyState EnvMonState,
+ envMonSupplyCurrentPower INTEGER,
+ envMonSupplyAveragePower INTEGER,
+ envMonSupplyAvgStartTime DateAndTime,
envMonSupplySource INTEGER
}
@@ -457,9 +461,34 @@
"
::= { envMonSupplyStatusEntry 4 }
+envMonSupplyCurrentPower OBJECT-TYPE
+ SYNTAX INTEGER (0|1..2147483647)
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Current power consumption of the power supply being instrumented.
+ 0 - indicates that Current power is not available for related supply."
+ ::= { envMonSupplyStatusEntry 5 }
+envMonSupplyAveragePower OBJECT-TYPE
+ SYNTAX INTEGER (0|1..2147483647)
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "Average power consumption of the power supply being instrumented.
+ 0 - indicates that Average power is not available for related supply."
+ ::= { envMonSupplyStatusEntry 6 }
+envMonSupplyAvgStartTime OBJECT-TYPE
+ SYNTAX DateAndTime
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The power supply data start.
+ 0 - indicates that power and related start time is not available for supply."
+ ::= { envMonSupplyStatusEntry 7 }
+
--
-- trap definitions
--
Index: includes/definitions/os.inc.php
===================================================================
--- includes/definitions/os.inc.php (revision 5765)
+++ includes/definitions/os.inc.php (working copy)
@@ -1045,6 +1045,37 @@
// Dell
+/// This is only to be used for Dell Network Operating System (DNOS) Devices
+
+$os = 'dnos';
+$config['os'][$os]['text'] = 'Dell Networking (DNOS)';
+$config['os'][$os]['ifname'] = 1;
+$config['os'][$os]['type'] = 'network';
+$config['os'][$os]['icon'] = 'dell';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text'] = 'Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text'] = 'CPU Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text'] = 'Memory';
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3023"; // 8024
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3024"; // 8024F
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3042"; // N4032
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3044"; // N4032F
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3045"; // N4064
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3046"; // N4064F
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3053"; // N2024
+$config['os'][$os]['sysObjectID'][] = '.1.3.6.1.4.1.674.10895.3054'; // N2048
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3055"; // N2024P
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3056"; // N2048P
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3057"; // N3024
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3058"; // N3048
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3059"; // N3024P
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3060"; // N3048P
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3061"; // N3024F
+$config['os'][$os]['mibs'][] = 'DNOS-SWITCHING-MIB';
+$config['os'][$os]['mibs'][] = 'DNOS-BOXSERVICES-PRIVATE-MIB';
+
/// This is only to be used for Broadcom-based PowerConnects
$os = "powerconnect-fastpath";
@@ -1061,15 +1092,9 @@
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3014"; // 6224F
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3015"; // M6220
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3022"; // M8024
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3023"; // 8024
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3024"; // 8024F
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3025"; // M6384
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3026"; // 2824
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3027"; // 2848
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3030"; // 5524
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3031"; // 5548
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3032"; // 5524P
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3033"; // 5548P
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3034"; // 7024
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3035"; // 7048
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3036"; // 7024P
@@ -1078,19 +1103,6 @@
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3039"; // 7048R
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3040"; // 7048R-RA
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3041"; // M8024-k
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3042"; // N4032
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3044"; // N4032F
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3045"; // N4064
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3046"; // N4064F
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3053"; // N2024
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3054"; // N2048
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3055"; // N2024P
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3056"; // N2048P
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3057"; // N3024
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3058"; // N3048
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3059"; // N3024P
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3060"; // N3048P
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3061"; // N3024F
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3052"; // VRTX R1-2401
$config['os'][$os]['mibs'][] = "FASTPATH-BOXSERVICES-PRIVATE-MIB";
$config['os'][$os]['mibs'][] = "Dell-Vendor-MIB"; // Keep this below FASTPATH-BOXSERVICES-PRIVATE-MIB, checks for duplicate sensors
@@ -1110,11 +1122,14 @@
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3004"; // 5324
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3016"; //
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3020"; // 5424
-$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3024"; // 5424
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3028"; // 2824
$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3029"; // 2848
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3030"; // 5524
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3031"; // 5548
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3032"; // 5524P
+$config['os'][$os]['sysObjectID'][] = ".1.3.6.1.4.1.674.10895.3033"; // 5548P
$config['os'][$os]['mibs'][] = "RADLAN-HWENVIROMENT";
-$config['os'][$os]['mibs'][] = "Dell-Vendor-MIB"; // Keep this below RADLAN-HWENVIROMENT, checks for duplicate sensors
+#$config['os'][$os]['mibs'][] = "Dell-Vendor-MIB"; // Keep this below RADLAN-HWENVIROMENT, checks for duplicate sensors
$config['os'][$os]['mibs'][] = "RADLAN-rndMng";
$os = "powervault";
Index: includes/definitions/sensors.inc.php
===================================================================
--- includes/definitions/sensors.inc.php (revision 5765)
+++ includes/definitions/sensors.inc.php (working copy)
@@ -82,6 +82,22 @@
$config['sensor_states']['dell-vendor-state'][5] = array('name' => 'notPresent', 'event' => 'ignore');
$config['sensor_states']['dell-vendor-state'][6] = array('name' => 'notFunctioning', 'event' => 'alert');
+// DNOS-BOXSERVICES-PRIVATE-MIB
+$config['sensor_states']['dnos-boxservices-state'][1] = array('name' => 'notpresent', 'event' => 'ignore');
+$config['sensor_states']['dnos-boxservices-state'][2] = array('name' => 'operational', 'event' => 'up');
+$config['sensor_states']['dnos-boxservices-state'][3] = array('name' => 'failed', 'event' => 'alert');
+$config['sensor_states']['dnos-boxservices-state'][4] = array('name' => 'powering', 'event' => 'ignore');
+$config['sensor_states']['dnos-boxservices-state'][5] = array('name' => 'nopower', 'event' => 'alert');
+$config['sensor_states']['dnos-boxservices-state'][6] = array('name' => 'notpowering', 'event' => 'alert');
+$config['sensor_states']['dnos-boxservices-state'][7] = array('name' => 'incompatible', 'event' => 'alert');
+$config['sensor_states']['dnos-boxservices-temp-state'][0] = array('name' => 'low', 'event' => 'alert');
+$config['sensor_states']['dnos-boxservices-temp-state'][1] = array('name' => 'normal', 'event' => 'up');
+$config['sensor_states']['dnos-boxservices-temp-state'][2] = array('name' => 'warning', 'event' => 'alert');
+$config['sensor_states']['dnos-boxservices-temp-state'][3] = array('name' => 'critical', 'event' => 'alert');
+$config['sensor_states']['dnos-boxservices-temp-state'][4] = array('name' => 'shutdown', 'event' => 'alert');
+$config['sensor_states']['dnos-boxservices-temp-state'][5] = array('name' => 'notpresent', 'event' => 'ignore');
+$config['sensor_states']['dnos-boxservices-temp-state'][6] = array('name' => 'notoperational', 'event' => 'alert');
+
// SPAGENT-MIB
$config['sensor_states']['spagent-state'][1] = array('name' => 'noStatus', 'event' => 'ignore');
$config['sensor_states']['spagent-state'][2] = array('name' => 'normal', 'event' => 'up');