[8/8] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456
Merge branch 'trunk' into branch-feature-AMBARI-18456 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/276d1244 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/276d1244 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/276d1244 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 276d1244e1b1d8200cf644b7cccfaa0a757f8146 Parents: 1f804d1 85c9104 Author: Jonathan Hurley Authored: Tue Nov 29 16:51:58 2016 -0500 Committer: Jonathan Hurley Committed: Tue Nov 29 17:00:59 2016 -0500 -- .../views/stackVersions/stackVersionPage.html | 2 +- .../org/apache/ambari/logsearch/LogSearch.java | 15 +- .../logsearch/common/ExternalServerClient.java | 12 +- .../logsearch/common/LogSearchConstants.java| 1 + .../AbstractOperationHolderConverter.java | 9 + ...actServiceLogRequestFacetQueryConverter.java | 44 ++ .../BaseServiceLogRequestQueryConverter.java| 1 + ...ServiceLogAnyGraphRequestQueryConverter.java | 13 + ...eLogComponentLevelRequestQueryConverter.java | 15 +- ...eLogComponentRequestFacetQueryConverter.java | 15 +- ...rviceLogLevelCountRequestQueryConverter.java | 16 + ...eLogLevelDateRangeRequestQueryConverter.java | 16 +- ...erviceLogTreeRequestFacetQueryConverter.java | 17 +- .../ambari/logsearch/doc/DocConstants.java | 1 + .../logsearch/graph/GraphDataGenerator.java | 26 +- .../logsearch/manager/ServiceLogsManager.java | 2 +- .../request/ServiceLogParamDefinition.java | 6 + .../request/impl/BaseServiceLogRequest.java | 13 + .../LogsearchKRBAuthenticationFilter.java | 4 +- .../src/main/resources/logsearch.properties | 2 +- .../dashboard/BubbleGraphTableLayoutView.js | 4 +- .../views/dashboard/ComponentListView.js| 2 +- .../scripts/views/dashboard/HostListView.js | 14 +- .../main/webapp/scripts/views/tabs/TreeView.js | 10 +- .../webapp/templates/tabs/TreeView_tmpl.html| 115 ++-- ...ComponentLevelRequestQueryConverterTest.java | 7 +- ...ComponentRequestFacetQueryConverterTest.java | 4 +- .../conf/unix/ambari-metrics-grafana| 34 +- .../ambari/server/checks/CheckDescription.java | 13 + .../server/checks/ServicePresenceCheck.java | 177 ++ .../internal/ClusterControllerImpl.java | 2 +- .../ServiceConfigVersionResourceProvider.java | 3 +- .../logging/LoggingSearchPropertyProvider.java | 11 +- .../ambari/server/orm/dao/ClusterDAO.java | 24 + .../ambari/server/orm/dao/ServiceConfigDAO.java | 13 +- .../orm/entities/ClusterConfigEntity.java | 7 +- .../entities/ClusterConfigMappingEntity.java| 6 + .../orm/entities/ServiceConfigEntity.java | 5 +- .../server/orm/helpers/dbms/MySqlHelper.java| 18 + .../upgrades/RangerKmsProxyConfig.java | 94 +++ .../server/state/cluster/ClusterImpl.java | 42 +- .../server/upgrade/SchemaUpgradeHelper.java | 35 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 + .../FLUME/1.4.0.2.0/package/scripts/flume.py| 1 + .../package/files/hbaseSmokeVerify.sh | 2 +- .../HDFS/2.1.0.2.0/kerberos.json| 2 +- .../HIVE/0.12.0.2.0/configuration/hive-env.xml | 19 + .../HIVE/0.12.0.2.0/package/scripts/webhcat.py | 10 - .../configuration/logfeeder-ambari-config.xml | 37 ++ .../configuration/logfeeder-output-config.xml | 37 ++ .../configuration/logsearch-properties.xml | 40 ++ .../LOGSEARCH/0.5.0/metainfo.xml| 5 + .../LOGSEARCH/0.5.0/package/scripts/params.py | 17 +- .../0.5.0/package/scripts/setup_logfeeder.py| 10 + .../templates/input.config-ambari.json.j2 | 602 --- .../package/templates/output.config.json.j2 | 61 -- .../properties/input.config-ambari.json.j2 | 602 +++ .../0.5.0/properties/output.config.json.j2 | 61 ++ .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 19 + .../0.6.0.2.5/package/scripts/master.py | 15 +- .../0.6.0.2.5/package/scripts/params.py | 28 +- .../ZEPPELIN/0.6.0.2.5/role_command_order.json | 2 +- .../HDP/2.0.6/configuration/cluster-env.xml | 6 + .../HDP/2.2/services/HIVE/themes/theme.json | 107 +++- .../services/HIVE/configuration/hive-env.xml| 35 ++ .../services/OOZIE/configuration/oozie-env.xml | 33 + .../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 6 + .../HDP/2.3/services/OOZIE/themes/theme.json| 116 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 7 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 7 + .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 11 + .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 11 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 7 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 7 + .../stacks/HDP/2.4/upgrades/upgrade-2.5.x
[8/8] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456
Merge branch 'trunk' into branch-feature-AMBARI-18456 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5467ad07 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5467ad07 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5467ad07 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 5467ad0737bdadf23e0cec752acdbdc1b250de3c Parents: 23fbfe4 a442efb Author: Jonathan Hurley Authored: Tue Oct 4 19:59:16 2016 -0400 Committer: Jonathan Hurley Committed: Tue Oct 4 19:59:16 2016 -0400 -- .../timeline/AbstractTimelineMetricsSink.java | 75 +++--- .../availability/MetricCollectorHAHelper.java | 19 +- .../availability/MetricCollectorHATest.java | 34 ++- .../src/main/python/core/blacklisted_set.py | 14 ++ .../src/main/python/core/config_reader.py | 3 +- .../src/main/python/core/emitter.py | 74 -- .../server/controller/KerberosHelperImpl.java | 243 ++- .../ConfigureAmbariIdentitiesServerAction.java | 190 +++ .../kerberos/FinalizeKerberosServerAction.java | 118 - .../kerberos/KerberosOperationHandler.java | 2 +- .../server/upgrade/UpgradeCatalog250.java | 30 ++- .../ambari/server/utils/ShellCommandUtil.java | 121 + .../resources/stacks/HDP/2.0.6/kerberos.json| 14 +- .../server/controller/KerberosHelperTest.java | 193 --- ...nfigureAmbariIdentitiesServerActionTest.java | 204 .../server/upgrade/UpgradeCatalog250Test.java | 61 + ambari-web/app/assets/test/tests.js | 1 + .../nameNode/step2_controller.js| 32 ++- .../main/admin/stack_and_upgrade_controller.js | 45 +++- .../app/mappers/repository_version_mapper.js| 28 ++- ambari-web/app/messages.js | 1 + .../models/stack_version/repository_version.js | 6 + .../admin/highAvailability/nameNode/step3.hbs | 10 +- .../admin/stack_upgrade/upgrade_version_box.hbs | 2 +- .../stack_upgrade/upgrade_version_column.hbs| 2 +- ambari-web/app/utils/ajax/ajax.js | 5 + .../stack_upgrade/upgrade_version_box_view.js | 6 + .../upgrade_version_column_view.js | 6 +- .../admin/stack_and_upgrade_controller_test.js | 74 +- .../mappers/repository_version_mapper_test.js | 46 .../upgrade_version_box_view_test.js| 23 +- 31 files changed, 1447 insertions(+), 235 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/5467ad07/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java -- diff --cc ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java index 6ac607d,b2eb738..fd5afcd --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java @@@ -18,39 -18,10 +18,42 @@@ package org.apache.ambari.server.controller; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import junit.framework.Assert; +import static org.easymock.EasyMock.anyLong; +import static org.easymock.EasyMock.anyObject; ++import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.getCurrentArguments; +import static org.easymock.EasyMock.isNull; +import static org.easymock.EasyMock.newCapture; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + ++import java.io.File; ++import java.lang.reflect.Method; +import java.net.InetAddress; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import javax.persistence.EntityManager; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.Role; import org.apache.ambari.server.actionmanager.ActionManager; @@@ -121,14 -96,45 +127,16 @@@ import org.easymock.CaptureType import org.easymock.EasyMockSupport; import o
