Commits

Peter Nixon committed 84f4ed8

Update Allot event files to support version 12.x and split the common events into events/Allot.events.xml

Comments (0)

Files changed (4)

opennms-base-assembly/src/main/filtered/etc/eventconf.xml

   <event-file>events/AKCP.events.xml</event-file>
   <event-file>events/AlcatelLucent.OmniSwitch.events.xml</event-file>
   <event-file>events/AlcatelLucent.SMSBrick.events.xml</event-file>
+  <event-file>events/Allot.events.xml</event-file>
   <event-file>events/Allot.NetXplorer.events.xml</event-file>
   <event-file>events/Allot.SM.events.xml</event-file>
   <event-file>events/Alteon.events.xml</event-file>

opennms-base-assembly/src/main/filtered/etc/events/Allot.NetXplorer.events.xml

 <events>
-<!-- Start of auto generated data from MIB: ALLOT-MIB -->
+<!-- Start of auto generated data from MIB: ALLOT-NX-MIB -->
 <event>
 	<mask>
 		<maskelement>
 			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+			<mevalue>.1.3.6.1.4.1.2603.10</mevalue>
 		</maskelement>
 		<maskelement>
 			<mename>generic</mename>
 			<mename>specific</mename>
 			<mevalue>1</mevalue>
 		</maskelement>
+                <varbind>
+                        <vbnumber>1</vbnumber>
+                        <vbvalue>3</vbvalue>
+                </varbind>
 	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alDeviceConfChangeTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alDeviceConfChangeTrap</event-label>
+	<uei>uei.opennms.org/vendor/allot/traps/alAlarmRisingTrap/Critical</uei>
+	<event-label>ALLOT-NX-MIB defined critical trap event: alAlarmRisingTrap</event-label>
 	<descr>
-&lt;p&gt;Is to be send when one of generic status
-variables is changed. The mentioned statuses are defined
-on the device level. The actual variable is defined via
-alGenericLastChangeVar&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alGenericLastChangeVar&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alGenericLastChangeIntVal&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alGenericLastChangeStrVal&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#3]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alGenericLastChangeAddrVal&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alDeviceConfChangeTrap trap received 
-			alGenericLastChangeVar=%parm[#1]% 
-			alGenericLastChangeIntVal=%parm[#2]% 
-			alGenericLastChangeStrVal=%parm[#3]% 
-			alGenericLastChangeAddrVal=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Normal</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>2</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alCatalogConfChangeTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alCatalogConfChangeTrap</event-label>
-	<descr>
-&lt;p&gt;Configuration change event on one of the catalogs&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alCatalogLastCommand&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		create(1)
-		update(2)
-		delete(3)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alCatalogLastChangeOrigin&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alCatalogConfChangeTrap trap received 
-			alCatalogLastCommand=%parm[#1]% 
-			alCatalogLastChangeOrigin=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Normal</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>3</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alLineConfChangeTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alLineConfChangeTrap</event-label>
-	<descr>
-&lt;p&gt;Configuration change occurs on one of the lines&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alLineLastCommand&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		create(1)
-		update(2)
-		delete(3)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alLineLastChangeOrigin&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alLineConfChangeTrap trap received 
-			alLineLastCommand=%parm[#1]% 
-			alLineLastChangeOrigin=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Normal</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>4</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alPipeConfChangeTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alPipeConfChangeTrap</event-label>
-	<descr>
-&lt;p&gt;The configuration change occurs on one of the pipes&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alPipeLastCommand&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		create(1)
-		update(2)
-		delete(3)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alPipeLastChangeOrigin&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alPipeConfChangeTrap trap received 
-			alPipeLastCommand=%parm[#1]% 
-			alPipeLastChangeOrigin=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Normal</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>5</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alVCConfChangeTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alVCConfChangeTrap</event-label>
-	<descr>
-&lt;p&gt;The configuration change occurs on one of the VCs&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alVCLastCommand&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		create(1)
-		update(2)
-		delete(3)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alVCLastChangeOrigin&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alVCConfChangeTrap trap received 
-			alVCLastCommand=%parm[#1]% 
-			alVCLastChangeOrigin=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Normal</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alAlertRisingTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alAlertRisingTrap</event-label>
-	<descr>
-&lt;p&gt;One of the alerts crossed the threshold&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alAlertConfVariable&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alAlertConfValue&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alAlertConfThreshold&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#3]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alAlertConfRegInterval&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alAlertRisingTrap trap received 
-			alAlertConfVariable=%parm[#1]% 
-			alAlertConfValue=%parm[#2]% 
-			alAlertConfThreshold=%parm[#3]% 
-			alAlertConfRegInterval=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>7</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alAlertFallingTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alAlertFallingTrap</event-label>
-	<descr>
-&lt;p&gt;The alert' value returned to the normal level&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alAlertConfVariable&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alAlertConfValue&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alAlertConfNormal&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#3]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alAlertConfUnRegInterval&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alAlertFallingTrap trap received 
-			alAlertConfVariable=%parm[#1]% 
-			alAlertConfValue=%parm[#2]% 
-			alAlertConfNormal=%parm[#3]% 
-			alAlertConfUnRegInterval=%parm[#4]%&lt;/p&gt;
-		</logmsg>
-	<severity>Cleared</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>8</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alDosAttackOnTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alDosAttackOnTrap</event-label>
-	<descr>
-&lt;p&gt;DOS attack is identified&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alDOSAttackStatus&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		active(1)
-		finish(2)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alDosAttackOnTrap trap received 
-			alDOSAttackStatus=%parm[#1]%&lt;/p&gt;
-		</logmsg>
-	<severity>Major</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>9</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alDosAttackOffTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alDosAttackOffTrap</event-label>
-	<descr>
-&lt;p&gt;DOS attack is over&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alDOSAttackStatus&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		active(1)
-		finish(2)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alDosAttackOffTrap trap received 
-			alDOSAttackStatus=%parm[#1]%&lt;/p&gt;
-		</logmsg>
-	<severity>Cleared</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>10</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alDataSourceDownTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alDataSourceDownTrap</event-label>
-	<descr>
-&lt;p&gt;Data source is unreachable&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alDataSourceIPAddr&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alDataSourceType&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		dns(1)
-		dhcp(2)
-		ldap(3)
-		radius(4)
-		tftp(5)
-		ntp(6)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alDataSourceDownTrap trap received 
-			alDataSourceIPAddr=%parm[#1]% 
-			alDataSourceType=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Major</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>11</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alDataSourceUpTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alDataSourceUpTrap</event-label>
-	<descr>
-&lt;p&gt;Data source is now reachable&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alDataSourceIPAddr&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alDataSourceType&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		dns(1)
-		dhcp(2)
-		ldap(3)
-		radius(4)
-		tftp(5)
-		ntp(6)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alDataSourceUpTrap trap received 
-			alDataSourceIPAddr=%parm[#1]% 
-			alDataSourceType=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Cleared</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>12</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alSoftwareProblemTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alSoftwareProblemTrap</event-label>
-	<descr>
-&lt;p&gt;Severe problem occured. The trap can't be
-blocked (disabled).&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alSevereSoftwareProblem&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		unknown(1)
-		reboot(2)
-		processUp(3)
-		processDown(4)
-		processStuck(5)
-		picoCheckSuccess(11)
-		picoCheckFalure(12)
-		picoSaveFalure(13)
-		wrongTrapOrder(21)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alLastMessage&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+<![CDATA[
+<p>Trap shall be sent for alarm rising</p><table>
+	<tr><td><b>
+
+	alSeverity</b></td><td>
+	%parm[#1]%;</td><td><p>
+		unknown(0)
+		cleared(1)
+		indeterminate(2)
+		critical(3)
+		major(4)
+		minor(5)
+		warning(6)
+	</p></td></tr>
+	<tr><td><b>
+
+	alDescription</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alTimestamp</b></td><td>
+	%parm[#3]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alIndex</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
 	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alSoftwareProblemTrap trap received 
-			alSevereSoftwareProblem=%parm[#1]% 
-			alLastMessage=%parm[#2]%&lt;/p&gt;
-		</logmsg>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alAlarmRisingTrap trap received 
+			alSeverity=%parm[#1]% 
+			alDescription=%parm[#2]% 
+			alTimestamp=%parm[#3]% 
+			alIndex=%parm[#4]%</p>
+]]>		</logmsg>
 	<severity>Critical</severity>
+        <varbindsdecode>
+                <parmid>parm[#1]</parmid>
+                <decode varbindvalue="0" varbinddecodedstring="Unknown"/>
+                <decode varbindvalue="1" varbinddecodedstring="Cleared"/>
+                <decode varbindvalue="2" varbinddecodedstring="Indeterminate"/>
+                <decode varbindvalue="3" varbinddecodedstring="Critical"/>
+                <decode varbindvalue="4" varbinddecodedstring="Major"/>
+                <decode varbindvalue="5" varbinddecodedstring="Minor"/>
+                <decode varbindvalue="6" varbinddecodedstring="Warning"/>
+        </varbindsdecode>
 </event>
 <event>
 	<mask>
 		<maskelement>
 			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+			<mevalue>.1.3.6.1.4.1.2603.10</mevalue>
 		</maskelement>
 		<maskelement>
 			<mename>generic</mename>
 		</maskelement>
 		<maskelement>
 			<mename>specific</mename>
-			<mevalue>13</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alAccessViolationTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alAccessViolationTrap</event-label>
-	<descr>
-&lt;p&gt;Access violation attempt is discovered&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alLastMessage&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alAccessViolationTrap trap received 
-			alLastMessage=%parm[#1]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>14</mevalue>
+			<mevalue>1</mevalue>
 		</maskelement>
+                <varbind>
+                        <vbnumber>1</vbnumber>
+                        <vbvalue>4</vbvalue>
+                </varbind>
 	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alIpAddrConfChangeTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alIpAddrConfChangeTrap</event-label>
+	<uei>uei.opennms.org/vendor/allot/traps/alAlarmRisingTrap/Major</uei>
+	<event-label>ALLOT-NX-MIB defined major trap event: alAlarmRisingTrap</event-label>
 	<descr>
-&lt;p&gt;Ip Address added or removed.&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alIpXEntryStatus&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		active(1)
-		notInService(2)
-		notReady(3)
-		createAndGo(4)
-		createAndWait(5)
-		destroy(6)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alIpXAddr&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+<![CDATA[
+<p>Trap shall be sent for alarm rising</p><table>
+	<tr><td><b>
+
+	alSeverity</b></td><td>
+	%parm[#1]%;</td><td><p>
+		unknown(0)
+		cleared(1)
+		indeterminate(2)
+		critical(3)
+		major(4)
+		minor(5)
+		warning(6)
+	</p></td></tr>
+	<tr><td><b>
+
+	alDescription</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alTimestamp</b></td><td>
+	%parm[#3]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alIndex</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
 	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alIpAddrConfChangeTrap trap received 
-			alIpXEntryStatus=%parm[#1]% 
-			alIpXAddr=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>15</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alConnRouteConfChangeTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alConnRouteConfChangeTrap</event-label>
-	<descr>
-&lt;p&gt;Connection routing configuration change trap&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alConnRouteEntryStatus&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		active(1)
-		notInService(2)
-		notReady(3)
-		createAndGo(4)
-		createAndWait(5)
-		destroy(6)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alConnRouteIfIndex&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alConnRouteConfChangeTrap trap received 
-			alConnRouteEntryStatus=%parm[#1]% 
-			alConnRouteIfIndex=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alAlarmRisingTrap trap received 
+			alSeverity=%parm[#1]% 
+			alDescription=%parm[#2]% 
+			alTimestamp=%parm[#3]% 
+			alIndex=%parm[#4]%</p>
+]]>		</logmsg>
+	<severity>Major</severity>
+        <varbindsdecode>
+                <parmid>parm[#1]</parmid>
+                <decode varbindvalue="0" varbinddecodedstring="Unknown"/>
+                <decode varbindvalue="1" varbinddecodedstring="Cleared"/>
+                <decode varbindvalue="2" varbinddecodedstring="Indeterminate"/>
+                <decode varbindvalue="3" varbinddecodedstring="Critical"/>
+                <decode varbindvalue="4" varbinddecodedstring="Major"/>
+                <decode varbindvalue="5" varbinddecodedstring="Minor"/>
+                <decode varbindvalue="6" varbinddecodedstring="Warning"/>
+        </varbindsdecode>
 </event>
 <event>
 	<mask>
 		<maskelement>
 			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+			<mevalue>.1.3.6.1.4.1.2603.10</mevalue>
 		</maskelement>
 		<maskelement>
 			<mename>generic</mename>
 		</maskelement>
 		<maskelement>
 			<mename>specific</mename>
-			<mevalue>16</mevalue>
+			<mevalue>1</mevalue>
 		</maskelement>
+                <varbind>
+                        <vbnumber>1</vbnumber>
+                        <vbvalue>5</vbvalue>
+                </varbind>
 	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alDeviceStatusUpTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alDeviceStatusUpTrap</event-label>
+	<uei>uei.opennms.org/vendor/allot/traps/alAlarmRisingTrap/Minor</uei>
+	<event-label>ALLOT-NX-MIB defined minor trap event: alAlarmRisingTrap</event-label>
 	<descr>
-&lt;p&gt;&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alGenericLastChangeVar&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alGenericLastChangeIntVal&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+<![CDATA[
+<p>Trap shall be sent for alarm rising</p><table>
+	<tr><td><b>
+
+	alSeverity</b></td><td>
+	%parm[#1]%;</td><td><p>
+		unknown(0)
+		cleared(1)
+		indeterminate(2)
+		critical(3)
+		major(4)
+		minor(5)
+		warning(6)
+	</p></td></tr>
+	<tr><td><b>
+
+	alDescription</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alTimestamp</b></td><td>
+	%parm[#3]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alIndex</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
 	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alDeviceStatusUpTrap trap received 
-			alGenericLastChangeVar=%parm[#1]% 
-			alGenericLastChangeIntVal=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Normal</severity>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alAlarmRisingTrap trap received 
+			alSeverity=%parm[#1]% 
+			alDescription=%parm[#2]% 
+			alTimestamp=%parm[#3]% 
+			alIndex=%parm[#4]%</p>
+]]>		</logmsg>
+	<severity>Minor</severity>
+        <varbindsdecode>
+                <parmid>parm[#1]</parmid>
+                <decode varbindvalue="0" varbinddecodedstring="Unknown"/>
+                <decode varbindvalue="1" varbinddecodedstring="Cleared"/>
+                <decode varbindvalue="2" varbinddecodedstring="Indeterminate"/>
+                <decode varbindvalue="3" varbinddecodedstring="Critical"/>
+                <decode varbindvalue="4" varbinddecodedstring="Major"/>
+                <decode varbindvalue="5" varbinddecodedstring="Minor"/>
+                <decode varbindvalue="6" varbinddecodedstring="Warning"/>
+        </varbindsdecode>
 </event>
 <event>
 	<mask>
 		<maskelement>
 			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+			<mevalue>.1.3.6.1.4.1.2603.10</mevalue>
 		</maskelement>
 		<maskelement>
 			<mename>generic</mename>
 		</maskelement>
 		<maskelement>
 			<mename>specific</mename>
-			<mevalue>17</mevalue>
+			<mevalue>1</mevalue>
 		</maskelement>
+                <varbind>
+                        <vbnumber>1</vbnumber>
+                        <vbvalue>6</vbvalue>
+                </varbind>
 	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alDeviceStatusDownTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alDeviceStatusDownTrap</event-label>
+	<uei>uei.opennms.org/vendor/allot/traps/alAlarmRisingTrap/Warning</uei>
+	<event-label>ALLOT-NX-MIB defined warning trap event: alAlarmRisingTrap</event-label>
 	<descr>
-&lt;p&gt;&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alGenericLastChangeVar&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alGenericLastChangeIntVal&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+<![CDATA[
+<p>Trap shall be sent for alarm rising</p><table>
+	<tr><td><b>
+
+	alSeverity</b></td><td>
+	%parm[#1]%;</td><td><p>
+		unknown(0)
+		cleared(1)
+		indeterminate(2)
+		critical(3)
+		major(4)
+		minor(5)
+		warning(6)
+	</p></td></tr>
+	<tr><td><b>
+
+	alDescription</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alTimestamp</b></td><td>
+	%parm[#3]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alIndex</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
 	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alDeviceStatusDownTrap trap received 
-			alGenericLastChangeVar=%parm[#1]% 
-			alGenericLastChangeIntVal=%parm[#2]%&lt;/p&gt;
-		</logmsg>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alAlarmRisingTrap trap received 
+			alSeverity=%parm[#1]% 
+			alDescription=%parm[#2]% 
+			alTimestamp=%parm[#3]% 
+			alIndex=%parm[#4]%</p>
+]]>		</logmsg>
 	<severity>Warning</severity>
+        <varbindsdecode>
+                <parmid>parm[#1]</parmid>
+                <decode varbindvalue="0" varbinddecodedstring="Unknown"/>
+                <decode varbindvalue="1" varbinddecodedstring="Cleared"/>
+                <decode varbindvalue="2" varbinddecodedstring="Indeterminate"/>
+                <decode varbindvalue="3" varbinddecodedstring="Critical"/>
+                <decode varbindvalue="4" varbinddecodedstring="Major"/>
+                <decode varbindvalue="5" varbinddecodedstring="Minor"/>
+                <decode varbindvalue="6" varbinddecodedstring="Warning"/>
+        </varbindsdecode>
 </event>
 <event>
 	<mask>
 		<maskelement>
 			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+			<mevalue>.1.3.6.1.4.1.2603.10</mevalue>
 		</maskelement>
 		<maskelement>
 			<mename>generic</mename>
 		</maskelement>
 		<maskelement>
 			<mename>specific</mename>
-			<mevalue>18</mevalue>
-		</maskelement>
-	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alApplicationInfoTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alApplicationInfoTrap</event-label>
-	<descr>
-&lt;p&gt;Application general information trap
-blocked (disabled).&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alLastMessage&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
-	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alApplicationInfoTrap trap received 
-			alLastMessage=%parm[#1]%&lt;/p&gt;
-		</logmsg>
-	<severity>Normal</severity>
-</event>
-<event>
-	<mask>
-		<maskelement>
-			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>generic</mename>
-			<mevalue>6</mevalue>
-		</maskelement>
-		<maskelement>
-			<mename>specific</mename>
-			<mevalue>19</mevalue>
+			<mevalue>1</mevalue>
 		</maskelement>
 	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alBoardStatusChangeTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alBoardStatusChangeTrap</event-label>
+	<uei>uei.opennms.org/vendor/allot/traps/alAlarmRisingTrap</uei>
+	<event-label>ALLOT-NX-MIB defined trap event: alAlarmRisingTrap</event-label>
 	<descr>
-&lt;p&gt;This trap is sent on changing software or hardware status of board&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alBoardType&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		thirdParty(1)
-		apc(2)
-		dpic(3)
-		host(4)
-		byc(5)
-		spider(6)
-		scorpion(7)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alBoardSoftwareStatus&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		notApplicable(0)
-		bypass(1)
-		nonBypass(2)
-		standBy(3)
-		partialBypass(4)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alBoardHWStatus&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#3]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		off(1)
-		on(2)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+<![CDATA[
+<p>Trap shall be sent for alarm rising</p><table>
+	<tr><td><b>
+
+	alSeverity</b></td><td>
+	%parm[#1]%;</td><td><p>
+		unknown(0)
+		cleared(1)
+		indeterminate(2)
+		critical(3)
+		major(4)
+		minor(5)
+		warning(6)
+	</p></td></tr>
+	<tr><td><b>
+
+	alDescription</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alTimestamp</b></td><td>
+	%parm[#3]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alIndex</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
 	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alBoardStatusChangeTrap trap received 
-			alBoardType=%parm[#1]% 
-			alBoardSoftwareStatus=%parm[#2]% 
-			alBoardHWStatus=%parm[#3]%&lt;/p&gt;
-		</logmsg>
-	<severity>Warning</severity>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alAlarmRisingTrap trap received 
+			alSeverity=%parm[#1]% 
+			alDescription=%parm[#2]% 
+			alTimestamp=%parm[#3]% 
+			alIndex=%parm[#4]%</p>
+]]>		</logmsg>
+	<severity>Indeterminate</severity>
+        <varbindsdecode>
+                <parmid>parm[#1]</parmid>
+                <decode varbindvalue="0" varbinddecodedstring="Unknown"/>
+                <decode varbindvalue="1" varbinddecodedstring="Cleared"/>
+                <decode varbindvalue="2" varbinddecodedstring="Indeterminate"/>
+                <decode varbindvalue="3" varbinddecodedstring="Critical"/>
+                <decode varbindvalue="4" varbinddecodedstring="Major"/>
+                <decode varbindvalue="5" varbinddecodedstring="Minor"/>
+                <decode varbindvalue="6" varbinddecodedstring="Warning"/>
+        </varbindsdecode>
 </event>
 <event>
 	<mask>
 		<maskelement>
 			<mename>id</mename>
-			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+			<mevalue>.1.3.6.1.4.1.2603.10</mevalue>
 		</maskelement>
 		<maskelement>
 			<mename>generic</mename>
 		</maskelement>
 		<maskelement>
 			<mename>specific</mename>
-			<mevalue>20</mevalue>
+			<mevalue>2</mevalue>
 		</maskelement>
 	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alWebUpdateTrap</uei>
-	<event-label>ALLOT-MIB defined trap event: alWebUpdateTrap</event-label>
+	<uei>uei.opennms.org/vendor/allot/traps/alAlarmFallingTrap/Cleared</uei>
+	<event-label>ALLOT-NX-MIB defined clear trap event: alAlarmFallingTrap</event-label>
 	<descr>
-&lt;p&gt;This trap will be sent for each attempted web update&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alCurrentVersion&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
-
-	alLastUpdateStatus&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		success(1)
-		generalError(2)
-		wrongVersion(3)
-		wrongFormat(4)
-		binaryFileCorrupted(5)
-		aSyncSwapRequest(6)
-		requestTimeout(7)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+<![CDATA[
+<p>Trap shall be sent for alarm clearing</p><table>
+	<tr><td><b>
+
+	alSeverity</b></td><td>
+	%parm[#1]%;</td><td><p>
+		unknown(0)
+		cleared(1)
+		indeterminate(2)
+		critical(3)
+		major(4)
+		minor(5)
+		warning(6)
+	</p></td></tr>
+	<tr><td><b>
+
+	alDescription</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alTimestamp</b></td><td>
+	%parm[#3]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alIndex</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
 	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alWebUpdateTrap trap received 
-			alCurrentVersion=%parm[#1]% 
-			alLastUpdateStatus=%parm[#2]%&lt;/p&gt;
-		</logmsg>
-	<severity>Normal</severity>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alAlarmFallingTrap trap received 
+			alSeverity=%parm[#1]% 
+			alDescription=%parm[#2]% 
+			alTimestamp=%parm[#3]% 
+			alIndex=%parm[#4]%</p>
+]]>		</logmsg>
+	<severity>Cleared</severity>
+        <varbindsdecode>
+                <parmid>parm[#1]</parmid>
+                <decode varbindvalue="0" varbinddecodedstring="Unknown"/>
+                <decode varbindvalue="1" varbinddecodedstring="Cleared"/>
+                <decode varbindvalue="2" varbinddecodedstring="Indeterminate"/>
+                <decode varbindvalue="3" varbinddecodedstring="Critical"/>
+                <decode varbindvalue="4" varbinddecodedstring="Major"/>
+                <decode varbindvalue="5" varbinddecodedstring="Minor"/>
+                <decode varbindvalue="6" varbinddecodedstring="Warning"/>
+        </varbindsdecode>
 </event>
-<!-- End of auto generated data from MIB: ALLOT-MIB -->
+<!-- End of auto generated data from MIB: ALLOT-NX-MIB -->
 </events>

opennms-base-assembly/src/main/filtered/etc/events/Allot.SM.events.xml

 			<mevalue>1</mevalue>
 		</maskelement>
 	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alSmpProvisionErrTrap</uei>
-	<event-label>ALLOT-SMP-SNMP-MIB defined trap event: alSmpProvisionErrTrap</event-label>
+	<uei>uei.opennms.org/vendor/allot/traps/alSMPProvisionErrTrap</uei>
+	<event-label>ALLOT-SMP-SNMP-MIB defined trap event: alSMPProvisionErrTrap</event-label>
 	<descr>
-&lt;p&gt;&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
+<![CDATA[
+<p></p><table>
+	<tr><td><b>
 
-	alIniatingProcess&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		fup(10)
+	alIniatingProcess</b></td><td>
+	%parm[#1]%;</td><td><p>
+		fastUpdates(10)
 		smf(50)
-		smfr(60)
-		qm(70)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
+		smfRouter(60)
+		quotaManagement(70)
+		eventDistributer(80)
+		highAvailability(90)
+		pcc(100)
+	</p></td></tr>
+	<tr><td><b>
 
-	alProvisioningType&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		startService(1)
-		stopService(2)
-		timeoutStopService(3)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
+	alProvisioningType</b></td><td>
+	%parm[#2]%;</td><td><p>
+		start(0)
+		stop(1)
+		timeout(2)
+	</p></td></tr>
+	<tr><td><b>
 
-	alProvisioningFailCause&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#3]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
+	alFailCause</b></td><td>
+	%parm[#3]%;</td><td><p>
 		unknownCause(0)
 		invalidParam(1)
 		subscriberLimit(2)
 		domainNotFound(3)
 		unknownSubscriber(4)
 		communicationError(5)
-		leaseTimeOut(6)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
+		subscriberTimeout(6)
+		smpNodeStartup(7)
+		heartbeatSwitchover(8)
+		passiveNodeNotSynched(9)
+		passiveNodeDown(10)
+		hostNoActive(11)
+		ipNotAssignedToHost(12)
+		unknownIp(14)
+	</p></td></tr>
+	<tr><td><b>
 
-	alSubscriberName&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#4]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
+	alSubscriberName</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr>
+	<tr><td><b>
 
-	alSubscriberIp&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#5]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+	alSubscriberIp</b></td><td>
+	%parm[#5]%;</td><td><p></p></td></tr></table>
+]]>
 	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alSmpProvisionErrTrap trap received 
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alSMPProvisionErrTrap trap received 
 			alIniatingProcess=%parm[#1]% 
 			alProvisioningType=%parm[#2]% 
-			alProvisioningFailCause=%parm[#3]% 
+			alFailCause=%parm[#3]% 
 			alSubscriberName=%parm[#4]% 
-			alSubscriberIp=%parm[#5]%&lt;/p&gt;
-		</logmsg>
+			alSubscriberIp=%parm[#5]%</p>
+]]>		</logmsg>
 	<severity>Warning</severity>
 </event>
 <event>
 			<mevalue>2</mevalue>
 		</maskelement>
 	</mask>
-	<uei>uei.opennms.org/vendor/allot/traps/alSmpMultiFailTrap</uei>
-	<event-label>ALLOT-SMP-SNMP-MIB defined trap event: alSmpMultiFailTrap</event-label>
+	<uei>uei.opennms.org/vendor/allot/traps/alSMPMultiFailTrap</uei>
+	<event-label>ALLOT-SMP-SNMP-MIB defined trap event: alSMPMultiFailTrap</event-label>
 	<descr>
-&lt;p&gt;&lt;/p&gt;&lt;table&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
+<![CDATA[
+<p></p><table>
+	<tr><td><b>
 
-	alIniatingProcess&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#1]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
-		fup(10)
+	alIniatingProcess</b></td><td>
+	%parm[#1]%;</td><td><p>
+		fastUpdates(10)
 		smf(50)
-		smfr(60)
-		qm(70)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;
-	&lt;tr&gt;&lt;td&gt;&lt;b&gt;
+		smfRouter(60)
+		quotaManagement(70)
+		eventDistributer(80)
+		highAvailability(90)
+		pcc(100)
+	</p></td></tr>
+	<tr><td><b>
 
-	alProvisioningFailCause&lt;/b&gt;&lt;/td&gt;&lt;td&gt;
-	%parm[#2]%;&lt;/td&gt;&lt;td&gt;&lt;p&gt;
+	alFailCause</b></td><td>
+	%parm[#2]%;</td><td><p>
 		unknownCause(0)
 		invalidParam(1)
 		subscriberLimit(2)
 		domainNotFound(3)
 		unknownSubscriber(4)
 		communicationError(5)
-		leaseTimeOut(6)
-	&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
+		subscriberTimeout(6)
+		smpNodeStartup(7)
+		heartbeatSwitchover(8)
+		passiveNodeNotSynched(9)
+		passiveNodeDown(10)
+		hostNoActive(11)
+		ipNotAssignedToHost(12)
+		unknownIp(14)
+	</p></td></tr></table>
+]]>
 	</descr>
-		<logmsg dest='logndisplay'>&lt;p&gt;
-			alSmpMultiFailTrap trap received 
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alSMPMultiFailTrap trap received 
 			alIniatingProcess=%parm[#1]% 
-			alProvisioningFailCause=%parm[#2]%&lt;/p&gt;
-		</logmsg>
+			alFailCause=%parm[#2]%</p>
+]]>		</logmsg>
 	<severity>Major</severity>
 </event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603.5.5.20</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>3</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alSmpHighAvailabilityTrap</uei>
+	<event-label>ALLOT-SMP-SNMP-MIB defined trap event: alSmpHighAvailabilityTrap</event-label>
+	<descr>
+<![CDATA[
+<p></p><table>
+	<tr><td><b>
+
+	alFailCause</b></td><td>
+	%parm[#1]%;</td><td><p>
+		unknownCause(0)
+		invalidParam(1)
+		subscriberLimit(2)
+		domainNotFound(3)
+		unknownSubscriber(4)
+		communicationError(5)
+		subscriberTimeout(6)
+		smpNodeStartup(7)
+		heartbeatSwitchover(8)
+		passiveNodeNotSynched(9)
+		passiveNodeDown(10)
+		hostNoActive(11)
+		ipNotAssignedToHost(12)
+		unknownIp(14)
+	</p></td></tr>
+	<tr><td><b>
+
+	alHighAvailabilityStatus</b></td><td>
+	%parm[#2]%;</td><td><p>
+		active(0)
+		passive(1)
+		dead(2)
+	</p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alSmpHighAvailabilityTrap trap received 
+			alFailCause=%parm[#1]% 
+			alHighAvailabilityStatus=%parm[#2]%</p>
+]]>		</logmsg>
+	<severity>Indeterminate</severity>
+</event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603.5.5.20</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>4</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alSMPSystemTrap</uei>
+	<event-label>ALLOT-SMP-SNMP-MIB defined trap event: alSMPSystemTrap</event-label>
+	<descr>
+<![CDATA[
+<p></p><table>
+	<tr><td><b>
+
+	alIniatingProcess</b></td><td>
+	%parm[#1]%;</td><td><p>
+		fastUpdates(10)
+		smf(50)
+		smfRouter(60)
+		quotaManagement(70)
+		eventDistributer(80)
+		highAvailability(90)
+		pcc(100)
+	</p></td></tr>
+	<tr><td><b>
+
+	alSysSubject</b></td><td>
+	%parm[#2]%;</td><td><p>
+		none(0)
+		pcrf(1)
+	</p></td></tr>
+	<tr><td><b>
+
+	alSysCause</b></td><td>
+	%parm[#3]%;</td><td><p>
+		lossOfCommunication(101)
+		communicationReestablished(102)
+	</p></td></tr>
+	<tr><td><b>
+
+	alSysInfo</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alSMPSystemTrap trap received 
+			alIniatingProcess=%parm[#1]% 
+			alSysSubject=%parm[#2]% 
+			alSysCause=%parm[#3]% 
+			alSysInfo=%parm[#4]%</p>
+]]>		</logmsg>
+	<severity>Indeterminate</severity>
+</event>
 <!-- End of auto generated data from MIB: ALLOT-SMP-SNMP-MIB -->
 </events>

opennms-base-assembly/src/main/filtered/etc/events/Allot.events.xml

+<events>
+<!-- Start of auto generated data from MIB: ALLOT-MIB -->
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>1</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alDeviceConfChangeTrap</uei>
+	<event-label>ALLOT-MIB defined trap event: alDeviceConfChangeTrap</event-label>
+	<descr>
+<![CDATA[
+<p>Is to be send when one of generic status
+variables is changed. The mentioned statuses are defined
+on the device level. The actual variable is defined via
+alGenericLastChangeVar</p><table>
+	<tr><td><b>
+
+	alGenericLastChangeVar</b></td><td>
+	%parm[#1]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alGenericLastChangeIntVal</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alGenericLastChangeStrVal</b></td><td>
+	%parm[#3]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alGenericLastChangeAddrVal</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alDeviceConfChangeTrap trap received 
+			alGenericLastChangeVar=%parm[#1]% 
+			alGenericLastChangeIntVal=%parm[#2]% 
+			alGenericLastChangeStrVal=%parm[#3]% 
+			alGenericLastChangeAddrVal=%parm[#4]%</p>
+]]>		</logmsg>
+	<severity>Normal</severity>
+</event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>2</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alCatalogConfChangeTrap</uei>
+	<event-label>ALLOT-MIB defined trap event: alCatalogConfChangeTrap</event-label>
+	<descr>
+<![CDATA[
+<p>Configuration change event on one of the catalogs</p><table>
+	<tr><td><b>
+
+	alCatalogLastCommand</b></td><td>
+	%parm[#1]%;</td><td><p>
+		create(1)
+		update(2)
+		delete(3)
+	</p></td></tr>
+	<tr><td><b>
+
+	alCatalogLastChangeOrigin</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alCatalogConfChangeTrap trap received 
+			alCatalogLastCommand=%parm[#1]% 
+			alCatalogLastChangeOrigin=%parm[#2]%</p>
+]]>		</logmsg>
+	<severity>Normal</severity>
+</event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>3</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alLineConfChangeTrap</uei>
+	<event-label>ALLOT-MIB defined trap event: alLineConfChangeTrap</event-label>
+	<descr>
+<![CDATA[
+<p>Configuration change occurs on one of the lines</p><table>
+	<tr><td><b>
+
+	alLineLastCommand</b></td><td>
+	%parm[#1]%;</td><td><p>
+		create(1)
+		update(2)
+		delete(3)
+	</p></td></tr>
+	<tr><td><b>
+
+	alLineLastChangeOrigin</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alLineConfChangeTrap trap received 
+			alLineLastCommand=%parm[#1]% 
+			alLineLastChangeOrigin=%parm[#2]%</p>
+]]>		</logmsg>
+	<severity>Normal</severity>
+</event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>4</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alPipeConfChangeTrap</uei>
+	<event-label>ALLOT-MIB defined trap event: alPipeConfChangeTrap</event-label>
+	<descr>
+<![CDATA[
+<p>The configuration change occurs on one of the pipes</p><table>
+	<tr><td><b>
+
+	alPipeLastCommand</b></td><td>
+	%parm[#1]%;</td><td><p>
+		create(1)
+		update(2)
+		delete(3)
+	</p></td></tr>
+	<tr><td><b>
+
+	alPipeLastChangeOrigin</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alPipeConfChangeTrap trap received 
+			alPipeLastCommand=%parm[#1]% 
+			alPipeLastChangeOrigin=%parm[#2]%</p>
+]]>		</logmsg>
+	<severity>Normal</severity>
+</event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>5</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alVCConfChangeTrap</uei>
+	<event-label>ALLOT-MIB defined trap event: alVCConfChangeTrap</event-label>
+	<descr>
+<![CDATA[
+<p>The configuration change occurs on one of the VCs</p><table>
+	<tr><td><b>
+
+	alVCLastCommand</b></td><td>
+	%parm[#1]%;</td><td><p>
+		create(1)
+		update(2)
+		delete(3)
+	</p></td></tr>
+	<tr><td><b>
+
+	alVCLastChangeOrigin</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alVCConfChangeTrap trap received 
+			alVCLastCommand=%parm[#1]% 
+			alVCLastChangeOrigin=%parm[#2]%</p>
+]]>		</logmsg>
+	<severity>Normal</severity>
+</event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alAlertRisingTrap</uei>
+	<event-label>ALLOT-MIB defined trap event: alAlertRisingTrap</event-label>
+	<descr>
+<![CDATA[
+<p>One of the alerts crossed the threshold</p><table>
+	<tr><td><b>
+
+	alAlertConfVariable</b></td><td>
+	%parm[#1]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alAlertConfValue</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alAlertConfThreshold</b></td><td>
+	%parm[#3]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alAlertConfRegInterval</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alAlertRisingTrap trap received 
+			alAlertConfVariable=%parm[#1]% 
+			alAlertConfValue=%parm[#2]% 
+			alAlertConfThreshold=%parm[#3]% 
+			alAlertConfRegInterval=%parm[#4]%</p>
+]]>		</logmsg>
+	<severity>Warning</severity>
+</event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>7</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alAlertFallingTrap</uei>
+	<event-label>ALLOT-MIB defined trap event: alAlertFallingTrap</event-label>
+	<descr>
+<![CDATA[
+<p>The alert' value returned to the normal level</p><table>
+	<tr><td><b>
+
+	alAlertConfVariable</b></td><td>
+	%parm[#1]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alAlertConfValue</b></td><td>
+	%parm[#2]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alAlertConfNormal</b></td><td>
+	%parm[#3]%;</td><td><p></p></td></tr>
+	<tr><td><b>
+
+	alAlertConfUnRegInterval</b></td><td>
+	%parm[#4]%;</td><td><p></p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alAlertFallingTrap trap received 
+			alAlertConfVariable=%parm[#1]% 
+			alAlertConfValue=%parm[#2]% 
+			alAlertConfNormal=%parm[#3]% 
+			alAlertConfUnRegInterval=%parm[#4]%</p>
+]]>		</logmsg>
+	<severity>Cleared</severity>
+</event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>8</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alDosAttackOnTrap</uei>
+	<event-label>ALLOT-MIB defined trap event: alDosAttackOnTrap</event-label>
+	<descr>
+<![CDATA[
+<p>DOS attack is identified</p><table>
+	<tr><td><b>
+
+	alDOSAttackStatus</b></td><td>
+	%parm[#1]%;</td><td><p>
+		active(1)
+		finish(2)
+	</p></td></tr></table>
+]]>
+	</descr>
+		<logmsg dest='logndisplay'><![CDATA[<p>
+			alDosAttackOnTrap trap received 
+			alDOSAttackStatus=%parm[#1]%</p>
+]]>		</logmsg>
+	<severity>Major</severity>
+</event>
+<event>
+	<mask>
+		<maskelement>
+			<mename>id</mename>
+			<mevalue>.1.3.6.1.4.1.2603</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>generic</mename>
+			<mevalue>6</mevalue>
+		</maskelement>
+		<maskelement>
+			<mename>specific</mename>
+			<mevalue>9</mevalue>
+		</maskelement>
+	</mask>
+	<uei>uei.opennms.org/vendor/allot/traps/alDosAttackOffTrap</uei>
+	<event-label>ALLOT-MIB defined trap event: alDosAttackOffTrap</event-label>
+	<descr>
+<![CDATA[
+<p>DOS attack is over</p><table>
+	<tr><td><b>