[jboss-cvs] JBossAS SVN: r111610 - in branches/snmp4j-int/varia/src/resources/services/snmp: deploy and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 13 17:07:08 EDT 2011
Author: thauser at redhat.com
Date: 2011-06-13 17:07:08 -0400 (Mon, 13 Jun 2011)
New Revision: 111610
Modified:
branches/snmp4j-int/varia/src/resources/services/snmp/config/Attributes.xsd
branches/snmp4j-int/varia/src/resources/services/snmp/config/Notification.xsd
branches/snmp4j-int/varia/src/resources/services/snmp/deploy/META-INF/jboss-service.xml
branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.xml
branches/snmp4j-int/varia/src/resources/services/snmp/deploy/notifications.xml
Log:
adding elements to schemas; creating correct OIDs; add mibresname
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/config/Attributes.xsd
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/config/Attributes.xsd 2011-06-13 21:06:01 UTC (rev 111609)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/config/Attributes.xsd 2011-06-13 21:07:08 UTC (rev 111610)
@@ -31,6 +31,7 @@
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/>
<xsd:attribute name="oid-prefix" type="xsd:string"/>
+ <xsd:attribute name="definition-name" type="xsd:string"/>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/config/Notification.xsd
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/config/Notification.xsd 2011-06-13 21:06:01 UTC (rev 111609)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/config/Notification.xsd 2011-06-13 21:07:08 UTC (rev 111610)
@@ -21,6 +21,7 @@
3. Enterprise OID
4. The trap payload comprised of notification variables mapped
to specific OIDs.
+ 5. The name of the Notification to put into the generated MIB (optional)
</xsd:documentation>
</xsd:annotation>
@@ -31,9 +32,11 @@
<xsd:complexType>
<xsd:sequence>
<xsd:element name="notification-type" type="xsd:string"/>
+ <xsd:element name="name" type="xsd:string" minOccurs="0"/>
<xsd:element name="generic" type="xsd:integer" />
<xsd:element name="specific" type="xsd:integer" />
- <xsd:element name="enterprise" type="xsd:string" />
+ <xsd:element name="enterprise" type="xsd:string"/>
+ <xsd:element name="enterpriseName" type="xsd:string" minOccurs="0"/>
<xsd:element name="inform" type="xsd:boolean" />
<xsd:element name="securityName" type="xsd:string" />
<xsd:element name="var-bind-list">
@@ -57,4 +60,4 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/deploy/META-INF/jboss-service.xml
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/deploy/META-INF/jboss-service.xml 2011-06-13 21:06:01 UTC (rev 111609)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/deploy/META-INF/jboss-service.xml 2011-06-13 21:07:08 UTC (rev 111610)
@@ -96,6 +96,7 @@
<attribute name="NotificationMapResName">/notifications.xml</attribute>
<attribute name="ManagersResName">/managers.xml</attribute>
<attribute name="UsersResName">/users.xml</attribute>
+ <attribute name="MibResName">/home/yyz/thauser/JBOSS-AS-MIB.mib</attribute>
<attribute name="HeartBeatPeriod">0</attribute>
<attribute name="BindAddress">
<!-- Get the interface from the ServiceBindingManager -->
@@ -144,7 +145,7 @@
name="jboss.jmx:name=SnmpAgent,service=MIB2SystemGroup">
<attribute name="SysLocation">In The Matrix</attribute>
- <attribute name="SysDescr">Mobicents Sip Servlets</attribute>
+ <attribute name="SysDescr">JBoss AS</attribute>
<attribute name="SysContact">Red Hat</attribute>
<!-- EAP IS 1, EPP is 2, SOAP is 3, ... JBCP is 9, JBCP Sip Servlets is 9.1 -->
<attribute name="Product">.1</attribute>
@@ -156,8 +157,7 @@
</depends>
</mbean>
- <!-- Used for internal testing - ignore
+<!-- Used for internal testing - ignore-->
<mbean code="org.jboss.jmx.adaptor.snmp.test.NotificationProducerService"
name="jboss.jmx:name=SnmpAgent,service=notification,type=producer"/>
- -->
</service>
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.xml
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.xml 2011-06-13 21:06:01 UTC (rev 111609)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/deploy/attributes.xml 2011-06-13 21:07:08 UTC (rev 111610)
@@ -12,32 +12,32 @@
<attribute-mappings>
<!-- basic system information -->
- <mbean name="jboss.system:type=ServerInfo" oid-prefix="1.3.6.1.4.1.2312.100.1">
- <attribute name="ActiveThreadCount" oid=".1"/>
+ <mbean name="jboss.system:type=ServerInfo" oid-prefix="1.3.6.1.4.1.2312.100.1.1" definition-name="jbossAsObjects">
+ <attribute name="ActiveThreadCount" oid=".1.0"/>
<attribute name="FreeMemory" oid=".2"/>
<attribute name="MaxMemory" oid=".3"/>
</mbean>
<!-- tomcat global http request processing -->
<mbean name="jboss.web:name=http-0.0.0.0-8080,type=GlobalRequestProcessor">
- <attribute name="requestCount" oid=".1.3.6.1.4.1.2312.100.1.5"/>
+ <attribute name="requestCount" oid=".1.3.6.1.4.1.2312.100.1.1.5"/>
</mbean>
<!-- Tx Manager statistics -->
- <mbean name="jboss:service=TransactionManager">
- <attribute name="CommitCount" oid=".1.3.6.1.4.1.2312.100.1.6"/>
- <attribute name="RollbackCount" oid=".1.3.6.1.4.1.2312.100.1.7"/>
- <attribute name="TransactionCount" oid=".1.3.6.1.4.1.2312.100.1.8"/>
- </mbean>
+<!-- <mbean name="jboss:service=TransactionManager">
+ <attribute name="CommitCount" oid=".1.3.6.1.4.1.2312.100.1.1.6.0"/>
+ <attribute name="RollbackCount" oid=".1.3.6.1.4.1.2312.100.1.1.7.0"/>
+ <attribute name="TransactionCount" oid=".1.3.6.1.4.1.2312.100.1.1.8.0"/>
+ </mbean>-->
<!-- DefaultDS statistics -->
- <mbean name="jboss.jca:name=DefaultDS,service=ManagedConnectionPool" oid-prefix="1.3.6.1.4.1.2312.100.1">
+ <mbean name="jboss.jca:name=DefaultDS,service=ManagedConnectionPool" oid-prefix="1.3.6.1.4.1.2312.100.1.1">
<attribute name="InUseConnectionCount" oid=".9"/>
<attribute name="MaxConnectionsInUseCount" oid=".10"/>
</mbean>
<!-- system information group see RFC-1213 -->
- <mbean name="jboss.jmx:name=SnmpAgent,service=MIB2SystemGroup" oid-prefix="1.3.6.1.2.1.1">
+ <mbean name="jboss.jmx:name=SnmpAgent,service=MIB2SystemGroup" oid-prefix="1.3.6.1.2.1.1" definition-name="system">
<attribute name="SysDescr" oid=".1" mode="rw"/> <!-- can be modified over snmp -->
<attribute name="SysObjectId" oid=".2"/>
<attribute name="SysUpTime" oid=".3"/>
Modified: branches/snmp4j-int/varia/src/resources/services/snmp/deploy/notifications.xml
===================================================================
--- branches/snmp4j-int/varia/src/resources/services/snmp/deploy/notifications.xml 2011-06-13 21:06:01 UTC (rev 111609)
+++ branches/snmp4j-int/varia/src/resources/services/snmp/deploy/notifications.xml 2011-06-13 21:07:08 UTC (rev 111610)
@@ -24,13 +24,15 @@
<mapping>
<notification-type>jboss.snmp.agent.heartbeat</notification-type>
- <generic>3</generic>
- <specific>0</specific>
- <enterprise>1.2.3.4.5.6.7</enterprise>
+ <name>jbossAsHeartbeatNotification</name>
+ <generic>0</generic>
+ <specific>3</specific>
+ <enterpriseName>jbossAsTraps</enterpriseName>
+ <enterprise>1.3.6.1.4.1.2312.100.1.2</enterprise>
<var-bind-list wrapper-class="org.jboss.jmx.adaptor.snmp.agent.NotificationWrapperSupport">
<var-bind>
<tag>a:uptime</tag>
- <oid>1.2.3.4.5.6.7.5</oid>
+ <oid>1.3.6.1.2.1.1.3</oid>
</var-bind>
<var-bind>
<tag>a:trapCount</tag>
@@ -41,7 +43,7 @@
<oid>1.2.3.4.5.6.7.7</oid>
</var-bind>
<var-bind>
- <tag>n:sequenceNumber</tag>
+ <tag>n:sequenceNumber</tag> <!-- todo: convert all of these to correct OIDs. -->
<oid>1.2.3.4.5.6.7.8</oid>
</var-bind>
</var-bind-list>
@@ -49,9 +51,10 @@
<mapping>
<notification-type>jboss.snmp.agent.coldstart</notification-type>
+ <name>jbossAsColdstartNotification</name>
<generic>0</generic>
- <specific>0</specific>
- <enterprise>1.2.3.4.5.6.7</enterprise>
+ <specific>1</specific>
+ <enterprise>1.3.6.1.4.1.2312.100.1.2</enterprise>
<!--inform>true</inform-->
<security-name>TEST</security-name>
<var-bind-list wrapper-class="org.jboss.jmx.adaptor.snmp.agent.NotificationWrapperSupport">
@@ -69,9 +72,10 @@
<!-- Used for internal testing -ignore -->
<mapping>
<notification-type>jboss.snmp.agent.v1test</notification-type>
- <generic>10</generic>
- <specific>0</specific>
- <enterprise>1.2.3.4.5.6.7</enterprise>
+ <name>jbossV1testNotification</name>
+ <generic>0</generic>
+ <specific>10</specific>
+ <enterprise>1.3.6.1.4.1.2312.100.1.2</enterprise>
<var-bind-list wrapper-class="org.jboss.jmx.adaptor.snmp.agent.NotificationWrapperSupport">
<var-bind>
<tag>a:startTime</tag>
@@ -86,9 +90,10 @@
<mapping>
<notification-type>jboss.snmp.agent.v2test</notification-type>
- <generic>11</generic>
- <specific>0</specific>
- <enterprise>1.2.3.4.5.6.7</enterprise>
+ <name>jbossV2notificationTest</name>
+ <generic>0</generic>
+ <specific>11</specific>
+ <enterprise>1.3.6.1.4.1.2312.100.1.2</enterprise>
<var-bind-list wrapper-class="org.jboss.jmx.adaptor.snmp.agent.NotificationWrapperSupport">
<var-bind>
<tag>a:startTime</tag>
@@ -103,9 +108,10 @@
<mapping>
<notification-type>jboss.snmp.agent.v3test</notification-type>
- <generic>12</generic>
- <specific>0</specific>
- <enterprise>1.2.3.4.5.6.7</enterprise>
+ <name>jbossV3notificationTest</name>
+ <generic>0</generic>
+ <specific>12</specific>
+ <enterprise>1.3.6.1.4.1.2312.100.1.2</enterprise>
<var-bind-list wrapper-class="org.jboss.jmx.adaptor.snmp.agent.NotificationWrapperSupport">
<var-bind>
<tag>a:startTime</tag>
More information about the jboss-cvs-commits
mailing list