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/efcfced5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/efcfced5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/efcfced5 Branch: refs/heads/branch-dev-patch-upgrade Commit: efcfced54da0d9f4ac9de0bdd3ac8c96369d1725 Parents: 863d995 61942e5 Author: Nate Cole <[email protected]> Authored: Wed Nov 16 08:57:19 2016 -0500 Committer: Nate Cole <[email protected]> Committed: Wed Nov 16 08:57:19 2016 -0500 ---------------------------------------------------------------------- ambari-agent/conf/unix/ambari-agent.ini | 3 + ambari-agent/conf/windows/ambari-agent.ini | 2 + .../src/main/python/ambari_agent/Controller.py | 8 +- .../src/main/python/ambari_agent/HostCleanup.py | 87 +- .../src/main/python/ambari_agent/NetUtil.py | 10 +- .../test/python/ambari_agent/TestHostCleanup.py | 18 +- ambari-metrics/ambari-metrics-assembly/pom.xml | 1 - .../conf/unix/metric_monitor.ini | 2 - .../src/main/python/core/config_reader.py | 10 +- .../src/main/python/core/emitter.py | 57 +- .../src/main/python/core/krberr.py | 42 - .../main/python/core/spnego_kerberos_auth.py | 163 -- .../src/test/python/core/TestEmitter.py | 26 - ambari-server/docs/configuration/index.md | 35 +- ambari-server/pom.xml | 10 + ambari-server/sbin/ambari-server | 4 + .../stackadvisor/StackAdvisorHelper.java | 18 +- .../server/configuration/Configuration.java | 162 +- .../AmbariManagementControllerImpl.java | 49 +- .../ambari/server/controller/AmbariServer.java | 222 +-- .../ambari/server/controller/GroupResponse.java | 14 + .../server/controller/KerberosHelperImpl.java | 6 - .../internal/GroupResourceProvider.java | 4 + .../internal/UserPrivilegeResourceProvider.java | 3 + .../metrics/MetricsCollectorHAClusterState.java | 10 + .../apache/ambari/server/orm/dao/GroupDAO.java | 19 +- .../ambari/server/orm/dao/ResourceDAO.java | 21 + .../ambari/server/orm/entities/GroupEntity.java | 18 + .../server/security/ClientSecurityType.java | 3 +- .../AmbariPamAuthenticationProvider.java | 252 +++ .../server/security/authorization/Group.java | 6 + .../security/authorization/GroupType.java | 25 + .../PamAuthenticationException.java | 36 + .../server/security/authorization/UserType.java | 3 +- .../server/security/authorization/Users.java | 54 +- .../security/unsecured/rest/ConnectionInfo.java | 2 +- .../kerberos/MITKerberosOperationHandler.java | 2 +- .../ambari/server/state/ConfigHelper.java | 85 - .../server/state/DependencyConditionInfo.java | 104 ++ .../ambari/server/state/DependencyInfo.java | 37 +- .../ambari/server/topology/AmbariContext.java | 20 - .../server/topology/BlueprintValidatorImpl.java | 18 +- .../server/upgrade/SchemaUpgradeHelper.java | 5 - .../server/upgrade/UpgradeCatalog150.java | 910 ----------- .../server/upgrade/UpgradeCatalog151.java | 152 -- .../server/upgrade/UpgradeCatalog160.java | 205 --- .../server/upgrade/UpgradeCatalog161.java | 343 ---- .../server/upgrade/UpgradeCatalog170.java | 1530 ------------------ .../server/upgrade/UpgradeCatalog200.java | 8 - .../server/upgrade/UpgradeCatalog250.java | 11 + ambari-server/src/main/python/ambari-server.py | 7 +- .../python/ambari_server/resourceFilesKeeper.py | 4 +- .../main/python/ambari_server/setupActions.py | 1 + .../main/python/ambari_server/setupMpacks.py | 2 + .../main/python/ambari_server/setupSecurity.py | 53 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 + .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 + .../resources/Ambari-DDL-Postgres-CREATE.sql | 1 + .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 1 + .../resources/Ambari-DDL-SQLServer-CREATE.sql | 1 + .../AMBARI_METRICS/0.1.0/kerberos.json | 26 - .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 13 +- .../0.1.0/package/scripts/params.py | 7 +- .../0.1.0/package/scripts/split_points.py | 43 +- .../package/templates/metric_monitor.ini.j2 | 2 - .../configuration/application-properties.xml | 11 + .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 2 +- .../common-services/HDFS/2.1.0.2.0/metainfo.xml | 43 +- .../0.12.0.2.0/package/scripts/params_linux.py | 2 - .../0.12.0.2.0/package/scripts/service_check.py | 10 +- .../configuration/kafka_client_jaas_conf.xml | 41 + .../0.8.1/configuration/kafka_jaas_conf.xml | 59 + .../common-services/KAFKA/0.8.1/metainfo.xml | 2 + .../KAFKA/0.8.1/package/scripts/kafka.py | 12 + .../KAFKA/0.8.1/package/scripts/params.py | 2 + .../OOZIE/4.0.0.2.0/metainfo.xml | 1 + .../src/main/resources/properties.json | 1 + .../stacks/HDP/2.0.6/services/stack_advisor.py | 29 +- .../services/HDFS/configuration/core-site.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 2 +- .../configuration/application-properties.xml | 95 ++ .../ATLAS/configuration/atlas-log4j.xml | 118 ++ .../stacks/HDP/2.6/services/ATLAS/metainfo.xml | 10 +- .../services/ATLAS/themes/theme_version_2.json | 845 ++++++++++ .../stacks/HDP/2.6/services/stack_advisor.py | 381 ++--- .../services/HDFS/configuration/core-site.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 2 +- .../webapp/WEB-INF/spring-security.xml | 1 + .../stackadvisor/StackAdvisorHelperTest.java | 10 +- .../server/configuration/ConfigurationTest.java | 6 +- .../AmbariPamAuthenticationProviderTest.java | 97 ++ .../security/authorization/TestUsers.java | 10 +- .../server/topology/AmbariContextTest.java | 2 - .../server/topology/BlueprintImplTest.java | 41 - .../topology/BlueprintValidatorImplTest.java | 75 +- .../server/upgrade/UpgradeCatalog150Test.java | 258 --- .../server/upgrade/UpgradeCatalog151Test.java | 120 -- .../server/upgrade/UpgradeCatalog160Test.java | 264 --- .../server/upgrade/UpgradeCatalog161Test.java | 418 ----- .../server/upgrade/UpgradeCatalog170Test.java | 791 --------- .../server/upgrade/UpgradeCatalog200Test.java | 2 +- .../server/upgrade/UpgradeCatalog250Test.java | 13 + .../server/upgrade/UpgradeCatalogTest.java | 85 +- .../src/test/python/TestResourceFilesKeeper.py | 45 +- .../2.0.6/HIVE/test_hive_service_check.py | 43 +- .../stacks/2.0.6/common/test_stack_advisor.py | 4 +- .../stacks/2.6/common/test_stack_advisor.py | 97 ++ ambari-web/app/config.js | 2 +- ambari-web/app/styles/alerts.less | 55 - ambari-web/app/styles/application.less | 997 +++++------- ambari-web/app/styles/bootstrap_overrides.less | 14 + ambari-web/app/styles/common.less | 298 +--- ambari-web/app/styles/config_history_flow.less | 6 - ambari-web/app/styles/modal_popups.less | 3 - ambari-web/app/styles/stack_versions.less | 24 +- ambari-web/app/styles/widgets.less | 4 +- .../common/configs/selectCreateConfigGroup.hbs | 4 +- .../templates/common/host_progress_popup.hbs | 4 +- .../common/modal_popups/log_tail_popup.hbs | 2 +- ambari-web/app/templates/login.hbs | 2 +- .../main/alerts/definition_details.hbs | 8 +- .../main/dashboard/plus_button_filter.hbs | 8 +- .../main/dashboard/widgets/yarn_links.hbs | 2 +- ambari-web/app/templates/main/host/summary.hbs | 2 +- .../manage_configuration_groups_popup.hbs | 8 +- .../templates/main/service/services/flume.hbs | 4 +- ambari-web/app/templates/main/views.hbs | 5 +- ambari-web/app/templates/wizard/step3.hbs | 4 +- ambari-web/app/views/main/dashboard/widgets.js | 2 + .../host_component_recommendation_mixin_test.js | 24 +- .../host_component_validation_mixin_test.js | 24 +- 131 files changed, 3459 insertions(+), 7099 deletions(-) ----------------------------------------------------------------------
