You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/24 15:24:22 UTC
[7/7] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/db999ae8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/db999ae8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/db999ae8
Branch: refs/heads/branch-dev-patch-upgrade
Commit: db999ae82c148dd69340fb40efff4d0b1c06fa04
Parents: a5b673d 6e002b2
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Feb 24 09:23:53 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Feb 24 09:23:53 2016 -0500
----------------------------------------------------------------------
.../resources/ui/admin-web/app/scripts/app.js | 3 +-
.../app/scripts/controllers/NavbarCtrl.js | 3 +-
.../authentication/AuthenticationMainCtrl.js | 3 +-
.../ui/admin-web/app/scripts/routes.js | 7 +-
.../app/views/authentication/main.html | 2 +-
.../ui/admin-web/app/views/leftNavbar.html | 2 +-
.../pluggable_stack_definition/configs/PHD.json | 167 ++++++++++++++++++-
.../conf/unix/metric_monitor.ini | 7 +-
.../src/main/python/core/config_reader.py | 36 +++-
.../src/main/python/core/controller.py | 1 -
.../src/main/python/core/emitter.py | 34 ++--
.../src/main/python/core/security.py | 98 +++++++++++
.../src/test/python/core/TestEmitter.py | 65 ++++----
.../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 40 ++++-
.../0.1.0/package/scripts/functions.py | 4 -
.../package/scripts/metrics_grafana_util.py | 58 +++++--
.../0.1.0/package/scripts/network.py | 39 +++++
.../0.1.0/package/scripts/params.py | 4 +-
.../0.1.0/package/scripts/service_check.py | 24 ++-
.../package/templates/metric_monitor.ini.j2 | 5 +-
.../metrics_grafana_datasource.json.j2 | 2 +-
.../AMBARI_METRICS/test_metrics_collector.py | 10 ++
.../AMBARI_METRICS/test_metrics_grafana.py | 12 +-
.../python/stacks/2.0.6/configs/default.json | 10 ++
ambari-server/src/test/python/unitTests.py | 8 +
ambari-web/app/router.js | 5 +-
ambari-web/app/styles/application.less | 15 +-
.../app/styles/enhanced_service_dashboard.less | 8 +-
.../app/templates/common/chart/linear_time.hbs | 4 +-
.../app/templates/main/charts/linear_time.hbs | 1 +
.../app/views/common/chart/linear_time.js | 48 +++++-
.../views/common/widget/graph_widget_view.js | 30 ++++
.../dashboard/widgets/cluster_metrics_widget.js | 2 +
.../test/views/common/chart/linear_time_test.js | 90 +++++++---
34 files changed, 709 insertions(+), 138 deletions(-)
----------------------------------------------------------------------