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 2016/12/07 21:50:44 UTC
[09/14] 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/087de8b7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/087de8b7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/087de8b7
Branch: refs/heads/trunk
Commit: 087de8b789d157aa8f4fd12963b0262ea6c40461
Parents: 276d124 6100be6
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu Dec 1 10:57:35 2016 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Thu Dec 1 10:57:35 2016 -0500
----------------------------------------------------------------------
.../src/main/python/ambari_agent/ActionQueue.py | 10 +-
.../ambari_agent/CustomServiceOrchestrator.py | 4 +-
.../simulate_perf_cluster_alert_behaviour.py | 108 ++
.../libraries/script/script.py | 15 +-
.../ambari/logfeeder/mapper/MapperDateTest.java | 56 -
.../ambari/logsearch/dao/SolrCollectionDao.java | 64 +-
ambari-server/conf/unix/ambari.properties | 4 +-
ambari-server/conf/windows/ambari.properties | 2 +
ambari-server/docs/configuration/index.md | 33 +-
.../ambari/server/agent/HeartBeatHandler.java | 2 +-
.../ambari/server/agent/HeartbeatProcessor.java | 2 +-
.../server/checks/ServicePresenceCheck.java | 55 +-
.../server/configuration/Configuration.java | 53 +
.../security/AbstractSecurityHeaderFilter.java | 14 +
.../AmbariServerSecurityHeaderFilter.java | 1 +
.../AmbariViewsSecurityHeaderFilter.java | 1 +
.../kerberos/MITKerberosOperationHandler.java | 22 +-
.../ambari/server/state/quicklinks/Link.java | 21 +
.../services/RetryUpgradeActionService.java | 2 +-
.../server/upgrade/UpgradeCatalog250.java | 52 +
.../ambari/server/utils/ShellCommandUtil.java | 11 +-
ambari-server/src/main/python/ambari-server.py | 12 +-
.../main/python/ambari_server/serverUtils.py | 11 +
.../src/main/python/ambari_server/utils.py | 60 +-
.../src/main/python/ambari_server_main.py | 70 +-
.../package/scripts/metadata_server.py | 18 +
.../RANGER/0.4.0/package/scripts/params.py | 14 +
.../0.4.0/package/scripts/setup_ranger_xml.py | 21 +
.../common-services/RANGER/0.6.0/metainfo.xml | 2 +
.../custom_actions/scripts/install_packages.py | 2 +-
.../src/main/resources/scripts/stack_advisor.py | 11 +-
.../HDP/2.0.6/configuration/cluster-env.xml | 10 +
.../stacks/HDP/2.0.6/services/stack_advisor.py | 47 +-
.../stacks/HDP/2.1/services/stack_advisor.py | 20 +-
.../stacks/HDP/2.2/services/stack_advisor.py | 7 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 5 +-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 5 +-
.../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 5 +-
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 5 +-
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 5 +-
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 5 +-
.../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 5 +-
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 5 +-
.../stacks/HDP/2.5/services/KNOX/metainfo.xml | 4 -
.../stacks/HDP/2.5/services/OOZIE/metainfo.xml | 4 +
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 12 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 3 +
.../configuration/hive-interactive-site.xml | 58 +
.../HIVE/configuration/tez-interactive-site.xml | 78 +
.../stacks/PERF/1.0/services/HAPPY/alerts.json | 20 +
.../HAPPY/configuration/happy-alert-config.xml | 75 +
.../stacks/PERF/1.0/services/HAPPY/metainfo.xml | 5 +
.../HAPPY/package/alerts/alert_happy_process.py | 59 +
.../stacks/PERF/1.0/services/HBASE/alerts.json | 110 +-
.../HBASE/configuration/hbase-alert-config.xml | 75 +
.../stacks/PERF/1.0/services/HBASE/metainfo.xml | 1 +
.../package/alerts/hbase_master_process.py | 59 +
.../alerts/hbase_regionserver_process.py | 59 +
.../stacks/PERF/1.0/services/HDFS/alerts.json | 1728 +-----------------
.../HDFS/configuration/hdfs-alert-config.xml | 75 +
.../stacks/PERF/1.0/services/HDFS/metainfo.xml | 1 +
.../package/alerts/alert_checkpoint_time.py | 38 +-
.../alerts/alert_datanode_unmounted_data_dir.py | 47 +-
.../package/alerts/alert_ha_namenode_health.py | 75 -
.../package/alerts/alert_metrics_deviation.py | 85 -
.../package/alerts/alert_nfs_gateway_process.py | 59 +
.../package/alerts/alert_snamenode_process.py | 59 +
.../package/alerts/alert_upgrade_finalized.py | 49 +-
.../stacks/PERF/1.0/services/SLEEPY/alerts.json | 20 +
.../configuration/sleepy-alert-config.xml | 75 +
.../PERF/1.0/services/SLEEPY/metainfo.xml | 5 +
.../package/alerts/alert_sleepy_process.py | 59 +
.../stacks/PERF/1.0/services/SNOW/alerts.json | 20 +
.../SNOW/configuration/snow-alert-config.xml | 75 +
.../stacks/PERF/1.0/services/SNOW/metainfo.xml | 5 +
.../SNOW/package/alerts/alert_snow_process.py | 59 +
.../stacks/PERF/1.0/services/YARN/alerts.json | 361 +---
.../YARN/configuration/yarn-alert-config.xml | 75 +
.../stacks/PERF/1.0/services/YARN/metainfo.xml | 3 +
.../package/alerts/alert_history_process.py | 59 +
.../package/alerts/alert_nodemanager_health.py | 36 +-
.../alerts/alert_nodemanagers_summary.py | 68 -
.../alerts/alert_resourcemanager_process.py | 59 +
.../package/alerts/alert_timeline_process.py | 59 +
.../PERF/1.0/services/ZOOKEEPER/alerts.json | 20 +
.../ZOOKEEPER/configuration/zk-alert-config.xml | 75 +
.../PERF/1.0/services/ZOOKEEPER/metainfo.xml | 4 +
.../package/alerts/alert_zk_server_process.py | 59 +
.../src/main/resources/stacks/stack_advisor.py | 209 ++-
.../AbstractSecurityHeaderFilterTest.java | 29 +-
.../MITKerberosOperationHandlerTest.java | 23 +
.../QuickLinksConfigurationModuleTest.java | 36 +
.../server/upgrade/UpgradeCatalog250Test.java | 5 +
.../server/utils/TestShellCommandUtil.java | 13 +-
.../src/test/python/TestAmbariServer.py | 6 +-
ambari-server/src/test/python/TestUtils.py | 37 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 16 +-
.../stacks/2.1/common/test_stack_advisor.py | 2 +
.../stacks/2.2/common/test_stack_advisor.py | 17 +-
.../stacks/2.3/ATLAS/test_metadata_server.py | 5 +-
.../test/python/stacks/test_stack_adviser.py | 239 +++
.../child_quicklinks_with_properties.json | 64 +
.../parent_quicklinks_with_properties.json | 65 +
.../admin/stack_upgrade_history_controller.js | 2 +-
.../controllers/main/service/info/configs.js | 2 +-
ambari-web/app/controllers/main/service/item.js | 49 +-
.../app/controllers/wizard/step6_controller.js | 58 +-
.../app/controllers/wizard/step7_controller.js | 2 +-
.../app/mappers/stack_upgrade_history_mapper.js | 2 +-
ambari-web/app/messages.js | 13 +-
ambari-web/app/mixins.js | 1 -
.../app/mixins/main/service/groups_mapping.js | 2 +-
.../stack_version/stack_upgrade_history.js | 2 +-
ambari-web/app/styles/stack_versions.less | 16 +-
.../highAvailability/journalNode/step2.hbs | 2 +
.../templates/main/admin/service_auto_start.hbs | 24 +-
.../info/delete_service_warning_popup.hbs | 28 +
ambari-web/app/templates/wizard/step1.hbs | 2 +-
.../app/utils/configs/config_initializer.js | 28 +-
.../mount_points_based_initializer_mixin.js | 340 ----
ambari-web/app/views/main/admin.js | 3 +-
.../app/views/main/admin/service_auto_start.js | 5 +
.../service_auto_start/component_auto_start.js | 1 +
.../upgrade_history_details_view.js | 2 +-
.../admin/stack_upgrade/upgrade_history_view.js | 120 +-
ambari-web/app/views/wizard/step1_view.js | 7 +
.../test/controllers/main/service/item_test.js | 13 +-
.../test/controllers/wizard/step6_test.js | 6 +-
ambari-web/test/utils/ajax/ajax_test.js | 9 +-
.../utils/configs/config_initializer_test.js | 457 -----
.../src/main/resources/ui/app/app.js | 14 +-
.../src/main/resources/ui/pig-web/app/app.js | 14 +-
.../resources/ui/app/components/job-details.js | 3 +
134 files changed, 3183 insertions(+), 3725 deletions(-)
----------------------------------------------------------------------