modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
| 3 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
| 6 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
| 11 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
| 22 ++++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
| 14 +++---
5 files changed, 32 insertions(+), 24 deletions(-)
New commits:
commit ed0735e68da5aa85e5b59280a8d6ebda91019053
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Jun 25 13:18:25 2013 -0700
For group graphs, eliminate loading of graphs on other monitor tabs.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 9a189a6..8791640 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -526,9 +526,7 @@ public class ResourceGroupDetailView extends
group.setResourceType(type);
updateTabContent(groupComposite, viewPath.isRefresh());
selectTab(getTabName(), getSubTabName(), viewPath);
- if (null != graphListView) {
- graphListView.redrawGraphs();
- }
+
} finally {
notifyViewRenderedListeners();
}
@@ -538,9 +536,7 @@ public class ResourceGroupDetailView extends
try {
updateTabContent(groupComposite, viewPath.isRefresh());
selectTab(getTabName(), getSubTabName(), viewPath);
- if (null != graphListView) {
- graphListView.redrawGraphs();
- }
+
} finally {
notifyViewRenderedListeners();
}
commit 4249045a429bb3b4e7eb761b8b976562707982e5
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Jun 25 12:07:35 2013 -0700
For graphs get rid of the warnings in the browser console logs.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
index bd021f1..6060305 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
@@ -100,6 +100,16 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
chart,
svg;
+ // adjust the min scale so blue low line is not in axis
+ function determineLowBound(min, peak) {
+ var newLow = min - ((peak - min) * 0.1);
+ if (newLow < 0) {
+ return 0;
+ }
+ else {
+ return newLow;
+ }
+ }
function getChartWidth() {
return $wnd.jQuery("#" + chartContext.chartHandle).width();
@@ -153,6 +163,7 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
min = $wnd.d3.min(minFiltered.map(function (d) {
return d.low;
}));
+ lowBound = determineLowBound(min, peak);
highBound = peak + ((peak - min) * 0.1);
oobMax = $wnd.d3.max(chartContext.data.map(function (d) {
if (d.baselineMax == undefined) {
commit 4fe440f6f4d7a74d40de11260f75b0eab2a6250d
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Jun 25 10:49:10 2013 -0700
Remove unnecessary loading of graphs on other monitor subtabs.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
index 0f3e555..07331ed 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
@@ -235,9 +235,6 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends
Layout, V extends
// safely rendered. Make sure to notify even on failure.
try {
this.selectTab(this.tabName, this.subTabName, viewPath);
- if(null != graphListView){
- graphListView.redrawGraphs();
- }
} finally {
notifyViewRenderedListeners();
}
commit aea006e342ebc294c79370052206de302b7347ba
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Jun 25 09:42:56 2013 -0700
Provide consistent labeling/bookmarking for group and resource detail views.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 2e4e169..9a189a6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -100,8 +100,8 @@ public class ResourceGroupDetailView extends
// subtabs
private SubTab summaryActivity;
private SubTab summaryTimeline;
- private SubTab monitorNewGraphs;
- private SubTab monitorTables;
+ private SubTab monitorGraphs;
+ private SubTab monitorMetrics;
private SubTab monitorTraits;
private SubTab monitorSched;
private SubTab monitorCallTime;
@@ -191,13 +191,13 @@ public class ResourceGroupDetailView extends
monitoringTab = new TwoLevelTab(new ViewName("Monitoring",
MSG.view_tabs_common_monitoring()),
IconEnum.SUSPECT_METRICS);
- monitorNewGraphs = new SubTab(monitoringTab, new ViewName("NewGraphs",
MSG.view_tabs_common_graphs()), null);
- monitorTables = new SubTab(monitoringTab, new ViewName("Metrics",
MSG.view_tabs_common_metrics()), null);
+ monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs",
MSG.view_tabs_common_graphs()), null);
+ monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics",
MSG.view_tabs_common_metrics()), null);
monitorTraits = new SubTab(monitoringTab, new ViewName("Traits",
MSG.view_tabs_common_traits()), null);
monitorSched = new SubTab(monitoringTab, new ViewName("Schedules",
MSG.view_tabs_common_schedules()), null);
monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime",
MSG.view_tabs_common_calltime()), null);
- monitoringTab.registerSubTabs( monitorNewGraphs, monitorTables, monitorTraits,
monitorSched,
+ monitoringTab.registerSubTabs(monitorGraphs, monitorMetrics, monitorTraits,
monitorSched,
monitorCallTime);
tabs.add(monitoringTab);
@@ -289,7 +289,7 @@ public class ResourceGroupDetailView extends
}
};
- updateSubTab(this.monitoringTab, this.monitorNewGraphs, visible, true,
viewFactory);
+ updateSubTab(this.monitoringTab, this.monitorGraphs, visible, true,
viewFactory);
// visible = same test as above
viewFactory = (!visible) ? null : new ViewFactory() {
@@ -299,7 +299,7 @@ public class ResourceGroupDetailView extends
return new GroupMonitoringTablesView(groupComposite);
}
};
- updateSubTab(this.monitoringTab, this.monitorTables, visible, true,
viewFactory);
+ updateSubTab(this.monitoringTab, this.monitorMetrics, visible, true,
viewFactory);
visible = hasMetricsOfType(this.groupComposite, DataType.TRAIT);
viewFactory = (!visible) ? null : new ViewFactory() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 052a775..2d33d66 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -129,8 +129,8 @@ public class ResourceDetailView extends
private SubTab summaryActivity;
private SubTab summaryTimeline;
- private SubTab monitorNewGraphs;
- private SubTab monitorTables;
+ private SubTab monitorGraphs;
+ private SubTab monitorMetrics;
private SubTab monitorTraits;
private SubTab monitorAvail;
private SubTab monitorSched;
@@ -196,15 +196,15 @@ public class ResourceDetailView extends
monitoringTab = new TwoLevelTab(new ViewName("Monitoring",
MSG.view_tabs_common_monitoring()),
IconEnum.SUSPECT_METRICS);
- monitorNewGraphs = new SubTab(monitoringTab, new ViewName("Graphs",
MSG.view_tabs_common_graphs()), null);
+ monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs",
MSG.view_tabs_common_graphs()), null);
- monitorTables = new SubTab(monitoringTab, new ViewName("Tables",
"Tables"), null);
+ monitorMetrics = new SubTab(monitoringTab, new ViewName("Metrics",
"Metrics"), null);
monitorTraits = new SubTab(monitoringTab, new ViewName("Traits",
MSG.view_tabs_common_traits()), null);
monitorAvail = new SubTab(monitoringTab, new ViewName("Availability",
MSG.view_tabs_common_availability()),
null);
monitorSched = new SubTab(monitoringTab, new ViewName("Schedules",
MSG.view_tabs_common_schedules()), null);
monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime",
MSG.view_tabs_common_calltime()), null);
- monitoringTab.registerSubTabs(monitorNewGraphs, monitorTables, monitorTraits,
monitorAvail,
+ monitoringTab.registerSubTabs(monitorGraphs, monitorMetrics, monitorTraits,
monitorAvail,
monitorSched, monitorCallTime);
tabs.add(monitoringTab);
@@ -401,7 +401,7 @@ public class ResourceDetailView extends
return createD3GraphListView();
}
};
- updateSubTab(this.monitoringTab, this.monitorNewGraphs, visible, visibleToIE8,
viewFactory);
+ updateSubTab(this.monitoringTab, this.monitorGraphs, visible, visibleToIE8,
viewFactory);
// visible = same test as above
viewFactory = (!visible) ? null : new ViewFactory() {
@@ -410,7 +410,7 @@ public class ResourceDetailView extends
return new MeasurementTableView(resource.getId());
}
};
- updateSubTab(this.monitoringTab, this.monitorTables, visible, true,
viewFactory);
+ updateSubTab(this.monitoringTab, this.monitorMetrics, visible, true,
viewFactory);
visible = hasMetricsOfType(this.resourceComposite, DataType.TRAIT);
viewFactory = (!visible) ? null : new ViewFactory() {
commit ea1e470fb7ca7154b7e5e3a9e71135dbfc7ebc27
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Jun 25 09:12:08 2013 -0700
Loosen the number of aggregate bars to detect before disabling average trendline.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
index 91d829c..a7abbd9 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/MetricGraphData.java
@@ -368,11 +368,15 @@ public class MetricGraphData implements JsonMetricProducer {
*/
public boolean showBarAvgTrendLine() {
for (MeasurementDataNumericHighLowComposite measurement : metricData) {
+ int numberOfAggBars = 0;
boolean noValuesInCurrentBarUndefined =
(!Double.isNaN(measurement.getValue()) &&
!Double.isNaN(measurement.getHighValue()) &&
!Double.isNaN(measurement.getLowValue()));
boolean foundAggregateBar = (measurement.getValue() !=
measurement.getHighValue() || measurement.getHighValue() != measurement.getLowValue());
// if there exists a even one aggregate bar then I can short circuit this and
exit
if (noValuesInCurrentBarUndefined && foundAggregateBar){
- return true;
+ numberOfAggBars++;
+ if(numberOfAggBars > 4){
+ return true;
+ }
}
}
return false;