[Hyperic-hq-discuss] hq r14522 - in trunk/src/org/hyperic/hq: bizapp/server/session measurement/server/session ui/action/resource/common/monitor/visibility

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

Author: pnguyen
Date: 2010-04-20 22:10:04 -0700 (Tue, 20 Apr 2010)
New Revision: 14522
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14522

Modified:
   trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java
   trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java
   trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java
Log:
[HHQ-3748] The "# Coll" column for availability is now = sum of # of metric data points for each resource in the group. The "SUM" column for percentage metrics now show the AVG value instead of calculating the # of resources in the group * AVG value. 

Modified: trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java
===================================================================
--- trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java	2010-04-21 00:35:42 UTC (rev 14521)
+++ trunk/src/org/hyperic/hq/bizapp/server/session/MetricSessionEJB.java	2010-04-21 05:10:04 UTC (rev 14522)
@@ -276,14 +276,12 @@
             summary.setMetric(MetricDisplayConstants.LAST_KEY,
                 new MetricDisplayValue(
                         data[MeasurementConstants.IND_LAST_TIME]));
-        }
-        else {
-            // Availability does not need to be summed
-            if (tmpl.isAvailability()) {
+        } else {
+            // Percentage metrics (including Availability) do not need to be summed
+            if (MeasurementConstants.UNITS_PERCENTAGE.equals(tmpl.getUnits())) {
                 summary.setMetric(MetricDisplayConstants.LAST_KEY,
                     new MetricDisplayValue(data[MeasurementConstants.IND_AVG]));
-            }
-            else {
+            } else {
                 summary.setMetric(MetricDisplayConstants.LAST_KEY,
                     new MetricDisplayValue(
                         data[MeasurementConstants.IND_AVG] *

Modified: trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java	2010-04-21 00:35:42 UTC (rev 14521)
+++ trunk/src/org/hyperic/hq/measurement/server/session/AvailabilityManagerEJBImpl.java	2010-04-21 05:10:04 UTC (rev 14522)
@@ -535,7 +535,7 @@
 
             // Expect data to be sorted by end time, so that the last value
             // returned is the final count and the last value
-            data[IND_CFG_COUNT] = (objs[4] == null) 
+            data[IND_CFG_COUNT] += (objs[4] == null) 
                                     ? 0 : ((java.lang.Number)objs[4]).doubleValue();
             data[IND_LAST_TIME] = ((Double)objs[2]).doubleValue();
 

Modified: trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java
===================================================================
--- trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java	2010-04-21 00:35:42 UTC (rev 14521)
+++ trunk/src/org/hyperic/hq/ui/action/resource/common/monitor/visibility/IndicatorChartsAction.java	2010-04-21 05:10:04 UTC (rev 14522)
@@ -284,6 +284,10 @@
         return data;    
     }
     
+    /**
+     * TODO: The logic here is similar to MetricSessionEJB.getMetricDisplaySummary().
+     * Need to consolidate the code.
+     */
     private MetricDisplaySummary getSummarizedMetricData(MeasurementTemplate template, double[] data, long begin, long end, int totalConfigured) {
         MetricDisplaySummary summary = new MetricDisplaySummary();
         
@@ -314,8 +318,8 @@
             if (totalConfigured == 1 || template.getCollectionType() == MeasurementConstants.COLL_TYPE_STATIC) {
                 summary.setMetric(MetricDisplayConstants.LAST_KEY, new MetricDisplayValue(data[MeasurementConstants.IND_LAST_TIME]));
             } else {
-                // Availability does not need to be summed
-                if (template.isAvailability()) {
+                // Percentage metrics (including Availability) do not need to be summed
+                if (MeasurementConstants.UNITS_PERCENTAGE.equals(template.getUnits())) {
                     summary.setMetric(MetricDisplayConstants.LAST_KEY, new MetricDisplayValue(data[MeasurementConstants.IND_AVG]));
                 } else {
                     summary.setMetric(MetricDisplayConstants.LAST_KEY, new MetricDisplayValue(data[MeasurementConstants.IND_AVG] * data[MeasurementConstants.IND_CFG_COUNT]));