NotifyType set to Gauge32, instead of Integer32, for host and service notifications (thanks to Dirk Fieldhouse)HEADmaster

4 files changed, 13 insertions, 15 deletions

diff --git a/MIB/NAGIOS-NOTIFY-MIB b/MIB/NAGIOS-NOTIFY-MIB
index a6bfceb..03b4c07 100644
--- a/MIB/NAGIOS-NOTIFY-MIB
+++ b/MIB/NAGIOS-NOTIFY-MIB
@@ -1,7 +1,7 @@
 NAGIOS-NOTIFY-MIB DEFINITIONS ::= BEGIN
   IMPORTS
     MODULE-IDENTITY, OBJECT-TYPE,  NOTIFICATION-TYPE,
-    Integer32
+    Integer32, Gauge32
       FROM SNMPv2-SMI
     nagios,NotifyType,HostStateID,HostStateType,ServiceStateID
       FROM NAGIOS-ROOT-MIB;
@@ -228,7 +228,7 @@ nagiosHostNotifyTable OBJECT-TYPE
 
 HostNotifyEntry ::= SEQUENCE {
   nHostNotifyType    NotifyType,
-  nHostNotifyNum     Integer32,
+  nHostNotifyNum     Gauge32,    -- was Integer32,
   nHostAckAuthor     OCTET STRING,
   nHostAckComment    OCTET STRING
   }
@@ -253,7 +253,7 @@ nHostNotifyType  OBJECT-TYPE
   ::= { nagiosHostNotifyEntry 1 }
   
 nHostNotifyNum OBJECT-TYPE
-  SYNTAX     NotifyType
+  SYNTAX     Gauge32    -- was NotifyType
   MAX-ACCESS read-only
   STATUS     current
   DESCRIPTION 
@@ -510,7 +510,7 @@ nagiosSvcNotifyTable OBJECT-TYPE
   
 SvcNotifyEntry ::= SEQUENCE {
   nSvcNotifyType    NotifyType,
-  nSvcNotifyNum     Integer32,
+  nSvcNotifyNum     Gauge32,    -- Integer32,
   nSvcAckAuthor     OCTET STRING,
   nSvcAckComment    OCTET STRING
   }
@@ -536,7 +536,7 @@ nSvcNotifyType OBJECT-TYPE
   ::= { nagiosSvcNotifyEntry 1 }
 
 nSvcNotifyNum  OBJECT-TYPE
-  SYNTAX       Integer32
+  SYNTAX       Gauge32  -- Integer32
   MAX-ACCESS   read-only
   STATUS       current
   DESCRIPTION
diff --git a/Makefile b/Makefile
index b9abf2f..b07d0ec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.0.0
+VERSION = 1.0.1
 
 all:
         smistrip -d MIB src-mib/nagios*.mib
@@ -7,6 +7,6 @@ test:
         smilint -p ./MIB/NAGIOS-ROOT-MIB ./MIB/NAGIOS-NOTIFY-MIB
 
 tarball:
-        tar cvzf nagiosmib-${VERSION}.tar.gz ./MIB/*MIB
+        tar cvzf nagiosmib-${VERSION}.tar.gz README CHANGES LEGAL LICENSE ./MIB/*MIB
         md5sum nagiosmib-${VERSION}.tar.gz > nagiosmib-${VERSION}.tar.gz.md5sum
 
diff --git a/README b/README
index f73c7f3..e4374a4 100644
--- a/README
+++ b/README
@@ -1,8 +1,6 @@
-$Id$
-
 This is the initial set of MIBs for Nagios to allow traps sent from Nagios to
 be recognized by other NMSes.
 
-Feedback should be directed to the nagiosplug-devel list.
+Feedback should be directed to the nagiosplug-devel list at http://nagiosplugins.org/mailinglists
 
 
diff --git a/src-mib/nagios-notify.mib b/src-mib/nagios-notify.mib
index a6bfceb..03b4c07 100644
--- a/src-mib/nagios-notify.mib
+++ b/src-mib/nagios-notify.mib
@@ -1,7 +1,7 @@
 NAGIOS-NOTIFY-MIB DEFINITIONS ::= BEGIN
   IMPORTS
     MODULE-IDENTITY, OBJECT-TYPE,  NOTIFICATION-TYPE,
-    Integer32
+    Integer32, Gauge32
       FROM SNMPv2-SMI
     nagios,NotifyType,HostStateID,HostStateType,ServiceStateID
       FROM NAGIOS-ROOT-MIB;
@@ -228,7 +228,7 @@ nagiosHostNotifyTable OBJECT-TYPE
 
 HostNotifyEntry ::= SEQUENCE {
   nHostNotifyType    NotifyType,
-  nHostNotifyNum     Integer32,
+  nHostNotifyNum     Gauge32,    -- was Integer32,
   nHostAckAuthor     OCTET STRING,
   nHostAckComment    OCTET STRING
   }
@@ -253,7 +253,7 @@ nHostNotifyType  OBJECT-TYPE
   ::= { nagiosHostNotifyEntry 1 }
   
 nHostNotifyNum OBJECT-TYPE
-  SYNTAX     NotifyType
+  SYNTAX     Gauge32    -- was NotifyType
   MAX-ACCESS read-only
   STATUS     current
   DESCRIPTION 
@@ -510,7 +510,7 @@ nagiosSvcNotifyTable OBJECT-TYPE
   
 SvcNotifyEntry ::= SEQUENCE {
   nSvcNotifyType    NotifyType,
-  nSvcNotifyNum     Integer32,
+  nSvcNotifyNum     Gauge32,    -- Integer32,
   nSvcAckAuthor     OCTET STRING,
   nSvcAckComment    OCTET STRING
   }
@@ -536,7 +536,7 @@ nSvcNotifyType OBJECT-TYPE
   ::= { nagiosSvcNotifyEntry 1 }
 
 nSvcNotifyNum  OBJECT-TYPE
-  SYNTAX       Integer32
+  SYNTAX       Gauge32  -- Integer32
   MAX-ACCESS   read-only
   STATUS       current
   DESCRIPTION