You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/05/14 08:38:56 UTC
ambari git commit: AMBARI-11122. Create widget wizard: JMX metrics
not shown for selection while adding metrics. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk c20250c5c -> 8452f207d
AMBARI-11122. Create widget wizard: JMX metrics not shown for selection while adding metrics. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8452f207
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8452f207
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8452f207
Branch: refs/heads/trunk
Commit: 8452f207d7b9343a162698f2a2b79bf2c512e9d3
Parents: c20250c
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Wed May 13 23:38:37 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Wed May 13 23:38:37 2015 -0700
----------------------------------------------------------------------
.../service/widgets/create/wizard_controller.js | 38 +++++++++++---------
.../service/widgets/create/expression_view.js | 4 +--
2 files changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8452f207/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
index 940f7c8..e9f5abd 100644
--- a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
+++ b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
@@ -229,23 +229,29 @@ App.WidgetWizardController = App.WizardController.extend({
var data = service.artifacts[0].artifact_data[service.StackServices.service_name];
for (var componentName in data) {
for (var level in data[componentName]) {
- metrics = data[componentName][level][0]['metrics']['default'];
- for (var widgetId in metrics) {
- var metricObj = {
- widget_id: widgetId,
- point_in_time: metrics[widgetId].pointInTime,
- temporal: metrics[widgetId].temporal,
- name: metrics[widgetId].name,
- level: level.toUpperCase(),
- type: data[componentName][level][0]["type"].toUpperCase(),
- component_name: componentName,
- service_name: service.StackServices.service_name
- };
- result.push(metricObj);
- if (metricObj.level === 'HOSTCOMPONENT') {
- self.insertHostComponentCriteria(metricObj);
+ var metricTypes = data[componentName][level]; //Ganglia or JMX
+ metricTypes.forEach(function (_metricType) {
+ metrics = _metricType['metrics']['default'];
+ var type = _metricType["type"].toUpperCase();
+ if (!(type === 'JMX' && level.toUpperCase() === 'COMPONENT')) {
+ for (var widgetId in metrics) {
+ var metricObj = {
+ widget_id: widgetId,
+ point_in_time: metrics[widgetId].pointInTime,
+ temporal: metrics[widgetId].temporal,
+ name: metrics[widgetId].name,
+ level: level.toUpperCase(),
+ type: type,
+ component_name: componentName,
+ service_name: service.StackServices.service_name
+ };
+ result.push(metricObj);
+ if (metricObj.level === 'HOSTCOMPONENT') {
+ self.insertHostComponentCriteria(metricObj);
+ }
+ }
}
- }
+ }, this);
}
}
}, this);
http://git-wip-us.apache.org/repos/asf/ambari/blob/8452f207/ambari-web/app/views/main/service/widgets/create/expression_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/widgets/create/expression_view.js b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 2e6c572..5c12ca9 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -171,8 +171,8 @@ App.AddMetricExpressionView = Em.View.extend({
var filteredMetric = filteredComponentMetrics.findProperty('name', obj.selected);
var selectedMetric = Em.Object.create({
name: obj.selected,
- componentName: self.get('selectedComponent.componentName'),
- serviceName: self.get('selectedComponent.serviceName'),
+ componentName: self.get('currentSelectedComponent.componentName'),
+ serviceName: self.get('currentSelectedComponent.serviceName'),
metricPath: filteredMetric.widget_id,
isMetric: true
});