--- a/agent/ChangeLog	Thu Aug 15 10:36:43 2013 +0900
+++ b/agent/ChangeLog	Thu Aug 15 11:47:19 2013 +0900
@@ -1,7 +1,12 @@
 2013-08-15  Yasumasa Suenaga  <suenaga.yasumasa@lab.ntt.co.jp>
 
+	* Bug 1496: SNMP MIB definitions are missing except HeapAlert trap.
 	* Bug 1506: HeapStats agent can't track Klass relocation.
 
+2013-07-26  Shinji Takao  <takao.shinji@lab.ntt.co.jp>
+
+	* Bug 1505: Suppress warning when dead lock detection faild.
+
 2013-07-25  Yasumasa Suenaga  <suenaga.yasumasa@lab.ntt.co.jp>
 
 	* Bug 1493: HeapStats agent should use UseCompressedKlassPointers on

--- a/agent/mib/HeapStatsMibs.txt	Thu Aug 15 10:36:43 2013 +0900
+++ b/agent/mib/HeapStatsMibs.txt	Thu Aug 15 11:47:19 2013 +0900
@@ -5,12 +5,15 @@
      FROM SNMPv2-SMI;
  
  heapStats MODULE-IDENTITY
-   LAST-UPDATED "201205251530Z"
+   LAST-UPDATED "201307121621Z"
    ORGANIZATION "Heapstats MIB"
    CONTACT-INFO
        "Email: oss-java-support@lab.ntt.co.jp"
    DESCRIPTION
        "Mib of Heapstats agent information."
+   REVISION "201307121621Z"
+   DESCRIPTION
+       "Append resourceExhaustedAlert, collectLogAlert, deadLockAlert ."
    -- REVISION "revision date"
    -- DESCRIPTION
    --     "about Revision"
@@ -70,4 +73,81 @@
               	The class occupy unjustly large size of Java-heap."
  ::= { heapAlert 0 }
  
+ -- resourceExhaustedAlert Define ==============================================
+ 
+ resourceExhaustedAlert OBJECT IDENTIFIER ::= { heapStats 2 }
+ 
+ resourceFlag OBJECT-TYPE
+   -- 
+   SYNTAX	INTEGER
+   MAX-ACCESS	read-only
+   STATUS	mandatory
+   DESCRIPTION	"Flag means information of resource exhausted."
+ ::= { resourceExhaustedAlert 1 }
+ 
+ description OBJECT-TYPE
+   -- 
+   SYNTAX	OCTET STRING
+   MAX-ACCESS	read-only
+   STATUS	mandatory
+   DESCRIPTION	"Description explain about resource exhausted."
+ ::= { resourceExhaustedAlert 2 }
+ 
+ resourceExhaustedAlertTrap NOTIFICATION-TYPE
+   STATUS	current
+   DESCRIPTION	"It's used to notify that JVM exhausted resources."
+ ::= { resourceExhaustedAlert 0 }
+ 
+ -- collectLogAlert Define =====================================================
+ 
+ collectLogAlert OBJECT IDENTIFIER ::= { heapStats 3 }
+ 
+ logPath OBJECT-TYPE
+   -- 
+   SYNTAX	OCTET STRING
+   MAX-ACCESS	read-only
+   STATUS	mandatory
+   DESCRIPTION	"Path of log archive file."
+ ::= { collectLogAlert 1 }
+ 
+ failureDateTime OBJECT-TYPE
+   -- 
+   SYNTAX	Counter64
+   MAX-ACCESS	read-only
+   STATUS	mandatory
+   DESCRIPTION	"Datetime of the point of failure.
+              	This value is equals alertDateTime in resourceExhaustedAlert trap.
+              	If collect log by user signal then this value is 0."
+ ::= { collectLogAlert 2 }
+ 
+ collectLogAlertTrap NOTIFICATION-TYPE
+   STATUS	current
+   DESCRIPTION	"It's used to notify that collect log."
+ ::= { collectLogAlert 0 }
+ 
+ -- deadLockAlert Define =====================================================
+ 
+ deadLockAlert OBJECT IDENTIFIER ::= { heapStats 4 }
+ 
+ threadCount OBJECT-TYPE
+   -- 
+   SYNTAX	Counter
+   MAX-ACCESS	read-only
+   STATUS	mandatory
+   DESCRIPTION	"Count of dead-locked threads."
+ ::= { deadLockAlert 1 }
+ 
+ threadName OBJECT-TYPE
+   -- 
+   SYNTAX	OCTET STRING
+   MAX-ACCESS	read-only
+   STATUS	mandatory
+   DESCRIPTION	"Name of dead-locked one thread."
+ ::= { deadLockAlert 2 }
+ 
+ deadLockAlertTrap NOTIFICATION-TYPE
+   STATUS	current
+   DESCRIPTION	"It's used to notify that raised dead-lock in JVM."
+ ::= { deadLockAlert 0 }
+ 
 END