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/08/23 17:41:43 UTC
[ambari] 01/01: Merge branch 'trunk' into
branch-feature-AMBARI-14714
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 2825adf511ed7055ab4fcef9cd204929d0d87f9d
Merge: 9224d91 74a5360
Author: Jonathan Hurley <jo...@apache.org>
AuthorDate: Thu Aug 23 13:41:38 2018 -0400
Merge branch 'trunk' into branch-feature-AMBARI-14714
KEYS | 35 ++
ambari-agent/conf/unix/install-helper.sh | 271 ++++++-----
ambari-agent/pom.xml | 4 +
ambari-agent/src/main/package/deb/control/postrm | 16 +-
ambari-agent/src/main/package/deb/control/preinst | 61 ++-
ambari-agent/src/main/package/deb/control/prerm | 1 +
.../package/rpm/{preremove.sh => postremove.sh} | 9 +-
.../src/main/package/rpm/posttrans_agent.sh | 4 +-
ambari-agent/src/main/package/rpm/preinstall.sh | 55 ++-
ambari-agent/src/main/package/rpm/preremove.sh | 1 -
.../ambari_agent/CustomServiceOrchestrator.py | 7 +-
.../main/python/ambari_agent/RecoveryManager.py | 14 +
.../test/python/ambari_agent/TestActionQueue.py | 29 +-
.../src/test/python/ambari_agent/TestAlerts.py | 4 +-
.../python/ambari_agent/TestRecoveryManager.py | 16 +-
.../resource_management/libraries/script/script.py | 9 +
ambari-common/src/test/python/coilmq/scheduler.py | 2 +-
ambari-funtest/pom.xml | 21 +
.../ambari-infra-manager/docker/docker-compose.yml | 2 +-
.../docker/infra-manager-docker-compose.sh | 2 +-
ambari-infra/ambari-infra-solr-client/README.md | 8 +-
.../src/main/python/migrationHelper.py | 2 +-
.../src/main/resources/solrIndexHelper.sh | 8 +-
.../docker/infra-solr-docker-compose.sh | 2 +-
ambari-infra/pom.xml | 23 +-
.../config/zookeeper/LogLevelFilterManagerZK.java | 27 ++
.../zookeeper/LogSearchConfigLogFeederZK.java | 34 +-
.../config/zookeeper/LogSearchConfigServerZK.java | 5 +-
.../config/zookeeper/LogSearchConfigZK.java | 148 +-----
...hConfigZK.java => LogSearchConfigZKHelper.java} | 187 +++++---
.../pom.xml | 1 +
.../logfeeder/common/LogFeederConstants.java | 3 +
.../ambari/logfeeder/conf/ApplicationConfig.java | 10 +-
.../ambari/logfeeder/conf/LogFeederProps.java | 18 +
.../loglevelfilter/LogLevelFilterHandler.java | 23 +-
.../main/configsets/audit_logs/conf/solrconfig.xml | 2 +-
.../configsets/hadoop_logs/conf/solrconfig.xml | 2 +-
.../main/configsets/history/conf/solrconfig.xml | 2 +-
.../logsearch/common/ACLPropertiesSplitter.java | 29 +-
.../logsearch/conf/LogSearchConfigApiConfig.java | 25 ++
.../ambari/logsearch/conf/SecurityConfig.java | 15 +-
.../apache/ambari/logsearch/conf/SolrConfig.java | 7 +-
...rState.java => LogLevelFilterManagerState.java} | 2 +-
.../LogLevelManagerFilterConfigurer.java | 123 +++++
.../configurer/SolrLogLevelFilterConfigurer.java | 92 ----
.../logsearch/manager/ShipperConfigManager.java | 12 +-
.../LogSearchLogLevelFilterManagerFilter.java | 10 +-
ambari-logsearch/ambari-logsearch-web/README.md | 9 +-
.../ambari-logsearch-web/src/app/app.module.ts | 23 -
.../classes/components/graph/graph.component.ts | 30 +-
.../components/graph/time-graph.component.less | 4 +-
.../components/graph/time-graph.component.ts | 5 +-
.../action-menu/action-menu.component.less | 1 -
.../src/app/components/app.component.html | 2 +-
.../src/app/components/app.component.less | 1 -
.../src/app/components/app.component.ts | 2 +-
.../log-message/log-message.component.ts | 50 ++-
.../logs-container/logs-container.component.html | 4 +-
.../logs-container/logs-container.component.less | 7 +
.../logs-container/logs-container.component.ts | 7 +-
.../service-logs-table.component.html | 6 +-
.../time-histogram/time-histogram.component.ts | 2 +-
.../data-loading-indicator.component.html | 2 +-
.../data-loading-indicator.component.less | 4 +-
.../data-loading-indicator.component.ts | 6 +-
.../dropdown-button/dropdown-button.component.html | 7 +-
.../dropdown-button/dropdown-button.component.ts | 27 +-
.../dropdown-list/dropdown-list.component.html | 9 +-
.../dropdown-list/dropdown-list.component.less | 23 +-
.../dropdown-list/dropdown-list.component.ts | 61 ++-
.../src/app/modules/shared/variables.less | 1 +
.../app/services/logs-filtering-utils.service.ts | 4 +-
.../ambari-logsearch-web/src/assets/i18n/en.json | 1 +
.../ambari-logsearch-web/src/index.html | 3 +
ambari-logsearch/docker/Dockerfile | 2 +-
ambari-logsearch/docker/docker-compose.yml | 2 +-
ambari-logsearch/docker/logsearch-docker.sh | 2 +-
ambari-logsearch/docker/solr.yml | 2 +-
ambari-logsearch/docker/sso.yml | 2 +-
.../test-config/logfeeder/logfeeder.properties | 3 +-
.../test-config/logsearch/logsearch.properties | 1 +
ambari-logsearch/pom.xml | 23 +-
ambari-metrics/ambari-metrics-grafana/pom.xml | 21 +
.../ambari-metrics-host-aggregator/pom.xml | 21 +
.../conf/unix/amshbase_metrics_whitelist | 6 +-
.../conf/unix/metrics_whitelist | 6 +-
.../conf/windows/amshbase_metrics_whitelist | 6 +-
.../conf/windows/metrics_whitelist | 6 +-
.../src/main/resources/metrics_def/AMS-HBASE.dat | 38 +-
.../main/resources/metrics_def/HBASE_MASTER.dat | 54 +--
.../core/timeline/TimelineMetricsFilterTest.java | 12 +-
.../test/resources/test_data/full_whitelist.dat | 114 ++---
.../test/resources/ui_metrics_def/AMS-HBASE.dat | 2 +-
.../src/test/resources/ui_metrics_def/HBASE.dat | 2 +-
.../src/test/resources/ui_metrics_def/NAMENODE.dat | 2 +-
.../src/test/resources/ui_metrics_def/NIMBUS.dat | 2 +-
ambari-server/conf/unix/install-helper.sh | 329 ++++++++------
ambari-server/docs/configuration/index.md | 9 +-
.../docs/security/kerberos/enabling_kerberos.md | 2 +-
ambari-server/pom.xml | 16 +-
.../server/actionmanager/ActionDBAccessorImpl.java | 14 +-
.../ambari/server/agent/CommandRepository.java | 1 +
.../ambari/server/agent/ExecutionCommand.java | 1 +
.../ambari/server/configuration/Configuration.java | 16 +
.../controller/AmbariManagementController.java | 3 +
.../controller/AmbariManagementControllerImpl.java | 229 ++++++++++
.../ambari/server/controller/AmbariServer.java | 15 +-
.../server/controller/KerberosHelperImpl.java | 4 +-
.../internal/BlueprintConfigurationProcessor.java | 6 +-
.../apache/ambari/server/events/AmbariEvent.java | 5 +
.../events/ClusterProvisionStartedEvent.java | 25 +-
.../events/listeners/tasks/TaskStatusListener.java | 46 +-
.../ads/DefaultLdapConfigurationService.java | 2 +-
.../ambari/server/orm/entities/ClusterEntity.java | 14 +
.../server/security/authorization/Users.java | 18 +-
.../kerberos/IPAKerberosOperationHandler.java | 4 +-
.../kerberos/KDCKerberosOperationHandler.java | 35 +-
.../kerberos/MITKerberosOperationHandler.java | 4 +-
.../upgrades/FixTimelineReaderAddress.java | 25 +-
.../server/state/BlueprintProvisioningState.java | 28 +-
.../org/apache/ambari/server/state/Cluster.java | 4 +
.../ambari/server/state/cluster/ClusterImpl.java | 35 ++
.../ambari/server/topology/TopologyManager.java | 2 +
.../ambari/server/upgrade/UpgradeCatalog271.java | 133 +++++-
ambari-server/src/main/package/deb/control/postrm | 14 +
ambari-server/src/main/package/deb/control/preinst | 190 ++++----
ambari-server/src/main/package/deb/control/prerm | 5 +-
ambari-server/src/main/package/rpm/postinstall.sh | 4 +-
.../{deb/control/prerm => rpm/postremove.sh} | 12 +-
ambari-server/src/main/package/rpm/preinstall.sh | 205 ++++-----
ambari-server/src/main/package/rpm/preremove.sh | 5 +-
.../python/ambari_server/dbConfiguration_linux.py | 17 +-
.../python/ambari_server/serverConfiguration.py | 2 +-
.../src/main/python/ambari_server/serverSetup.py | 4 +-
.../src/main/python/ambari_server/serverUpgrade.py | 4 +-
.../src/main/python/ambari_server/utils.py | 11 +-
.../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 1 +
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 +
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 +
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 1 +
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 1 +
.../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 1 +
.../src/main/resources/scripts/Ambaripreupload.py | 7 +-
.../ads/detectors/GroupMemberAttrDetectorTest.java | 4 +-
.../AmbariLdapAuthenticationProviderBaseTest.java | 58 ---
...apAuthenticationProviderForDNWithSpaceTest.java | 185 --------
...AuthenticationProviderForDuplicateUserTest.java | 143 ------
.../AmbariLdapAuthenticationProviderTest.java | 309 ++++---------
.../server/security/authorization/TestUsers.java | 79 +++-
.../kerberos/IPAKerberosOperationHandlerTest.java | 45 ++
.../kerberos/MITKerberosOperationHandlerTest.java | 46 ++
.../upgrades/FixTimelineReaderAddressTest.java | 4 +-
.../topology/ClusterDeployWithStartOnlyTest.java | 6 +
...terInstallWithoutStartOnComponentLevelTest.java | 7 +
.../topology/ClusterInstallWithoutStartTest.java | 6 +
.../server/topology/TopologyManagerTest.java | 20 +-
.../server/upgrade/UpgradeCatalog271Test.java | 101 ++++-
.../src/test/python/TestUpgradeSummary.py | 8 +-
.../test/resources/hbase_hbasemaster_jmx_2.json | 4 +-
ambari-web/api-docs/index.html | 2 +-
ambari-web/api-docs/lib/jquery-1.8.0.min.js | 2 -
ambari-web/api-docs/lib/jquery-1.8.3.min.js | 2 +
ambari-web/app/assets/test/tests.js | 3 +
.../app/controllers/global/update_controller.js | 2 +-
ambari-web/app/mappers/service_metrics_mapper.js | 4 +-
ambari-web/app/messages.js | 2 +-
.../common/configs/config_recommendation_parser.js | 47 +-
ambari-web/app/mixins/common/serverValidator.js | 7 +-
ambari-web/app/routes/installer.js | 3 -
ambari-web/app/styles/application.less | 9 +-
ambari-web/app/styles/bootstrap_overrides.less | 16 +-
ambari-web/app/styles/common.less | 5 +
ambari-web/app/styles/stack_versions.less | 494 +++++++++++----------
ambari-web/app/utils/ajax/ajax.js | 2 +-
ambari-web/app/utils/config.js | 2 +-
.../controllers/global/update_controller_test.js | 2 +-
.../hawq/activateStandby/step3_controller_test.js | 173 ++++++++
.../hawq/addStandby/step4_controller_test.js | 108 +++++
.../rangerAdmin/step4_controller_test.js | 128 ++++++
ambari-web/test/mappers/service_mapper_test.js | 8 +-
contrib/views/ambari-views-package/pom.xml | 2 +-
contrib/views/commons/pom.xml | 6 +
contrib/views/files/pom.xml | 1 -
.../main/resources/ui/app/config/files-columns.js | 20 +-
.../main/resources/ui/app/helpers/shorten-text.js | 4 +
.../files/src/main/resources/ui/app/models/file.js | 3 +
.../ui/app/templates/components/file-row.hbs | 10 +
contrib/views/pig/pom.xml | 21 +-
.../org/apache/ambari/view/pig/test/JobTest.java | 26 +-
.../ambari/view/pig/test/ScriptTestUnmanaged.java | 3 +-
contrib/views/pom.xml | 66 ++-
contrib/views/utils/pom.xml | 11 +-
.../org/apache/ambari/view/utils/hdfs/HdfsApi.java | 14 +-
.../ambari/view/utils/hdfs/DummyFileStatus.java | 76 ++++
.../view/utils/hdfs/DummyNonHdfsFileStatus.java} | 22 +-
.../apache/ambari/view/utils/hdfs/HdfsApiTest.java | 63 +++
docs/pom.xml | 16 +-
197 files changed, 3643 insertions(+), 2291 deletions(-)