|
From: <rm...@hy...> - 2007-03-29 04:28:40
|
Author: rmorgan Date: 2007-03-28 20:28:35 -0800 (Wed, 28 Mar 2007) New Revision: 3953 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3953 Modified: branches/HQ_3_0/plugins/xml/resin-plugin.xml Log: Upgrade Resin plugin for Resin 3.0.20+ [merge from trunk] Modified: branches/HQ_3_0/plugins/xml/resin-plugin.xml =================================================================== --- branches/HQ_3_0/plugins/xml/resin-plugin.xml 2007-03-29 04:18:07 UTC (rev 3952) +++ branches/HQ_3_0/plugins/xml/resin-plugin.xml 2007-03-29 04:28:35 UTC (rev 3953) @@ -7,10 +7,10 @@ Kit or the Hyperic Client Development Kit - this is merely considered normal use of the program, and does *not* fall under the heading of "derived work". - + Copyright (C) [2004, 2005, 2006], Hyperic, Inc. This file is part of HQ. - + HQ is free software; you can redistribute it and/or modify it under the terms version 2 of the GNU General Public License as published by the Free Software Foundation. This program is distributed @@ -18,7 +18,7 @@ even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -26,212 +26,289 @@ --> <plugin name="resin"> - <classpath> - <include name="pdk/lib/mx4j"/> - </classpath> + <classpath> + <include name="pdk/lib/mx4j"/> + </classpath> - <filter name="template" - value="${OBJECT_NAME}:${alias}"/> + <filter name="template" + value="${OBJECT_NAME}:${alias}"/> - <filter name="THREAD_OBJ" - value="resin:type=ThreadPool"/> + <!-- Generic 3.x type is known to work with 3.0.20, 3.0.21, and 3.0.22. --> + <server name="Resin" + version="3.x" + description="Resin 3.x"> - <metrics name="port"> - <metric name="Availability" - template="${OBJECT_NAME}:Active" - indicator="true"/> + <property name="OBJECT_NAME" + value="resin:type=Server"/> - <metric name="Total Connection Count" - collectionType="trendsup" - indicator="true"/> + <property name="PROC_MAIN_CLASS" + value="com.caucho.server.resin.Resin"/> - <metric name="Active Connection Count" - indicator="true"/> + <property name="PROC_HOME_PROPERTY" + value="resin.home"/> - <metric name="Thread Count" - collectionType="trendsup" - indicator="true"/> + <!-- Availability mappings --> + <property name="State.active" value="1.0"/> + <property name="State.stopped" value="0.0"/> + <property name="State.stopped-lazy" value="-0.01"/> - <metric name="Active Thread Count" - indicator="true"/> + <plugin type="autoinventory" + class="org.hyperic.hq.product.jmx.MxServerDetector"/> - <metric name="Idle Thread Count"/> - </metrics> + <plugin type="control" + class="org.hyperic.hq.product.jmx.MxControlPlugin"/> - <!-- Only known to work with 3.0.12. --> - <server name="Resin" - version="3.x" - description="Resin 3.x"> + <plugin type="measurement" + class="org.hyperic.hq.product.jmx.MxMeasurementPlugin"/> - <property name="OBJECT_NAME" - value="resin:type=ResinServer"/> + <config> + <option name="jmx.url" + description="JMX URL to MBeanServer" + default="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"/> - <property name="PROC_HOME_PROPERTY" - value="resin.home"/> + <option name="jmx.username" + description="JMX username" + optional="true" + default="system"/> - <!-- Availability mappings --> - <property name="State.active" value="1.0"/> - <property name="State.stopped" value="0.0"/> - <property name="State.stopped-lazy" value="-0.01"/> + <option name="jmx.password" + description="JMX password" + optional="true" + default="manager" + type="secret"/> + </config> - <plugin type="autoinventory" - class="org.hyperic.hq.product.jmx.MxServerDetector"/> + <properties> + <property name="RedeployMode" description="Redeploy Mode"/> + <property name="Id" description="Server Id"/> + <property name="SelectManagerEnabled" description="Select Manager Enabled"/> + <property name="StartupMode" description="Startup Mode"/> + </properties> - <plugin type="control" - class="org.hyperic.hq.product.jmx.MxControlPlugin"/> + <actions include="stop,start,update,restart"/> - <plugin type="measurement" - class="org.hyperic.hq.product.jmx.MxMeasurementPlugin"/> + <metric name="Availability" + template="${OBJECT_NAME}:State" + indicator="true"/> - <config> - <option name="jmx.url" - description="JMX URL to MBeanServer" - default="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"/> + <metric name="Invocation Cache Hit Count" + alias="InvocationCacheHitCountTotal" + collectionType="trendsup"/> - <option name="jmx.username" - description="JMX username" - optional="true" - default="system"/> + <metric name="Invocation Cache Miss Count" + alias="InvocationCacheMissCountTotal" + collectionType="trendsup"/> - <option name="jmx.password" - description="JMX password" - optional="true" - default="manager" - type="secret"/> - </config> + <metric name="Keepalive Count" + alias="KeepaliveCountTotal" + collectionType="trendsup"/> - <properties> - <property name="ResinHome" description="Resin Home"/> - <property name="ServerRoot" description="Server Root"/> - <property name="ServerId" description="Server Id"/>> - </properties> + <metric name="Request Count" + alias="RequestCountTotal" + collectionType="trendsup" + indicator="true"/> - <actions include="restart"/> + <metric name="Request Read Bytes" + alias="RequestReadBytesTotal" + collectionType="trendsup" + units="b" + indicator="true"/> - <metric name="Availability" - template="${OBJECT_NAME}:State" - indicator="true"/> + <metric name="Request Time" + alias="RequestTimeTotal" + collectionType="trendsup" + units="ms"/> - <metric name="Thread Count" - template="${THREAD_OBJ}:${alias}" - indicator="true"/> + <metric name="Request Write Bytes" + alias="RequestWriteBytesTotal" + collectionType="trendsup" + units="b" + indicator="true"/> - <metric name="Thread Max" - template="${THREAD_OBJ}:${alias}" - type="static"/> + <metric name="Runtime Memory" + units="b"/> - <metric name="Spare Thread Min" - template="${THREAD_OBJ}:${alias}"/> + <metric name="Runtime Memory Free" + units="b"/> - <metric name="Idle Thread Count" - template="${THREAD_OBJ}:${alias}"/> + <metric name="Thread Active" + alias="ThreadActiveCount" + indicator="true"/> - <metric name="Active Thread Count" - template="${THREAD_OBJ}:${alias}" - indicator="true"/> + <metric name="Thread Keepalive" + alias="ThreadKeepaliveCount"/> - <service name="Multiple Host Port"> - <property name="OBJECT_NAME" - value="resin:type=Port,Server=*,port=*"/> - <config> - <option name="Server" - description="Server name"/> - <option name="port" - description="Port"/> - </config> + <service name="Port"> + <property name="OBJECT_NAME" + value="resin:type=Port,name=*"/> + <config> + <option name="name" + description="Port name"/> + </config> - <properties> - <property name="ProtocolName" description="ProtocolName"/> - </properties> + <properties> + <property name="Address" description="Address"/> + <property name="ProtocolName" description="Protocol"/> + <property name="ConnectionMax" description="Max Connections"/> + <property name="KeepAliveMax" description="Max Keepalives"/> + <property name="Port" description="Port"/> + <property name="SSL" description="SSL Enabled"/> + <property name="SelectKeepaliveCount" + description="Select Keepalive"/> + </properties> - <plugin type="autoinventory"/> + <plugin type="autoinventory"/> - <metrics include="port"/> - </service> + <!-- Availability mappings --> + <property name="State.active" value="1.0"/> + <property name="State.stopped" value="0.0"/> + <property name="State.stopped-lazy" value="-0.01"/> - <service name="Single Host Port"> - <property name="OBJECT_NAME" - value="resin:type=Port,Server=*,port=*,host=*"/> - <config> - <option name="Server" - description="Server name"/> - <option name="port" - description="Port"/> - <option name="host" - description="Host"/> - </config> + <metric name="Availability" + template="${OBJECT_NAME}:State" + indicator="true"/> - <properties> - <property name="ProtocolName" description="ProtocolName"/> - </properties> + <metric name="Client Disconnect Count" + alias="ClientDisconnectCountTotal" + collectionType="trendsup"/> - <plugin type="autoinventory"/> + <metric name="Keepalive Count" + alias="KeepaliveCountTotal" + collectionType="trendsup"/> - <metrics include="port"/> - </service> + <metric name="Read Bytes" + alias="ReadBytesTotal" + collectionType="trendsup" + units="b" + indicator="true"/> - <service name="Connection Pool"> - <property name="OBJECT_NAME" - value="resin:type=ConnectionPool,name=*"/> - <config> - <option name="name" - description="Connection Pool name"/> - </config> + <metric name="Write Bytes" + alias="WriteBytesTotal" + collectionType="trendsup" + units="b" + indicator="true"/> - <plugin type="autoinventory"/> + <metric name="Request Count" + alias="RequestCountTotal" + collectionType="trendsup" + indicator="true"/> - <!-- No state attribute --> - <metric name="Availability" - indicator="true"/> + <metric name="Request Time" + alias="RequestTimeTotal" + collectionType="trendsup" + units="ms"/> - <metric name="Connection Count" - collectionType="trendsup" - indicator="true"/> + <metric name="Thread Active Count"/> - <metric name="Active Connection Count" - indicator="true"/> + <metric name="Thread Count"/> - <metric name="Idle Connection Count"/> + <metric name="Thread Idle Count"/> - </service> + <metric name="Thread Keepalive Count"/> - <service name="Webapp"> - <property name="OBJECT_NAME" - value="resin:type=WebApp,Server=*,Host=*,name=*"/> + </service> - <!-- Availability mappings --> - <property name="State.active" value="1.0"/> - <property name="State.stopped-lazy" value="-0.01"/> + <service name="Connection Pool"> + <property name="OBJECT_NAME" + value="resin:type=ConnectionPool,Host=*,WebApp=*,name=*"/> + <config> + <option name="Host" + description="Connection Pool Host"/> + <option name="WebApp" + description="Connection Pool WebApp"/> + <option name="name" + description="Connection Pool name"/> + </config> - <config> - <option name="Server" - description="Server name"/> - <option name="Host" - description="Host"/> - <option name="name" - description="name"/> - </config> + <properties> + <property name="MaxConnections" description="Max Connections"/> + <property name="MaxActiveTime" description="Max Active Time"/> + <property name="MaxCreateConnections" description="Max Create Connections"/> + <property name="MaxIdleTime" description="Max Idle Time"/> + <property name="MaxOverflowConnections" description="Max Overflow Connections"/> + <property name="MaxPoolTime" description="Max Pool Time"/> + </properties> - <plugin type="autoinventory"/> + <plugin type="autoinventory"/> - <metric name="Availability" - indicator="true"/> + <!-- No state attribute, use existance of MBean --> + <metric name="Availability" + indicator="true"/> - <metric name="Active Session Count" - indicator="true"/> + <metric name="Connection Active Count" + indicator="true"/> - <plugin type="control"/> + <metric name="Connection Count" + indicator="true"/> - <actions include="start,stop,restart"/> + <metric name="Connection Idle Count" + indicator="true"/> - </service> + </service> - <!-- Temporary due to HHQ-708 --> - <service name="Port"/> + <service name="Webapp"> + <property name="OBJECT_NAME" + value="resin:type=WebApp,Host=*,name=*"/> - </server> + <!-- Availability mappings --> + <property name="State.active" value="1.0"/> + <property name="State.stopped" value="0.0"/> + <property name="State.stopped-lazy" value="-0.01"/> - <help name="Resin 3.x"> + <config> + <option name="Host" + description="Host"/> + <option name="WebApp" + description="WebApp"/> + <option name="name" + description="name"/> + </config> + + <properties> + <property name="RedeployMode" description="Redeploy Mode"/> + <property name="StartupMode" description="Startup Mode"/> + </properties> + + <plugin type="autoinventory"/> + + <metric name="Availability" + template="${OBJECT_NAME}:State" + indicator="true"/> + + <metric name="Client Disconnect Count" + alias="ClientDisconnectCountTotal"/> + + <metric name="Request Count" + alias="RequestCountTotal" + collectionType="trendsup" + indicator="true"/> + + <metric name="Request Read Bytes" + alias="RequestReadBytesTotal" + collectionType="trendsup" + units="b" + indicator="true"/> + + <metric name="Request Time" + alias="RequestTimeTotal" + collectionType="trendsup" + units="ms"/> + + <metric name="Request Write Bytes" + alias="RequestWriteBytesTotal" + collectionType="trendsup" + units="b" + indicator="true"/> + + <plugin type="control"/> + + <actions include="start,stop,update,restart"/> + + </service> + + </server> + + <help name="Resin 3.x"> <![CDATA[ <p> <h3>Configure Resin ${product.version} for Monitoring</h3> @@ -263,19 +340,19 @@ To enable monitoring and management of Resin, set this property when starting the server: </p> - + <p> <code> com.sun.management.jmxremote.port=portNum </code> </p> - + <p> Where portNum is the port number through which you want to enable the JMX/RMI - connections. Within Resin's httpd.sh script there is an args parameter that + connections. Within Resin's httpd.sh script there is an args parameter that can be used to pass additional arguments to the JVM when starting up. For example: - </p> + </p> <p> <code> @@ -283,6 +360,6 @@ </code> </p> ]]> - </help> + </help> </plugin> |