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/0945f28e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0945f28e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0945f28e Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 0945f28e65e7627b9a7f85c00027795f7c772b32 Parents: 12ae259 d7c59fc Author: Robert Levas <rle...@hortonworks.com> Authored: Fri Jun 30 05:45:59 2017 -0400 Committer: Robert Levas <rle...@hortonworks.com> Committed: Fri Jun 30 05:45:59 2017 -0400 ---------------------------------------------------------------------- .../controllers/ambariViews/ViewsListCtrl.js | 20 + .../controllers/groups/GroupsEditCtrl.js | 19 +- .../app/views/ambariViews/listTable.html | 3 + .../ui/admin-web/app/views/groups/edit.html | 3 + .../ambari_agent/AlertSchedulerHandler.py | 10 +- .../python/ambari_agent/alerts/base_alert.py | 8 +- .../python/ambari_agent/alerts/port_alert.py | 107 +- .../ambari_agent/TestAlertSchedulerHandler.py | 17 +- .../libraries/functions/mounted_dirs_helper.py | 1 + .../libraries/functions/packages_analyzer.py | 15 +- ambari-infra/ambari-infra-manager/pom.xml | 1 - ambari-infra/ambari-infra-solr-plugin/pom.xml | 4 +- ambari-infra/pom.xml | 2 +- .../ambari-logsearch-logfeeder/pom.xml | 4 +- .../ambari-logsearch-server/pom.xml | 12 +- ambari-logsearch/pom.xml | 5 +- ambari-metrics/ambari-metrics-common/pom.xml | 4 + .../timeline/HBaseTimelineMetricStore.java | 9 +- .../timeline/TimelineMetricConfiguration.java | 11 + .../timeline/TestTimelineMetricStore.java | 1 + ambari-server/docs/configuration/index.md | 13 +- .../server/agent/AlertDefinitionCommand.java | 7 +- .../ambari/server/agent/ExecutionCommand.java | 4 + .../ambari/server/agent/HeartBeatHandler.java | 4 +- .../server/configuration/Configuration.java | 65 +- .../controller/AmbariActionExecutionHelper.java | 2 + .../AmbariCustomCommandExecutionHelper.java | 12 +- .../controller/AmbariManagementController.java | 4 + .../AmbariManagementControllerImpl.java | 43 +- .../ambari/server/controller/AmbariServer.java | 4 + .../server/controller/ConfigGroupResponse.java | 10 + .../controller/DeleteIdentityHandler.java | 283 +++++ .../server/controller/KerberosHelper.java | 3 + .../server/controller/KerberosHelperImpl.java | 31 +- .../OrderedRequestStageContainer.java | 62 ++ .../internal/AbstractProviderModule.java | 47 +- .../internal/ClientConfigResourceProvider.java | 9 +- .../internal/ConfigGroupResourceProvider.java | 31 +- .../server/controller/jmx/JMXHostProvider.java | 11 + .../controller/jmx/JMXPropertyProvider.java | 24 + .../utilities/KerberosIdentityCleaner.java | 135 +++ .../ambari/server/orm/DBAccessorImpl.java | 48 +- .../orm/helpers/dbms/GenericDbmsHelper.java | 2 +- .../AbstractPrepareKerberosServerAction.java | 19 +- .../server/serveraction/kerberos/Component.java | 74 ++ .../kerberos/FinalizeKerberosServerAction.java | 27 +- .../kerberos/KerberosServerAction.java | 27 + .../ambari/server/stack/MasterHostResolver.java | 11 +- .../org/apache/ambari/server/state/Cluster.java | 8 + .../apache/ambari/server/state/ConfigImpl.java | 3 +- .../server/state/alert/AlertDefinitionHash.java | 14 +- .../server/state/cluster/ClusterImpl.java | 18 + .../kerberos/AbstractKerberosDescriptor.java | 15 + .../kerberos/KerberosComponentDescriptor.java | 15 + .../state/kerberos/KerberosDescriptor.java | 8 - .../kerberos/KerberosIdentityDescriptor.java | 30 + .../kerberos/KerberosServiceDescriptor.java | 6 + .../apache/ambari/server/utils/StageUtils.java | 54 + ambari-server/src/main/python/ambari-server.py | 2 + .../python/ambari_server/serverConfiguration.py | 6 + .../main/python/ambari_server/serverSetup.py | 105 +- .../0.1.0/package/scripts/params.py | 4 +- .../0.1.0/package/scripts/params.py | 10 +- .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 8 +- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 1 + .../HBASE/0.96.0.2.0/role_command_order.json | 3 +- .../HBASE/2.0.0.3.0/role_command_order.json | 2 +- .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 4 +- .../package/scripts/namenode_upgrade.py | 2 +- .../2.1.0.2.0/package/scripts/params_linux.py | 4 + .../HIVE/2.1.0.3.0/service_advisor.py | 19 + .../LOGSEARCH/0.5.0/package/scripts/params.py | 4 +- .../RANGER/0.4.0/package/scripts/params.py | 1 + .../0.4.0/package/scripts/setup_ranger_xml.py | 10 +- .../2.0.6/hooks/before-ANY/scripts/params.py | 2 + .../before-ANY/scripts/shared_initialization.py | 30 +- .../2.0.6/hooks/before-START/scripts/params.py | 4 + .../scripts/shared_initialization.py | 22 +- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 10 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 7 +- .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 5 +- .../stacks/HDP/2.6/services/stack_advisor.py | 21 + .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 9 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 6 + .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 + .../HDP/3.0/hooks/before-ANY/scripts/params.py | 3 + .../before-ANY/scripts/shared_initialization.py | 31 +- .../3.0/hooks/before-START/scripts/params.py | 4 + .../scripts/shared_initialization.py | 22 +- .../main/resources/stacks/HDP/3.0/metainfo.xml | 2 +- .../PERF/1.0/hooks/before-ANY/scripts/params.py | 3 + .../before-ANY/scripts/shared_initialization.py | 23 +- .../src/main/resources/stacks/stack_advisor.py | 2 +- .../AmbariManagementControllerImplTest.java | 16 +- .../ClientConfigResourceProviderTest.java | 8 + .../ConfigGroupResourceProviderTest.java | 2 + .../metrics/JMXPropertyProviderTest.java | 9 + .../utilities/KerberosIdentityCleanerTest.java | 204 ++++ .../ambari/server/orm/DBAccessorImplTest.java | 29 + .../state/alerts/AlertDefinitionHashTest.java | 4 +- .../ambari/server/utils/StageUtilsTest.java | 99 ++ .../src/test/python/TestAmbariServer.py | 49 +- .../src/test/python/TestUpgradeHelper.py | 1028 ------------------ .../stacks/2.0.6/common/test_stack_advisor.py | 2 +- .../configs/ha_bootstrap_standby_node.json | 2 +- ...ha_bootstrap_standby_node_initial_start.json | 2 +- ...dby_node_initial_start_dfs_nameservices.json | 2 +- .../stacks/2.5/common/test_stack_advisor.py | 2 +- .../stacks/2.6/common/test_stack_advisor.py | 123 ++- ambari-web/app/controllers/main/service/item.js | 6 +- .../app/controllers/wizard/step8_controller.js | 16 +- .../mixins/common/configs/enhanced_configs.js | 3 +- ambari-web/app/models/stack.js | 4 +- .../stacks/ODPi/2.0/services/stack_advisor.py | 2 +- .../src/main/resources/ui/app/styles/app.less | 4 +- .../wfmanager/src/main/resources/ui/bower.json | 4 +- .../hdfs-directory-viewer/addon/styles/app.css | 1 + .../wfmanager/src/main/resources/ui/yarn.lock | 68 +- docs/pom.xml | 12 + 119 files changed, 2159 insertions(+), 1373 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0945f28e/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0945f28e/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0945f28e/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0945f28e/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java ----------------------------------------------------------------------
