Add totals for running instances only (the existing totals row includ…

…es statistics for app instances that are not running)
wocommunity · Apr 17, 2014 · e688592 · e688592
1 parent b817afd
commit e688592
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 0 deletions.
diff --git a/Applications/JavaMonitor/Components/AppDetailPage.wo/AppDetailPage.html b/Applications/JavaMonitor/Components/AppDetailPage.wo/AppDetailPage.html
@@ -250,6 +250,19 @@ <h2 class="SectionHeading">
         <webobject name = "ConfigureLink"><span>Configure</span></webobject></td>
       <td><webobject name = "InstDeleteAllLink"><span>Delete</span></webobject></td>
     </tr>
+
+    <wo:if condition="$showDetailStatistics">
+    <tr class="TotalsForRunningInstances">
+    	<td colspan="10" class="label">Running Sessions</td>
+    	<td class="TotalTransactionCount"><webobject name = "TotalTransactionsForActiveInstances"></webobject></td>
+      	<td class="TotalActiveSessions"><webobject name = "ActiveSessionsForActiveInstances"></webobject></td>
+      	<td class="TotalAverageTransaction"></td>
+      	<td class="TotalAverageIdleTime"></td>
+
+  		<td colspan="2"></td>
+    </tr>
+    </wo>
+
   </webobject>
 </table>
 </div>

diff --git a/Applications/JavaMonitor/Components/AppDetailPage.wo/AppDetailPage.wod b/Applications/JavaMonitor/Components/AppDetailPage.wo/AppDetailPage.wod
@@ -282,6 +282,19 @@ TotalTransactions: WOString {
 	value = totalTransactions;
 }
 
+TotalTransactionsForActiveInstances: WOString {
+	value = totalTransactionsForActiveInstances;
+	numberformat = "#,##0";
+}
+
+ActiveSessionsForActiveInstances: WOString {
+	value = totalActiveSessionsForActiveInstances;
+	numberformat = "#,##0";	
+}
+
+
+
+
 // Start of Add Instance Stuff
 
 AddHostsLink : WOHyperlink {

diff --git a/Applications/JavaMonitor/Sources/com/webobjects/monitor/application/AppDetailPage.java b/Applications/JavaMonitor/Sources/com/webobjects/monitor/application/AppDetailPage.java
@@ -693,10 +693,20 @@ public Integer totalTransactions() {
         return StatsUtilities.totalTransactionsForApplication(myApplication());
     }
 
+    public Integer totalTransactionsForActiveInstances(){
+    	return StatsUtilities.totalTransactionsForActiveInstancesOfApplication(myApplication());
+    }
+
+
     public Integer totalActiveSessions() {
         return StatsUtilities.totalActiveSessionsForApplication(myApplication());
     }
 
+    public Integer totalActiveSessionsForActiveInstances(){
+    	return StatsUtilities.totalActiveSessionsForActiveInstancesOfApplication(myApplication());
+    }
+
+
     public Float totalAverageTransaction() {
         return StatsUtilities.totalAverageTransactionForApplication(myApplication());
     }

diff --git a/Applications/JavaMonitor/WebServerResources/javamonitor.css b/Applications/JavaMonitor/WebServerResources/javamonitor.css
@@ -438,3 +438,9 @@ td.PushButtonWrapper {
 	text-align: right;
 }
 
+
+div.ApplicationDetailsBox table tr.TotalsForRunningInstances .label
+{
+	font-weight: bold;
+	text-align: right;
+}
diff --git a/...rks/Misc/JavaMonitorFramework/Sources/com/webobjects/monitor/_private/StatsUtilities.java b/...rks/Misc/JavaMonitorFramework/Sources/com/webobjects/monitor/_private/StatsUtilities.java
@@ -42,6 +42,19 @@ static public Integer totalTransactionsForApplication(MApplication anApp) {
         }
         return Integer.valueOf(aTotalTrans);
     }
+
+
+    /**
+     * Returns the total number of transactions for running instances of the given monitored application
+     * If the monitored application has no running instances, returns Integer.valueOf(0)
+     * 
+     * @param monitoredApplication
+     * @return
+     */
+    public static Integer totalTransactionsForActiveInstancesOfApplication(MApplication monitoredApplication) {
+    	Integer totalTransactions = sumStatisticOfActiveInstances(monitoredApplication, "transactions");
+        return totalTransactions;
+    }
 
 
     static public Integer totalActiveSessionsForApplication(MApplication anApp) {
@@ -66,6 +79,49 @@ static public Integer totalActiveSessionsForApplication(MApplication anApp) {
         return Integer.valueOf(aTotalActiveSessions);
     }
 
+
+    /**
+     * Returns the total number of active sessions for running instances of the given monitored application
+     * If the monitored application has no running instances, returns Integer.valueOf(0)
+     * 
+     * @param monitoredApplication
+     * @return
+     */
+    public static Integer totalActiveSessionsForActiveInstancesOfApplication(MApplication monitoredApplication) {
+    	Integer totalActiveSessions = sumStatisticOfActiveInstances(monitoredApplication, "activeSessions");
+        return totalActiveSessions;
+    }
+
+
+    /**
+     * Calculates and returns the sum of the statistic indicated by the given statisticsKey for 
+     * the running instances of the given monitored application.
+     * 
+     * @param monitoredApplication
+     * @param statisticsKey
+     * @return
+     */
+    protected static Integer sumStatisticOfActiveInstances(MApplication monitoredApplication, String statisticsKey){
+        int sum = 0;
+        NSArray<MInstance> instances = monitoredApplication.instanceArray();
+        for (MInstance anInstance : instances) {
+        	if (anInstance.isRunning_M()){
+	            NSDictionary statistics = anInstance.statistics();
+	            if (statistics != null) {
+	                try {
+	                    String aValue = (String) statistics.valueForKey(statisticsKey);
+	                    sum = sum + Integer.parseInt(aValue);
+	                } catch (Throwable ex) {
+	                    // do nothing
+	                }
+	            }	
+        	}
+		}
+        Integer sumAsInteger = Integer.valueOf(sum);
+        return sumAsInteger;
+    }
+
+
 
     static public Float totalAverageTransactionForApplication(MApplication anApp) {
         NSArray anInstArray = anApp.instanceArray();