You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ec...@apache.org on 2008/02/29 22:05:10 UTC
svn commit: r632440 - in /geronimo/server/branches/2.1/plugins/monitoring:
mconsole-ear/src/main/resources/MonitoringClientDB.sql
mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
Author: ecraig
Date: Fri Feb 29 13:05:07 2008
New Revision: 632440
URL: http://svn.apache.org/viewvc?rev=632440&view=rev
Log:
GERONIMO-3833
Removed hard coded paths from .sql file in monitoring console
Modified:
geronimo/server/branches/2.1/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql
geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql?rev=632440&r1=632439&r2=632440&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-ear/src/main/resources/MonitoringClientDB.sql Fri Feb 29 13:05:07 2008
@@ -1,20 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
/*
* server_id ID number for server - auto generated
* enabled Enable/disable this server - defaults to 1
@@ -110,109 +93,6 @@
graph_ids LONG VARCHAR NOT NULL,
added TIMESTAMP NOT NULL,
modified TIMESTAMP NOT NULL
-);
-INSERT INTO servers VALUES(DEFAULT, DEFAULT, 'Local host', '127.0.0.1', 'system', 'manager', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO graphs VALUES(
- DEFAULT,
- DEFAULT,
- DEFAULT,
- 'TomcatWebBytesSentSecond60Min',
- 'KiloBytes sent per second from the Tomcat Web Connector',
- DEFAULT,
- 'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car,j2eeType=GBean,name=TomcatWebConnector',
- 'D',
- 'Bytes Sent',
- '/1024/',
- 'D',
- 'time',
- 'Tomcat Web KBytes/Sec Sent',
- 'KBps',
- 500.0,
- 1024.0,
- DEFAULT,
- DEFAULT,
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP
-);
-INSERT INTO graphs VALUES(
- DEFAULT,
- DEFAULT,
- DEFAULT,
- 'TomcatWebBytesReceivedSecond60Min',
- 'KiloBytes received per second from the Tomcat Web Connector',
- DEFAULT,
- 'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car,j2eeType=GBean,name=TomcatWebConnector',
- 'D',
- 'Bytes Received',
- '/1024/',
- 'D',
- 'time',
- 'Tomcat Web KBytes/Sec Received',
- 'KBps',
- 500.0,
- 1024.0,
- DEFAULT,
- DEFAULT,
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP
-);
-INSERT INTO graphs VALUES(
- DEFAULT,
- DEFAULT,
- DEFAULT,
- 'TomcatWebRequestTimeSecond60Min',
- 'Request processing time over time from the Tomcat Web Connector',
- DEFAULT,
- 'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car,j2eeType=GBean,name=TomcatWebConnector',
- 'D',
- 'Request Time CurrentTime',
- '/',
- 'D',
- 'time',
- 'Tomcat Request Time/Second',
- 'RequestTime',
- 500.0,
- 1024.0,
- DEFAULT,
- DEFAULT,
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP
-);
-INSERT INTO graphs VALUES(
- DEFAULT,
- DEFAULT,
- DEFAULT,
- 'TomcatWebErrorCountSecond60Min',
- 'Error count over time from the Tomcat Web Connector',
- DEFAULT,
- 'geronimo:J2EEServer=geronimo,ServiceModule=org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car,j2eeType=GBean,name=TomcatWebConnector',
- 'D',
- 'Error Count',
- '/',
- 'D',
- 'time',
- 'Error Count/Sec',
- 'Errors',
- 500.0,
- 1024.0,
- DEFAULT,
- DEFAULT,
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP
-);
-INSERT INTO views VALUES(
- DEFAULT,
- DEFAULT,
- 'Tomcat Web Connector 60 mins',
- 'Tomcat Web Connector 60 minute graphs',
- 4,
- '0,1,2,3,',
- CURRENT_TIMESTAMP,
- CURRENT_TIMESTAMP
);
Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java?rev=632440&r1=632439&r2=632440&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java Fri Feb 29 13:05:07 2008
@@ -46,7 +46,7 @@
public class MRCConnector {
- private static final String PATH = "geronimo:ServiceModule=org.apache.geronimo.plugins.monitoring/agent-car-jmx/2.1-SNAPSHOT/car,J2EEServer=geronimo,name=MasterRemoteControlJMX,j2eeType=GBean";
+ private static final String PATH = "geronimo:ServiceModule=org.apache.geronimo.plugins.monitoring/agent-car-jmx/2.1.1-SNAPSHOT/car,J2EEServer=geronimo,name=MasterRemoteControlJMX,j2eeType=GBean";
private static MBeanServerConnection mbServerConn;
private MasterRemoteControlRemote mrc = null;
private int Protocol = 0;