Merge branch 'trunk' into branch-feature-logsearch-ui
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5ac65e0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5ac65e0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5ac65e0 Branch: refs/heads/trunk Commit: e5ac65e0415aa9a2a4beee92b6e477ac8d50fb62 Parents: 39e1922 a795f38 Author: ababiichuk <ababiic...@hortonworks.com> Authored: Fri Jul 7 17:57:33 2017 +0300 Committer: ababiichuk <ababiic...@hortonworks.com> Committed: Fri Jul 7 17:57:33 2017 +0300 ---------------------------------------------------------------------- ambari-agent/etc/init.d/ambari-agent | 2 +- .../ambari_commons/resources/os_family.json | 3 +- .../libraries/functions/solr_cloud_util.py | 10 + .../src/main/resources/solr | 826 ++++++-- .../ambari/infra/solr/AmbariSolrCloudCLI.java | 14 + .../infra/solr/AmbariSolrCloudClient.java | 8 + .../commands/RemoveAdminHandlersCommand.java | 46 + .../commands/SetClusterPropertyZkCommand.java | 6 +- .../InfraRuleBasedAuthorizationPluginTest.java | 5 + ambari-infra/pom.xml | 2 +- .../logsearch/config/api/LogSearchConfig.java | 7 +- .../config/api/LogSearchConfigFactory.java | 8 +- .../config/api/LogSearchConfigClass1.java | 6 +- .../config/api/LogSearchConfigClass2.java | 6 +- .../config/api/LogSearchConfigFactoryTest.java | 6 +- .../config/zookeeper/LogSearchConfigZK.java | 64 +- .../org/apache/ambari/logfeeder/LogFeeder.java | 34 +- .../ambari/logfeeder/common/ConfigHandler.java | 52 +- .../logfeeder/common/LogFeederException.java | 31 + .../logfeeder/common/LogfeederException.java | 31 - .../apache/ambari/logfeeder/filter/Filter.java | 6 +- .../ambari/logfeeder/filter/FilterGrok.java | 10 +- .../ambari/logfeeder/filter/FilterJSON.java | 6 +- .../ambari/logfeeder/filter/FilterKeyValue.java | 6 +- .../logfeeder/input/AbstractInputFile.java | 108 +- .../apache/ambari/logfeeder/input/Input.java | 76 +- .../logfeeder/input/InputConfigUploader.java | 18 +- .../ambari/logfeeder/input/InputFile.java | 23 +- .../ambari/logfeeder/input/InputManager.java | 158 +- .../ambari/logfeeder/input/InputS3File.java | 11 +- .../ambari/logfeeder/input/InputSimulate.java | 74 +- .../loglevelfilter/LogLevelFilterHandler.java | 28 +- .../logfeeder/metrics/LogFeederAMSClient.java | 43 +- .../logfeeder/metrics/MetricsManager.java | 25 +- .../ambari/logfeeder/output/OutputHDFSFile.java | 10 +- .../ambari/logfeeder/output/OutputS3File.java | 2 +- .../ambari/logfeeder/output/OutputSolr.java | 28 +- .../apache/ambari/logfeeder/util/FileUtil.java | 15 - .../logfeeder/util/LogFeederHDFSUtil.java | 77 + .../ambari/logfeeder/util/LogFeederUtil.java | 41 +- .../logfeeder/util/LogfeederHDFSUtil.java | 77 - .../apache/ambari/logfeeder/util/SSLUtil.java | 9 + .../ambari/logfeeder/filter/FilterJSONTest.java | 8 +- .../logfeeder/input/InputManagerTest.java | 27 - .../logfeeder/metrics/MetricsManagerTest.java | 2 - .../src/test/resources/logfeeder.properties | 1 - .../configsets/audit_logs/conf/solrconfig.xml | 3 +- .../configsets/hadoop_logs/conf/solrconfig.xml | 3 +- .../main/configsets/history/conf/solrconfig.xml | 3 +- .../configurer/LogSearchConfigConfigurer.java | 2 +- .../logsearch/dao/SolrSchemaFieldDao.java | 2 +- ambari-logsearch/docker/Dockerfile | 2 +- ambari-logsearch/docker/bin/start.sh | 4 +- ambari-logsearch/pom.xml | 2 +- .../checks/DatabaseConsistencyCheckHelper.java | 14 + .../internal/ClientConfigResourceProvider.java | 2 + .../state/ClientConfigFileDefinition.java | 15 +- .../server/upgrade/UpgradeCatalog300.java | 18 + .../0.1.0/package/scripts/params.py | 3 + .../0.1.0/package/scripts/setup_infra_solr.py | 17 +- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 4 +- .../ATLAS/0.7.0.3.0/configuration/atlas-env.xml | 6 + .../ATLAS/0.7.0.3.0/package/scripts/params.py | 4 +- .../HDFS/3.0.0.3.0/service_advisor.py | 53 + .../HIVE/0.12.0.2.0/metainfo.xml | 1 + .../common-services/HIVE/2.1.0.3.0/metainfo.xml | 7 + .../properties/audit_logs-solrconfig.xml.j2 | 3 +- .../properties/service_logs-solrconfig.xml.j2 | 3 +- .../LOGSEARCH/0.5.0/service_advisor.py | 7 + .../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 | 577 ------ .../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 - .../RANGER/1.0.0.3.0/alerts.json | 76 + .../1.0.0.3.0/configuration/admin-log4j.xml | 132 ++ .../configuration/admin-properties.xml | 161 ++ .../configuration/atlas-tagsync-ssl.xml | 72 + .../configuration/ranger-admin-site.xml | 751 +++++++ .../1.0.0.3.0/configuration/ranger-env.xml | 503 +++++ .../configuration/ranger-solr-configuration.xml | 59 + .../ranger-tagsync-policymgr-ssl.xml | 72 + .../configuration/ranger-tagsync-site.xml | 201 ++ .../configuration/ranger-ugsync-site.xml | 571 ++++++ .../tagsync-application-properties.xml | 62 + .../1.0.0.3.0/configuration/tagsync-log4j.xml | 90 + .../1.0.0.3.0/configuration/usersync-log4j.xml | 89 + .../RANGER/1.0.0.3.0/kerberos.json | 153 ++ .../RANGER/1.0.0.3.0/metainfo.xml | 177 ++ .../alerts/alert_ranger_admin_passwd_check.py | 195 ++ .../RANGER/1.0.0.3.0/package/scripts/params.py | 449 +++++ .../1.0.0.3.0/package/scripts/ranger_admin.py | 210 ++ .../1.0.0.3.0/package/scripts/ranger_service.py | 69 + .../1.0.0.3.0/package/scripts/ranger_tagsync.py | 139 ++ .../package/scripts/ranger_usersync.py | 120 ++ .../1.0.0.3.0/package/scripts/service_check.py | 49 + .../package/scripts/setup_ranger_xml.py | 853 ++++++++ .../1.0.0.3.0/package/scripts/status_params.py | 39 + .../RANGER/1.0.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/1.0.0.3.0/quicklinks/quicklinks.json | 41 + .../RANGER/1.0.0.3.0/role_command_order.json | 9 + .../RANGER/1.0.0.3.0/service_advisor.py | 774 ++++++++ .../1.0.0.3.0/themes/theme_version_1.json | 1821 +++++++++++++++++ .../RANGER_KMS/0.5.0.3.0/alerts.json | 32 - .../0.5.0.3.0/configuration/dbks-site.xml | 206 -- .../0.5.0.3.0/configuration/kms-env.xml | 116 -- .../0.5.0.3.0/configuration/kms-log4j.xml | 120 -- .../0.5.0.3.0/configuration/kms-properties.xml | 166 -- .../0.5.0.3.0/configuration/kms-site.xml | 133 -- .../configuration/ranger-kms-audit.xml | 124 -- .../configuration/ranger-kms-policymgr-ssl.xml | 68 - .../configuration/ranger-kms-security.xml | 64 - .../0.5.0.3.0/configuration/ranger-kms-site.xml | 104 - .../RANGER_KMS/0.5.0.3.0/kerberos.json | 84 - .../RANGER_KMS/0.5.0.3.0/metainfo.xml | 115 -- .../RANGER_KMS/0.5.0.3.0/package/scripts/kms.py | 677 ------- .../0.5.0.3.0/package/scripts/kms_server.py | 117 -- .../0.5.0.3.0/package/scripts/kms_service.py | 58 - .../0.5.0.3.0/package/scripts/params.py | 331 ---- .../0.5.0.3.0/package/scripts/service_check.py | 41 - .../0.5.0.3.0/package/scripts/status_params.py | 36 - .../0.5.0.3.0/package/scripts/upgrade.py | 30 - .../templates/input.config-ranger-kms.json.j2 | 48 - .../0.5.0.3.0/role_command_order.json | 7 - .../RANGER_KMS/0.5.0.3.0/service_advisor.py | 281 --- .../0.5.0.3.0/themes/theme_version_1.json | 303 --- .../0.5.0.3.0/themes/theme_version_2.json | 124 -- .../RANGER_KMS/1.0.0.3.0/alerts.json | 32 + .../1.0.0.3.0/configuration/dbks-site.xml | 206 ++ .../1.0.0.3.0/configuration/kms-env.xml | 115 ++ .../1.0.0.3.0/configuration/kms-log4j.xml | 120 ++ .../1.0.0.3.0/configuration/kms-properties.xml | 166 ++ .../1.0.0.3.0/configuration/kms-site.xml | 133 ++ .../configuration/ranger-kms-audit.xml | 118 ++ .../configuration/ranger-kms-policymgr-ssl.xml | 68 + .../configuration/ranger-kms-security.xml | 64 + .../1.0.0.3.0/configuration/ranger-kms-site.xml | 110 + .../RANGER_KMS/1.0.0.3.0/kerberos.json | 84 + .../RANGER_KMS/1.0.0.3.0/metainfo.xml | 111 ++ .../RANGER_KMS/1.0.0.3.0/package/scripts/kms.py | 675 +++++++ .../1.0.0.3.0/package/scripts/kms_server.py | 117 ++ .../1.0.0.3.0/package/scripts/kms_service.py | 58 + .../1.0.0.3.0/package/scripts/params.py | 331 ++++ .../1.0.0.3.0/package/scripts/service_check.py | 41 + .../1.0.0.3.0/package/scripts/status_params.py | 36 + .../1.0.0.3.0/package/scripts/upgrade.py | 30 + .../templates/input.config-ranger-kms.json.j2 | 48 + .../1.0.0.3.0/role_command_order.json | 7 + .../RANGER_KMS/1.0.0.3.0/service_advisor.py | 358 ++++ .../1.0.0.3.0/themes/theme_version_1.json | 409 ++++ .../STORM/0.9.1/package/scripts/nimbus.py | 8 +- .../services/ATLAS/configuration/atlas-env.xml | 6 + .../stacks/HDP/3.0/services/RANGER/metainfo.xml | 4 +- .../HDP/3.0/services/RANGER_KMS/metainfo.xml | 4 +- .../server/upgrade/UpgradeCatalog300Test.java | 33 + .../stacks/2.1/STORM/test_storm_nimbus.py | 60 +- .../stacks/2.1/configs/default-storm-start.json | 14 + .../test/python/stacks/2.1/configs/default.json | 13 + .../stacks/2.1/configs/secured-storm-start.json | 13 + .../test/python/stacks/2.1/configs/secured.json | 15 +- .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py | 3 + .../main/admin/stack_and_upgrade_controller.js | 16 +- .../main/host/bulk_operations_controller.js | 32 +- ambari-web/app/controllers/main/host/details.js | 2 +- .../app/controllers/wizard/step8_controller.js | 16 +- ambari-web/app/mappers/hosts_mapper.js | 2 +- ambari-web/app/messages.js | 6 +- ambari-web/app/models/stack.js | 4 +- .../main/host/delete_hosts_result_popup.hbs | 8 +- ambari-web/app/utils/db.js | 14 +- .../stack_upgrade/upgrade_version_box_view.js | 2 +- ambari-web/app/views/main/host.js | 8 +- .../admin/stack_and_upgrade_controller_test.js | 40 +- .../upgrade_version_box_view_test.js | 11 +- ambari-web/test/views/main/host_test.js | 4 +- 215 files changed, 15286 insertions(+), 15514 deletions(-) ----------------------------------------------------------------------
