Repository: eagle Updated Branches: refs/heads/master 8e76d34ea -> a64b622cc
[EAGLE-978] change max(absoluteUsedCapacity) to avg() in queueCtrl.js https://issues.apache.org/jira/browse/EAGLE-964 https://issues.apache.org/jira/browse/EAGLE-978 * change max(absoluteUsedCapacity) to avg() in queueCtrl.js * add severity column in policy list page Author: Zhao, Qingwen <[email protected]> Closes #894 from qingwen220/EAGLE-978. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/a64b622c Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/a64b622c Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/a64b622c Branch: refs/heads/master Commit: a64b622cc086198a2ae056cc9cc59fab8b4f628d Parents: 8e76d34 Author: Zhao, Qingwen <[email protected]> Authored: Wed Mar 29 14:46:54 2017 +0800 Committer: Zhao, Qingwen <[email protected]> Committed: Wed Mar 29 14:46:54 2017 +0800 ---------------------------------------------------------------------- .../eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/queueCtrl.js | 2 +- .../src/main/webapp/app/dev/partials/alert/policyList.html | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/a64b622c/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/queueCtrl.js ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/queueCtrl.js b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/queueCtrl.js index 70988f4..bfde071 100644 --- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/queueCtrl.js +++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/queueCtrl.js @@ -95,7 +95,7 @@ var promiseList = []; // Load sub queue trend promiseList.push(JPM.aggMetricsToEntities( - JPM.groups('RunningQueueService', condition, ['queue', 'parentQueue'], 'max(absoluteUsedCapacity)', intervalMin, startTime, endTime) + JPM.groups('RunningQueueService', condition, ['queue', 'parentQueue'], 'avg(absoluteUsedCapacity)', intervalMin, startTime, endTime) )._promise.then(function (list) { $scope.subQueueList = []; http://git-wip-us.apache.org/repos/asf/eagle/blob/a64b622c/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html b/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html index 7cfee58..7ee3bc0 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html +++ b/eagle-server/src/main/webapp/app/dev/partials/alert/policyList.html @@ -30,6 +30,7 @@ <tr> <th sortpath="policyStatus" width="10"></th> <th sortpath="name" width="10%">Name</th> + <th width="5%">Severity</th> <th>Description</th> <th width="85" ng-if="Auth.isAdmin">Action</th> </tr> @@ -42,6 +43,7 @@ <td> <a ui-sref="policyDetail({siteId: site, name: item.name})">{{item.name}}</a> </td> + <td>{{item.alertDefinition.severity}}</td> <td>{{item.description}}</td> <td class="text-center" ng-if="Auth.isAdmin"> <div class="btn-group btn-group-xs">
