new things :>

git-svn-id: http://www.observium.org/svn/observer/trunk@496 61d68cd4-352d-0410-923a-c4978735b2b8

html/includes/graphs/device_ip.inc.php

@@ -1,44 +1,56 @@
 <?php
 
-  include("common.inc.php");
+include("common.inc.php");
 
-  $rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netinfo.rrd";
+$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netinfo.rrd";
 
-  $rrd_options .= " DEF:ipForwDatagrams=$rrd_filename:ipForwDatagrams:AVERAGE";
+$rrd_options .= " DEF:ipForwDatagrams=$rrd_filename:ipForwDatagrams:AVERAGE";
-  $rrd_options .= " DEF:ipInDelivers=$rrd_filename:ipInDelivers:AVERAGE";
+$rrd_options .= " DEF:ipInDelivers=$rrd_filename:ipInDelivers:AVERAGE";
-  $rrd_options .= " DEF:ipInReceives=$rrd_filename:ipInReceives:AVERAGE";
+$rrd_options .= " DEF:ipInReceives=$rrd_filename:ipInReceives:AVERAGE";
-  $rrd_options .= " DEF:ipOutRequests=$rrd_filename:ipOutRequests:AVERAGE";
+$rrd_options .= " DEF:ipOutRequests=$rrd_filename:ipOutRequests:AVERAGE";
-  $rrd_options .= " DEF:ipInDiscards=$rrd_filename:ipInDiscards:AVERAGE";
+$rrd_options .= " DEF:ipInDiscards=$rrd_filename:ipInDiscards:AVERAGE";
-  $rrd_options .= " DEF:ipOutDiscards=$rrd_filename:ipOutDiscards:AVERAGE";
+$rrd_options .= " DEF:ipOutDiscards=$rrd_filename:ipOutDiscards:AVERAGE";
-  $rrd_options .= " DEF:ipOutNoRoutes=$rrd_filename:ipInDiscards:AVERAGE";
+$rrd_options .= " DEF:ipOutNoRoutes=$rrd_filename:ipInDiscards:AVERAGE";
-  $rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ Average\ \ \ Maximum\\\\n";
+
-  $rrd_options .= " LINE1.25:ipForwDatagrams#cc0000:ForwDgrams\ ";
+$rrd_options .= " DEF:MipReasmReqds=$database:ipReasmReqds:MAX";
-  $rrd_options .= " GPRINT:ipForwDatagrams:LAST:%6.2lf%s";
+$rrd_options .= " DEF:MipReasmOKs=$database:ipReasmOKs:MAX";
-  $rrd_options .= " GPRINT:ipForwDatagrams:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " DEF:MipReasmFails=$database:ipReasmFails:MAX";
-  $rrd_options .= " GPRINT:ipForwDatagrams:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " DEF:MipFragOKs=$database:ipFragOKs:MAX";
-  $rrd_options .= " LINE1.25:ipInDelivers#00cc00:InDelivers\ ";
+$rrd_options .= " DEF:MipFragFails=$database:ipFragFails:MAX";
-  $rrd_options .= " GPRINT:ipInDelivers:LAST:%6.2lf%s";
+$rrd_options .= " DEF:MipFragCreates=$database:ipFragCreates:MAX";
-  $rrd_options .= " GPRINT:ipInDelivers:AVERAGE:\ %6.2lf%s";
+# express all as a % of ipInDelivers
-  $rrd_options .= " GPRINT:ipInDelivers:MAX:\ %6.2lf%s\\\\n";
+# averages
-  $rrd_options .= " LINE1.25:ipInReceives#006600:InReceives\ ";
+$rrd_options .= " CDEF:ReasmReqds=ipReasmReqds,ipInDelivers,/,100,*";
-  $rrd_options .= " GPRINT:ipInReceives:LAST:%6.2lf%s";
+$rrd_options .= " CDEF:ReasmOKs=ipReasmOKs,ipInDelivers,/,100,*";
-  $rrd_options .= " GPRINT:ipInReceives:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " CDEF:ReasmFails=ipReasmFails,ipInDelivers,/,100,*";
-  $rrd_options .= " GPRINT:ipInReceives:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " CDEF:FragOKs=ipFragOKs,ipInDelivers,/,100,*";
-  $rrd_options .= " LINE1.25:ipOutRequests#0000cc:OutRequests";
+$rrd_options .= " CDEF:FragFails=ipFragFails,ipInDelivers,/,100,*";
-  $rrd_options .= " GPRINT:ipOutRequests:LAST:%6.2lf%s";
+$rrd_options .= " CDEF:FragCreates=ipFragCreates,ipInDelivers,/,100,*";
-  $rrd_options .= " GPRINT:ipOutRequests:AVERAGE:\ %6.2lf%s";
+# maximums
-  $rrd_options .= " GPRINT:ipOutRequests:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " CDEF:MReasmReqds=MipReasmReqds,ipInDelivers,/,100,*";
-  $rrd_options .= " LINE1.25:ipInDiscards#cccc00:InDiscards\ ";
+$rrd_options .= " CDEF:MReasmOKs=MipReasmOKs,ipInDelivers,/,100,*";
-  $rrd_options .= " GPRINT:ipInDiscards:LAST:%6.2lf%s";
+$rrd_options .= " CDEF:MReasmFails=MipReasmFails,ipInDelivers,/,100,*";
-  $rrd_options .= " GPRINT:ipInDiscards:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " CDEF:MFragOKs=MipFragOKs,ipInDelivers,/,100,*";
-  $rrd_options .= " GPRINT:ipInDiscards:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " CDEF:MFragFails=MipFragFails,ipInDelivers,/,100,*";
-  $rrd_options .= " LINE1.25:ipOutDiscards#330033:OutDiscards";
+$rrd_options .= " CDEF:MFragCreates=MipFragCreates,ipInDelivers,/,100,*";
-  $rrd_options .= " GPRINT:ipOutDiscards:LAST:%6.2lf%s";
+# print some lines, with fails stacked on top
-  $rrd_options .= " GPRINT:ipOutDiscards:AVERAGE:\ %6.2lf%s";
+$rrd_options .= " LINE1:FragOKs#00ff00:Fragmentation OK";
-  $rrd_options .= " GPRINT:ipOutDiscards:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " LINE2:FragFails#ff0000:Fragmentation Fail";
-  $rrd_options .= " LINE1.25:ipOutNoRoutes#660000:OutNoRoutes";
+$rrd_options .= " LINE1:ReasmOKs#0033aa:Reassembly OK";
-  $rrd_options .= " GPRINT:ipOutNoRoutes:LAST:%6.2lf%s";
+$rrd_options .= " LINE2:ReasmFails#000000:Reassembly Fail";
-  $rrd_options .= " GPRINT:ipOutNoRoutes:AVERAGE:\ %6.2lf%s";
+# print some summary numbers.
-  $rrd_options .= " GPRINT:ipOutNoRoutes:MAX:\ %6.2lf%s\\\\n";
+$rrd_options .= " GPRINT:ReasmReqds:AVERAGE:Avg ReasmReqd %1.2lf %%";
+$rrd_options .= " GPRINT:MReasmReqds:MAX:Max ReasmReqd %1.2lf %%";
+$rrd_options .= " GPRINT:ReasmOKs:AVERAGE:Avg ReasmOK %1.2lf %%";
+$rrd_options .= " GPRINT:MReasmOKs:MAX:Max ReasmOK %1.2lf %%";
+$rrd_options .= " GPRINT:ReasmFails:AVERAGE:Avg ReasmFail %1.2lf %%";
+$rrd_options .= " GPRINT:MReasmFails:MAX:Max ReasmFail %1.2lf %%";
+$rrd_options .= " GPRINT:FragOKs:AVERAGE:Avg FragOK %1.2lf %%";
+$rrd_options .= " GPRINT:MFragOKs:MAX:Max FragOK %1.2lf %%";
+$rrd_options .= " GPRINT:FragFails:AVERAGE:Avg FragFail %1.2lf %%";
+$rrd_options .= " GPRINT:MFragFails:MAX:Max FragFail %1.2lf %%";
+$rrd_options .= " GPRINT:FragCreates:AVERAGE:Avg FragCreate %1.2lf %%";
+$rrd_options .= " GPRINT:MFragCreates:MAX:Max FragCreate %1.2lf %%";
+$rrd_options .= " COMMENT:   Calculated as a % of ipInDelivers"
 
 ?>

html/pages/device/ports.inc.php

@@ -1,25 +1,31 @@
 <?php
 
+if($_GET['opta'] == graphs ) {
+  if($_GET['optb']) { $graph_type = "port_" . $_GET['optb']; } else { $graph_type = "port_bits"; }
+}
+
 print_optionbar_start();
 
 echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/'>Basic</a> | 
 <a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/details/'>Details</a> | 
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/arp/'>ARP Table</a> | Graphs:
+<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/arp/'>ARP Table</a> | Graphs: ");
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/bits/'>Bits</a> 
+
-(<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/bits/thumbs/'>Mini</a>) | 
+$graph_types = array("bits" => "Bits",
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/upkts/'>Packets</a> 
+                     "upkts" => "Unicast Packets",
-(<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/upkts/thumbs/'>Mini</a>) | 
+                     "nupkts" => "Non-Unicast Packets", 
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/nupkts/'>NU Packets</a>
+                     "errors" => "Errors", 
-(<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/nupkts/thumbs/'>Mini</a>) |
+                     "etherlike" => "Etherlike");
-<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/errors/'>Errors</a>
+
-(<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/errors/thumbs/'>Mini</a>)</a>");
+foreach ($graph_types as $type => $descr) {
+  echo("$type_sep 
+  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/$type/'>$descr</a> 
+  (<a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/graphs/$type/thumbs/'>Mini</a>) ");
+  $type_sep = " | ";
+}
+
 
 print_optionbar_end();
 
-if($_GET['opta'] == graphs ) {
-  if($_GET['optb']) { $graph_type = "port_" . $_GET['optb']; } else { $graph_type = "port_bits"; }
-}
-
 if($_GET['optc'] == thumbs) {
 
   $timeperiods = array('-1day','-1week','-1month','-1year');

mibs/POWER-ETHERNET-MIB.my

@@ -0,0 +1,629 @@
+-- *****************************************************************
+-- POWER-ETHERNET-MIB
+--
+-- This mib was extracted from RFC 3621
+--
+-- Copyright (c) 2006, 2009 by Cisco Systems, Inc.
+-- All rights reserved.
+-- *****************************************************************
+POWER-ETHERNET-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+           MODULE-IDENTITY, mib-2, OBJECT-TYPE, Integer32,
+           Gauge32, Counter32, NOTIFICATION-TYPE
+                   FROM SNMPv2-SMI
+           TruthValue
+                   FROM SNMPv2-TC
+           MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
+                   FROM SNMPv2-CONF
+
+            SnmpAdminString
+                    FROM SNMP-FRAMEWORK-MIB;
+
+    powerEthernetMIB MODULE-IDENTITY
+
+         LAST-UPDATED    "200311240000Z"  -- November 24, 2003
+         ORGANIZATION "IETF Ethernet Interfaces and Hub MIB
+                       Working Group"
+
+         CONTACT-INFO
+         "
+          WG Charter:
+          http://www.ietf.org/html.charters/hubmib-charter.html
+
+         Mailing lists:
+          General Discussion: hubmib@ietf.org
+          To Subscribe: hubmib-requests@ietf.org
+          In Body: subscribe your_email_address
+
+         Chair: Dan Romascanu
+          Avaya
+          Tel:  +972-3-645-8414
+          Email: dromasca@avaya.com
+
+         Editor: Avi Berger
+          PowerDsine Inc.
+          Tel:    972-9-7755100 Ext 307
+          Fax:    972-9-7755120
+          E-mail: avib@PowerDsine.com
+         "
+
+        DESCRIPTION
+              "The MIB module for managing Power Source Equipment
+               (PSE) working according to the IEEE 802.af Powered
+               Ethernet (DTE Power via MDI) standard.
+
+                The following terms are used throughout this
+                MIB module.  For complete formal definitions,
+                the IEEE 802.3 standards should be consulted
+                wherever possible:
+
+                Group - A recommended, but optional, entity
+                defined by the IEEE 802.3 management standard,
+                in order to support a modular numbering scheme.
+                The classical example allows an implementor to
+                represent field-replaceable units as groups of
+                ports, with the port numbering matching the
+                modular hardware implementation.
+
+              Port - This entity identifies the port within the group
+              for which this entry contains information.  The numbering
+              scheme for ports is implementation specific.
+
+             Copyright (c) The Internet Society (2003).  This version
+             of this MIB module is part of RFC 3621; See the RFC
+             itself for full legal notices."
+
+       REVISION    "200311240000Z"  -- November 24, 2003
+       DESCRIPTION "Initial version, published as RFC 3621."
+       ::= { mib-2 105 }
+
+pethNotifications OBJECT IDENTIFIER ::= { powerEthernetMIB 0 }
+pethObjects       OBJECT IDENTIFIER ::= { powerEthernetMIB 1 }
+pethConformance   OBJECT IDENTIFIER ::= { powerEthernetMIB 2 }
+
+-- PSE Objects
+
+  pethPsePortTable OBJECT-TYPE
+       SYNTAX      SEQUENCE OF PethPsePortEntry
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+           "A table of objects that display and control the power
+            characteristics of power Ethernet ports on a Power Source
+            Entity (PSE) device.  This group will be implemented in
+            managed power Ethernet switches and mid-span devices.
+            Values of all read-write objects in this table are
+            persistent at restart/reboot."
+       ::= { pethObjects 1 }
+
+   pethPsePortEntry OBJECT-TYPE
+       SYNTAX      PethPsePortEntry
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+               "A set of objects that display and control the power
+               characteristics of a power Ethernet PSE port."
+       INDEX    { pethPsePortGroupIndex , pethPsePortIndex  }
+       ::= { pethPsePortTable 1 }
+
+   PethPsePortEntry ::= SEQUENCE {
+       pethPsePortGroupIndex
+          Integer32,
+       pethPsePortIndex
+          Integer32,
+       pethPsePortAdminEnable
+          TruthValue,
+       pethPsePortPowerPairsControlAbility
+          TruthValue,
+       pethPsePortPowerPairs
+          INTEGER,
+       pethPsePortDetectionStatus
+          INTEGER,
+       pethPsePortPowerPriority
+          INTEGER,
+       pethPsePortMPSAbsentCounter
+          Counter32,
+       pethPsePortType
+          SnmpAdminString,
+       pethPsePortPowerClassifications
+          INTEGER,
+       pethPsePortInvalidSignatureCounter
+          Counter32,
+       pethPsePortPowerDeniedCounter
+          Counter32,
+       pethPsePortOverLoadCounter
+          Counter32,
+       pethPsePortShortCounter
+          Counter32
+  }
+
+     pethPsePortGroupIndex OBJECT-TYPE
+       SYNTAX      Integer32 (1..2147483647)
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+           "This variable uniquely identifies the group
+            containing the port to which a power Ethernet PSE is
+            connected.  Group means box in the stack, module in a
+            rack and the value 1 MUST be used for non-modular devices.
+            Furthermore, the same value MUST be used in this variable,
+            pethMainPseGroupIndex, and pethNotificationControlGroupIndex
+            to refer to a given box in a stack or module in the rack."
+       ::= { pethPsePortEntry 1 }
+
+     pethPsePortIndex OBJECT-TYPE
+       SYNTAX      Integer32 (1..2147483647)
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+           "This variable uniquely identifies the power Ethernet PSE
+            port within group pethPsePortGroupIndex to which the
+            power Ethernet PSE entry is connected."
+       ::= { pethPsePortEntry 2 }
+
+     pethPsePortAdminEnable OBJECT-TYPE
+    SYNTAX TruthValue
+    MAX-ACCESS read-write
+    STATUS current
+    DESCRIPTION
+        "true (1) An interface which can provide the PSE functions.
+         false(2) The interface will act as it would if it had no PSE
+         function."
+    REFERENCE
+      "IEEE Std 802.3af Section 30.9.1.1.2 aPSEAdminState"
+    ::= { pethPsePortEntry 3 }
+
+     pethPsePortPowerPairsControlAbility OBJECT-TYPE
+    SYNTAX TruthValue
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Describes the capability of controlling the power pairs
+         functionality to switch pins for sourcing power.
+         The value true indicate that the device has the capability
+         to control the power pairs.  When false the PSE Pinout
+         Alternative used cannot be controlled through the
+         PethPsePortAdminEnable attribute."
+    REFERENCE
+      "IEEE Std 802.3af Section 30.9.1.1.3
+       aPSEPowerPairsControlAbility"
+    ::= { pethPsePortEntry 4 }
+
+    pethPsePortPowerPairs OBJECT-TYPE
+    SYNTAX INTEGER   {
+               signal(1),
+               spare(2)
+     }
+    MAX-ACCESS read-write
+    STATUS current
+    DESCRIPTION
+        "Describes or controls the pairs in use.  If the value of
+         pethPsePortPowerPairsControl is true, this object is
+         writable.
+         A value of signal(1) means that the signal pairs
+         only are in use.
+         A value of spare(2) means that the spare pairs
+         only are in use."
+    REFERENCE
+      "IEEE Std 802.3af Section 30.9.1.1.4 aPSEPowerPairs"
+    ::= { pethPsePortEntry 5 }
+
+     pethPsePortDetectionStatus OBJECT-TYPE
+    SYNTAX INTEGER   {
+             disabled(1),
+             searching(2),
+               deliveringPower(3),
+               fault(4),
+               test(5),
+               otherFault(6)
+     }
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Describes the operational status of the port PD detection.
+         A value of disabled(1)- indicates that the PSE State diagram
+         is in the state DISABLED.
+         A value of deliveringPower(3) - indicates that the PSE State
+         diagram is in the state POWER_ON for a duration greater than
+         tlim max (see IEEE Std 802.3af Table 33-5 tlim).
+         A value of fault(4) - indicates that the PSE State diagram is
+         in the state TEST_ERROR.
+         A value of test(5) - indicates that the PSE State diagram is
+         in the state TEST_MODE.
+         A value of otherFault(6) - indicates that the PSE State
+         diagram is in the state IDLE due to the variable
+         error_conditions.
+         A value of searching(2)- indicates the PSE State diagram is
+         in a state other than those listed above."
+    REFERENCE
+      "IEEE Std 802.3af Section 30.9.1.1.5
+       aPSEPowerDetectionStatus"
+    ::= { pethPsePortEntry 6 }
+
+     pethPsePortPowerPriority OBJECT-TYPE
+    SYNTAX INTEGER   {
+               critical(1),
+               high(2),
+               low(3)
+     }
+    MAX-ACCESS read-write
+    STATUS current
+    DESCRIPTION
+        "This object controls the priority of the port from the point
+         of view of a power management algorithm.  The priority that
+         is set by this variable could be used by a control mechanism
+         that prevents over current situations by disconnecting first
+         ports with lower power priority.  Ports that connect devices
+         critical to the operation of the network - like the E911
+         telephones ports - should be set to higher priority."
+    ::= { pethPsePortEntry 7 }
+
+   pethPsePortMPSAbsentCounter OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+          "This counter is incremented when the PSE state diagram
+             transitions directly from the state POWER_ON to the
+             state IDLE due to tmpdo_timer_done being asserted."
+    REFERENCE
+      "IEEE Std 802.3af Section 30.9.1.1.11
+       aPSEMPSAbsentCounter"
+    ::= { pethPsePortEntry 8 }
+
+   pethPsePortType OBJECT-TYPE
+    SYNTAX SnmpAdminString
+    MAX-ACCESS read-write
+    STATUS current
+    DESCRIPTION
+        "A manager will set the value of this variable to indicate
+         the type of powered device that is connected to the port.
+         The default value supplied by the agent if no value has
+         ever been set should be a zero-length octet string."
+    ::= { pethPsePortEntry 9 }
+
+    pethPsePortPowerClassifications OBJECT-TYPE
+     SYNTAX INTEGER   {
+               class0(1),
+               class1(2),
+               class2(3),
+               class3(4),
+               class4(5)
+     }
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+        "Classification is a way to tag different terminals on the
+        Power over LAN network according to their power consumption.
+        Devices such as IP telephones, WLAN access points and others,
+        will be classified according to their power requirements.
+
+        The meaning of the classification labels is defined in the
+        IEEE specification.
+
+       This variable is valid only while a PD is being powered,
+        that is, while the attribute pethPsePortDetectionStatus
+        is reporting the enumeration deliveringPower."
+    REFERENCE
+      "IEEE Std 802.3af Section 30.9.1.1.6
+       aPSEPowerClassification"
+   ::= { pethPsePortEntry 10 }
+
+   pethPsePortInvalidSignatureCounter OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+       "This counter is incremented when the PSE state diagram
+         enters the state SIGNATURE_INVALID."
+    REFERENCE
+          "IEEE Std 802.3af Section 30.9.1.1.7
+           aPSEInvalidSignatureCounter"
+    ::= { pethPsePortEntry 11 }
+
+   pethPsePortPowerDeniedCounter OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+          "This counter is incremented when the PSE state diagram
+             enters the state POWER_DENIED."
+    REFERENCE
+      "IEEE Std 802.3af Section 30.9.1.1.8
+       aPSEPowerDeniedCounter"
+    ::= { pethPsePortEntry 12 }
+
+   pethPsePortOverLoadCounter OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+          "This counter is incremented when the PSE state diagram
+             enters the state ERROR_DELAY_OVER."
+    REFERENCE
+      "IEEE Std 802.3af Section 30.9.1.1.9
+       aPSEOverLoadCounter"
+    ::= { pethPsePortEntry 13 }
+
+   pethPsePortShortCounter OBJECT-TYPE
+    SYNTAX Counter32
+    MAX-ACCESS read-only
+    STATUS current
+    DESCRIPTION
+          "This counter is incremented when the PSE state diagram
+             enters the state ERROR_DELAY_SHORT."
+    REFERENCE
+      "IEEE Std 802.3af Section 30.9.1.1.10
+       aPSEShortCounter"
+    ::= { pethPsePortEntry 14 }
+
+-- Main PSE Objects
+
+pethMainPseObjects       OBJECT IDENTIFIER ::= { pethObjects 3 }
+
+pethMainPseTable OBJECT-TYPE
+       SYNTAX      SEQUENCE OF PethMainPseEntry
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+           "A table of objects that display and control attributes
+            of the main power source in a PSE  device.  Ethernet
+            switches are one example of boxes that would support
+            these objects.
+            Values of all read-write objects in this table are
+            persistent at restart/reboot."
+       ::= { pethMainPseObjects 1 }
+
+   pethMainPseEntry OBJECT-TYPE
+       SYNTAX      PethMainPseEntry
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+            "A set of objects that display and control the Main
+             power of a PSE. "
+       INDEX    { pethMainPseGroupIndex }
+       ::= { pethMainPseTable 1 }
+
+   PethMainPseEntry ::= SEQUENCE {
+       pethMainPseGroupIndex
+           Integer32,
+       pethMainPsePower
+           Gauge32 ,
+       pethMainPseOperStatus
+           INTEGER,
+       pethMainPseConsumptionPower
+           Gauge32,
+       pethMainPseUsageThreshold
+           Integer32
+   }
+     pethMainPseGroupIndex OBJECT-TYPE
+       SYNTAX       Integer32 (1..2147483647)
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+           "This variable uniquely identifies the group to which
+           power Ethernet PSE is connected.  Group means (box in
+           the stack, module in a rack) and the value 1 MUST be
+           used for non-modular devices.  Furthermore, the same
+           value MUST be used in this variable, pethPsePortGroupIndex,
+           and pethNotificationControlGroupIndex to refer to a
+           given box in a stack or module in a rack."
+       ::= { pethMainPseEntry 1 }
+
+     pethMainPsePower OBJECT-TYPE
+       SYNTAX      Gauge32  (1..65535)
+       UNITS      "Watts"
+       MAX-ACCESS  read-only
+       STATUS      current
+       DESCRIPTION
+               "The nominal power of the PSE expressed in Watts."
+       ::= { pethMainPseEntry 2 }
+
+     pethMainPseOperStatus OBJECT-TYPE
+       SYNTAX INTEGER   {
+               on(1),
+               off(2),
+               faulty(3)
+          }
+       MAX-ACCESS  read-only
+       STATUS      current
+       DESCRIPTION
+               "The operational status of the main PSE."
+       ::= { pethMainPseEntry 3 }
+
+     pethMainPseConsumptionPower OBJECT-TYPE
+       SYNTAX      Gauge32
+       UNITS      "Watts"
+       MAX-ACCESS  read-only
+       STATUS      current
+       DESCRIPTION
+               "Measured usage power expressed in Watts."
+       ::= { pethMainPseEntry 4 }
+
+     pethMainPseUsageThreshold OBJECT-TYPE
+       SYNTAX      Integer32  (1..99)
+       UNITS      "%"
+       MAX-ACCESS  read-write
+       STATUS      current
+       DESCRIPTION
+               "The usage threshold expressed in percents for
+                comparing the measured power and initiating
+                an alarm if the threshold is exceeded."
+       ::= { pethMainPseEntry 5 }
+
+-- Notification  Control  Objects
+
+pethNotificationControl        OBJECT IDENTIFIER ::= { pethObjects 4 }
+
+pethNotificationControlTable OBJECT-TYPE
+       SYNTAX      SEQUENCE OF PethNotificationControlEntry
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+           "A table of objects that display and control the
+            Notification on a PSE  device.
+            Values of all read-write objects in this table are
+            persistent at restart/reboot."
+       ::= { pethNotificationControl 1 }
+
+   pethNotificationControlEntry OBJECT-TYPE
+       SYNTAX      PethNotificationControlEntry
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+            "A set of objects that control the Notification events."
+       INDEX    { pethNotificationControlGroupIndex }
+       ::= { pethNotificationControlTable 1 }
+
+   PethNotificationControlEntry ::= SEQUENCE {
+       pethNotificationControlGroupIndex
+           Integer32,
+       pethNotificationControlEnable
+           TruthValue
+   }
+     pethNotificationControlGroupIndex OBJECT-TYPE
+       SYNTAX      Integer32 (1..2147483647)
+       MAX-ACCESS  not-accessible
+       STATUS      current
+       DESCRIPTION
+           "This variable uniquely identifies the group.  Group
+            means box in the stack, module in a rack and the value
+            1 MUST be used for non-modular devices.  Furthermore,
+            the same value MUST be used in this variable,
+            pethPsePortGroupIndex, and
+            pethMainPseGroupIndex to refer to a given box in a
+            stack or module in a rack. "
+       ::= { pethNotificationControlEntry 1 }
+
+      pethNotificationControlEnable  OBJECT-TYPE
+       SYNTAX             TruthValue
+       MAX-ACCESS         read-write
+       STATUS             current
+       DESCRIPTION
+          "This object controls, on a per-group basis, whether
+             or not notifications from the agent are enabled.  The
+             value true(1) means that notifications are enabled; the
+             value false(2) means that they are not."
+       ::= { pethNotificationControlEntry 2 }
+
+--
+-- Notifications Section
+--
+--
+
+     pethPsePortOnOffNotification NOTIFICATION-TYPE
+         OBJECTS     { pethPsePortDetectionStatus }
+         STATUS      current
+         DESCRIPTION
+             " This Notification indicates if Pse Port is delivering or
+               not power to the PD.  This Notification SHOULD be sent on
+               every status change except in the searching mode.
+               At least 500 msec must elapse between notifications
+               being emitted by the same object instance."
+          ::= { pethNotifications 1 }
+
+     pethMainPowerUsageOnNotification NOTIFICATION-TYPE
+         OBJECTS     { pethMainPseConsumptionPower  }
+         STATUS      current
+         DESCRIPTION
+           " This Notification indicate PSE Threshold usage
+               indication is on, the usage power is above the
+               threshold.  At least 500 msec must elapse between
+               notifications being emitted by the same object
+               instance."
+         ::= { pethNotifications 2 }
+
+      pethMainPowerUsageOffNotification NOTIFICATION-TYPE
+         OBJECTS     { pethMainPseConsumptionPower }
+         STATUS      current
+         DESCRIPTION
+           " This Notification indicates PSE Threshold usage indication
+               off, the usage power is below the threshold.
+               At least 500 msec must elapse between notifications being
+               emitted by the same object instance."
+         ::= { pethNotifications 3 }
+
+--
+-- Conformance Section
+--
+pethCompliances OBJECT IDENTIFIER ::= { pethConformance 1 }
+pethGroups      OBJECT IDENTIFIER ::= { pethConformance 2 }
+
+pethCompliance MODULE-COMPLIANCE
+       STATUS  current
+       DESCRIPTION
+               "Describes the requirements for conformance to the
+               Power Ethernet MIB."
+
+       MODULE  -- this module
+           MANDATORY-GROUPS { pethPsePortGroup,
+                              pethPsePortNotificationGroup,
+                              pethNotificationControlGroup
+                            }
+           GROUP   pethMainPseGroup
+           DESCRIPTION
+               "The pethMainPseGroup is mandatory for PSE systems
+                that implement a main power supply."
+           GROUP   pethMainPowerNotificationGroup
+           DESCRIPTION
+               "The pethMainPowerNotificationGroup is mandatory for
+               PSE systems that implement a main power supply."
+       ::= { pethCompliances 1 }
+
+pethPsePortGroup OBJECT-GROUP
+    OBJECTS {
+       pethPsePortAdminEnable,
+       pethPsePortPowerPairsControlAbility,
+       pethPsePortPowerPairs,
+       pethPsePortDetectionStatus,
+       pethPsePortPowerPriority,
+       pethPsePortMPSAbsentCounter,
+       pethPsePortInvalidSignatureCounter,
+       pethPsePortPowerDeniedCounter,
+       pethPsePortOverLoadCounter,
+       pethPsePortShortCounter,
+       pethPsePortType,
+       pethPsePortPowerClassifications
+    }
+    STATUS  current
+    DESCRIPTION
+          "PSE Port objects."
+    ::= { pethGroups 1 }
+
+pethMainPseGroup OBJECT-GROUP
+    OBJECTS {
+       pethMainPsePower,
+       pethMainPseOperStatus,
+       pethMainPseConsumptionPower,
+       pethMainPseUsageThreshold
+    }
+    STATUS  current
+    DESCRIPTION
+            "Main PSE Objects. "
+    ::= { pethGroups 2 }
+
+pethNotificationControlGroup OBJECT-GROUP
+    OBJECTS {
+       pethNotificationControlEnable
+    }
+    STATUS  current
+    DESCRIPTION
+            "Notification Control  Objects. "
+    ::= { pethGroups 3 }
+
+pethPsePortNotificationGroup NOTIFICATION-GROUP
+    NOTIFICATIONS { pethPsePortOnOffNotification}
+    STATUS           current
+    DESCRIPTION  "Pse Port Notifications."
+    ::= { pethGroups 4 }
+
+  pethMainPowerNotificationGroup NOTIFICATION-GROUP
+     NOTIFICATIONS { pethMainPowerUsageOnNotification,
+                      pethMainPowerUsageOffNotification}
+    STATUS           current
+    DESCRIPTION  "Main PSE Notifications."
+      ::= { pethGroups 5 }
+
+END
+