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/418745d1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/418745d1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/418745d1 Branch: refs/heads/branch-dev-patch-upgrade Commit: 418745d1297e41d08ba522544ffb17d3bbb22f77 Parents: e4d1475 f927149 Author: Nate Cole <nc...@hortonworks.com> Authored: Thu Feb 18 08:33:10 2016 -0500 Committer: Nate Cole <nc...@hortonworks.com> Committed: Thu Feb 18 08:33:10 2016 -0500 ---------------------------------------------------------------------- .../libraries/providers/hdfs_resource.py | 63 +- .../libraries/resources/hdfs_resource.py | 12 + ambari-funtest/pom.xml | 13 +- ambari-funtest/src/main/assemblies/empty.xml | 22 + ambari-funtest/src/main/assemblies/funtest.xml | 79 -- ambari-metrics/ambari-metrics-grafana/README.md | 22 +- .../ambari-metrics/datasource.js | 49 +- .../screenshots/21-multi-templating.png | Bin 0 -> 92034 bytes .../conf/unix/ambari-metrics-monitor | 6 +- .../conf/unix/ambari-metrics-collector | 2 +- ambari-server/conf/unix/log4j.properties | 9 + ambari-server/conf/windows/log4j.properties | 9 + ambari-server/src/main/conf/log4j.properties | 9 + .../api/resources/GroupResourceDefinition.java | 1 + .../resources/ResourceInstanceFactoryImpl.java | 4 + .../api/services/GroupPrivilegeService.java | 76 ++ .../server/api/services/GroupService.java | 11 + .../server/checks/CheckDatabaseHelper.java | 155 ++-- .../internal/DefaultProviderModule.java | 2 + .../GroupPrivilegeResourceProvider.java | 237 ++++++ .../ambari/server/controller/spi/Resource.java | 2 + .../server/upgrade/UpgradeCatalog240.java | 76 +- .../main/python/ambari_server/checkDatabase.py | 7 +- .../1.6.1.2.2.0/package/scripts/params.py | 1 + .../0.1.0/package/scripts/params.py | 1 + .../0.5.0.2.1/package/scripts/params_linux.py | 1 + .../HAWQ/2.0.0/configuration/gpcheck-env.xml | 89 -- .../HAWQ/2.0.0/configuration/hawq-check-env.xml | 89 ++ .../common-services/HAWQ/2.0.0/kerberos.json | 125 ++- .../common-services/HAWQ/2.0.0/metainfo.xml | 16 +- .../HAWQ/2.0.0/package/scripts/common.py | 63 +- .../2.0.0/package/scripts/hawq_constants.py | 2 +- .../HAWQ/2.0.0/package/scripts/hawqmaster.py | 2 +- .../HAWQ/2.0.0/package/scripts/hawqsegment.py | 2 +- .../HAWQ/2.0.0/package/scripts/hawqstandby.py | 10 +- .../HAWQ/2.0.0/package/scripts/master_helper.py | 2 +- .../HAWQ/2.0.0/package/scripts/params.py | 21 +- .../HAWQ/2.0.0/package/scripts/utils.py | 10 +- .../0.96.0.2.0/package/scripts/params_linux.py | 1 + .../2.1.0.2.0/package/scripts/params_linux.py | 1 + .../0.12.0.2.0/package/scripts/params_linux.py | 1 + .../KAFKA/0.8.1.2.2/package/scripts/params.py | 1 + .../0.5.0.2.2/package/scripts/params_linux.py | 1 + .../MAHOUT/1.0.0.2.3/package/scripts/params.py | 1 + .../4.0.0.2.0/package/scripts/params_linux.py | 1 + .../0.12.0.2.0/package/scripts/params_linux.py | 1 + .../0.60.0.2.2/package/scripts/params_linux.py | 1 + .../SPARK/1.2.0.2.2/package/scripts/params.py | 1 + .../0.9.1.2.1/package/scripts/params_linux.py | 1 + .../0.4.0.2.1/package/scripts/params_linux.py | 1 + .../2.1.0.2.0/package/scripts/params_linux.py | 1 + .../custom_actions/scripts/ru_execute_tasks.py | 2 +- .../main/resources/scripts/Ambaripreupload.py | 54 +- .../2.0.6/hooks/before-START/scripts/params.py | 1 + .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 3 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 3 +- .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 2 + .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 2 + .../KAFKA/configuration/kafka-broker.xml | 2 +- .../services/RANGER/themes/theme_version_2.json | 20 +- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 3 +- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 4 + .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 +- .../main/resources/stacks/HDP/2.5/metainfo.xml | 25 + .../resources/stacks/HDP/2.5/repos/repoinfo.xml | 92 ++ .../HDP/2.5/services/ACCUMULO/metainfo.xml | 26 + .../stacks/HDP/2.5/services/ATLAS/metainfo.xml | 26 + .../stacks/HDP/2.5/services/FALCON/metainfo.xml | 26 + .../stacks/HDP/2.5/services/FLUME/metainfo.xml | 26 + .../stacks/HDP/2.5/services/HBASE/metainfo.xml | 26 + .../stacks/HDP/2.5/services/HDFS/metainfo.xml | 26 + .../stacks/HDP/2.5/services/HIVE/metainfo.xml | 26 + .../stacks/HDP/2.5/services/KAFKA/metainfo.xml | 26 + .../HDP/2.5/services/KERBEROS/metainfo.xml | 25 + .../stacks/HDP/2.5/services/KNOX/metainfo.xml | 26 + .../stacks/HDP/2.5/services/MAHOUT/metainfo.xml | 26 + .../stacks/HDP/2.5/services/OOZIE/metainfo.xml | 26 + .../stacks/HDP/2.5/services/PIG/metainfo.xml | 26 + .../stacks/HDP/2.5/services/RANGER/metainfo.xml | 29 + .../HDP/2.5/services/RANGER_KMS/metainfo.xml | 29 + .../stacks/HDP/2.5/services/SLIDER/metainfo.xml | 26 + .../stacks/HDP/2.5/services/SPARK/metainfo.xml | 29 + .../stacks/HDP/2.5/services/SQOOP/metainfo.xml | 26 + .../stacks/HDP/2.5/services/STORM/metainfo.xml | 27 + .../stacks/HDP/2.5/services/TEZ/metainfo.xml | 26 + .../stacks/HDP/2.5/services/YARN/metainfo.xml | 27 + .../HDP/2.5/services/ZOOKEEPER/metainfo.xml | 26 + .../stacks/HDP/2.5/services/stack_advisor.py | 22 + .../api/services/GroupPrivilegeServiceTest.java | 109 +++ .../server/checks/CheckDatabaseHelperTest.java | 29 +- .../GroupPrivilegeResourceProviderTest.java | 362 ++++++++ .../server/upgrade/UpgradeCatalog240Test.java | 92 +- .../src/test/python/TestAmbariServer.py | 3 +- ambari-server/src/test/python/TestSetupAgent.py | 2 +- .../custom_actions/test_ru_execute_tasks.py | 4 +- .../AMBARI_METRICS/test_metrics_collector.py | 6 +- .../stacks/2.0.6/HBASE/test_hbase_master.py | 18 +- .../python/stacks/2.0.6/HDFS/test_namenode.py | 54 +- .../stacks/2.0.6/HDFS/test_service_check.py | 8 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 28 +- .../2.0.6/HIVE/test_hive_service_check.py | 12 +- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 32 +- .../stacks/2.0.6/OOZIE/test_service_check.py | 10 +- .../stacks/2.0.6/PIG/test_pig_service_check.py | 12 +- .../stacks/2.0.6/YARN/test_historyserver.py | 29 +- .../2.0.6/YARN/test_mapreduce2_service_check.py | 12 +- .../stacks/2.0.6/common/test_stack_advisor.py | 12 +- .../stacks/2.1/FALCON/test_falcon_server.py | 12 +- .../python/stacks/2.1/TEZ/test_service_check.py | 16 +- .../stacks/2.1/YARN/test_apptimelineserver.py | 2 +- .../stacks/2.2/PIG/test_pig_service_check.py | 12 +- .../stacks/2.2/SPARK/test_job_history_server.py | 11 +- .../2.3/MAHOUT/test_mahout_service_check.py | 8 +- .../2.3/SPARK/test_spark_thrift_server.py | 4 +- .../test/python/stacks/2.3/YARN/test_ats_1_5.py | 10 +- .../stacks/2.3/common/services-hawq-1-host.json | 2 +- .../2.3/common/services-hawq-3-hosts.json | 2 +- .../2.3/common/services-hawq-pxf-hdfs.json | 4 +- .../services-master_ambari_colo-3-hosts.json | 2 +- .../services-master_standby_colo-3-hosts.json | 2 +- .../common/services-normal-hawq-3-hosts.json | 2 +- .../services-standby_ambari_colo-3-hosts.json | 2 +- ambari-web/app/assets/test/tests.js | 3 + .../hawq/activateStandby/step3_controller.js | 2 +- .../alerts/definition_configs_controller.js | 4 +- ambari-web/app/controllers/main/host.js | 18 + .../controllers/main/host/combo_search_box.js | 43 +- .../controllers/main/service/info/configs.js | 23 +- ambari-web/app/controllers/main/service/item.js | 46 +- ambari-web/app/controllers/wizard.js | 3 - .../app/controllers/wizard/step7_controller.js | 6 +- ambari-web/app/data/HDP2.3/site_properties.js | 4 +- ambari-web/app/messages.js | 5 +- .../app/mixins/common/configs/configs_saver.js | 4 - .../app/mixins/common/widgets/widget_mixin.js | 70 +- .../mixins/wizard/assign_master_components.js | 58 +- ambari-web/app/models/alerts/alert_config.js | 4 +- .../configs/objects/service_config_property.js | 2 + ambari-web/app/models/host_component.js | 27 +- ambari-web/app/models/service.js | 2 +- ambari-web/app/models/stack_service.js | 4 +- .../main/host/details/host_component.hbs | 2 +- ambari-web/app/utils/ajax/ajax.js | 12 + ambari-web/app/utils/config.js | 151 ++-- ambari-web/app/utils/helper.js | 14 + .../app/views/common/chart/linear_time.js | 88 +- ambari-web/app/views/common/controls_view.js | 75 +- .../main/admin/stack_upgrade/versions_view.js | 6 +- .../app/views/main/host/combo_search_box.js | 55 +- .../main/host/details/host_component_view.js | 7 +- ambari-web/app/views/main/service/info/menu.js | 45 +- .../app/views/main/service/info/summary.js | 154 ++-- ambari-web/app/views/main/service/item.js | 41 +- .../definitions_configs_controller_test.js | 4 +- .../service/reassign/step4_controller_test.js | 5 +- .../test/controllers/wizard/step7_test.js | 26 - .../test/mixins/common/widget_mixin_test.js | 51 +- .../wizard/assign_master_components_test.js | 154 ++++ .../test/models/alerts/alert_config_test.js | 8 +- ambari-web/test/utils/ajax/ajax_test.js | 32 + ambari-web/test/utils/config_test.js | 242 ------ .../test/views/common/chart/linear_time_test.js | 13 +- .../stack_upgrade/upgrade_wizard_view_test.js | 5 - .../service/info/component_list_view_test.js | 153 ++++ .../test/views/main/service/info/config_test.js | 99 ++- .../test/views/main/service/info/menu_test.js | 93 ++ .../views/main/service/info/summary_test.js | 852 +++++++++++++------ docs/pom.xml | 6 +- 169 files changed, 4203 insertions(+), 1583 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/418745d1/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/418745d1/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/418745d1/ambari-web/app/messages.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/418745d1/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js ----------------------------------------------------------------------