You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2013/08/15 21:36:34 UTC
git commit: AMBARI-2919. YARN 'Cluster Memory' and 'Containers'
graphs should use /root queue. (srimanth)
Updated Branches:
refs/heads/trunk aa5933a5a -> 6141422e0
AMBARI-2919. YARN 'Cluster Memory' and 'Containers' graphs should use /root queue. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/6141422e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/6141422e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/6141422e
Branch: refs/heads/trunk
Commit: 6141422e0837e6bf6c59bf2be008ea05851674b2
Parents: aa5933a
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Thu Aug 15 12:19:52 2013 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Thu Aug 15 12:27:12 2013 -0700
----------------------------------------------------------------------
ambari-web/app/utils/ajax.js | 4 ++--
.../main/service/info/metrics/yarn/allocated.js | 18 ++++++++++++------
.../info/metrics/yarn/allocated_container.js | 10 +++++-----
3 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6141422e/ambari-web/app/utils/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax.js b/ambari-web/app/utils/ajax.js
index 5f55d9c..ac522ec 100644
--- a/ambari-web/app/utils/ajax.js
+++ b/ambari-web/app/utils/ajax.js
@@ -427,12 +427,12 @@ var urls = {
'testInProduction': true
},
'service.metrics.yarn.queue.allocated': {
- 'real': '/clusters/{clusterName}/hosts/{resourceManager}/host_components/RESOURCEMANAGER?fields=metrics/yarn/Queue/AvailableMB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/yarn/Queue/PendingMB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/yarn/Queue/AllocatedMB[{fromSeconds},{toSeconds},{stepSeconds}]',
+ 'real': '/clusters/{clusterName}/hosts/{resourceManager}/host_components/RESOURCEMANAGER?fields=metrics/yarn/Queue/root/AvailableMB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/yarn/Queue/root/PendingMB[{fromSeconds},{toSeconds},{stepSeconds}],metrics/yarn/Queue/root/AllocatedMB[{fromSeconds},{toSeconds},{stepSeconds}]',
'mock': '',
'testInProduction': true
},
'service.metrics.yarn.queue.allocated.container': {
- 'real': '/clusters/{clusterName}/hosts/{resourceManager}/host_components/RESOURCEMANAGER?fields=metrics/yarn/Queue/AllocatedContainers[{fromSeconds},{toSeconds},{stepSeconds}],metrics/yarn/Queue/ReservedContainers[{fromSeconds},{toSeconds},{stepSeconds}],metrics/yarn/Queue/PendingContainers[{fromSeconds},{toSeconds},{stepSeconds}]',
+ 'real': '/clusters/{clusterName}/hosts/{resourceManager}/host_components/RESOURCEMANAGER?fields=metrics/yarn/Queue/root/AllocatedContainers[{fromSeconds},{toSeconds},{stepSeconds}],metrics/yarn/Queue/root/ReservedContainers[{fromSeconds},{toSeconds},{stepSeconds}],metrics/yarn/Queue/root/PendingContainers[{fromSeconds},{toSeconds},{stepSeconds}]',
'mock': '',
'testInProduction': true
},
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6141422e/ambari-web/app/views/main/service/info/metrics/yarn/allocated.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/metrics/yarn/allocated.js b/ambari-web/app/views/main/service/info/metrics/yarn/allocated.js
index 1f11699..e7f922a 100644
--- a/ambari-web/app/views/main/service/info/metrics/yarn/allocated.js
+++ b/ambari-web/app/views/main/service/info/metrics/yarn/allocated.js
@@ -31,13 +31,15 @@ App.ChartServiceMetricsYARN_AllocatedMemory = App.ChartLinearTimeView.extend({
title: Em.I18n.t('services.service.info.metrics.yarn.allocated.memory'),
renderer: 'line',
ajaxIndex: 'service.metrics.yarn.queue.allocated',
+ yAxisFormatter: App.ChartLinearTimeView.BytesFormatter,
transformToSeries: function (jsonData) {
var seriesArray = [];
- if (jsonData && jsonData.metrics && jsonData.metrics.yarn.Queue) {
- for (var name in jsonData.metrics.yarn.Queue) {
- var displayName;
- var seriesData = jsonData.metrics.yarn.Queue[name];
+ var MB = Math.pow(2, 20);
+ if (jsonData && jsonData.metrics && jsonData.metrics.yarn.Queue && jsonData.metrics.yarn.Queue.root) {
+ for (var name in jsonData.metrics.yarn.Queue.root) {
+ var displayName = null;
+ var seriesData = jsonData.metrics.yarn.Queue.root[name];
switch (name) {
case "AvailableMB":
displayName = Em.I18n.t('services.service.info.metrics.yarn.allocated.memory.displayNames.available');
@@ -51,8 +53,12 @@ App.ChartServiceMetricsYARN_AllocatedMemory = App.ChartLinearTimeView.extend({
default:
break;
}
- if (seriesData) {
- seriesArray.push(this.transformData(seriesData, displayName));
+ if (seriesData && displayName) {
+ var s = this.transformData(seriesData, displayName);
+ for (var i = 0; i < s.data.length; i++) {
+ s.data[i].y *= MB;
+ }
+ seriesArray.push(s);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6141422e/ambari-web/app/views/main/service/info/metrics/yarn/allocated_container.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/metrics/yarn/allocated_container.js b/ambari-web/app/views/main/service/info/metrics/yarn/allocated_container.js
index e3110b8..942d1b4 100644
--- a/ambari-web/app/views/main/service/info/metrics/yarn/allocated_container.js
+++ b/ambari-web/app/views/main/service/info/metrics/yarn/allocated_container.js
@@ -34,10 +34,10 @@ App.ChartServiceMetricsYARN_AllocatedContainer = App.ChartLinearTimeView.extend(
transformToSeries: function (jsonData) {
var seriesArray = [];
- if (jsonData && jsonData.metrics && jsonData.metrics.yarn.Queue) {
- for (var name in jsonData.metrics.yarn.Queue) {
- var displayName;
- var seriesData = jsonData.metrics.yarn.Queue[name];
+ if (jsonData && jsonData.metrics && jsonData.metrics.yarn.Queue && jsonData.metrics.yarn.Queue.root) {
+ for (var name in jsonData.metrics.yarn.Queue.root) {
+ var displayName = null;
+ var seriesData = jsonData.metrics.yarn.Queue.root[name];
switch (name) {
case "ReservedContainers":
displayName = Em.I18n.t('services.service.info.metrics.yarn.allocated.container.displayNames.reserved');
@@ -51,7 +51,7 @@ App.ChartServiceMetricsYARN_AllocatedContainer = App.ChartLinearTimeView.extend(
default:
break;
}
- if (seriesData != null) {
+ if (seriesData != null && displayName) {
seriesArray.push(this.transformData(seriesData, displayName));
}
}