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:42 UTC
[07/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/1f804d13
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f804d13
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f804d13
Branch: refs/heads/trunk
Commit: 1f804d1392fc076542b9905766108d658258bcb4
Parents: 936626b ece1de3
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Nov 28 08:37:22 2016 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Nov 28 08:37:22 2016 -0500
----------------------------------------------------------------------
ambari-agent/conf/unix/agent-multiplier.py | 14 +-
.../ambari_agent/CustomServiceOrchestrator.py | 17 +-
.../TestCustomServiceOrchestrator.py | 25 +-
.../ambari-metrics/datasource.js | 6 +-
ambari-server/pom.xml | 2 +
ambari-server/sbin/ambari-server | 6 +-
.../server/actionmanager/ActionScheduler.java | 2 +-
.../checks/DatabaseConsistencyCheckHelper.java | 10 +-
.../server/configuration/Configuration.java | 23 +-
.../ambari/server/events/AmbariEvent.java | 5 +
.../events/ClusterConfigFinishedEvent.java | 53 +
.../AmbariLdapAuthenticationProvider.java | 23 +-
.../AmbariLdapBindAuthenticator.java | 233 +-
.../apache/ambari/server/stack/StackModule.java | 101 +-
.../ambari/server/state/stack/UpgradePack.java | 12 +-
.../ambari/server/topology/TopologyManager.java | 16 +-
.../ambari/server/view/ViewExtractor.java | 2 +-
.../apache/ambari/server/view/ViewRegistry.java | 381 +--
ambari-server/src/main/python/ambari-server.py | 137 +-
.../python/ambari_server/serverConfiguration.py | 9 +-
.../main/python/ambari_server/setupActions.py | 1 +
.../main/python/ambari_server/setupMpacks.py | 167 +-
.../0.1.0/configuration/storm-site.xml | 84 -
.../AMBARI_METRICS/0.1.0/metainfo.xml | 4 -
.../FLUME/1.4.0.2.0/metrics.json | 62 -
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 497 ++--
.../package/scripts/hive_server_interactive.py | 4 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 1 +
.../0.4.0/package/scripts/setup_ranger_xml.py | 18 +
.../0.4.0/package/templates/ranger_admin_pam.j2 | 22 +
.../package/templates/ranger_remote_pam.j2 | 22 +
.../0.5.0/configuration/ranger-admin-site.xml | 2 +-
.../STORM/1.0.1/configuration/storm-site.xml | 54 +
.../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 | 50 +-
.../stacks/HDP/2.1/services/stack_advisor.py | 20 +-
.../stacks/HDP/2.2/services/stack_advisor.py | 7 -
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 1042 -------
.../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 1050 -------
.../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 4 +-
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 4 +-
.../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 4 +-
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 4 +-
.../HIVE/configuration/hive-interactive-env.xml | 10 +
.../HIVE/configuration/hivemetastore-site.xml | 8 +
.../hiveserver2-interactive-site.xml | 8 +
.../HIVE/configuration/hiveserver2-site.xml | 8 +
.../stacks/HDP/2.5/services/stack_advisor.py | 52 +-
.../services/ATLAS/themes/theme_version_2.json | 28 +-
.../stacks/HDP/2.6/services/stack_advisor.py | 2 +-
.../PERF/1.0/configuration/cluster-env.xml | 6 +-
.../GRUMPY/configuration/grumpy-site.xml | 2 +-
.../services/HAPPY/configuration/happy-site.xml | 2 +-
.../services/HBASE/configuration/hbase-env.xml | 30 +-
.../HBASE/configuration/hbase-log4j.xml | 2 +-
.../configuration/hbase-logsearch-conf.xml | 6 +-
.../HBASE/configuration/hbase-policy.xml | 6 +-
.../services/HBASE/configuration/hbase-site.xml | 74 +-
.../services/HDFS/configuration/core-site.xml | 32 +-
.../services/HDFS/configuration/hadoop-env.xml | 44 +-
.../hadoop-metrics2.properties.xml | 2 +-
.../HDFS/configuration/hadoop-policy.xml | 22 +-
.../services/HDFS/configuration/hdfs-log4j.xml | 2 +-
.../HDFS/configuration/hdfs-logsearch-conf.xml | 6 +-
.../services/HDFS/configuration/hdfs-site.xml | 108 +-
.../services/HDFS/configuration/ssl-client.xml | 14 +-
.../services/HDFS/configuration/ssl-server.xml | 16 +-
.../SLEEPY/configuration/sleepy-site.xml | 2 +-
.../services/SNOW/configuration/snow-site.xml | 2 +-
.../YARN/configuration-mapred/mapred-env.xml | 2 +-
.../YARN/configuration-mapred/mapred-site.xml | 28 +-
.../services/YARN/configuration/yarn-env.xml | 8 +-
.../services/YARN/configuration/yarn-log4j.xml | 2 +-
.../services/YARN/configuration/yarn-site.xml | 150 +-
.../src/main/resources/stacks/stack_advisor.py | 200 +-
.../src/main/resources/upgrade-pack.xsd | 10 +-
.../StackDefinedPropertyProviderTest.java | 2 +
.../RestMetricsPropertyProviderTest.java | 2 +
.../AmbariLdapBindAuthenticatorTest.java | 226 +-
.../server/state/stack/UpgradePackTest.java | 22 +
.../ClusterDeployWithStartOnlyTest.java | 2 +-
...InstallWithoutStartOnComponentLevelTest.java | 2 +-
.../ClusterInstallWithoutStartTest.java | 2 +-
.../ambari/server/view/ViewRegistryTest.java | 2 +
ambari-server/src/test/python/TestMpacks.py | 223 +-
.../grafana-dashboards/grafana-hdfs-users.json | 270 ++
.../dashboards/service-metrics/STORM.txt | 7 +
.../stacks/2.0.6/HIVE/test_hive_metastore.py | 147 +-
.../stacks/2.0.6/HIVE/test_hive_server.py | 311 +--
.../stacks/2.0.6/common/test_stack_advisor.py | 34 +-
.../stacks/2.1/HIVE/test_hive_metastore.py | 170 +-
.../stacks/2.1/common/test_stack_advisor.py | 5 -
.../stacks/2.2/common/test_stack_advisor.py | 20 +-
.../stacks/2.5/common/test_stack_advisor.py | 79 +-
.../stacks/2.6/common/test_stack_advisor.py | 4 +-
.../test/python/stacks/test_stack_adviser.py | 239 --
.../python/uninstall/common-services/SERVICEA | 1 +
.../python/uninstall/common-services/SERVICEB | 1 +
.../test/python/uninstall/dashboards/SERVICEA | 1 +
.../test/python/uninstall/dashboards/SERVICEB | 1 +
.../uninstall/dashboards/files/README.txt | 17 +
.../python/uninstall/dashboards/files/STORM.txt | 1 +
.../uninstall/dashboards/files/metainfo.xml | 1 +
.../test/python/uninstall/extensions/SERVICEA | 1 +
.../test/python/uninstall/extensions/SERVICEB | 1 +
.../test/python/uninstall/stacks/2.0/SERVICEA | 1 +
.../test/python/uninstall/stacks/2.0/SERVICEB | 1 +
.../uninstall/stacks/2.0/files/README.txt | 17 +
.../uninstall/stacks/2.0/files/metainfo1.xml | 1 +
.../uninstall/stacks/2.0/files/metainfo2.xml | 1 +
.../GANGLIA/upgrades/HDP/rolling-upgrade.xml | 41 +
ambari-web/app/assets/test/tests.js | 9 +-
.../hawq/activateStandby/step2_controller.js | 2 +-
.../hawq/addStandby/step3_controller.js | 3 +-
.../journalNode/step2_controller.js | 3 +-
.../nameNode/step3_controller.js | 3 +-
.../resourceManager/step3_controller.js | 2 +-
.../main/admin/service_auto_start.js | 330 ++-
.../add_alert_definition/step1_controller.js | 41 +-
.../alerts/definition_configs_controller.js | 40 +-
.../app/controllers/main/charts/heatmap.js | 6 +-
ambari-web/app/controllers/main/host/details.js | 2 +-
.../app/controllers/wizard/step7_controller.js | 2 +-
.../app/controllers/wizard/step8_controller.js | 2 +-
ambari-web/app/data/HDP2.2/hive_properties.js | 119 -
ambari-web/app/data/HDP2.2/site_properties.js | 275 --
ambari-web/app/data/HDP2.2/tez_properties.js | 43 -
ambari-web/app/data/HDP2.2/yarn_properties.js | 54 -
.../HDP2.3/hawq_activate_standby_properties.js | 43 -
.../app/data/HDP2.3/hawq_ha_properties.js | 43 -
ambari-web/app/data/HDP2.3/site_properties.js | 370 ---
ambari-web/app/data/HDP2/alert_notification.js | 145 -
.../app/data/HDP2/gluster_fs_properties.js | 94 -
ambari-web/app/data/HDP2/ha_properties.js | 538 ----
.../data/HDP2/kerberos_descriptor_properties.js | 35 -
ambari-web/app/data/HDP2/kerberos_identities.js | 129 -
.../data/HDP2/move_journal_node_properties.js | 42 -
ambari-web/app/data/HDP2/rm_ha_properties.js | 206 --
ambari-web/app/data/HDP2/secure_mapping.js | 1004 -------
ambari-web/app/data/HDP2/site_properties.js | 2579 ------------------
ambari-web/app/data/HDP2/ui_properties.js | 49 -
.../app/data/configs/alert_notification.js | 145 +
.../configs/services/accumulo_properties.js | 116 +
.../configs/services/ambari_infra_properties.js | 167 ++
.../services/ambari_metrics_properties.js | 188 ++
.../data/configs/services/falcon_properties.js | 302 ++
.../data/configs/services/flume_properties.js | 38 +
.../configs/services/glusterfs_properties.js | 93 +
.../data/configs/services/hawq_properties.js | 110 +
.../data/configs/services/hbase_properties.js | 124 +
.../data/configs/services/hdfs_properties.js | 164 ++
.../data/configs/services/hive_properties.js | 590 ++++
.../data/configs/services/kafka_properties.js | 66 +
.../configs/services/kerberos_properties.js | 204 ++
.../data/configs/services/knox_properties.js | 32 +
.../configs/services/logsearch_properties.js | 447 +++
.../configs/services/mapreduce2_properties.js | 45 +
.../data/configs/services/oozie_properties.js | 93 +
.../data/configs/services/ranger_properties.js | 327 +++
.../data/configs/services/storm_properties.js | 296 ++
.../app/data/configs/services/tez_properties.js | 92 +
.../data/configs/services/yarn_properties.js | 300 ++
.../configs/services/zookeeper_properties.js | 67 +
ambari-web/app/data/configs/site_properties.js | 55 +
ambari-web/app/data/configs/ui_properties.js | 49 +
.../app/data/configs/wizards/ha_properties.js | 538 ++++
.../wizards/hawq_activate_standby_properties.js | 43 +
.../data/configs/wizards/hawq_ha_properties.js | 43 +
.../wizards/kerberos_descriptor_properties.js | 35 +
.../data/configs/wizards/kerberos_identities.js | 129 +
.../wizards/move_journal_node_properties.js | 42 +
.../data/configs/wizards/rm_ha_properties.js | 206 ++
.../app/data/configs/wizards/secure_mapping.js | 1004 +++++++
ambari-web/app/data/custom_stack_map.js | 2 -
.../configs/stack_config_properties_mapper.js | 2 +-
ambari-web/app/messages.js | 19 +-
ambari-web/app/mixins.js | 1 +
.../app/mixins/wizard/addSecurityConfigs.js | 2 +-
.../app/models/alerts/alert_definition.js | 54 +
ambari-web/app/models/service/flume.js | 8 +
ambari-web/app/models/stack_service.js | 13 +-
ambari-web/app/styles/alerts.less | 135 +-
ambari-web/app/styles/application.less | 448 +--
.../app/styles/enhanced_service_dashboard.less | 2 +
ambari-web/app/styles/modal_popups.less | 67 +-
ambari-web/app/styles/stack_versions.less | 6 +-
.../app/styles/theme/bootstrap-ambari.css | 25 +-
ambari-web/app/styles/wizard.less | 23 +-
.../common/assign_master_components.hbs | 62 +-
.../templates/common/configs/overrideWindow.hbs | 2 +-
.../common/form/check_db_connection.hbs | 26 +-
.../templates/common/host_progress_popup.hbs | 317 ++-
.../common/modal_popups/alerts_popup.hbs | 80 +-
.../modal_popups/dependent_configs_list.hbs | 2 +-
ambari-web/app/templates/experimental.hbs | 2 +-
.../templates/main/admin/service_auto_start.hbs | 76 +-
.../service_auto_start/component_auto_start.hbs | 2 +-
.../admin/stack_upgrade/edit_repositories.hbs | 52 +-
.../stack_upgrade/stack_upgrade_wizard.hbs | 4 +-
.../stack_upgrade/upgrade_history_details.hbs | 4 +-
.../main/admin/stack_upgrade/upgrade_task.hbs | 4 +-
.../main/alerts/add_alert_definition/step1.hbs | 30 +-
.../alerts/add_definition_to_group_popup.hbs | 2 +-
.../main/charts/heatmap/heatmap_host_detail.hbs | 70 +-
.../main/charts/heatmap/heatmap_rack.hbs | 37 +-
.../templates/main/charts/heatmap_dropdown.hbs | 4 +-
.../main/host/bulk_operation_confirm_popup.hbs | 2 +-
.../main/host/details/deleteComponentPopup.hbs | 20 +-
.../main/host/details/doDeleteHostPopup.hbs | 35 +-
.../details/raiseDeleteComponentErrorPopup.hbs | 21 +-
.../main/service/info/heatmap_dropdown.hbs | 2 +-
.../app/templates/main/service/info/summary.hbs | 2 +-
.../templates/main/service/services/flume.hbs | 196 +-
ambari-web/app/templates/wizard/step1.hbs | 2 +-
ambari-web/app/templates/wizard/step3.hbs | 2 +-
.../wizard/step3/step3_host_warnings_popup.hbs | 18 +-
.../wizard/step9/step9HostTasksLogPopup.hbs | 88 +-
ambari-web/app/utils/config.js | 25 +-
.../app/utils/configs/config_initializer.js | 28 +-
.../mount_points_based_initializer_mixin.js | 340 +++
ambari-web/app/utils/host_progress_popup.js | 5 +-
.../common/assign_master_components_view.js | 6 +-
ambari-web/app/views/common/controls_view.js | 5 +-
.../app/views/main/admin/service_auto_start.js | 55 +-
.../service_auto_start/component_auto_start.js | 8 +-
.../alerts/add_alert_definition/step1_view.js | 3 +
.../views/main/charts/heatmap/heatmap_rack.js | 23 +-
.../views/main/dashboard/widgets/hbase_links.js | 6 +-
ambari-web/app/views/main/host.js | 5 +-
.../views/main/service/reassign/step5_view.js | 3 +-
.../app/views/main/service/services/flume.js | 32 +-
ambari-web/app/views/wizard/step3_view.js | 2 +-
.../views/wizard/step9/hostLogPopupBody_view.js | 2 +
ambari-web/brunch-config.js | 1 +
ambari-web/copy-pluggable-stack-resources.sh | 2 +-
.../main/admin/service_auto_start_test.js | 326 +++
.../step1_controller_test.js | 33 +-
.../test/controllers/main/host/details_test.js | 25 +-
.../test/data/HDP2.2/site_properties_test.js | 76 -
.../test/data/HDP2.3/site_properties_test.js | 77 -
.../test/data/HDP2/secure_mapping_test.js | 36 -
.../test/data/HDP2/site_properties_test.js | 76 -
.../test/data/configs/site_properties_test.js | 76 +
.../data/configs/wizards/secure_mapping_test.js | 36 +
ambari-web/test/models/service/flume_test.js | 6 +
ambari-web/test/utils/ajax/ajax_test.js | 9 +-
ambari-web/test/utils/config_test.js | 46 +-
.../utils/configs/config_initializer_test.js | 458 ++++
.../component_auto_start_test.js | 64 +
.../views/main/admin/service_auto_start_test.js | 83 +
.../views/main/service/services/flume_test.js | 17 +-
ambari-web/vendor/scripts/jquery.typeahead.js | 300 ++
contrib/utils/perf/deploy-gce-perf-cluster.py | 230 +-
contrib/views/ambari-views-package/pom.xml | 123 +
.../src/main/package/deb/control/control | 22 +
contrib/views/capacity-scheduler/pom.xml | 18 +
contrib/views/files/pom.xml | 18 +
contrib/views/hawq/pom.xml | 18 +
contrib/views/hive-next/pom.xml | 18 +
contrib/views/hive/pom.xml | 18 +
contrib/views/hueambarimigration/pom.xml | 18 +
contrib/views/jobs/pom.xml | 23 +
contrib/views/pig/pom.xml | 18 +
contrib/views/pom.xml | 5 +
contrib/views/slider/pom.xml | 18 +
contrib/views/storm/pom.xml | 23 +
contrib/views/tez/pom.xml | 18 +
contrib/views/wfmanager/pom.xml | 18 +
contrib/views/zeppelin/pom.xml | 18 +
docs/pom.xml | 2 +-
docs/src/site/apt/index.apt | 2 +-
docs/src/site/apt/whats-new.apt | 4 +-
docs/src/site/site.xml | 2 +
274 files changed, 12584 insertions(+), 11650 deletions(-)
----------------------------------------------------------------------