You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by ji...@apache.org on 2017/05/12 08:41:57 UTC
eagle git commit: [EAGLE-1020] JPM UI overview page OPS unit error
Repository: eagle
Updated Branches:
refs/heads/master 8da06636b -> 845f89151
[EAGLE-1020] JPM UI overview page OPS unit error
https://issues.apache.org/jira/browse/EAGLE-1020
Author: zombieJ <sm...@gmail.com>
Closes #931 from zombieJ/EAGLE-1020.
Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/845f8915
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/845f8915
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/845f8915
Branch: refs/heads/master
Commit: 845f891517a2befccb73267c54fc08f8dc2c811a
Parents: 8da0663
Author: zombieJ <sm...@gmail.com>
Authored: Fri May 12 16:41:44 2017 +0800
Committer: zombieJ <sm...@gmail.com>
Committed: Fri May 12 16:41:44 2017 +0800
----------------------------------------------------------------------
.../src/main/webapp/app/apps/jpm/ctrl/overviewCtrl.js | 8 ++++++++
.../src/main/webapp/app/apps/jpm/partials/job/overview.html | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/eagle/blob/845f8915/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..d50c4df 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 =
// ======================================================================
http://git-wip-us.apache.org/repos/asf/eagle/blob/845f8915/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>