modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 36 +++------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java | 26 ++----- 3 files changed, 23 insertions(+), 41 deletions(-)
New commits: commit a80e5b2dbcd84b6ece2bd9eb02a9901035e89961 Author: Mike Thompson mithomps@redhat.com Date: Wed Jul 17 15:23:54 2013 -0700
Consolidated Metrics - Additional misc. bug fixes.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java index bc35ccf..811a579 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/AvailabilityOverUnderGraphType.java @@ -344,7 +344,7 @@ public class AvailabilityOverUnderGraphType implements AvailabilityGraphType { console.log("Availability Chart Drawn"); }
- }-*/; + }-*/;
public String getChartId() { return String.valueOf(entityId); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index 9273e0b..99ad1e6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -25,7 +25,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Img; -import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.layout.VLayout; @@ -57,23 +56,15 @@ public class MetricsResourceView extends AbstractD3GraphListView { private VLayout vLayout; private Img expandCollapseArrow; private MetricsTableView metricsTableView; - private MetricsViewDataSource dataSource; private ResourceMetricAvailabilityView availabilityDetails;
public MetricsResourceView(Resource resource) { super(); this.resource = resource; - dataSource = new MetricsViewDataSource(resource); metricsTableView = new MetricsTableView(resource, this); availabilityDetails = new ResourceMetricAvailabilityView(resource); }
- private EnhancedHLayout createAvailabilityDetails() { - EnhancedHLayout hLayout = new EnhancedHLayout(); - hLayout.addMember(new Label("Availability Details")); - hLayout.hide(); - return hLayout; - }
public void redrawGraphs() { this.onDraw(); @@ -91,6 +82,10 @@ public class MetricsResourceView extends AbstractD3GraphListView { vLayout.setHeight100(); vLayout.addMember(buttonBarDateTimeRangeEditor);
+ + availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( + new AvailabilityOverUnderGraphType(resource.getId())); + EnhancedHLayout expandCollapseHLayout = new EnhancedHLayout();
//add expand/collapse icon @@ -111,15 +106,18 @@ public class MetricsResourceView extends AbstractD3GraphListView { expandCollapseArrow.setSrc(IconEnum.EXPANDED_ICON.getIcon16x16Path()); expandCollapseArrow.setTooltip(EXPANDED_TOOLTIP); availabilityDetails.show(); + } - markForRedraw(); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + } + }.schedule(150); } });
- availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( - new AvailabilityOverUnderGraphType(resource.getId())); - expandCollapseHLayout.addMember(expandCollapseArrow); expandCollapseHLayout.addMember(availabilityGraph); vLayout.addMember(expandCollapseHLayout); @@ -138,8 +136,7 @@ public class MetricsResourceView extends AbstractD3GraphListView { }
@Override - protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, - final CountDownLatch countDownLatch) { + protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, CountDownLatch notUsed ) {
final long timerStart = System.currentTimeMillis();
@@ -149,26 +146,19 @@ public class MetricsResourceView extends AbstractD3GraphListView { @Override public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); - if (countDownLatch != null) { - countDownLatch.countDown(); - } }
@Override public void onSuccess(List<Availability> availList) { Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + " ms."); - availabilityList = availList; + availabilityGraph.setAvailabilityList(availList); new Timer() { @Override public void run() { availabilityGraph.drawJsniChart(); } }.schedule(150); - - if (countDownLatch != null) { - countDownLatch.countDown(); - } } }); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java index d8bfb64..a03ad1a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java @@ -154,41 +154,35 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
private String getCsvMetricsForSparkline(int definitionId) { StringBuilder sb = new StringBuilder(); - Log.debug("getCsvMetricsForSparkline.metricsDataList("+definitionId+"): " + metricsDataList.size()); List<MeasurementDataNumericHighLowComposite> selectedMetricsList = getMeasurementsForMeasurementDefId(definitionId);
for (int i = 0; i < selectedMetricsList.size(); i++) { - // take the last 20 values - //if (i >= selectedMetricsList.size() - 20) { - MeasurementDataNumericHighLowComposite measurementData = selectedMetricsList.get(i); - if (!Double.isNaN(measurementData.getValue())) { - sb.append((int) measurementData.getValue()); - sb.append(","); - } - //} + MeasurementDataNumericHighLowComposite measurementData = selectedMetricsList.get(i); + if (!Double.isNaN(measurementData.getValue())) { + sb.append((int) measurementData.getValue()); + sb.append(","); } + }
if (sb.toString().endsWith(",")) { sb.setLength(sb.length() - 1); } - Log.debug("getCsvMetricsForSparkline: " + sb.toString());
return sb.toString(); }
- List<MeasurementDataNumericHighLowComposite> getMeasurementsForMeasurementDefId(int definitionId){ - List<MeasurementDataNumericHighLowComposite> selectedMetricsDataList; + List<MeasurementDataNumericHighLowComposite> getMeasurementsForMeasurementDefId(int definitionId) { int selectedIndex = 0;
// find the ordinal position as specified when querying the metrics for (int i = 0; i < definitionArrayIds.length; i++) { - if(definitionArrayIds[i] == definitionId){ + if (definitionArrayIds[i] == definitionId) { selectedIndex = i; break; } }
- return metricsDataList.get(selectedIndex); + return metricsDataList.get(selectedIndex); }
protected String getMetricStringValue(MetricDisplayValue value) { @@ -197,7 +191,7 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
@Override protected Criteria getFetchCriteria(DSRequest request) { - // we don't use criterias for this datasource, just return null + // NOTE: we don't use criterias for this datasource, just return null return null; }
@@ -228,7 +222,6 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C BrowserUtility.graphSparkLines(); } }.schedule(150); - Log.debug("Finished CountdownLatch for metrics loaded: " + metricsDataList.size()); } });
@@ -305,7 +298,6 @@ public class MetricsViewDataSource extends RPCDataSource<MetricDisplaySummary, C
if (!measurementDataList.isEmpty()) { metricsDataList = measurementDataList; - Log.debug("Retrieved metrics metricsDataList.size: " + metricsDataList.size()); countDownLatch.countDown(); } }
rhq-commits@lists.fedorahosted.org