eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jay...@apache.org
Subject eagle git commit: [MINOR] Sync 0.5 branch with master branch changes
Date Thu, 18 May 2017 05:47:50 GMT
Repository: eagle
Updated Branches:
  refs/heads/branch-0.5 31aa29f59 -> 7111b7656


[MINOR] Sync 0.5 branch with master branch changes

Author: zombieJ <smith3816@gmail.com>

Closes #937 from qingwen220/master.


Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/7111b765
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/7111b765
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/7111b765

Branch: refs/heads/branch-0.5
Commit: 7111b7656e28fa2e30dc2dfdbb79e53a75c20f45
Parents: 31aa29f
Author: zombieJ <smith3816@gmail.com>
Authored: Wed May 17 22:47:38 2017 -0700
Committer: Jay <jhsonline@gmail.com>
Committed: Wed May 17 22:47:38 2017 -0700

----------------------------------------------------------------------
 .../main/webapp/app/apps/jpm/ctrl/overviewCtrl.js  | 17 +++++++++++++----
 .../webapp/app/apps/jpm/partials/job/detail.html   |  2 +-
 .../webapp/app/apps/jpm/partials/job/overview.html |  8 ++++----
 3 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/eagle/blob/7111b765/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/overviewCtrl.js
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/overviewCtrl.js b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/overviewCtrl.js
index 85c4547..0e6275c 100644
--- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/overviewCtrl.js
+++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/overviewCtrl.js
@@ -58,6 +58,14 @@
 				}]
 			};
 
+			$scope.opsOption = $.extend({}, $scope.commonOption, {
+				yAxis: [{
+					axisLabel: {formatter: function (value) {
+						return common.number.abbr(value);
+					}}
+				}]
+			});
+
 			// ======================================================================
 			// =                          Refresh Overview                          =
 			// ======================================================================
@@ -72,8 +80,9 @@
 				var endTime = Time.endTime();
 				var intervalMin = Time.diffInterval(startTime, endTime) / 1000 / 60;
 
-				function getTopList(metric, scopeVariable) {
+				function getTopList(metric, scopeVariable, aggType) {
 					var deferred = $q.defer();
+					aggType = aggType || 'avg';
 
 					metric = common.template(metric, {
 						type: $scope.type.toLocaleLowerCase()
@@ -88,7 +97,7 @@
 					var aggregation = $scope.aggregationMap[$scope.type];
 
 					var aggPromise = cache[metric] = cache[metric] || JPM.aggMetricsToEntities(
-						JPM.aggMetrics({site: $scope.site}, metric, [aggregation], "avg(value), sum(value)
desc", intervalMin, startTime, endTime, 10)
+						JPM.aggMetrics({site: $scope.site}, metric, [aggregation], aggType + "(value), sum(value)
desc", intervalMin, startTime, endTime, 10)
 					, [0])._promise.then(function (list) {
 						var series = $.map(list, function (metrics) {
 							return JPM.metricsToSeries(metrics[0].tags[aggregation], metrics, {
@@ -125,8 +134,8 @@
 				getTopList("hadoop.${type}.history.minute.virtual_memory_bytes", "virtualMemorySeries");
 				getTopList("hadoop.${type}.history.minute.hdfs_bytes_read", "hdfsBtyesReadSeries");
 				getTopList("hadoop.${type}.history.minute.hdfs_bytes_written", "hdfsBtyesWrittenSeries");
-				getTopList("hadoop.${type}.history.minute.hdfs_read_ops", "hdfsReadOpsSeries");
-				getTopList("hadoop.${type}.history.minute.hdfs_write_ops", "hdfsWriteOpsSeries");
+				getTopList("hadoop.${type}.history.minute.hdfs_read_ops", "hdfsReadOpsSeries", 'max');
+				getTopList("hadoop.${type}.history.minute.hdfs_write_ops", "hdfsWriteOpsSeries", 'max');
 				getTopList("hadoop.${type}.history.minute.file_bytes_read", "fileBytesReadSeries");
 				getTopList("hadoop.${type}.history.minute.file_bytes_written", "fileBytesWrittenSeries");
 			};

http://git-wip-us.apache.org/repos/asf/eagle/blob/7111b765/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/detail.html
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/detail.html
b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/detail.html
index eeb5976..573b092 100644
--- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/detail.html
+++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/detail.html
@@ -136,7 +136,7 @@
 						<tr>
 							<th>Reduce vCores</th>
 							<td class="text-no-break">{{common.number.toFixed(job.jobCounters.counters["org.apache.hadoop.mapreduce.JobCounter"].VCORES_MILLIS_REDUCES)}}
ms</td>
-							<th>Map CPU</th>
+							<th>Reduce CPU</th>
 							<td class="text-no-break">{{common.number.toFixed(job.jobCounters.counters.ReduceTaskAttemptCounter.CPU_MILLISECONDS)}}
ms</td>
 							<th>HDFS Write Bytes</th>
 							<td title="{{job.jobCounters.counters['org.apache.hadoop.mapreduce.FileSystemCounter'].HDFS_BYTES_WRITTEN}}">

http://git-wip-us.apache.org/repos/asf/eagle/blob/7111b765/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/overview.html
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/overview.html
b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/overview.html
index 06e85ea..fac0296 100644
--- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/overview.html
+++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/overview.html
@@ -105,7 +105,7 @@
 				<div class="col-sm-6 col-md-8 col-lg-9">
 					<div class="jpm-chart chart-lg overlay-wrapper">
 						<h3 class="text-center">Top HDFS Read OPs</h3>
-						<div chart class="jpm-chart-container" series="hdfsReadOpsSeries" option="commonOption"></div>
+						<div chart class="jpm-chart-container" series="hdfsReadOpsSeries" option="opsOption"></div>
 						<div ng-if="!hdfsReadOpsSeries._done" class="overlay">
 							<i class="fa fa-refresh fa-spin"></i>
 						</div>
@@ -127,7 +127,7 @@
 								</a>
 								<span ng-if="type !== 'job'">{{item.name}}</span>
 							</td>
-							<td title="{{item.total}}">{{common.number.abbr(item.total, true)}}</td>
+							<td title="{{item.total}}">{{common.number.abbr(item.total)}}</td>
 						</tr>
 						</tbody>
 					</table>
@@ -140,7 +140,7 @@
 				<div class="col-sm-6 col-md-8 col-lg-9">
 					<div class="jpm-chart chart-lg overlay-wrapper">
 						<h3 class="text-center">Top HDFS Write OPs</h3>
-						<div chart class="jpm-chart-container" series="hdfsWriteOpsSeries" option="commonOption"></div>
+						<div chart class="jpm-chart-container" series="hdfsWriteOpsSeries" option="opsOption"></div>
 						<div ng-if="!hdfsWriteOpsSeries._done" class="overlay">
 							<i class="fa fa-refresh fa-spin"></i>
 						</div>
@@ -162,7 +162,7 @@
 								</a>
 								<span ng-if="type !== 'job'">{{item.name}}</span>
 							</td>
-							<td title="{{item.total}}">{{common.number.abbr(item.total, true)}}</td>
+							<td title="{{item.total}}">{{common.number.abbr(item.total)}}</td>
 						</tr>
 						</tbody>
 					</table>


Mime
View raw message