Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df9c2378 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df9c2378 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df9c2378 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: df9c2378a9d35c131163c409d4705c2bcfa05d97 Parents: eb56813 5d629dc Author: Nate Cole <nc...@hortonworks.com> Authored: Thu Mar 16 16:01:28 2017 -0400 Committer: Nate Cole <nc...@hortonworks.com> Committed: Thu Mar 16 16:01:28 2017 -0400 ---------------------------------------------------------------------- ambari-agent/pom.xml | 75 +- .../ambari_agent/StatusCommandsExecutor.py | 6 + ambari-agent/src/packages/tarball/all.xml | 10 + .../resource_management/TestLibraryFunctions.py | 2 + .../libraries/functions/get_port_from_url.py | 6 +- .../libraries/functions/security_commons.py | 11 +- .../ambari/server/controller/AmbariServer.java | 6 + .../BlueprintConfigurationProcessor.java | 1 + .../svccomphost/ServiceComponentHostImpl.java | 1 + .../HDP/grafana-solr-cores-dashboard.json | 1581 ------------------ .../HDP/grafana-solr-hosts-dashboard.json | 269 --- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 10 +- .../ATLAS/0.7.0.2.5/metainfo.xml | 7 + .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 4 + .../KNOX/0.5.0.2.2/configuration/topology.xml | 2 +- .../0.5.0.2.2/package/scripts/params_linux.py | 7 +- .../SPARK2/2.0.0/package/scripts/params.py | 2 +- .../2.0.0/package/scripts/spark_service.py | 4 +- .../0.6.0.2.5/package/scripts/params.py | 6 +- .../services/HIVE/configuration/hive-site.xml | 4 + .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 2 +- .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 2 +- .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 2 +- .../services/YARN/configuration/yarn-site.xml | 26 + .../ZEPPELIN/configuration/zeppelin-env.xml | 1 + .../stacks/HDP/2.6/services/stack_advisor.py | 44 +- .../server/controller/AmbariServerTest.java | 18 + ambari-web/app/controllers/experimental.js | 4 +- .../main/admin/stack_and_upgrade_controller.js | 17 +- ambari-web/app/messages.js | 4 + .../mixins/wizard/assign_master_components.js | 15 +- .../app/routes/activate_hawq_standby_routes.js | 4 + .../app/routes/add_hawq_standby_routes.js | 4 + ambari-web/app/routes/add_kerberos_routes.js | 1 + .../app/routes/high_availability_routes.js | 4 + ambari-web/app/routes/main.js | 46 +- .../app/routes/manage_journalnode_routes.js | 4 + .../app/routes/ra_high_availability_routes.js | 4 + ambari-web/app/routes/reassign_master_routes.js | 8 + .../app/routes/remove_hawq_standby_routes.js | 4 + .../app/routes/rm_high_availability_routes.js | 4 + ambari-web/app/routes/stack_upgrade_routes.js | 13 +- ambari-web/app/routes/view.js | 1 + ambari-web/app/routes/views.js | 10 +- ambari-web/app/styles/application.less | 5 +- .../modal_popups/cluster_check_dialog.hbs | 3 + .../upgrade_configs_recommend_table.hbs | 51 + .../app/templates/main/side-menu-item.hbs | 2 +- ambari-web/app/views/common/breadcrumbs_view.js | 37 +- .../common/modal_popups/cluster_check_popup.js | 39 +- .../test/controllers/experimental_test.js | 32 + .../admin/stack_and_upgrade_controller_test.js | 19 + .../test/views/common/breadcrumbs_view_test.js | 75 + .../modal_popups/cluster_check_popup_test.js | 33 +- ambari-web/test/views/main/menu_test.js | 52 +- .../vendor/scripts/theme/bootstrap-ambari.js | 14 +- .../ui/app/components/capacityInput.js | 62 + .../ui/app/components/userGroupInput.js | 4 +- .../main/resources/ui/app/templates/queue.hbs | 2 +- .../pig/jobqueryset/QuerySetAmbariDB.java | 2 +- .../savedscriptqueryset/QuerySetAmbariDB.java | 2 +- .../PostgressQuerySetHueDb.java | 20 +- .../src/main/resources/scripts/utils/Utils.js | 2 +- contrib/views/storm/src/main/resources/view.xml | 7 + .../ui/app/domain/workflow-importer.js | 2 +- .../resources/ui/app/routes/design/jobtab.js | 2 +- .../ui/app/services/workflow-clipboard.js | 4 +- .../src/main/resources/ui/app/styles/app.less | 43 +- .../components/workflow-job-action.hbs | 14 +- .../components/workflow-job-details.hbs | 44 +- 70 files changed, 745 insertions(+), 2083 deletions(-) ----------------------------------------------------------------------
