Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3AE76200C36 for ; Fri, 10 Mar 2017 07:29:24 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 399D1160B79; Fri, 10 Mar 2017 06:29:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8726C160B69 for ; Fri, 10 Mar 2017 07:29:23 +0100 (CET) Received: (qmail 76967 invoked by uid 500); 10 Mar 2017 06:29:22 -0000 Mailing-List: contact commits-help@eagle.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.apache.org Delivered-To: mailing list commits@eagle.apache.org Received: (qmail 76958 invoked by uid 99); 10 Mar 2017 06:29:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Mar 2017 06:29:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6F6ABDFB7D; Fri, 10 Mar 2017 06:29:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jilin@apache.org To: commits@eagle.apache.org Message-Id: <4896d27c69ae4585957674bae63e7e8b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: eagle git commit: [EAGLE-945] support queue in JPM overview Date: Fri, 10 Mar 2017 06:29:22 +0000 (UTC) archived-at: Fri, 10 Mar 2017 06:29:24 -0000 Repository: eagle Updated Branches: refs/heads/master 1085dae69 -> dd16620e2 [EAGLE-945] support queue in JPM overview JPM overviewCtrl add queue type Author: zombieJ Closes #861 from zombieJ/EAGLE-945. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/dd16620e Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/dd16620e Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/dd16620e Branch: refs/heads/master Commit: dd16620e235478b27e83565432ac2c98d070a175 Parents: 1085dae Author: zombieJ Authored: Fri Mar 10 14:29:12 2017 +0800 Committer: zombieJ Committed: Fri Mar 10 14:29:12 2017 +0800 ---------------------------------------------------------------------- .../webapp/app/apps/jpm/ctrl/overviewCtrl.js | 5 +++-- .../src/main/webapp/app/apps/jpm/index.js | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/dd16620e/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 7d7b949..85c4547 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 @@ -26,7 +26,8 @@ $scope.aggregationMap = { job: "jobId", user: "user", - jobType: "jobType" + jobType: "jobType", + queue: "queue", }; $scope.site = $wrapState.param.siteId; @@ -88,7 +89,7 @@ var aggPromise = cache[metric] = cache[metric] || JPM.aggMetricsToEntities( JPM.aggMetrics({site: $scope.site}, metric, [aggregation], "avg(value), sum(value) desc", intervalMin, startTime, endTime, 10) - )._promise.then(function (list) { + , [0])._promise.then(function (list) { var series = $.map(list, function (metrics) { return JPM.metricsToSeries(metrics[0].tags[aggregation], metrics, { stack: "stack", http://git-wip-us.apache.org/repos/asf/eagle/blob/dd16620e/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/index.js ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/index.js b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/index.js index 234c539..178b24f 100644 --- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/index.js +++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/index.js @@ -327,6 +327,12 @@ return _list; }; + /** + * + * @param list + * @param flatten {bool|[]} bool will set merge result. array will pick only contains value + * @return {Array} + */ JPM.aggMetricsToEntities = function (list, flatten) { var _list = []; _list.done = false; @@ -351,14 +357,21 @@ }; }); - if(flatten) { - _list.push.apply(_list, _subList); + if ($.isArray(flatten)) { + if (flatten.indexOf(j) !== -1) { + _list.push(_subList); + } } else { - _list.push(_subList); + if(flatten) { + _list.push.apply(_list, _subList); + } else { + _list.push(_subList); + } } }); }); _list.done = true; + return _list; }); return _list;