You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2018/09/07 22:07:27 UTC

[ambari] branch branch-feature-AMBARI-14714 updated (33e86d7 -> 45b0ab8)

This is an automated email from the ASF dual-hosted git repository.

jonathanhurley pushed a change to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git.


    from 33e86d7  [AMBARI-24608] Package install should handle multiple deployed mpacks (#2271)
     add d06469a  AMBARI-24558. Add setup.py for ambari python packages (for using with pip) (#2195)
     add 47a9fe4  AMBARI-24231 : Adding additional jars in classpath of ambari views (nitirajrathore) (#1657)
     add 8a79291  AMBARI-24546. Only authenticated users with proper AMBARI/CLUSTER authorization roles can query Ambari Request related information (#2198)
     add e6f1d35  AMBARI-24525 Accumulo does not startup in Federated Cluster. (ababiichuk)
     add 14811e4  AMBARI-24555 Nifi Registry install fails. (ababiichuk)
     add 6451f81  AMBARI-24561 Update styles for pre-upgrade modals. (ababiichuk)
     add e3db41d  AMBARI-24578 Quicklinks URL overflow outside the UI box
     add dd5c769  [AMBARI-24577] Services should display the Stop button if any of their components are started.
     add a4b2901  [AMBARI-24582] - Ambari Alert - HiveServer2 Process - False negative in Certain Scenarios
     add 4df6c51  AMBARI-24558. ADDENDUM: add missing ambari_jinja2 modules + install required dependencies for testing
     add 8ae34e9  AMBARI-24343 - [LogSearch] Wrong (error) response format (#1962)
     add 0d85927  AMBARI-24574. Cover mainHostComboSearchBoxController with tests
     add 085208a  Merge pull request #2213 from hiveww/AMBARI-24574-trunk
     add 2b52c9a  AMBARI-24586. User get stuck between steps if API returns empty version_definitions array (akovalenko)
     add 29ea5bd  AMBARI-24585 'yarn.nodemanager.linux-container-executor.cgroups.hierarchy' is not equal to the value of yarn_hierarchy in UI Deploy
     add 6444258  AMBARI-24587. HDI Livy2 fails to restart (aonishuk)
     add a41262e  AMBARI-24583. Ambari agent status could be reported stale just after execution command thread has finished execution (aonishuk)
     add 160b6a0  AMBARI-24554 UX issues with yarn containers widget (akovalenko)
     add 58c6aa2  AMBARI-24588. UI Hangs on Deploy wizard without any visible error, if stack metadata have error and no available stacks returned
     add 92bf920  AMBARI-24588. UI Hangs on Deploy wizard without any visible error, if stack metadata have error and no available stacks returned
     add 51e5eab4 AMBARI-24588. UI Hangs on Deploy wizard without any visible error, if stack metadata have error and no available stacks returned
     add a3d548a  Merge pull request #2239 from hiveww/AMBARI-24588-trunk
     add b84ad9f  AMBARI-24592 fix handling of stack defaults in blueprints (benyoka) (#2243)
     add 85a0e32  AMBARI-24355. Logfeeder: create CLI for checkpoints and include log type in checkpoint file names. (#2245)
     add f3f6452  AMBARI-24593. Download client config fails if user running Ambari server has UID>2097151 (amagyar) (#2246)
     add 4b5aafc  AMBARI-24549. Move blueprint provisioning state property to host component level. (#2241)
     add 8055899  AMBARI-24595. PrincipalKeyCredential.equals fails for subtypes (dlysnichenko) (#2250)
     add 014d379  [AMBARI-24573] Clarify the warning message during ambari server setup (dsen) (#2212)
     add 7ce6e4e  AMBARI-24596. Stack Advisor reported an error. Exit Code: 2. Error: KeyError: 'onefs' (amagyar) (#2258)
     add 96faa4e  AMBARI-24598. Broken markup for alert on Installer Step7 (akovalenko)
     add 991e107  AMBARI-24546. Inserting new role authorization into DB tables (#2261)
     add e8f7413  AMBARI-23077. LogFeeder: create socket input. (#2260)
     add 8289c7f  [AMBARI-24580] [Log Search UI] Change the fix width and the height for the modal to flexible layout (#2251)
     add 8c175c9  Merge branch 'trunk' into branch-feature-AMBARI-14714
     new 45b0ab8  Merge branch 'trunk' into branch-feature-AMBARI-14714

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .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(-)
 copy ambari-logsearch/ambari-logsearch-appender/src/test/resources/log4j.properties => MANIFEST.in (51%)
 copy ambari-logsearch/{ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/StatusMessage.java => ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/model/inputconfig/InputSocketDescriptor.java} (67%)
 create mode 100644 ambari-logsearch/ambari-logsearch-config-json/src/main/java/org/apache/ambari/logsearch/config/json/model/inputconfig/impl/InputSocketDescriptorImpl.java
 copy ambari-logsearch/ambari-logsearch-logfeeder-plugin-api/src/main/java/org/apache/ambari/logfeeder/plugin/manager/{InputManager.java => CheckpointManager.java} (56%)
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputSocket.java
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputSocketMarker.java
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/file/checkpoint/FileCheckpointManager.java
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/file/checkpoint/util/CheckpointFileReader.java
 rename ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/file/{ => checkpoint/util}/FileCheckInHelper.java (98%)
 create mode 100644 ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/file/checkpoint/util/FileCheckpointCleanupHelper.java
 rename ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/file/{ => checkpoint/util}/ResumeLineNumberHelper.java (89%)
 delete mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/VResponse.java
 copy ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/{common/StatusMessage.java => manager/AlreadyExistsException.java} (67%)
 copy ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/{common/StatusMessage.java => manager/MalformedInputException.java} (68%)
 copy ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/{common/StatusMessage.java => manager/NotFoundException.java} (67%)
 copy ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/{common/StatusMessage.java => manager/UnsupportedFormatException.java} (67%)
 create mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/common/LSServerInputSocket.java
 create mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/error/GeneralExceptionMapper.java
 copy ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/{common/StatusMessage.java => rest/error/SolrExceptionMapper.java} (54%)
 delete mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/util/RESTErrorUtil.java
 delete mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/AbstractLogsearchGlobalStateFilter.java
 create mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/ConfigStateProvider.java
 create mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/GlobalStateProvider.java
 delete mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogSearchConfigStateFilter.java
 delete mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogSearchLogLevelFilterManagerFilter.java
 delete mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchAuditLogsStateFilter.java
 delete mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchEventHistoryStateFilter.java
 create mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchFilter.java
 delete mode 100644 ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/web/filters/LogsearchServiceLogsStateFilter.java
 copy ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/{common/StatusMessage.java => web/filters/StatusProvider.java} (67%)
 create mode 100644 ambari-logsearch/ambari-logsearch-server/src/test/java/org/apache/ambari/logsearch/rest/error/GeneralExceptionMapperTest.java
 create mode 100644 ambari-logsearch/ambari-logsearch-server/src/test/java/org/apache/ambari/logsearch/web/filters/GlobalStateTest.java
 create mode 100644 ambari-logsearch/ambari-logsearch-server/src/test/java/org/apache/ambari/logsearch/web/filters/LogsearchFilterTest.java
 rename ambari-logsearch/ambari-logsearch-web/src/app/modules/app-load/stores/{data-avaibility-state.store.ts => data-availability-state.store.ts} (100%)
 copy ambari-logsearch/ambari-logsearch-web/src/app/{components/graph-legend-item/graph-legend-item.component.html => modules/shared/components/loading-indicator/loading-indicator.component.html} (84%)
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/loading-indicator/loading-indicator.component.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/loading-indicator/loading-indicator.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/loading-indicator/loading-indicator.component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/modal-dialog/modal-dialog.component.html
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/modal-dialog/modal-dialog.component.less
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/modal-dialog/modal-dialog.component.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/modules/shared/components/modal-dialog/modal-dialog.component.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/services/log-index-filter.service.spec.ts
 create mode 100644 ambari-logsearch/ambari-logsearch-web/src/app/services/log-index-filter.service.ts
 create mode 100644 ambari-web/test/controllers/main/host/combo_search_box_test.js
 create mode 100644 setup.py


[ambari] 01/01: Merge branch 'trunk' into branch-feature-AMBARI-14714

Posted by jo...@apache.org.
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 <jo...@apache.org>
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(-)