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 91410200C4E for ; Thu, 6 Apr 2017 08:35:38 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8FE7F160BA4; Thu, 6 Apr 2017 06:35:38 +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 D7740160BA6 for ; Thu, 6 Apr 2017 08:35:37 +0200 (CEST) Received: (qmail 95716 invoked by uid 500); 6 Apr 2017 06:35:36 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 95487 invoked by uid 99); 6 Apr 2017 06:35:36 -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; Thu, 06 Apr 2017 06:35:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 872E6E0896; Thu, 6 Apr 2017 06:35:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajani@apache.org To: commits@cloudstack.apache.org Date: Thu, 06 Apr 2017 06:35:40 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: updated refs/heads/master to 5c0979f archived-at: Thu, 06 Apr 2017 06:35:38 -0000 Merge release branch 4.9 to master * 4.9: CLOUDSTACK-9783: Improve metrics view performance Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5c0979ff Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5c0979ff Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5c0979ff Branch: refs/heads/master Commit: 5c0979fff5fba6cca07998ef76e01897d1218747 Parents: 85d073b 6548839 Author: Rajani Karuturi Authored: Thu Apr 6 12:04:55 2017 +0530 Committer: Rajani Karuturi Committed: Thu Apr 6 12:04:55 2017 +0530 ---------------------------------------------------------------------- .travis.yml | 1 + .../command/admin/cluster/ListClustersCmd.java | 12 +- .../api/command/admin/host/ListHostsCmd.java | 20 +- .../cloudstack/api/response/HostResponse.java | 159 +++++ .../cloudstack/api/response/NicResponse.java | 84 ++- .../api/response/StoragePoolResponse.java | 8 + .../cloudstack/api/response/UserVmResponse.java | 24 + .../cloudstack/api/response/VolumeResponse.java | 149 ++++- .../cloudstack/api/response/ZoneResponse.java | 88 +++ client/pom.xml | 5 + .../schema/src/com/cloud/dc/dao/ClusterDao.java | 8 +- .../src/com/cloud/dc/dao/ClusterDaoImpl.java | 28 +- .../schema/src/com/cloud/dc/dao/HostPodDao.java | 2 +- .../src/com/cloud/dc/dao/HostPodDaoImpl.java | 6 +- plugins/metrics/pom.xml | 55 ++ .../cloudstack/metrics/module.properties | 18 + .../metrics/spring-metrics-context.xml | 27 + .../cloudstack/api/ListClustersMetricsCmd.java | 51 ++ .../cloudstack/api/ListHostsMetricsCmd.java | 54 ++ .../cloudstack/api/ListInfrastructureCmd.java | 52 ++ .../api/ListStoragePoolsMetricsCmd.java | 52 ++ .../cloudstack/api/ListVMsMetricsCmd.java | 51 ++ .../cloudstack/api/ListVolumesMetricsCmd.java | 51 ++ .../cloudstack/api/ListZonesMetricsCmd.java | 52 ++ .../cloudstack/metrics/MetricsService.java | 46 ++ .../cloudstack/metrics/MetricsServiceImpl.java | 563 +++++++++++++++++ .../response/ClusterMetricsResponse.java | 211 +++++++ .../response/HostMetricsResponse.java | 204 ++++++ .../response/InfrastructureResponse.java | 101 +++ .../response/StoragePoolMetricsResponse.java | 105 ++++ .../cloudstack/response/VmMetricsResponse.java | 108 ++++ .../response/VolumeMetricsResponse.java | 41 ++ .../response/ZoneMetricsResponse.java | 206 ++++++ plugins/pom.xml | 1 + .../com/cloud/api/query/dao/HostJoinDao.java | 2 + .../cloud/api/query/dao/HostJoinDaoImpl.java | 15 + .../deploy/DeploymentPlanningManagerImpl.java | 2 +- test/integration/smoke/test_metrics_api.py | 210 +++++++ tools/apidoc/gen_toc.py | 4 +- ui/scripts/metrics.js | 626 +++---------------- ui/scripts/system.js | 331 +--------- ui/scripts/ui/widgets/listView.js | 9 +- 42 files changed, 2922 insertions(+), 920 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c0979ff/.travis.yml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c0979ff/client/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c0979ff/plugins/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c0979ff/ui/scripts/system.js ----------------------------------------------------------------------