This is an automated email from the ASF dual-hosted git repository. jonathanhurley pushed a commit to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 45b0ab8ae9ee52a8a7a328a77a61a9fe12fa71a8 Merge: 33e86d7 8c175c9 Author: Jonathan Hurley <[email protected]> AuthorDate: Fri Sep 7 18:07:23 2018 -0400 Merge branch 'trunk' into branch-feature-AMBARI-14714 .gitignore | 3 + .../test/resources/log4j.properties => MANIFEST.in | 16 +- .../python/ambari_agent/ComponentStatusExecutor.py | 35 ++++ .../main/python/ambari_agent/RecoveryManager.py | 8 +- .../libraries/functions/hive_check.py | 11 +- .../libraries/providers/hdfs_resource.py | 13 +- .../src/test/resources/log4j.properties | 9 +- .../model/inputconfig/InputSocketDescriptor.java} | 25 +-- .../json/model/inputconfig/impl/InputAdapter.java | 2 + .../impl/InputSocketDescriptorImpl.java | 111 +++++++++++ .../config/zookeeper/LogSearchConfigServerZK.java | 2 - .../logsearch/steps/LogSearchConfigApiSteps.java | 33 +++- .../backend/log_search_cofig_api_tests.story | 10 +- .../ambari/logfeeder/plugin/input/Input.java | 10 +- .../{InputManager.java => CheckpointManager.java} | 31 ++- .../logfeeder/plugin/manager/InputManager.java | 6 +- .../ambari/logfeeder/LogFeederCommandLine.java | 82 +++++++- .../ambari/logfeeder/common/ConfigHandler.java | 2 +- .../ambari/logfeeder/conf/ApplicationConfig.java | 9 +- .../apache/ambari/logfeeder/input/InputFile.java | 27 ++- .../ambari/logfeeder/input/InputManagerImpl.java | 182 ++---------------- .../ambari/logfeeder/input/InputSimulate.java | 10 +- .../apache/ambari/logfeeder/input/InputSocket.java | 167 +++++++++++++++++ .../ambari/logfeeder/input/InputSocketMarker.java | 71 +++++++ .../file/checkpoint/FileCheckpointManager.java | 208 +++++++++++++++++++++ .../file/checkpoint/util/CheckpointFileReader.java | 64 +++++++ .../{ => checkpoint/util}/FileCheckInHelper.java | 2 +- .../util/FileCheckpointCleanupHelper.java | 132 +++++++++++++ .../util}/ResumeLineNumberHelper.java | 12 +- .../input/monitor/CheckpointCleanupMonitor.java | 10 +- .../apache/ambari/logfeeder/output/OutputSolr.java | 6 +- .../src/main/resources/alias_config.json | 5 +- .../shipper-conf/input.config-sample.json | 18 ++ .../src/main/scripts/logfeeder.sh | 17 ++ .../ambari/logfeeder/input/InputFileTest.java | 14 +- .../ambari/logsearch/common/StatusMessage.java | 29 ++- .../apache/ambari/logsearch/common/VResponse.java | 164 ---------------- .../conf/LogSearchJerseyResourceConfig.java | 7 +- .../ambari/logsearch/conf/SecurityConfig.java | 68 +++---- .../ambari/logsearch/dao/EventHistorySolrDao.java | 41 ++-- .../apache/ambari/logsearch/dao/SolrDaoBase.java | 54 +++--- .../org/apache/ambari/logsearch/dao/UserDao.java | 38 ++-- .../AlreadyExistsException.java} | 27 +-- .../ambari/logsearch/manager/AuditLogsManager.java | 63 +++---- .../logsearch/manager/EventHistoryManager.java | 53 ++---- .../MalformedInputException.java} | 27 +-- .../NotFoundException.java} | 27 +-- .../logsearch/manager/ServiceLogsManager.java | 166 +++++++--------- .../UnsupportedFormatException.java} | 27 +-- .../model/common/LSServerInputConfig.java | 4 + .../model/common/LSServerInputSocket.java | 81 ++++++++ .../logsearch/rest/ShipperConfigResource.java | 23 ++- .../rest/error/GeneralExceptionMapper.java | 104 +++++++++++ .../error/SolrExceptionMapper.java} | 35 ++-- .../org/apache/ambari/logsearch/util/DateUtil.java | 90 --------- .../org/apache/ambari/logsearch/util/JSONUtil.java | 87 ++------- .../ambari/logsearch/util/RESTErrorUtil.java | 68 ------- .../AbstractLogsearchGlobalStateFilter.java | 100 ---------- .../logsearch/web/filters/ConfigStateProvider.java | 55 ++++++ .../logsearch/web/filters/GlobalStateProvider.java | 55 ++++++ .../web/filters/LogSearchConfigStateFilter.java | 109 ----------- .../LogSearchLogLevelFilterManagerFilter.java | 102 ---------- .../web/filters/LogsearchAuditLogsStateFilter.java | 51 ----- .../filters/LogsearchEventHistoryStateFilter.java | 52 ------ .../logsearch/web/filters/LogsearchFilter.java | 79 ++++++++ .../filters/LogsearchServiceLogsStateFilter.java | 51 ----- .../filters/StatusProvider.java} | 27 +-- .../security/LogsearchAuthenticationProvider.java | 17 +- .../rest/error/GeneralExceptionMapperTest.java | 84 +++++++++ .../logsearch/web/filters/GlobalStateTest.java | 89 +++++++++ .../logsearch/web/filters/LogsearchFilterTest.java | 116 ++++++++++++ .../action-menu/action-menu.component.html | 29 ++- .../action-menu/action-menu.component.less | 16 ++ .../action-menu/action-menu.component.spec.ts | 18 +- .../action-menu/action-menu.component.ts | 85 +++++++-- .../cluster-filter.component.spec.ts | 5 +- .../cluster-filter/cluster-filter.component.ts | 2 +- .../graph-legend-item.component.html | 2 +- .../log-index-filter.component.html | 130 ++++++------- .../log-index-filter.component.less | 79 +++++--- .../log-index-filter.component.spec.ts | 10 +- .../log-index-filter/log-index-filter.component.ts | 62 ++++-- .../logs-container/logs-container.component.ts | 2 +- .../timezone-picker.component.spec.ts | 8 +- .../src/app/modules/app-load/app-load.module.ts | 2 +- .../modules/app-load/services/app-load.service.ts | 2 +- ...e.store.ts => data-availability-state.store.ts} | 0 .../data-loading-indicator.component.html | 4 +- .../data-loading-indicator.component.spec.ts | 8 +- .../data-loading-indicator.component.ts | 2 +- .../dropdown-list/dropdown-list.component.ts | 4 + .../loading-indicator.component.html} | 6 +- .../loading-indicator.component.less | 32 ++++ .../loading-indicator.component.spec.ts | 42 +++++ .../loading-indicator.component.ts | 29 +++ .../modal-dialog/modal-dialog.component.html | 37 ++++ .../modal-dialog/modal-dialog.component.less | 56 ++++++ .../modal-dialog/modal-dialog.component.spec.ts | 50 +++++ .../modal-dialog/modal-dialog.component.ts | 92 +++++++++ .../src/app/modules/shared/shared.module.ts | 10 +- .../app/services/log-index-filter.service.spec.ts | 45 +++++ .../src/app/services/log-index-filter.service.ts | 40 ++++ .../src/app/services/storage/reducers.service.ts | 2 +- .../src/app/services/user-settings.service.spec.ts | 8 +- .../src/app/services/user-settings.service.ts | 39 ++-- ambari-server/conf/unix/ambari.properties | 1 + .../server/agent/stomp/HostLevelParamsHolder.java | 24 ++- .../agent/stomp/dto/HostLevelParamsCluster.java | 14 +- .../ambari/server/configuration/Configuration.java | 22 +++ .../controller/AmbariManagementController.java | 15 ++ .../controller/AmbariManagementControllerImpl.java | 42 ++++- .../internal/BlueprintConfigurationProcessor.java | 40 +++- .../internal/ClientConfigResourceProvider.java | 2 + .../controller/internal/HostResourceProvider.java | 3 +- .../internal/RequestResourceProvider.java | 26 ++- .../ambari/server/orm/entities/ClusterEntity.java | 14 -- .../entities/HostComponentDesiredStateEntity.java | 21 ++- .../security/authorization/RoleAuthorization.java | 1 + .../credential/PrincipalKeyCredential.java | 2 +- .../org/apache/ambari/server/state/Cluster.java | 4 - .../ambari/server/state/cluster/ClusterImpl.java | 53 +++--- .../svccomphost/ServiceComponentHostImpl.java | 20 ++ .../ambari/server/topology/AmbariContext.java | 7 +- .../apache/ambari/server/view/ViewExtractor.java | 40 +++- .../apache/ambari/server/view/ViewRegistry.java | 21 ++- .../python/ambari_server/dbConfiguration_linux.py | 6 +- .../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 4 +- .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 4 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 4 +- .../main/resources/Ambari-DDL-Postgres-CREATE.sql | 4 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 4 +- .../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 4 +- .../agent/stomp/HostLevelParamsHolderTest.java | 18 +- .../BlueprintConfigurationProcessorTest.java | 100 +++++++++- .../internal/HostResourceProviderTest.java | 3 + .../internal/RequestResourceProviderTest.java | 47 +++++ .../ambari/server/topology/AmbariContextTest.java | 9 +- .../topology/ClusterConfigurationRequestTest.java | 35 +++- .../ambari/server/view/ViewExtractorTest.java | 33 +++- .../ambari/server/view/ViewRegistryTest.java | 3 +- ambari-web/app/assets/test/tests.js | 1 + ambari-web/app/controllers/installer.js | 47 ++++- .../main/admin/federation/step3_controller.js | 55 +++++- .../main/admin/federation/step4_controller.js | 10 +- ambari-web/app/controllers/main/service/item.js | 21 ++- .../app/controllers/wizard/step0_controller.js | 6 +- .../data/configs/wizards/federation_properties.js | 3 +- ambari-web/app/messages.js | 4 + .../common/configs/config_recommendation_parser.js | 1 + ambari-web/app/mixins/wizard/addSecurityConfigs.js | 2 +- ambari-web/app/styles/application.less | 3 + ambari-web/app/styles/stack_versions.less | 26 +-- ambari-web/app/styles/wizard.less | 5 + .../templates/common/configs/services_config.hbs | 4 +- .../common/modal_popups/cluster_check_dialog.hbs | 12 +- .../stack_upgrade/upgrade_configs_merge_table.hbs | 4 +- .../upgrade_configs_recommend_table.hbs | 4 +- .../main/admin/stack_upgrade/upgrade_options.hbs | 138 +++++++------- .../app/templates/wizard/step8/step8_log_popup.hbs | 1 - .../configs/service_config_container_view.js | 2 +- .../common/modal_popups/cluster_check_popup.js | 1 + .../main/dashboard/widgets/yarn_containers.js | 10 +- ambari-web/test/controllers/installer_test.js | 62 ++++++ .../main/admin/federation/step3_controller_test.js | 27 ++- .../controllers/main/host/combo_search_box_test.js | 116 ++++++++++++ .../test/controllers/main/service/item_test.js | 107 ++++++++++- ambari-web/test/controllers/wizard/step7_test.js | 15 +- .../test/mixins/wizard/addSeccurityConfigs_test.js | 6 + .../addon-services/ONEFS/1.0.0/service_advisor.py | 7 +- pom.xml | 5 +- setup.py | 89 +++++++++ 171 files changed, 4032 insertions(+), 2003 deletions(-)
