update from Vit

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@575 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/website/iana/RRDMONITOR.MIB b/website/iana/RRDMONITOR.MIB
index ac69f4672c83f9cbb87f1d4263bc22d33d822012..3e1e2fd67afbf5878fbaaf9eba612c5652920aee 100644 (file)
--- a/website/iana/RRDMONITOR.MIB
+++ b/website/iana/RRDMONITOR.MIB
@@ -1,4 +1,3 @@
-\r
 RRDMONITOR-MIB DEFINITIONS ::= BEGIN\r
 \r
 IMPORTS\r
@@ -12,11 +11,12 @@ IMPORTS
 rrdmonitor MODULE-IDENTITY\r
        LAST-UPDATED "200505160000Z"\r
        ORGANIZATION \r
-               "RrdMonitor project"\r
+               "RRDMonitor project"\r
        CONTACT-INFO \r
-               "aaa"\r
+               "contact        info@rrdmonitor.net\r
+                                                       http://rrdmonitor.net"\r
        DESCRIPTION \r
-               "The MIB module for SNMP variables specific to rrdmonitor project"\r
+               "The MIB module for SNMP variables specific to RRDMonitor project"\r
 ::= { rrdtool 3 }\r
 \r
 \r
@@ -24,11 +24,11 @@ EventType ::= TEXTUAL-CONVENTION
        STATUS     current\r
        DESCRIPTION \r
                "Defines the event type:\r
-                       warning      -- The monitor condition is first time met\r
-                       critical   -- The monitor condition is met again on the consequtive\r
-                                   monitorin cycle\r
-                       clear    -- The monitor condition is not met the first time after\r
-                                   event type set or repeat"\r
+                       warning         -- The monitor condition is first time met\r
+                       critical        -- The monitor condition is met again on the consequtive\r
+                                               monitorin cycle\r
+                       clear                   -- The monitor condition is not met the first time after\r
+                                               event type set or repeat"\r
        SYNTAX  INTEGER {\r
                warning (1),\r
                critical (2),\r
@@ -36,30 +36,6 @@ EventType ::= TEXTUAL-CONVENTION
        }\r
 \r
 \r
-Path ::= TEXTUAL-CONVENTION\r
-       STATUS     current\r
-       DESCRIPTION \r
-               "Path is the full name of the rrdmonitor datasource, containing its\r
-                       parent nodes separated by slashes"\r
-       SYNTAX  OCTET STRING (SIZE(1..512))\r
-\r
-\r
-Token ::= TEXTUAL-CONVENTION\r
-       STATUS     current\r
-       DESCRIPTION \r
-               "Token is a short ID for the leaf or subtree of the rrdmonitor\r
-                       datasources hierarchy"\r
-       SYNTAX  OCTET STRING (SIZE(5..10))\r
-\r
-\r
-TreeName ::= TEXTUAL-CONVENTION\r
-       STATUS     current\r
-       DESCRIPTION \r
-               "rrdmonitor system operates with several datasource trees\r
-                       identified by names"\r
-       SYNTAX  OCTET STRING (SIZE(1..512))\r
-\r
-\r
 rrdmonitorAlarmTable  OBJECT-TYPE\r
        SYNTAX SEQUENCE OF RrdmonitorAlarmEntry\r
        MAX-ACCESS not-accessible\r
@@ -101,35 +77,11 @@ rrdmonitorMessage  OBJECT-TYPE
                "The value of this object uniquely identifies this event entry."\r
        ::= { rrdmonitorAlarmEntry 2 }\r
 \r
-generic-cpu  NOTIFICATION-TYPE\r
+generic  NOTIFICATION-TYPE\r
        OBJECTS { rrdmonitorEventType, \r
                rrdmonitorMessage }\r
        STATUS     current\r
        DESCRIPTION \r
                "The SNMP trap that is generated when an rrdmonitor monitor condition is changed for the leaf being monitored"\r
        ::= { rrdmonitor 2 }\r
-\r
-nokia3gsAttached  NOTIFICATION-TYPE\r
-       OBJECTS { rrdmonitorEventType, \r
-               rrdmonitorMessage }\r
-       STATUS     current\r
-       DESCRIPTION \r
-               "The SNMP trap that is generated when an rrdmonitor monitor condition is changed for the leaf being monitored"\r
-       ::= { rrdmonitor 3 }\r
-\r
-nokia3gsActivePDP  NOTIFICATION-TYPE\r
-       OBJECTS { rrdmonitorEventType, \r
-               rrdmonitorMessage }\r
-       STATUS     current\r
-       DESCRIPTION \r
-               "The SNMP trap that is generated when an rrdmonitor monitor condition is changed for the leaf being monitored"\r
-       ::= { rrdmonitor 4 }\r
-\r
-nokia3gsDNS  NOTIFICATION-TYPE\r
-       OBJECTS { rrdmonitorEventType, \r
-               rrdmonitorMessage }\r
-       STATUS     current\r
-       DESCRIPTION \r
-               "The SNMP trap that is generated when an rrdmonitor monitor condition is changed for the leaf being monitored"\r
-       ::= { rrdmonitor 5 }\r
 END
\ No newline at end of file

diff --git a/website/iana/index.wml b/website/iana/index.wml
index 8ee1cc85aa02d69c590901c2d4f5cf21dae64d50..9540895ad62995ffc456d6d5980b9d333ffcc420 100644 (file)
--- a/website/iana/index.wml
+++ b/website/iana/index.wml
@@ -17,7 +17,7 @@ you want an OID for your project, please drop <a href="mailto:tobi@oetiker.ch">m
 <UL>
 <LI><B>1</B> -- <A HREF="http://rrfw.sourceforge.net/">Round Robin Database Framework</A> -- <A HREF="http://rrfw.sourceforge.net/RRFW-MIB.txt">RRFW-MIB.txt</A>.</LI>
 <LI><B>2</B> -- MobileRRD RRD implementation of KPN Mobile Contact Wim Siebring.</LI>
-<LI><B>3</B> -- RRDMonitor by Vit Luca luca from 10096.it -- <A HREF="RRDMONITOR.MIB">RRDMONITOR.MIB</a>.</LI>
+<LI><B>3</B> -- RRDMonitor by RRDMonitor by Pusceddu and Vit from RRDMonitor.net -- <A HREF="RRDMONITOR.MIB">RRDMONITOR.MIB</a>.</LI>
 </UL>
 
 <P>If you submit MIB modules, please <A HREF="http://wwwsnmp.cs.utwente.nl/ietf/mibs/validate/">validate</A> them