hyperic-hq-discuss — Hyperic HQ SVN Commits

[Hyperic-hq-discuss] hq r14511 - trunk/etc

[<bo...@hy...>]

Author: bob
Date: 2010-04-16 01:03:56 -0700 (Fri, 16 Apr 2010)
New Revision: 14511
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14511

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1410

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-04-16 06:02:23 UTC (rev 14510)
+++ trunk/etc/version.properties	2010-04-16 08:03:56 UTC (rev 14511)
@@ -1,3 +1,3 @@
-#Thu Apr 15 00:17:41 PDT 2010
+#Fri Apr 16 00:20:16 PDT 2010
 version=4.3.0
-build=1409
+build=1410

[Hyperic-hq-discuss] hq r14510 - trunk/src/org/hyperic/hq/product/servlet/client

[<pn...@hy...>]

Author: pnguyen
Date: 2010-04-15 23:02:23 -0700 (Thu, 15 Apr 2010)
New Revision: 14510
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14510

Modified:
   trunk/src/org/hyperic/hq/product/servlet/client/JMXProtocolAjp.java
Log:
[HHQ-3880] Set the default socket timeout to be 60 seconds. Allow the socket timeout to be configurable through a system property.

Modified: trunk/src/org/hyperic/hq/product/servlet/client/JMXProtocolAjp.java
===================================================================
--- trunk/src/org/hyperic/hq/product/servlet/client/JMXProtocolAjp.java	2010-04-15 23:43:07 UTC (rev 14509)
+++ trunk/src/org/hyperic/hq/product/servlet/client/JMXProtocolAjp.java	2010-04-16 06:02:23 UTC (rev 14510)
@@ -6,7 +6,7 @@
  * normal use of the program, and does *not* fall under the heading of
  * "derived work".
  * 
- * Copyright (C) [2004, 2005, 2006], Hyperic, Inc.
+ * Copyright (C) [2004-2010], Hyperic, Inc.
  * This file is part of HQ.
  * 
  * HQ is free software; you can redistribute it and/or modify
@@ -50,7 +50,9 @@
 public class JMXProtocolAjp extends JMXProtocolRequest {
     private static Log log = LogFactory.getLog(JMXProtocolAjp.class);
 
+    private static final String PROP_JMX_AJP_TIMEOUT = "jmx.ajpTimeOut";
     private static final int M_GET = 2;
+    private static final int SOCKET_TIMEOUT = 60000;
 
     private HashMap sockets = new HashMap();
 
@@ -66,14 +68,28 @@
         }
 
         if (s == null) {
-            log.debug("Connect " + host + " " + port );
+            if (log.isDebugEnabled()) {
+                log.debug("Connect " + host + " " + port );
+            }
             s = new Socket(host, port);
+            s.setSoTimeout(getSocketTimeout());
             sockets.put(key, s);
         }
 
         return s;
     }
 
+    private int getSocketTimeout() {
+        int soTimeout;
+        try {
+            soTimeout = 
+                Integer.parseInt(System.getProperty(PROP_JMX_AJP_TIMEOUT));
+        } catch (NumberFormatException e) {
+            soTimeout = SOCKET_TIMEOUT;
+        }
+        return soTimeout;
+    }
+    
     private void closeSocket(Socket s)
         throws SocketException, IOException {
         s.shutdownOutput();

[Hyperic-hq-discuss] hq r14509 - in trunk/tools/dbmigrate: . src

[<sc...@hy...>]

Author: scottmf
Date: 2010-04-15 16:43:07 -0700 (Thu, 15 Apr 2010)
New Revision: 14509
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14509

Modified:
   trunk/tools/dbmigrate/build.xml
   trunk/tools/dbmigrate/src/DatabaseExport.java
Log:
[HHQ-3906] added validation, logging to separate file, better error checking and pre-migration schema spec checks

Modified: trunk/tools/dbmigrate/build.xml
===================================================================
--- trunk/tools/dbmigrate/build.xml	2010-04-15 20:57:10 UTC (rev 14508)
+++ trunk/tools/dbmigrate/build.xml	2010-04-15 23:43:07 UTC (rev 14509)
@@ -23,7 +23,7 @@
   </path>
 
   <target name="compile" depends="init" description="compile the source">
-    <javac srcdir="${src}" destdir="${classes}">
+    <javac srcdir="${src}" destdir="${classes}" debug="yes">
       <classpath refid='my.class.path' />
     </javac>
   </target>

Modified: trunk/tools/dbmigrate/src/DatabaseExport.java
===================================================================
--- trunk/tools/dbmigrate/src/DatabaseExport.java	2010-04-15 20:57:10 UTC (rev 14508)
+++ trunk/tools/dbmigrate/src/DatabaseExport.java	2010-04-15 23:43:07 UTC (rev 14509)
@@ -1,5 +1,7 @@
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.PrintStream;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.PreparedStatement;
@@ -40,25 +42,101 @@
     private static String _targetUser;
     private static String _sourcePass;
     private static String _sourceUser;
+    private static PrintStream _out;
     private static final String _logCtx = DatabaseExport.class.getName();
+    private static final String LOG_FILE = "dbmigration.log";
 
     public static void main(String[] args) throws Exception {
         final long start = System.currentTimeMillis();
         getArgs(args);
+        String fs = File.separator;
+        String logFile = _workingDir + fs + LOG_FILE;
+        _out = new PrintStream(logFile);
         Connection connExp = getConnectionExport();
-        _tables = Collections.unmodifiableList(getTables(connExp, _sourceUser));
-        exportDataSetPerTable(connExp);
         Connection connImp = getConnectionImport();
-        importDataSetPerTable(connImp);
-        importBigTables(connExp, connImp);
-        importSequences(connImp);
-        connImp.commit();
-        connExp.close();
-        connImp.close();
-        System.out.println("process took " +
-            (System.currentTimeMillis()-start)/1000/60/60 + " hours");
+        try {
+            checkSchemaSpecVersions(connExp, connImp);
+            System.out.println("Starting dbmigration.  To monitor progress tail file: " + logFile);
+            _tables = Collections.unmodifiableList(getTables(connExp, _sourceUser));
+            exportDataSetPerTable(connExp);
+            importDataSetPerTable(connImp);
+            importBigTables(connExp, connImp);
+            importSequences(connImp);
+            connImp.commit();
+            validateTransfer(connExp, connImp);
+            final long end = System.currentTimeMillis();
+            System.out.println("migration successful, process took " + (end-start)/1000/60/60 +
+                               " hours");
+        } finally {
+            connExp.close();
+            connImp.close();
+            _out.close();
+        }
     }
 
+    private static void validateTransfer(Connection connExp, Connection connImp) throws Exception {
+        for (final String table : _tables) {
+            _out.println("validating table=" + table);
+            int rowsExp = getNumRows(connExp, table);
+            int rowsImp = getNumRows(connImp, table);
+            if (rowsExp != rowsImp) {
+                throw new Exception("ERROR: validation failed for table=" + table +
+                                    ", has " + rowsExp + " rows in source vs " + rowsImp + 
+                                    " rows in target");
+            }
+        }
+        _out.println("validation successful");
+    }
+
+    private static int getNumRows(Connection conn, String table) throws SQLException {
+        Statement stmt = null;
+        ResultSet rs = null;
+        try {
+            stmt = conn.createStatement();
+            String sql = "select count(*) from " + table;
+            rs = stmt.executeQuery(sql);
+            if (rs.next()) {
+                return rs.getInt(1);
+            }
+            return 0;
+        } finally {
+            DBUtil.close(_logCtx, null, stmt, rs);
+        }
+    }
+
+    private static void checkSchemaSpecVersions(Connection connExp, Connection connImp)
+    throws Exception {
+        String schemaSpecExp = getSchemaSpec(connExp);
+        String schemaSpecImp = getSchemaSpec(connImp);
+        if (schemaSpecExp == null) {
+            throw new Exception("ERROR: HQ schema version not found in source database");
+        } else if (schemaSpecImp == null) {
+            throw new Exception("ERROR: HQ schema version not found in target database");
+        } else if (!schemaSpecExp.equals(schemaSpecImp)) {
+            throw new Exception("ERROR: schema spec versions of the source and target databases " +
+                                "do not match.  Make sure both databases are running the same " +
+                                "version of HQ.  Most likely solution is to upgrade the source " +
+                                "database.  sourceSpec=" + schemaSpecExp + 
+                                ", targetSpec=" + schemaSpecImp);
+        }
+    }
+
+    private static String getSchemaSpec(Connection conn) throws SQLException {
+        Statement stmt = null;
+        ResultSet rs = null;
+        try {
+            stmt = conn.createStatement();
+            String sql = "select PROPVALUE from EAM_CONFIG_PROPS where propkey = 'CAM_SCHEMA_VERSION'";
+            rs = stmt.executeQuery(sql);
+            if (rs.next()) {
+                return rs.getString(1);
+            }
+            return null;
+        } finally {
+            DBUtil.close(_logCtx, null, stmt, rs);
+        }
+    }
+
     private static void getArgs(String[] args) {
         //-s hqadmin -p hqadmin -t hqadmin -r hqadmin
         // -u jdbc:postgresql://localhost:5432/hqdb
@@ -88,7 +166,7 @@
     private static void exportDataSetPerTable(Connection conn) throws Exception {
         IDatabaseConnection connection = new DatabaseConnection(conn);
         // partial database export
-        System.out.print("dumping partial db...");
+        _out.print("dumping partial db...");
         for (final String table : _tables) {
             setSeqVal(table, conn);
             QueryDataSet dataSet = new QueryDataSet(connection);
@@ -96,16 +174,16 @@
             String file = _workingDir+table+".xml.gz";
             GZIPOutputStream gstream = new GZIPOutputStream(new FileOutputStream(file));
             long start = now();
-            if (_debug) System.out.print("writing "+file+"...");
+            _out.print("writing "+file+"...");
             FlatXmlDataSet.write(dataSet, gstream);
             gstream.finish();
-            if (_debug) System.out.println("done "+(System.currentTimeMillis()-start)+" ms");
+            _out.println("done "+(System.currentTimeMillis()-start)+" ms");
         }
-        System.out.println("done");
+        _out.println("done");
         for (final Map.Entry<String, Long> entry : _seqMap.entrySet()) {
             final String seqName = entry.getKey();
             final Long seq = entry.getValue();
-            if (_debug) System.out.println(seqName+": "+seq);
+            _out.println(seqName+": "+seq);
         }
     }
 
@@ -136,18 +214,18 @@
         IDatabaseConnection connection = new DatabaseConnection(conn);
         conn.setAutoCommit(false);
         long begin = now();
-        System.out.print("restoring db...");
+        _out.println("restoring db...");
         for (String table : _tables) {
-            if (_debug) System.out.print("restoring " + table + "...");
+            _out.print("restoring " + table + "...");
             long start = now();
             String file = _workingDir+table+".xml.gz";
             GZIPInputStream gstream = new GZIPInputStream(new FileInputStream(file));
             IDataSet dataset = new FlatXmlDataSet(gstream);
             DatabaseOperation.CLEAN_INSERT.execute(connection, dataset);
-            if (_debug) System.out.println("done " + (now()-start) + " ms");
+            _out.println("done " + (now()-start) + " ms");
         }
         conn.commit();
-        System.out.println("done restoring db in " + (now()-begin) + " ms");
+        _out.println("done restoring db in " + (now()-begin) + " ms");
     }
 
     private static final long now() {
@@ -155,11 +233,11 @@
     }
 
     private static void importSequences(Connection conn) throws Exception {
-        if (isPG()) {
+        if (isPG(conn)) {
             importPGSequences(conn);
-        } else if (isOra()) {
+        } else if (isOra(conn)) {
             importOraSequences(conn);
-        } else if (isMySQL()) {
+        } else if (isMySQL(conn)) {
             importMySQLSequences(conn);
         }
     }
@@ -183,7 +261,7 @@
                 pstmt.setString(1, seqName);
                 pstmt.setLong(2, (val/100)+1);
                 int rows = pstmt.executeUpdate();
-                if (_debug) System.out.println(seqName + ": " + val + ", " + rows);
+                _out.println(seqName + ": " + val + ", " + rows);
             }
         } finally {
             DBUtil.close(_logCtx, null, pstmt, null);
@@ -257,10 +335,9 @@
             } catch (Exception e) {
                 // ignore, sequence just doesn't exist
             }
-            System.out.print(
-                "transferring large table " + table.getTable() + "...");
+            _out.print("transferring large table " + table.getTable() + "...");
             transferTable(table, connExport, connImport);
-            System.out.println("done " + (now() - start) + " ms");
+            _out.println("done " + (now() - start) + " ms");
         }
     }
 
@@ -287,7 +364,7 @@
                 exportPstmt.setInt(1, selectBatchSize);
                 exportPstmt.setInt(2, (offset++ * selectBatchSize));
                 rs = exportPstmt.executeQuery();
-                if (_debug) System.out.println("row " + ((offset-1) * selectBatchSize));
+                _out.println("row " + ((offset-1) * selectBatchSize));
                 boolean hasNext = false;
                 if (pstmt != null) {
                     pstmt.clearBatch();
@@ -305,7 +382,7 @@
                     pstmt.addBatch();
                     batch++;
                     if ((batch % insertBatchSize) == 0) {
-                        if (_debug) System.out.print('.');
+                        _out.print('.');
                         pstmt.executeBatch();
                         pstmt.clearBatch();
                     }
@@ -313,7 +390,7 @@
                 if (pstmt != null && (batch % insertBatchSize) != 0) {
                     pstmt.executeBatch();
                 }
-                if (_debug) System.out.println();
+                _out.println();
                 rs.close();
                 if (!hasNext) {
                     break;
@@ -347,24 +424,31 @@
             }
             vals.append("?");
             String sBuf = buf.toString() + ")" + vals.toString() + ")";
-            if (_debug) System.out.println(sBuf);
         }
         buf.append(')');
         String sBuf = buf.toString() + vals.toString() + ")";
-        if (_debug) System.out.println(sBuf);
+        if (_debug) _out.println(sBuf);
         return conn.prepareStatement(sBuf);
     }
 
     private static List<String> getTables(Connection conn, String tableOwner)
     throws Exception {
-        if (isPG()) {
-            return getPGTables(conn, tableOwner);
-        } else if (isOra()) {
-            return getOraTables(conn);
-        } else if (isMySQL()) {
-            return getMySQLTables(conn);
+        List<String> rtn = null;
+        if (isPG(conn)) {
+            rtn = getPGTables(conn, tableOwner);
+        } else if (isOra(conn)) {
+            rtn = getOraTables(conn);
+        } else if (isMySQL(conn)) {
+            rtn = getMySQLTables(conn);
         }
-        return new ArrayList<String>();
+        if (rtn == null) {
+            throw new Exception("ERROR: cannot determine what type of database is being used " +
+                                "for connectionUrl=" + conn.getMetaData().getURL());
+        } else if (rtn.isEmpty()) {
+            throw new Exception("ERROR: query to determine HQ tables had no results.  Make sure " +
+                                "the sourceuser owns the HQ tables.");
+        }
+        return rtn;
     }
 
     private static List<String> getOraTables(Connection conn) throws Exception {
@@ -396,6 +480,7 @@
                          " ORDER BY tablename";
             sql = sql.replace(":owner", tableOwner);
             sql = sql.replace(":vals", notIn);
+            System.out.println(sql);
             rs = stmt.executeQuery(sql);
             int table_col = rs.findColumn("tablename");
             while (rs.next()) {
@@ -411,22 +496,22 @@
         }
     }
 
-    private static boolean isPG() {
-        if (-1 == _url.toLowerCase().indexOf("postgresql")) {
+    private static boolean isPG(Connection conn) throws Exception {
+        if (-1 == conn.getMetaData().getURL().toLowerCase().indexOf("postgresql")) {
             return false;
         }
         return true;
     }
 
-    private static boolean isOra() {
-        if (-1 == _url.toLowerCase().indexOf("oracle")) {
+    private static boolean isOra(Connection conn) throws Exception {
+        if (-1 == conn.getMetaData().getURL().toLowerCase().indexOf("oracle")) {
             return false;
         }
         return true;
     }
 
-    private static boolean isMySQL() {
-        if (-1 == _url.toLowerCase().indexOf("mysql")) {
+    private static boolean isMySQL(Connection conn) throws Exception {
+        if (-1 == conn.getMetaData().getURL().toLowerCase().indexOf("mysql")) {
             return false;
         }
         return true;

[Hyperic-hq-discuss] hq r14508 - trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices

[<pn...@hy...>]

Author: pnguyen
Date: 2010-04-15 13:57:10 -0700 (Thu, 15 Apr 2010)
New Revision: 14508
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14508

Modified:
   trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices/HTTPCollector.java
Log:
[HHQ-3446] Rename the property to "http.useragent" and make it an "agent.properties" top-level property instead of a system property.

Modified: trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices/HTTPCollector.java
===================================================================
--- trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices/HTTPCollector.java	2010-04-15 07:53:09 UTC (rev 14507)
+++ trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices/HTTPCollector.java	2010-04-15 20:57:10 UTC (rev 14508)
@@ -88,10 +88,12 @@
         this.url = 
             protocol + "://" + getHostname() + ":" + getPort() + getPath();
 
-        this.useragent = 
-            System.getProperty("httpclient.useragent",
-                               "Hyperic-HQ-Agent/" + ProductProperties.getVersion());
+        this.useragent = getPlugin().getManagerProperty("http.useragent");
         
+        if (this.useragent == null || this.useragent.trim().length() == 0) {
+            this.useragent = "Hyperic-HQ-Agent/" + ProductProperties.getVersion();
+        }
+        
         //for log_track
         setSource(this.url);
 

[Hyperic-hq-discuss] hq r14507 - trunk/etc

[<bo...@hy...>]

Author: bob
Date: 2010-04-15 00:53:09 -0700 (Thu, 15 Apr 2010)
New Revision: 14507
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14507

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1409

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-04-15 04:13:02 UTC (rev 14506)
+++ trunk/etc/version.properties	2010-04-15 07:53:09 UTC (rev 14507)
@@ -1,3 +1,3 @@
-#Wed Apr 14 00:18:24 PDT 2010
+#Thu Apr 15 00:17:41 PDT 2010
 version=4.3.0
-build=1408
+build=1409

[Hyperic-hq-discuss] hq r14506 - trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices

[<pn...@hy...>]

Author: pnguyen
Date: 2010-04-14 21:13:02 -0700 (Wed, 14 Apr 2010)
New Revision: 14506
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14506

Modified:
   trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices/HTTPCollector.java
Log:
[HHQ-3446] Allow the HQ agent's HTTP user agent to be overridden by a system property ("httpclient.useragent")

Modified: trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices/HTTPCollector.java
===================================================================
--- trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices/HTTPCollector.java	2010-04-14 21:40:30 UTC (rev 14505)
+++ trunk/plugins/netservices/src/org/hyperic/hq/plugin/netservices/HTTPCollector.java	2010-04-15 04:13:02 UTC (rev 14506)
@@ -55,6 +55,7 @@
     private String url;
     private String method;
     private String hosthdr;
+    private String useragent;
     private Pattern pattern;
     private ArrayList matches = new ArrayList();
     private String proxyHost = null;
@@ -87,6 +88,10 @@
         this.url = 
             protocol + "://" + getHostname() + ":" + getPort() + getPath();
 
+        this.useragent = 
+            System.getProperty("httpclient.useragent",
+                               "Hyperic-HQ-Agent/" + ProductProperties.getVersion());
+        
         //for log_track
         setSource(this.url);
 
@@ -257,8 +262,7 @@
             getMethod().equals(METHOD_HEAD);
         HttpClient client = new HttpClient();
         HttpClientParams params = new HttpClientParams();
-        String userAgent = "Hyperic-HQ-Agent/" + ProductProperties.getVersion();
-        params.setParameter(HttpMethodParams.USER_AGENT, userAgent);
+        params.setParameter(HttpMethodParams.USER_AGENT, this.useragent);
         if (this.hosthdr != null) {
             params.setVirtualHost(this.hosthdr);
         }

[Hyperic-hq-discuss] [hyperic/hqapi] c7917a: [HHQ-3275] Fix regression in handling of --propert...

[<no...@gi...>]

Branch: refs/heads/master
Home:   http://github.com/hyperic/hqapi

Commit: c7917a54996c2cafd76406f695efd5c50b92804d
    http://github.com/hyperic/hqapi/commit/c7917a54996c2cafd76406f695efd5c50b92804d
Author: Ryan Morgan <rm...@hy...>
Date:   2010-04-14 (Wed, 14 Apr 2010)

Changed paths:
  M src/org/hyperic/hq/hqapi1/tools/Shell.java

Log Message:
-----------
[HHQ-3275] Fix regression in handling of --properties argument.

Re: [Hyperic-hq-discuss] using SIGAR in a C++ project

[Doug M. <do...@hy...>]

Any detail on the problem you're having?
There are C++ projects using sigar, here's an example:
http://github.com/nuggetwheat/hypertable/blob/master/src/cc/Common/SystemInfo.cc

[Hyperic-hq-discuss] hq r14505 - trunk

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-04-14 14:40:30 -0700 (Wed, 14 Apr 2010)
New Revision: 14505
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14505

Modified:
   trunk/build.xml
Log:
Swapped around build dependencies to prevent test jars from getting into the staged build

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2010-04-14 07:52:21 UTC (rev 14504)
+++ trunk/build.xml	2010-04-14 21:40:30 UTC (rev 14505)
@@ -582,7 +582,7 @@
     <property name="generate-manifest.notrequired" value="true" />
   </target>
 
-  <target name="pack-test">
+  <target name="pack-test" depends="pack-war">
     <mkdir dir="${war.dir}" />
     <mkdir dir="${war.dir}/WEB-INF/lib" />
 
@@ -668,7 +668,7 @@
  
   
   <target name="pack-war" description="Create the war directory structure ( use if you modify .jsp or other web files, but no sources )"
-          depends="pack-ear,pack-test">
+          depends="pack-ear">
     <mkdir dir="${war.dir}" />
     <mkdir dir="${war.dir}/WEB-INF/lib" />
     
@@ -765,7 +765,7 @@
       <include name="org/apache/taglibs/display/**" />
     </jar>
 
-    <!-- Pack ROOT.war used for startup progress -->
+  	<!-- Pack ROOT.war used for startup progress -->
     <mkdir dir="${ROOT.war}" />
     <mkdir dir="${ROOT.war}/WEB-INF" />
     <mkdir dir="${ROOT.war}/WEB-INF/lib" />

[Hyperic-hq-discuss] hq r14504 - trunk/etc

[<bo...@hy...>]

Author: bob
Date: 2010-04-14 00:52:21 -0700 (Wed, 14 Apr 2010)
New Revision: 14504
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14504

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1408

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-04-13 22:03:22 UTC (rev 14503)
+++ trunk/etc/version.properties	2010-04-14 07:52:21 UTC (rev 14504)
@@ -1,3 +1,3 @@
-#Tue Apr 13 00:16:23 PDT 2010
+#Wed Apr 14 00:18:24 PDT 2010
 version=4.3.0
-build=1407
+build=1408

[Hyperic-hq-discuss] hq r14503 - trunk/src/org/hyperic/hq/measurement/server/mbean

[<sc...@hy...>]

Author: scottmf
Date: 2010-04-13 15:03:22 -0700 (Tue, 13 Apr 2010)
New Revision: 14503
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14503

Modified:
   trunk/src/org/hyperic/hq/measurement/server/mbean/AvailabilityCheckService.java
Log:
[HHQ-3498] updating to check in the runtime method instead of just the unittest method

Modified: trunk/src/org/hyperic/hq/measurement/server/mbean/AvailabilityCheckService.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/mbean/AvailabilityCheckService.java	2010-04-13 21:30:38 UTC (rev 14502)
+++ trunk/src/org/hyperic/hq/measurement/server/mbean/AvailabilityCheckService.java	2010-04-13 22:03:22 UTC (rev 14503)
@@ -26,7 +26,6 @@
 package org.hyperic.hq.measurement.server.mbean;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -94,6 +93,10 @@
      * @jmx:managed-operation
      */
     public void hit(Date lDate) {
+        if (!new NotReadyManager().isReady()) {
+            _log.info("availability check service not starting until server is ready.");
+            return;
+        }
         Date date = new Date(System.currentTimeMillis());
         super.hit(date);
     }

[Hyperic-hq-discuss] hq r14502 - trunk/web/js/dojo/1.1.2/dijit

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-04-13 14:30:38 -0700 (Tue, 13 Apr 2010)
New Revision: 14502
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14502

Modified:
   trunk/web/js/dojo/1.1.2/dijit/Dialog.js
Log:
Backported an option to autofocus (or not) when the dialog is shown.
http://bugs.dojotoolkit.org/attachment/ticket/7287/Dialog.patch

This has been included in the latest dojo build, so we'll continue to get the functionality when we upgrade.

Modified: trunk/web/js/dojo/1.1.2/dijit/Dialog.js
===================================================================
--- trunk/web/js/dojo/1.1.2/dijit/Dialog.js	2010-04-13 21:28:28 UTC (rev 14501)
+++ trunk/web/js/dojo/1.1.2/dijit/Dialog.js	2010-04-13 21:30:38 UTC (rev 14502)
@@ -157,6 +157,8 @@
 		//		False will disable refocusing. Default: true
 		refocus: true,
 
+		autofocus: true, 
+		
 		// _firstFocusItem: DomNode
 		//		The pointer to the first focusable node in the dialog
 		_firstFocusItem:null,
@@ -351,9 +353,11 @@
 			this._getFocusItems(this.domNode);
 
 			// set timeout to allow the browser to render dialog
-			setTimeout(dojo.hitch(this, function(){
-				dijit.focus(this._firstFocusItem);
-			}), 50);
+			if(this.autofocus){ 
+				setTimeout(dojo.hitch(this, function(){
+					dijit.focus(this._firstFocusItem);
+				}), 50);
+			}
 		},
 
 		hide: function(){

[Hyperic-hq-discuss] hq r14501 - trunk/tools/dbmigrate/bin

[<sc...@hy...>]

Author: scottmf
Date: 2010-04-13 14:28:28 -0700 (Tue, 13 Apr 2010)
New Revision: 14501
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14501

Modified:
   trunk/tools/dbmigrate/bin/migrateDB
Log:
changed LIBS var to handle basedir correctly

Modified: trunk/tools/dbmigrate/bin/migrateDB
===================================================================
--- trunk/tools/dbmigrate/bin/migrateDB	2010-04-13 19:42:49 UTC (rev 14500)
+++ trunk/tools/dbmigrate/bin/migrateDB	2010-04-13 21:28:28 UTC (rev 14501)
@@ -8,7 +8,7 @@
 my ($sourceUrl, $targetUrl, $debug);
 
 my $BASEDIR = dirname($0);
-my $LIBS = "-cp ../lib/dbunit-2.2.jar:../lib/mysql-connector-java-5.0.5-bin.jar:../lib/postgresql-8.1-407.jdbc3.jar:../lib/dbmigrate.jar";
+my $LIBS = "-cp $BASEDIR/../lib/dbunit-2.2.jar:$BASEDIR/../lib/mysql-connector-java-5.0.5-bin.jar:$BASEDIR/../lib/postgresql-8.1-407.jdbc3.jar:$BASEDIR/../lib/dbmigrate.jar";
 my $ARGS = "-Xms1536m -Xmx1536m";
 
 sub main() {
@@ -47,7 +47,7 @@
                "vmargs=s" => \$ARGS,
                "d" => \$debug,
                "debug" => \$debug) || printUsage() && exit(1);
-    if ($count == 0) {
+    if ($count == 0 || ($count == 1 && $debug)) {
         printUsage();
         exit(0);
     }
@@ -99,5 +99,6 @@
     print "$sp -g, --targeturl  => target mysql url (e.g. jdbc:mysql://localhost:3306/hqdb)\n";
     print "$sp -d, --debug      => prints debugging statetments to STDOUT\n";
     print "$sp --vmargs         => java vm args, default = \"$ARGS\"\n";
+    print "$sp ARGS             => $LIBS\n" if ($debug);
 }
 

[Hyperic-hq-discuss] hq r14500 - trunk/tools/dbmigrate/src

[<sc...@hy...>]

Author: scottmf
Date: 2010-04-13 12:42:49 -0700 (Tue, 13 Apr 2010)
New Revision: 14500
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14500

Modified:
   trunk/tools/dbmigrate/src/DatabaseExport.java
Log:
[HQ-2078] take out hardcoded hqadmin user

Modified: trunk/tools/dbmigrate/src/DatabaseExport.java
===================================================================
--- trunk/tools/dbmigrate/src/DatabaseExport.java	2010-04-13 18:52:57 UTC (rev 14499)
+++ trunk/tools/dbmigrate/src/DatabaseExport.java	2010-04-13 19:42:49 UTC (rev 14500)
@@ -40,14 +40,13 @@
     private static String _targetUser;
     private static String _sourcePass;
     private static String _sourceUser;
-    private static final String _pgUser = "hqadmin";
     private static final String _logCtx = DatabaseExport.class.getName();
 
     public static void main(String[] args) throws Exception {
         final long start = System.currentTimeMillis();
         getArgs(args);
         Connection connExp = getConnectionExport();
-        _tables = Collections.unmodifiableList(getTables(connExp, _pgUser));
+        _tables = Collections.unmodifiableList(getTables(connExp, _sourceUser));
         exportDataSetPerTable(connExp);
         Connection connImp = getConnectionImport();
         importDataSetPerTable(connImp);
@@ -450,7 +449,15 @@
         private final String getTable() {
             return _table;
         }
-        public boolean equals(BigTable rhs) {
+        public boolean equals(Object rhs) {
+            if (this == rhs) {
+                return true;
+            } else if (rhs instanceof BigTable) {
+                return equals((BigTable)rhs);
+            }
+            return false;
+        }
+        private boolean equals(BigTable rhs) {
             return _table.equals(rhs._table);
         }
         public int hashCode() {

[Hyperic-hq-discuss] hq r14498 - in trunk/src/org/hyperic: hq/escalation/server/session hq/product/server/mbean util/stats

[<sc...@hy...>]

Author: scottmf
Date: 2010-04-13 11:38:04 -0700 (Tue, 13 Apr 2010)
New Revision: 14498
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14498

Modified:
   trunk/src/org/hyperic/hq/escalation/server/session/EscalationRuntime.java
   trunk/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java
   trunk/src/org/hyperic/util/stats/ConcurrentStatsCollector.java
Log:
[HHQ-3899] added stat around executeState() in EscalationRuntime

Modified: trunk/src/org/hyperic/hq/escalation/server/session/EscalationRuntime.java
===================================================================
--- trunk/src/org/hyperic/hq/escalation/server/session/EscalationRuntime.java	2010-04-13 07:52:05 UTC (rev 14497)
+++ trunk/src/org/hyperic/hq/escalation/server/session/EscalationRuntime.java	2010-04-13 18:38:04 UTC (rev 14498)
@@ -46,6 +46,7 @@
 import org.hyperic.hq.application.HQApp;
 import org.hyperic.hq.application.TransactionListener;
 import org.hyperic.hq.escalation.shared.EscalationManagerLocal;
+import org.hyperic.util.stats.ConcurrentStatsCollector;
 
 /**
  * This class manages the runtime execution of escalation chains.  The
@@ -407,7 +408,11 @@
     private void runEscalation(Integer stateId) {
         final boolean debug = _log.isDebugEnabled();
         if (debug) _log.debug("Running escalation state [" + stateId + "]");
+        final long start = System.currentTimeMillis();
         _esclMan.executeState(stateId);
+        final long end = System.currentTimeMillis();
+        ConcurrentStatsCollector.getInstance().addStat(
+            (end-start), ConcurrentStatsCollector.ESCALATION_EXECUTE_STATE_TIME);
     }
     
     public static EscalationRuntime getInstance() {

Modified: trunk/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java
===================================================================
--- trunk/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java	2010-04-13 07:52:05 UTC (rev 14497)
+++ trunk/src/org/hyperic/hq/product/server/mbean/ProductPluginDeployer.java	2010-04-13 18:38:04 UTC (rev 14498)
@@ -284,6 +284,7 @@
             c.register(ConcurrentStatsCollector.FIRED_ALERT_TIME);
             c.register(ConcurrentStatsCollector.SCHEDULE_QUEUE_SIZE);
             c.register(ConcurrentStatsCollector.UNSCHEDULE_QUEUE_SIZE);
+            c.register(ConcurrentStatsCollector.ESCALATION_EXECUTE_STATE_TIME);
             c.startCollector();
         } catch (Exception e) {
             _log.error("Could not start Concurrent Stats Collector", e);

Modified: trunk/src/org/hyperic/util/stats/ConcurrentStatsCollector.java
===================================================================
--- trunk/src/org/hyperic/util/stats/ConcurrentStatsCollector.java	2010-04-13 07:52:05 UTC (rev 14497)
+++ trunk/src/org/hyperic/util/stats/ConcurrentStatsCollector.java	2010-04-13 18:38:04 UTC (rev 14498)
@@ -111,7 +111,8 @@
         TRIGGER_INIT_TIME            = "TRIGGER_INIT_TIME",
         FIRED_ALERT_TIME             = "FIRED_ALERT_TIME",
         SCHEDULE_QUEUE_SIZE          = "SCHEDULE_QUEUE_SIZE",
-        UNSCHEDULE_QUEUE_SIZE        = "UNSCHEDULE_QUEUE_SIZE";
+        UNSCHEDULE_QUEUE_SIZE        = "UNSCHEDULE_QUEUE_SIZE",
+        ESCALATION_EXECUTE_STATE_TIME = "ESCALATION_EXECUTE_STATE_TIME";
     // using tree due to ordering capabilities
     private final Map _statKeys = new TreeMap();
     private AtomicBoolean _hasStarted = new AtomicBoolean(false);

[Hyperic-hq-discuss] hq r14497 - trunk/etc

[<bo...@hy...>]

Author: bob
Date: 2010-04-13 00:52:05 -0700 (Tue, 13 Apr 2010)
New Revision: 14497
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14497

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1407

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-04-12 19:02:54 UTC (rev 14496)
+++ trunk/etc/version.properties	2010-04-13 07:52:05 UTC (rev 14497)
@@ -1,3 +1,3 @@
-#Mon Apr 12 00:18:40 PDT 2010
+#Tue Apr 13 00:16:23 PDT 2010
 version=4.3.0
-build=1406
+build=1407

[Hyperic-hq-discuss] hq r14496 - trunk/plugins/mysql_stats/src/org/hyperic/hq/plugin/mysql_stats

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-04-12 12:02:54 -0700 (Mon, 12 Apr 2010)
New Revision: 14496
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14496

Modified:
   trunk/plugins/mysql_stats/src/org/hyperic/hq/plugin/mysql_stats/MySqlServerDetector.java
Log:
Enhanced logic to test for MySQL version via --help (the existing mechanism), then check --version if version number wasn't found.

Modified: trunk/plugins/mysql_stats/src/org/hyperic/hq/plugin/mysql_stats/MySqlServerDetector.java
===================================================================
--- trunk/plugins/mysql_stats/src/org/hyperic/hq/plugin/mysql_stats/MySqlServerDetector.java	2010-04-12 07:56:00 UTC (rev 14495)
+++ trunk/plugins/mysql_stats/src/org/hyperic/hq/plugin/mysql_stats/MySqlServerDetector.java	2010-04-12 19:02:54 UTC (rev 14496)
@@ -302,7 +302,12 @@
     {
         List servers = new ArrayList();
         String installdir = getParentDir(path, 2);
-        String version = getVersion(path);
+        String version = getVersion(path, "--help");
+        
+        if (version == null) {
+            version = getVersion(path, "--version");
+        }
+        
         // ensure this instance of ServerDetector is associated with the
         // correct version
         if (!getTypeInfo().getVersion().equals(version)) {
@@ -338,12 +343,11 @@
         return rtn.toString();
     }
     
-    private String getVersion(String executable) {
+    private String getVersion(String executable, String arg) {
         try {
             ByteArrayOutputStream output = new ByteArrayOutputStream();
             Execute exec = new Execute(new PumpStreamHandler(output));
-            exec.setCommandline(
-                new String[] {executable, "--help"});
+            exec.setCommandline(new String[] {executable, arg});
             int res = exec.execute();
             if (res != 0) {
                 return null;

[Hyperic-hq-discuss] hq r14495 - trunk/etc

[<bo...@hy...>]

Author: bob
Date: 2010-04-12 00:56:00 -0700 (Mon, 12 Apr 2010)
New Revision: 14495
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14495

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1406

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-04-11 07:56:19 UTC (rev 14494)
+++ trunk/etc/version.properties	2010-04-12 07:56:00 UTC (rev 14495)
@@ -1,3 +1,3 @@
-#Sun Apr 11 00:18:32 PDT 2010
+#Mon Apr 12 00:18:40 PDT 2010
 version=4.3.0
-build=1405
+build=1406

[Hyperic-hq-discuss] hq r14494 - trunk/etc

[<bo...@hy...>]

Author: bob
Date: 2010-04-11 00:56:19 -0700 (Sun, 11 Apr 2010)
New Revision: 14494
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14494

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1405

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-04-10 07:52:03 UTC (rev 14493)
+++ trunk/etc/version.properties	2010-04-11 07:56:19 UTC (rev 14494)
@@ -1,3 +1,3 @@
-#Sat Apr 10 00:17:17 PDT 2010
+#Sun Apr 11 00:18:32 PDT 2010
 version=4.3.0
-build=1404
+build=1405

[Hyperic-hq-discuss] hq r14493 - trunk/etc

[<bo...@hy...>]

Author: bob
Date: 2010-04-10 00:52:03 -0700 (Sat, 10 Apr 2010)
New Revision: 14493
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14493

Modified:
   trunk/etc/version.properties
Log:
Release 4.3.0 build #1404

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2010-04-09 17:04:02 UTC (rev 14492)
+++ trunk/etc/version.properties	2010-04-10 07:52:03 UTC (rev 14493)
@@ -1,3 +1,3 @@
-#Fri Apr 09 00:17:24 PDT 2010
+#Sat Apr 10 00:17:17 PDT 2010
 version=4.3.0
-build=1403
+build=1404

[Hyperic-hq-discuss] [hyperic/hqapi] 20f760: Update integration test to verify that the resourc...

[<no...@gi...>]

Branch: refs/heads/master
Home:   http://github.com/hyperic/hqapi

Commit: 20f760b05319bf49ee696228f44f224b3b207b00
    http://github.com/hyperic/hqapi/commit/20f760b05319bf49ee696228f44f224b3b207b00
Author: pnguyen <pnguyen@10.16.16.130>
Date:   2010-04-09 (Fri, 09 Apr 2010)

Changed paths:
  M src/org/hyperic/hq/hqapi1/test/MaintenanceSchedule_test.java

Log Message:
-----------
Update integration test to verify that the resource's availability has recovered from a pause state to an up state at the end of a maintenance window

Re: [Hyperic-hq-discuss] Debian package

[Thiago F. de M. <sig...@hy...>]

Hi,

I've been trying to package the sigar and all the bindings. The python, ruby, perl and dotnet I have already packaged. The problem now is with erlang, php, java and lua. 

The java I can compile but I have to set the JAVA_HOME environment, I have to find the better way to do that when packaging. 

The erlang binding I can compile too, but I have to install the sigar before compile erlang, there is a way to compile erlang without install sigar? I need that to package.

The php bindings I don't know how to compile, it doesn't have a makefile. The lua version there is a makefile, but it doesn't compile.

To generate the packages. You can, from debian or ubuntu:

dget http://dl.dropbox.com/u/817671/packages/sigar_1.7.0%7Esvn5287-1.dsc

dpkg-source -x sigar_1.7.0~svn5287-1.dsc

Enter in the sigar directory:

debuild

Then it creates the sigar packages.

It's necessary a copyright about the files in the sigar.

[Hyperic-hq-discuss] Show in Hyperic Dashboard?

[Robert K. <rob...@pr...>]

Ok I think I have it built... But how do I connect it into my Hyperic Dashboard?

What good is it as a seperate app?  I'm a laymen.  I just want to watch processes and services on remote machines.

Thankx,

Robert

[Hyperic-hq-discuss] hq r14492 - trunk/plugins/xml

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-04-09 10:04:02 -0700 (Fri, 09 Apr 2010)
New Revision: 14492
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14492

Modified:
   trunk/plugins/xml/activemq-plugin.xml
Log:
[HHQ-3885] - activemq-plugin.xml: "Embeeded" should be "Embedded" (spelling error)

Modified: trunk/plugins/xml/activemq-plugin.xml
===================================================================
--- trunk/plugins/xml/activemq-plugin.xml	2010-04-09 07:53:39 UTC (rev 14491)
+++ trunk/plugins/xml/activemq-plugin.xml	2010-04-09 17:04:02 UTC (rev 14492)
@@ -381,23 +381,23 @@
           include="5.2">
   </server>
 
-  <server name="ActiveMQ Embeeded"
+  <server name="ActiveMQ Embedded"
           version="5.0"
           include="ActiveMQ 5.0">
     <property name="PROC_HOME_PROPERTY"
               value="catalina.base"/>
   </server>
-  <server name="ActiveMQ Embeeded"
+  <server name="ActiveMQ Embedded"
           version="5.1"
           include="ActiveMQ 5.1">
     <property name="PROC_HOME_PROPERTY"
               value="catalina.base"/>
   </server>
-  <server name="ActiveMQ Embeeded"
+  <server name="ActiveMQ Embedded"
           version="5.2"
           include="5.1">
   </server>
-  <server name="ActiveMQ Embeeded"
+  <server name="ActiveMQ Embedded"
           version="5.3"
           include="5.2">
   </server>

Re: [Hyperic-hq-discuss] Debian package

[Doug M. <do...@hy...>]

Hi,

The JAVA_HOME issue has been fixed: http://jira.hyperic.com/browse/SIGAR-214
Let me know if that solves the problem for you too.

The erlang and lua bindings are quite new and probably not ready for release.
To build php, just run 'phpize' in bindings/php to generate the Makefile.
However, php and dotnet have not been updated for quite some time.

I recommend for now just packaging: java, python, ruby and perl bindings.

I will also be bringing the copyright headers up to date in the next couple of days.