diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js index b36098b..cb0c8d3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools.js @@ -23,7 +23,7 @@ export default Ember.Controller.extend({ text: "Home", routeName: 'application' }, { - text: "Yarn Tools", + text: "YARN Tools", routeName: 'yarn-tools', }], }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js index e1eba5a..ace50e6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/helpers/node-menu.js @@ -56,11 +56,11 @@ export default Ember.Helper.helper(function(params,hash) { html = html + ' class="active"'; } html = html + '>List of ApplicationsList of Applications on this NodeList of Containers'; + '">List of Containers on this Node'; return Ember.String.htmlSafe(html); }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs index ff4682a..e7752ea 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/cluster-overview.hbs @@ -58,7 +58,7 @@
- Finished Apps + Finished Apps From All Users
{{donut-chart data=model.clusterMetrics.firstObject.getFinishedAppsDataForDonutChart @@ -74,7 +74,7 @@
- Running Apps + Running Apps From All Users
{{donut-chart data=model.clusterMetrics.firstObject.getRunningAppsDataForDonutChart diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs index acdff2f..ba48952 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/node-menu-panel.hbs @@ -29,11 +29,11 @@ {{/link-to}} {{/link-to}} {{#link-to 'yarn-node-apps' tagName="li"}} - {{#link-to 'yarn-node-apps' nodeId encodedAddr}}List of Applications + {{#link-to 'yarn-node-apps' nodeId encodedAddr}}List of Applications on this Node {{/link-to}} {{/link-to}} {{#link-to 'yarn-node-containers' tagName="li"}} - {{#link-to 'yarn-node-containers' nodeId encodedAddr}}List of Containers + {{#link-to 'yarn-node-containers' nodeId encodedAddr}}List of Containers on this Node {{/link-to}} {{/link-to}} {{#if (and nmGpuInfo nmGpuInfo.info.totalGpuDevices)}} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs index a7260bc..11fed76 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue-info.hbs @@ -20,7 +20,7 @@
- Running Apps: {{model.selected}} + Running Apps From All Users: {{model.selected}}
{{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs index 9ad2a6f..6615b1d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/capacity-queue.hbs @@ -35,7 +35,7 @@ {{yarn-queue-partition-capacity-labels partitionMap=model.selectedQueue.partitionMap queue=model.selectedQueue filteredPartition=filteredPartition}}
-
Running Apps
+
Running Apps From All Users in Queue
{{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData showLabels=true diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs index a770bfe..3e368ae 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue-info.hbs @@ -51,7 +51,7 @@
- Running Apps: {{model.selected}} + Running Apps From All Users: {{model.selected}}
{{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs index dcc80c1..85670da 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/yarn-queue/fair-queue.hbs @@ -50,7 +50,7 @@
- Running Apps: {{model.selected}} + Running Apps From All Users: {{model.selected}}
{{donut-chart data=model.selectedQueue.numOfApplicationsDonutChartData diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs index 2f618fd..3efcf57 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools.hbs @@ -67,7 +67,7 @@
- Finished Apps + Finished Apps From All Users
{{donut-chart data=model.clusterMetrics.firstObject.getFinishedAppsDataForDonutChart @@ -84,7 +84,7 @@
- Running Apps + Running Apps From All Users
{{donut-chart data=model.clusterMetrics.firstObject.getRunningAppsDataForDonutChart