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/87e8bdf1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87e8bdf1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87e8bdf1 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 87e8bdf1a0833897c98faeccfbf268017ed27c49 Parents: 7b0ccda 8f9786b Author: Jonathan Hurley <[email protected]> Authored: Fri May 12 10:32:12 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Fri May 12 10:32:12 2017 -0400 ---------------------------------------------------------------------- ambari-infra/.gitignore | 6 + ambari-infra/ambari-infra-manager/pom.xml | 17 +- .../conf/batch/InfraManagerBatchConfig.java | 227 +++ .../infra/job/dummy/DummyItemProcessor.java | 36 + .../ambari/infra/job/dummy/DummyItemWriter.java | 36 + .../ambari/infra/job/dummy/DummyObject.java | 40 + .../apache/ambari/infra/rest/JobResource.java | 43 +- .../src/main/resources/dummy/dummy.txt | 3 + .../src/main/resources/infra-manager.properties | 6 +- .../alerts/AlertMaintenanceModeListener.java | 60 +- .../apache/ambari/server/state/AlertState.java | 4 + .../server/topology/BlueprintValidatorImpl.java | 88 +- .../RequiredConfigPropertiesValidator.java | 188 ++ .../validators/TopologyValidatorFactory.java | 3 +- .../server/upgrade/UpgradeCatalog250.java | 72 - .../main/python/ambari_server/serverUpgrade.py | 31 +- .../main/python/ambari_server/setupMpacks.py | 9 +- .../common-services/HDFS/2.1.0.2.0/metainfo.xml | 6 +- .../common-services/HDFS/3.0.0.3.0/metainfo.xml | 10 +- .../package/alerts/alert_llap_app_status.py | 4 +- .../package/scripts/hive_server_interactive.py | 3 - .../0.12.0.2.0/package/scripts/params_linux.py | 4 +- .../package/alerts/alert_llap_app_status.py | 4 +- .../package/scripts/hive_server_interactive.py | 3 - .../2.1.0.3.0/package/scripts/params_linux.py | 4 +- .../0.10.0.3.0/configuration/kafka-broker.xml | 2 +- .../0.10.0.3.0/package/scripts/service_check.py | 15 +- .../RANGER/0.7.0.3.0/alerts.json | 76 + .../0.7.0.3.0/configuration/admin-log4j.xml | 132 ++ .../configuration/admin-properties.xml | 163 ++ .../configuration/atlas-tagsync-ssl.xml | 72 + .../configuration/ranger-admin-site.xml | 785 ++++++++ .../0.7.0.3.0/configuration/ranger-env.xml | 513 +++++ .../0.7.0.3.0/configuration/ranger-site.xml | 30 + .../configuration/ranger-solr-configuration.xml | 59 + .../ranger-tagsync-policymgr-ssl.xml | 72 + .../configuration/ranger-tagsync-site.xml | 206 ++ .../configuration/ranger-ugsync-site.xml | 574 ++++++ .../tagsync-application-properties.xml | 62 + .../0.7.0.3.0/configuration/tagsync-log4j.xml | 90 + .../0.7.0.3.0/configuration/usersync-log4j.xml | 89 + .../configuration/usersync-properties.xml | 32 + .../RANGER/0.7.0.3.0/kerberos.json | 153 ++ .../RANGER/0.7.0.3.0/metainfo.xml | 189 ++ .../alerts/alert_ranger_admin_passwd_check.py | 195 ++ .../RANGER/0.7.0.3.0/package/scripts/params.py | 448 +++++ .../0.7.0.3.0/package/scripts/ranger_admin.py | 217 ++ .../0.7.0.3.0/package/scripts/ranger_service.py | 69 + .../0.7.0.3.0/package/scripts/ranger_tagsync.py | 139 ++ .../package/scripts/ranger_usersync.py | 124 ++ .../0.7.0.3.0/package/scripts/service_check.py | 49 + .../0.7.0.3.0/package/scripts/setup_ranger.py | 153 ++ .../package/scripts/setup_ranger_xml.py | 853 ++++++++ .../0.7.0.3.0/package/scripts/status_params.py | 39 + .../RANGER/0.7.0.3.0/package/scripts/upgrade.py | 31 + .../templates/input.config-ranger.json.j2 | 79 + .../package/templates/ranger_admin_pam.j2 | 22 + .../package/templates/ranger_remote_pam.j2 | 22 + .../package/templates/ranger_solr_jaas_conf.j2 | 26 + .../properties/ranger-solrconfig.xml.j2 | 1874 ++++++++++++++++++ .../RANGER/0.7.0.3.0/quicklinks/quicklinks.json | 41 + .../RANGER/0.7.0.3.0/role_command_order.json | 9 + .../RANGER/0.7.0.3.0/service_advisor.py | 793 ++++++++ .../0.7.0.3.0/themes/theme_version_1.json | 722 +++++++ .../0.7.0.3.0/themes/theme_version_2.json | 1470 ++++++++++++++ .../0.7.0.3.0/themes/theme_version_3.json | 692 +++++++ .../0.7.0.3.0/themes/theme_version_5.json | 48 + .../SPARK/1.2.1/package/scripts/params.py | 2 +- .../SPARK/2.2.0/package/scripts/params.py | 2 +- .../SPARK2/2.0.0/package/scripts/params.py | 2 +- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 15 + .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 12 + .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 2 + .../configuration/hive-interactive-site.xml | 11 +- .../HIVE/configuration/tez-interactive-site.xml | 13 + .../stacks/HDP/3.0/services/RANGER/metainfo.xml | 27 + .../AlertMaintenanceModeListenerTest.java | 4 + .../server/topology/BlueprintImplTest.java | 13 - .../RequiredConfigPropertiesValidatorTest.java | 302 +++ .../server/upgrade/UpgradeCatalog250Test.java | 23 +- .../controllers/main/service/info/summary.js | 2 +- ambari-web/app/styles/alerts.less | 19 +- .../app/styles/theme/bootstrap-ambari.css | 55 +- ambari-web/app/styles/top-nav.less | 2 +- ambari-web/app/templates/main/alerts.hbs | 16 +- .../view/hive2/resources/files/FileService.java | 8 +- .../view/hive20/internal/dto/TableStats.java | 24 +- .../internal/parsers/TableMetaParserImpl.java | 8 +- 88 files changed, 12620 insertions(+), 278 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/87e8bdf1/ambari-server/src/main/python/ambari_server/serverUpgrade.py ----------------------------------------------------------------------
