Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/deb18003 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/deb18003 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/deb18003 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: deb18003619a3aade99dc6fa39e4da57762f2d60 Parents: 167b482 0d7f609 Author: Robert Levas <[email protected]> Authored: Wed Nov 29 11:58:04 2017 -0500 Committer: Robert Levas <[email protected]> Committed: Wed Nov 29 11:58:04 2017 -0500 ---------------------------------------------------------------------- .../libraries/functions/component_version.py | 9 +- ambari-infra/ambari-infra-manager/pom.xml | 11 ++ .../infra/job/archive/CompositeFileAction.java | 46 +++++ .../ambari/infra/job/archive/Document.java | 54 +++++ .../infra/job/archive/DocumentDestination.java | 23 +++ .../archive/DocumentExportConfiguration.java | 118 +++++++++++ .../job/archive/DocumentExportJobListener.java | 35 ++++ .../job/archive/DocumentExportProperties.java | 112 +++++++++++ .../job/archive/DocumentExportStepListener.java | 47 +++++ .../infra/job/archive/DocumentExporter.java | 99 ++++++++++ .../infra/job/archive/DocumentItemReader.java | 135 +++++++++++++ .../infra/job/archive/DocumentItemWriter.java | 25 +++ .../infra/job/archive/DocumentIterator.java | 25 +++ .../infra/job/archive/DocumentSource.java | 24 +++ .../ambari/infra/job/archive/FileAction.java | 25 +++ .../job/archive/LocalDocumentItemWriter.java | 72 +++++++ .../ambari/infra/job/archive/S3Properties.java | 64 ++++++ .../ambari/infra/job/archive/S3Uploader.java | 51 +++++ .../infra/job/archive/SolrDocumentIterator.java | 90 +++++++++ .../infra/job/archive/SolrDocumentSource.java | 68 +++++++ .../infra/job/archive/SolrQueryBuilder.java | 115 +++++++++++ .../infra/job/archive/SolrQueryProperties.java | 69 +++++++ .../infra/job/archive/TarGzCompressor.java | 50 +++++ .../apache/ambari/infra/manager/JobManager.java | 21 +- .../src/main/resources/infra-manager.properties | 12 ++ .../src/main/resources/log4j2.xml | 2 +- .../infra/job/archive/DocumentExporterTest.java | 147 ++++++++++++++ .../job/archive/DocumentItemReaderTest.java | 197 +++++++++++++++++++ .../archive/LocalDocumentItemWriterTest.java | 98 +++++++++ .../infra/job/archive/SolrQueryBuilderTest.java | 113 +++++++++++ .../ambari/logfeeder/filter/FilterKeyValue.java | 4 +- .../LogsearchAuthenticationEntryPoint.java | 15 +- .../src/app/classes/filtering.ts | 22 ++- .../src/app/classes/models/app-state.ts | 3 +- .../classes/queries/audit-logs-query-params.ts | 3 +- .../service-logs-truncated-query-params.ts | 3 +- .../src/app/classes/string.ts | 25 +++ .../filters-panel/filters-panel.component.html | 8 +- .../filters-panel.component.spec.ts | 1 + .../filters-panel/filters-panel.component.ts | 99 +++++----- .../logs-container.component.html | 2 +- .../logs-container/logs-container.component.ts | 5 +- .../src/app/components/mixins.less | 2 +- .../search-box/search-box.component.html | 24 ++- .../search-box/search-box.component.less | 23 ++- .../search-box/search-box.component.ts | 122 +++++++++--- .../src/app/components/variables.less | 6 +- .../services/component-actions.service.spec.ts | 4 +- .../app/services/component-actions.service.ts | 2 +- .../component-generator.service.spec.ts | 4 +- .../app/services/logs-container.service.spec.ts | 4 +- .../src/app/services/logs-container.service.ts | 69 +++++-- .../src/app/services/utils.service.ts | 4 + .../test-config/logfeeder/logfeeder.properties | 2 +- .../stackadvisor/StackAdvisorRequest.java | 19 ++ .../commands/StackAdvisorCommand.java | 2 + .../ambari/server/controller/AmbariServer.java | 3 +- .../internal/BlueprintResourceProvider.java | 3 +- .../internal/StackAdvisorResourceProvider.java | 9 +- .../internal/UpgradeResourceProvider.java | 8 - .../dispatchers/AmbariSNMPDispatcher.java | 10 +- .../apache/ambari/server/state/ServiceInfo.java | 2 +- .../ambari/server/topology/Blueprint.java | 2 +- .../ambari/server/topology/BlueprintImpl.java | 3 +- .../server/topology/BlueprintValidator.java | 3 +- .../server/topology/BlueprintValidatorImpl.java | 23 ++- .../GPLLicenseNotAcceptedException.java | 28 +++ .../OOZIE/4.2.0.3.0/metainfo.xml | 9 +- .../2.1.0.2.0/package/scripts/params_linux.py | 6 + .../3.0.0.3.0/package/scripts/params_linux.py | 6 + .../custom_actions/scripts/ru_execute_tasks.py | 5 +- .../HDP/2.0.6/properties/stack_packages.json | 4 +- .../stacks/HDP/2.0.6/services/stack_advisor.py | 35 ++++ .../stacks/HDP/2.5/services/FALCON/metainfo.xml | 4 +- .../services/YARN/configuration/yarn-site.xml | 4 +- .../stacks/HDP/2.5/services/stack_advisor.py | 2 +- .../stacks/HDP/2.6/services/FALCON/metainfo.xml | 26 +++ .../stacks/HDP/2.6/services/OOZIE/metainfo.xml | 37 ++++ .../stacks/HDP/2.6/services/stack_advisor.py | 3 + .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 14 +- .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 10 +- .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 4 + .../HDP/3.0/properties/stack_packages.json | 4 +- .../services/YARN/configuration/yarn-site.xml | 4 +- .../PERF/1.0/configuration/cluster-env.xml | 26 +++ .../1.0/hooks/before-INSTALL/scripts/hook.py | 7 + .../PERF/1.0/properties/stack_packages.json | 8 + .../FAKEYARN/configuration/yarn-site.xml | 4 +- .../src/main/resources/stacks/stack_advisor.py | 9 + .../ValidationResourceProviderTest.java | 4 +- .../dispatchers/AmbariSNMPDispatcherTest.java | 23 +-- .../AlertNoticeDispatchServiceTest.java | 53 ++++- .../server/topology/BlueprintImplTest.java | 87 +++++++- .../topology/BlueprintValidatorImplTest.java | 10 +- .../custom_actions/test_ru_execute_tasks.py | 6 +- .../stacks/2.0.6/common/test_stack_advisor.py | 59 +++++- .../stacks/2.5/common/test_stack_advisor.py | 2 +- .../stacks/2.6/common/test_stack_advisor.py | 11 ++ .../files/src/main/resources/ui/bower.json | 4 +- .../src/main/resources/ui/hive-web/bower.json | 4 +- .../scripts/containers/ComponentDetailView.jsx | 2 +- .../storm/src/main/resources/ui/package.json | 20 +- 102 files changed, 2793 insertions(+), 251 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/deb18003/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java ----------------------------------------------------------------------
