Hyperic Application & System Monitoring

Author: bob
Date: 2008-01-05 04:01:12 -0800 (Sat, 05 Jan 2008)
New Revision: 7424
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7424

Modified:
   trunk/etc/version.properties
Log:
Release 3.2.0 build #591

Modified: trunk/etc/version.properties
===================================================================
--- trunk/etc/version.properties	2008-01-05 02:48:47 UTC (rev 7423)
+++ trunk/etc/version.properties	2008-01-05 12:01:12 UTC (rev 7424)
@@ -1,3 +1,3 @@
-#Fri Jan 04 02:58:41 PST 2008
+#Sat Jan 05 03:00:01 PST 2008
 version=3.2.0
-build=590
+build=591

Revision: 143
          http://hyperic-hq.svn.sourceforge.net/hyperic-hq/?rev=143&view=rev
Author:   Hyperic
Date:     2008-01-05 00:31:05 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
latest svn mirror

Modified Paths:
--------------
    etc/agent.properties
    etc/version.properties
    installer/data/db-upgrade.xml
    plugins/xml/sendmail-plugin.xml
    sql/events/AlertDefinition.hbm.xml
    src/org/hyperic/hq/application/HQApp.java
    src/org/hyperic/hq/authz/shared/PermissionManagerImpl.java
    src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java
    src/org/hyperic/hq/bizapp/server/action/log/SyslogAction.java
    src/org/hyperic/hq/escalation/server/session/EscalationManagerEJBImpl.java
    src/org/hyperic/hq/events/Notify.java
    src/org/hyperic/hq/hqu/rendit_sys/dispatcher.groovy
    src/org/hyperic/hq/hqu/rendit_sys/metaclass/MetricCategory.groovy
    src/org/hyperic/hq/measurement/server/session/DerivedMeasurementDAO.java
    src/org/hyperic/hq/measurement/server/session/DerivedMeasurementManagerEJBImpl.java
    ui_plugins/health/app/HealthController.groovy
    ui_plugins/health/etc/health_i18n.properties
    ui_plugins/health/views/health/printReport.gsp
    web/common/Header.jsp

Added Paths:
-----------
    src/org/hyperic/hq/hqu/rendit_sys/metaclass/AppdefCategory.groovy
    src/org/hyperic/util/thread/ThreadWatchdog.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Author: jtravis
Date: 2008-01-04 18:48:47 -0800 (Fri, 04 Jan 2008)
New Revision: 7423
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7423

Added:
   trunk/src/org/hyperic/util/thread/ThreadWatchdog.java
Modified:
   trunk/src/org/hyperic/hq/application/HQApp.java
Log:
HHQ-1471.  Add ThreadWatchdog which will be used to interrupt Zevent listeners

Modified: trunk/src/org/hyperic/hq/application/HQApp.java
===================================================================
--- trunk/src/org/hyperic/hq/application/HQApp.java	2008-01-05 01:57:20 UTC (rev 7422)
+++ trunk/src/org/hyperic/hq/application/HQApp.java	2008-01-05 02:48:47 UTC (rev 7423)
@@ -45,6 +45,7 @@
 import org.hyperic.hq.hibernate.SessionManager;
 import org.hyperic.txsnatch.TxSnatch;
 import org.hyperic.util.callback.CallbackDispatcher;
+import org.hyperic.util.thread.ThreadWatchdog;
 import org.jboss.ejb.Interceptor;
 import org.jboss.invocation.Invocation;
 
@@ -65,6 +66,7 @@
     private File               _restartStorage;
     private File               _resourceDir;
     private File               _webAccessibleDir;
+    private ThreadWatchdog     _watchdog;
     
     private final Object       STAT_LOCK = new Object();
     private long               _numTx;
@@ -78,7 +80,9 @@
         _callbacks = new CallbackDispatcher();
         _shutdown = (ShutdownCallback)
             _callbacks.generateCaller(ShutdownCallback.class);
+        _watchdog = new ThreadWatchdog("ThreadWatchdog");
         
+        _watchdog.initialize();
         Runtime.getRuntime().addShutdownHook(new Thread() {
             public void run() {
                 _log.info("Running shutdown hooks");
@@ -88,6 +92,12 @@
         });
     }
 
+    public ThreadWatchdog getWatchdog() {
+        synchronized (_watchdog) {
+            return _watchdog;
+        }
+    }
+    
     public void setRestartStorageDir(File dir) {
         synchronized (_startupClasses) {
             _restartStorage = dir;

Added: trunk/src/org/hyperic/util/thread/ThreadWatchdog.java
===================================================================
--- trunk/src/org/hyperic/util/thread/ThreadWatchdog.java	                        (rev 0)
+++ trunk/src/org/hyperic/util/thread/ThreadWatchdog.java	2008-01-05 02:48:47 UTC (rev 7423)
@@ -0,0 +1,118 @@
+/*
+ * NOTE: This copyright does *not* cover user programs that use HQ
+ * program services by normal system calls through the application
+ * program interfaces provided as part of the Hyperic Plug-in Development
+ * 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
+ * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * 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
+ * USA.
+ */
+
+package org.hyperic.util.thread;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.emory.mathcs.backport.java.util.concurrent.Future;
+import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;
+import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
+import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+
+/**
+ * This class is able to interrupt threads after a certain interval -- useful
+ * when threads need to have a bounded runtime.  
+ */
+public class ThreadWatchdog {
+    private final Log _log = LogFactory.getLog(ThreadWatchdog.class);
+    private ScheduledThreadPoolExecutor _executor; 
+    private ThreadFactory _tFact;
+    
+    public ThreadWatchdog(final String threadName) {
+        _tFact = new ThreadFactory() {
+            public Thread newThread(Runnable r) {
+                return new Thread(r, threadName);
+            }
+        };
+    }
+
+    /**
+     * Must be called prior to any other use of this object.
+     */
+    public void initialize() {
+        _executor = new ScheduledThreadPoolExecutor(1, _tFact);
+    }
+    
+    /**
+     * Schedule an interrupt for the current thread.
+     * 
+     * @param delay      The # of units to delay 
+     * @param units      Combines with 'delay' to give the length of time to 
+     *                   delay
+     * @param targetMsg  An informational message about what the current thread
+     *                   is doing, used when logging an interrupt.
+     */
+    public InterruptToken interruptMeIn(long delay, TimeUnit units,
+                                        String targetMsg) 
+    {
+        Interruptor i = new Interruptor(Thread.currentThread(), targetMsg,
+                                        delay + " " + units);
+        Future f;
+        
+        synchronized (_executor) {
+            f = _executor.schedule(i, delay, units);
+        }
+
+        InterruptToken res = new InterruptToken(f);
+        return res;
+    }
+
+    /**
+     * Cancel a scheduled interrupt.
+     */
+    public void cancelInterrupt(InterruptToken t) {
+        t._f.cancel(false);
+    }
+    
+    public static class InterruptToken {
+        private Future _f;
+        
+        private InterruptToken(Future f) {
+            _f = f;
+        }
+    }
+    
+    private class Interruptor 
+        implements Runnable
+    {
+        private final Thread _target;
+        private final String _targetMsg;
+        private final String _timeMsg;
+        
+        public Interruptor(Thread target, String targetMsg, String timeMsg) {
+            _target    = target;
+            _targetMsg = targetMsg;
+            _timeMsg   = timeMsg;
+        }
+        
+        public void run() {
+            _log.warn("Interrupting thread [" + _target + "] (" + _targetMsg +
+                      ") it exceeded " + _timeMsg);
+            _target.interrupt();
+        }
+    }
+}

Author: heather
Date: 2008-01-04 17:57:20 -0800 (Fri, 04 Jan 2008)
New Revision: 7422
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7422

Modified:
   trunk/web/common/Header.jsp
Log:
HQ-1037 - duplicate text in the header for 'User'

Modified: trunk/web/common/Header.jsp
===================================================================
--- trunk/web/common/Header.jsp	2008-01-05 01:32:54 UTC (rev 7421)
+++ trunk/web/common/Header.jsp	2008-01-05 01:57:20 UTC (rev 7422)
@@ -99,8 +99,6 @@
                         </html:link>
                     </c:when>
                     <c:otherwise>
-                        <fmt:message key="header.User"/>
-                        :
                         <c:out value="${sessionScope.webUser.username}"/>
                     </c:otherwise>
                 </c:choose>

Author: tkeeney
Date: 2008-01-04 17:32:54 -0800 (Fri, 04 Jan 2008)
New Revision: 7421
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7421

Modified:
   branches/HQ_3_1/src/org/hyperic/hq/bizapp/server/mdb/RegisteredDispatcherEJBImpl.java
Log:
[HQ-1115] We do not want to continue flushing the state for the visited multi condition triggers if one of the flushes causes an exception to occur. This is because the MDB txn will be rolled back so any further processing will not be persisted. Instead, we will release the shared locks on all the visited multi condition triggers and return from flushing the state.

Modified: branches/HQ_3_1/src/org/hyperic/hq/bizapp/server/mdb/RegisteredDispatcherEJBImpl.java
===================================================================
--- branches/HQ_3_1/src/org/hyperic/hq/bizapp/server/mdb/RegisteredDispatcherEJBImpl.java	2008-01-05 00:23:19 UTC (rev 7420)
+++ branches/HQ_3_1/src/org/hyperic/hq/bizapp/server/mdb/RegisteredDispatcherEJBImpl.java	2008-01-05 01:32:54 UTC (rev 7421)
@@ -162,47 +162,65 @@
         } catch (InterruptedException e) {
             log.info("Thread was interrupted while processing events.");
         } finally {
-            try {
-                flushStateForVisitedMCTriggers(visitedMCTriggers);
-            } catch (Exception e) {
-                log.error("Failed to flush state for multi conditional trigger", e);
-            }
-            
+            flushStateForVisitedMCTriggers(visitedMCTriggers);            
             publishEnqueuedEvents();
         }
     }
     
-    private void flushStateForVisitedMCTriggers(Set visitedMCTriggers) 
-        throws EventTypeException, ActionExecuteException {
-        
-        if (!visitedMCTriggers.isEmpty()) {
-            FlushStateEvent event = new FlushStateEvent();
-            
+    private void flushStateForVisitedMCTriggers(Set visitedMCTriggers) {
+        if (visitedMCTriggers.isEmpty()) {
+            return;
+        }
+                
+        FlushStateEvent event = new FlushStateEvent();
+        MultiConditionTrigger trigger = null;
+                
+        try {
             for (Iterator it = visitedMCTriggers.iterator(); it.hasNext();) {
-                MultiConditionTrigger trigger = (MultiConditionTrigger) it.next();
+                trigger = (MultiConditionTrigger) it.next();
+                it.remove();
                                 
+                boolean lockAcquired = false;
+                
                 try {
-                    boolean lockAcquired = false;
+                    lockAcquired = trigger.upgradeSharedLockToExclusiveLock();
                     
-                    try {
-                        lockAcquired = trigger.upgradeSharedLockToExclusiveLock();
-                        
-                        if (lockAcquired) {
-                            trigger.processEvent(event);                    
-                        }                        
-                    } finally {
-                        if (lockAcquired) {
-                            trigger.releaseExclusiveLock();
-                        }
+                    if (lockAcquired) {
+                        trigger.processEvent(event);                    
+                    } else {
+                        if (log.isDebugEnabled()) {
+                            log.debug("There must be more interesting events "+
+                                    "to multicondition alert with trigger id="+
+                                    trigger.getId()+" since we failed to upgrade "+
+                                    "shared lock on flushing state.");    
+                        } 
                     }
-                } catch (Throwable e) {
-                    // continue flushing the other triggers
-                    log.error("Failed to flush state for multi " +
-                              "conditional trigger id="+trigger.getId(), e); 
+                } finally {
+                    if (lockAcquired) {
+                        trigger.releaseExclusiveLock();
+                    }
                 }                 
+            }             
+        } catch (Exception e) {
+            if (trigger == null) {
+                log.error("Failed to flush state for multi condition trigger", e);                                
+            } else {
+                log.error("Failed to flush state for multi " +
+                          "condition trigger id="+trigger.getId(), e);                
+            }
+        } finally {
+            // Shared locks on all the visited multi condition triggers must 
+            // be released, else these triggers may never fired again until 
+            // the server is rebooted!
+            if (!visitedMCTriggers.isEmpty()) {
+                for (Iterator it = visitedMCTriggers.iterator(); it.hasNext();) {
+                    trigger = (MultiConditionTrigger) it.next();
+                    it.remove();
+                    trigger.releaseSharedLock();
+                }
             }            
         }
-        
+                
     }
     
     private void publishEnqueuedEvents() {

Author: jtravis
Date: 2008-01-04 16:23:19 -0800 (Fri, 04 Jan 2008)
New Revision: 7420
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7420

Modified:
   trunk/ui_plugins/health/app/HealthController.groovy
   trunk/ui_plugins/health/views/health/printReport.gsp
Log:
HHQ-1461. Add agent info to printable report

Modified: trunk/ui_plugins/health/app/HealthController.groovy
===================================================================
--- trunk/ui_plugins/health/app/HealthController.groovy	2008-01-04 23:58:00 UTC (rev 7419)
+++ trunk/ui_plugins/health/app/HealthController.groovy	2008-01-05 00:23:19 UTC (rev 7420)
@@ -16,6 +16,7 @@
 import org.hyperic.hq.common.DiagnosticThread
 import org.hyperic.hq.common.Humidor
 import org.hyperic.util.jdbc.DBUtil
+import org.hyperic.hibernate.PageInfo
 
 import java.text.DateFormat;
 import java.sql.Connection
@@ -33,8 +34,10 @@
 {
     private final DateFormat df = 
         DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT)
-    
-    def HealthController() {
+    private final PrintfFormat agentFmt =
+        new PrintfFormat("%-25s %-15s %-5s %-9s %-17s %-13s %-16s %-10s")
+
+    HealthController() {
         onlyAllowSuperUsers()
         setJSONMethods(['getSystemStats', 'getDiag', 'cacheData', 
                         'agentData', 'runQuery'])
@@ -52,20 +55,10 @@
                 [field: [getValue: {localeBundle.fqdn},
                          description:'fqdn', sortable:false], 
                  width: '20%',
-                 label: {
-                    if (it.platform)
-                        return linkTo(it.platform.fqdn, [resource:it.platform.resource])
-                    else
-                        return 'Unknown'
-                 }],
+                 label: {it.platformHtml}],
                 [field: AgentSortField.ADDR,
                  width: '15%',
-                 label: {
-                    if (it.server)
-                        return linkTo(it.agent.address, [resource:it.server.resource])
-                    else
-                        return 'Unknown'
-                 }],
+                 label: {it.serverHtml}],
                 [field: AgentSortField.PORT,
                  width: '5%',
                  label: {it.agent.port}],
@@ -74,7 +67,7 @@
                  label: {it.agent.version}],
                 [field: AgentSortField.CTIME,
                  width: '18%',
-                 label: {df.format(it.agent.creationTime)}],
+                 label: {it.creationTime}],
                 [field: [getValue: {localeBundle.numPlatforms},
                          description:'numPlatforms', sortable:false], 
                  width: '8%',
@@ -86,13 +79,7 @@
                 [field: [getValue: {localeBundle.timeOffset},
                          description:'timeOffset', sortable:false], 
                  width: '19%',
-                 label: {
-                    if (it.offset) 
-                        return linkTo(it.offset.lastDataPoint.value, 
-                                      [resource:it.offset])
-                    else 
-                    	return 'Unknown'
-                 }],
+                 label: {it.offsetHtml}],
             ],
         ]   
     }
@@ -110,14 +97,25 @@
                 numMetrics = metricData[a]
             for (d in offsetData) {
                 if (d[0] == a) {
-                    res << [agent:a, platform:d[1], server:d[2], 
-                            offset:d[3], numMetrics:numMetrics]
+                    res << [agent:a, 
+                            platform:d[1].fqdn,
+                            platformHtml:linkTo(d[1].fqdn, [resource:d[1].resource]),
+                            server:a.address,
+                            serverHtml:linkTo(a.address, [resource:d[2].resource]),
+                            offset:d[3].lastDataPoint.value,
+                            offsetHtml:linkTo(d[3].lastDataPoint.value, [resource:d[3]]), 
+                            numMetrics:numMetrics,
+                            creationTime:df.format(a.creationTime)]
                     found = true
                     break
                 }
             }
             if (!found) {
-                res << [agent:a, numMetrics:numMetrics]
+                res << [agent:a, numMetrics:numMetrics,
+                        platform:'Unknown', platformHtml:'Unknown',
+                        server:a.address, serverHtml:a.address,
+                        offset:'?', offsetHtml:'?', 
+                        creationTime:df.format(a.creationTime)]
             }
         }
         res
@@ -302,9 +300,10 @@
     
     private printReport(params) {
         def s = Humidor.instance.sigar
-        def dateFormat = DateFormat.dateTimeInstance
-        def cmdLine = s.getProcArgs('$$')
-        def procEnv = s.getProcEnv('$$')
+        def dateFormat  = DateFormat.dateTimeInstance
+        def cmdLine     = s.getProcArgs('$$')
+        def procEnv     = s.getProcEnv('$$')
+        def agentPager  = PageInfo.getAll(AgentSortField.ADDR, true) 
         
         def locals = [
             numCpu:           Runtime.runtime.availableProcessors(),
@@ -323,6 +322,9 @@
             procEnv:          procEnv,
             cpuInfos:         s.cpuInfoList,
             jvmSupportsTraces: getJVMSupportsTraces(),
+            agentData:        getAgentData(agentPager),
+            agentFmt:         agentFmt,
+            AgentSortField:   AgentSortField,
         ] + getSystemStats([:])
     	render(locals: locals)
     }

Modified: trunk/ui_plugins/health/views/health/printReport.gsp
===================================================================
--- trunk/ui_plugins/health/views/health/printReport.gsp	2008-01-04 23:58:00 UTC (rev 7419)
+++ trunk/ui_plugins/health/views/health/printReport.gsp	2008-01-05 00:23:19 UTC (rev 7420)
@@ -70,6 +70,20 @@
 <% } %>
 
 
+-- Agents --
+<%= agentFmt.sprintf([l.fqdn, AgentSortField.ADDR.value, 
+                      AgentSortField.PORT.value, AgentSortField.VERSION.value,
+                      AgentSortField.CTIME.value, l.numPlatforms, 
+                      l.timeOffset, l.numMetrics] as Object[]) %>
+-----------------------------------------------------------------------                      
+<% for (a in agentData) { %>
+<%= agentFmt.sprintf([a.platform, a.server, "${a.agent.port}", a.agent.version, 
+                      a.creationTime, "${a.agent.platforms.size()}", 
+                      "${a.offset}", "${a.numMetrics}"] as Object[]) %> <% } %>
+                      
+
+
+
 <% if (jvmSupportsTraces) { %>
 -- Thread Dump --
   <% for (ent in Thread.allStackTraces) { %>