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/80cdcf25 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/80cdcf25 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/80cdcf25 Branch: refs/heads/trunk Commit: 80cdcf251b8b36da73dee0dd126adecdded7e7d5 Parents: 9a45ef6 8ba5c3e Author: ababiichuk <ababiic...@hortonworks.com> Authored: Wed Jul 5 14:07:08 2017 +0300 Committer: ababiichuk <ababiic...@hortonworks.com> Committed: Wed Jul 5 14:07:08 2017 +0300 ---------------------------------------------------------------------- .../src/main/package/rpm/posttrans_agent.sh | 7 + .../api/LogSearchPropertyDescription.java | 59 ++++++ .../config/zookeeper/LogSearchConfigZK.java | 29 +++ .../org/apache/ambari/logsearch/LogSearch.java | 11 +- .../ambari/logsearch/common/ApiDocStorage.java | 90 +++++++++ .../logsearch/common/LogSearchConstants.java | 2 + .../logsearch/common/PropertiesHelper.java | 17 -- .../common/PropertyDescriptionStorage.java | 101 ++++++++++ .../ambari/logsearch/conf/ApiDocConfig.java | 6 - .../logsearch/conf/ApplicationConfig.java | 4 +- .../ambari/logsearch/conf/AuthPropsConfig.java | 122 ++++++++++++ .../conf/LogSearchHttpHeaderConfig.java | 31 +++ .../ambari/logsearch/conf/SecurityConfig.java | 1 + .../logsearch/conf/SolrAuditLogPropsConfig.java | 76 ++++++++ .../conf/SolrConnectionPropsConfig.java | 28 +++ .../conf/SolrEventHistoryPropsConfig.java | 56 ++++-- .../logsearch/conf/SolrKerberosConfig.java | 17 ++ .../conf/SolrServiceLogPropsConfig.java | 38 ++++ .../ambari/logsearch/doc/DocConstants.java | 4 +- .../ambari/logsearch/manager/InfoManager.java | 59 ++++++ .../ambari/logsearch/manager/PublicManager.java | 48 ----- .../model/response/PropertyDescriptionData.java | 62 ++++++ .../ambari/logsearch/rest/InfoResource.java | 73 +++++++ .../ambari/logsearch/rest/PublicResource.java | 48 ----- .../ambari/logsearch/rest/SwaggerResource.java | 56 ++++++ .../apache/ambari/logsearch/util/SSLUtil.java | 25 +++ .../LogsearchKRBAuthenticationFilter.java | 69 ++++++- ...rchExternalServerAuthenticationProvider.java | 23 +-- .../src/main/resources/default.properties | 2 - .../src/main/resources/logsearch.properties | 3 - ...xternalServerAuthenticationProviderTest.java | 4 + .../src/main/webapp/login.html | 19 +- .../logsearch/logsearch-https.properties | 4 - ambari-server/pom.xml | 5 +- .../main/python/ambari_server/setupSecurity.py | 4 - .../AMBARI_INFRA/0.1.0/service_advisor.py | 133 +++++++++++++ .../LOGSEARCH/0.5.0/service_advisor.py | 188 +++++++++++++++++++ .../PXF/3.0.0/configuration/pxf-profiles.xml | 25 +++ .../0.6.0.2.5/configuration/zeppelin-env.xml | 5 + .../stacks/HDP/2.2/services/stack_advisor.py | 66 ------- .../stacks/HDP/2.6/services/stack_advisor.py | 2 +- .../ClientConfigResourceProviderTest.java | 2 +- .../view/persistence/DataStoreImplTest.java | 4 +- .../src/test/python/TestAmbariServer.py | 13 +- .../LOGSEARCH/test_service_advisor.py | 164 ++++++++++++++++ .../stacks/2.3/common/test_stack_advisor.py | 123 ------------ .../hive2/resources/uploads/UploadService.java | 4 +- 47 files changed, 1548 insertions(+), 384 deletions(-) ----------------------------------------------------------------------