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/02 21:25:05 UTC
[24/24] 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/a58c39c9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a58c39c9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a58c39c9
Branch: refs/heads/branch-feature-AMBARI-18456
Commit: a58c39c9c177da52c32dd6f004cefa9658e9019d
Parents: 087de8b 0c837a6
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Dec 2 16:19:40 2016 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Dec 2 16:19:40 2016 -0500
----------------------------------------------------------------------
.../admin-web/app/scripts/services/Cluster.js | 51 --
.../app/scripts/services/RoleDetailsModal.js | 31 +-
.../app/views/modals/RoleDetailsModal.html | 6 +-
.../src/main/python/ambari_agent/ActionQueue.py | 11 +
.../ambari_agent/CustomServiceOrchestrator.py | 7 +-
.../src/main/python/ambari_agent/FileCache.py | 12 +-
.../test/python/ambari_agent/TestActionQueue.py | 48 ++
.../TestCustomServiceOrchestrator.py | 30 +-
.../test/python/ambari_agent/TestFileCache.py | 10 +-
.../ambari_commons/ambari_metrics_helper.py | 45 +-
.../timeline/AbstractTimelineMetricsSink.java | 6 +-
.../AbstractTimelineMetricSinkTest.java | 10 +-
.../conf/unix/ambari-metrics-grafana | 6 +-
.../timeline/HadoopTimelineMetricsSink.java | 4 +-
.../timeline/HadoopTimelineMetricsSinkTest.java | 6 +-
.../src/main/python/core/config_reader.py | 9 +-
.../src/test/python/core/TestEmitter.py | 2 +-
.../ambari/server/agent/ExecutionCommand.java | 1 +
.../AmbariManagementControllerImpl.java | 9 +
.../controller/internal/CalculatedStatus.java | 52 +-
.../internal/RequestResourceProvider.java | 34 +-
.../internal/StageResourceProvider.java | 2 +-
.../internal/UpgradeResourceProvider.java | 24 +-
.../orm/AmbariJpaLocalTxnInterceptor.java | 9 +-
.../ambari/server/state/ComponentInfo.java | 14 +
.../stack/upgrade/ConfigurationCondition.java | 72 +-
.../server/upgrade/UpgradeCatalog211.java | 24 +-
.../server/upgrade/UpgradeCatalog250.java | 6 +
.../ambari/server/utils/RequestUtils.java | 10 +
.../python/ambari_server/serverConfiguration.py | 14 +-
.../src/main/python/ambari_server/utils.py | 23 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 11 +-
.../1.6.1.2.2.0/package/scripts/params.py | 2 +-
.../AMBARI_METRICS/0.1.0/metainfo.xml | 1 +
.../0.1.0/package/scripts/params.py | 2 +-
.../0.1.0/package/scripts/service_check.py | 2 +-
.../FLUME/1.4.0.2.0/package/scripts/params.py | 2 +-
.../0.96.0.2.0/package/scripts/params_linux.py | 2 +-
.../package/alerts/alert_metrics_deviation.py | 2 +-
.../KAFKA/0.8.1/package/scripts/params.py | 2 +-
.../STORM/0.9.1/package/scripts/params_linux.py | 2 +-
.../2.1.0.2.0/package/scripts/service_check.py | 66 +-
.../ZOOKEEPER/3.4.6/metainfo.xml | 2 +-
.../2.0.6/hooks/before-START/scripts/params.py | 2 +-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 27 +-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 27 +-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 27 +-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 27 +-
.../services/HDFS/configuration/hadoop-env.xml | 176 ++++
.../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 27 +-
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 27 +-
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 27 +-
.../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 27 +-
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 27 +-
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 27 +-
.../2.1/hooks/before-START/scripts/params.py | 4 +-
.../src/main/resources/upgrade-pack.xsd | 8 +-
.../AmbariManagementControllerTest.java | 9 +
.../internal/CalculatedStatusTest.java | 31 +
.../internal/RequestResourceProviderTest.java | 12 +-
.../internal/UpgradeResourceProviderTest.java | 2 +-
.../orm/AmbariJpaLocalTxnInterceptorTest.java | 155 ++++
.../server/orm/InMemoryDefaultTestModule.java | 5 +
.../server/upgrade/UpgradeCatalog250Test.java | 17 +-
.../ambari/server/utils/RequestUtilsTest.java | 18 +
ambari-server/src/test/python/TestMpacks.py | 102 ++-
.../2.0.6/YARN/test_yarn_service_check.py | 111 +--
.../src/test/resources/dashboards/README.txt | 18 +
.../stacks/HDP/0.1/services/HDFS/metainfo.xml | 1 +
.../controllers/main/service/info/summary.js | 37 +-
.../main/service/reassign/step4_controller.js | 19 +-
.../mixins/main/dashboard/widgets/editable.js | 47 +-
.../main/dashboard/edit_widget_popup.hbs | 4 +-
.../edit_widget_popup_single_threshold.hbs | 2 +-
.../main/dashboard/plus_button_filter.hbs | 2 +-
.../app/templates/main/dashboard/widgets.hbs | 8 +-
.../main/dashboard/widgets/pie_chart.hbs | 5 +-
.../main/service/info/service_alert_popup.hbs | 15 +-
.../app/views/common/not-scrollable-textarea.js | 2 +-
ambari-web/app/views/main/dashboard/widget.js | 159 ++--
ambari-web/app/views/main/dashboard/widgets.js | 824 +++++++++----------
.../main/dashboard/widgets/datanode_live.js | 7 -
.../main/dashboard/widgets/flume_agent_live.js | 7 -
.../main/dashboard/widgets/hawqsegment_live.js | 7 -
.../dashboard/widgets/hbase_average_load.js | 11 +-
.../views/main/dashboard/widgets/hbase_links.js | 4 -
.../main/dashboard/widgets/hbase_master_heap.js | 4 -
.../dashboard/widgets/hbase_master_uptime.js | 5 -
.../widgets/hbase_regions_in_transition.js | 10 +-
.../main/dashboard/widgets/hdfs_capacity.js | 4 -
.../views/main/dashboard/widgets/hdfs_links.js | 4 -
.../views/main/dashboard/widgets/metrics_cpu.js | 3 -
.../main/dashboard/widgets/metrics_load.js | 3 -
.../main/dashboard/widgets/metrics_memory.js | 3 -
.../main/dashboard/widgets/metrics_network.js | 3 -
.../main/dashboard/widgets/namenode_cpu.js | 4 -
.../main/dashboard/widgets/namenode_heap.js | 4 -
.../main/dashboard/widgets/namenode_rpc.js | 10 +-
.../main/dashboard/widgets/namenode_uptime.js | 5 -
.../dashboard/widgets/node_managers_live.js | 7 -
.../main/dashboard/widgets/pie_chart_widget.js | 16 +-
.../views/main/dashboard/widgets/pxf_live.js | 6 -
.../dashboard/widgets/resource_manager_heap.js | 4 -
.../widgets/resource_manager_uptime.js | 5 -
.../main/dashboard/widgets/supervisor_live.js | 7 -
.../views/main/dashboard/widgets/text_widget.js | 4 +-
.../widgets/text_widget_single_threshold.js | 6 +-
.../dashboard/widgets/uptime_text_widget.js | 2 -
.../views/main/dashboard/widgets/yarn_links.js | 4 -
.../views/main/dashboard/widgets/yarn_memory.js | 4 -
.../service/reassign/step4_controller_test.js | 2 +-
.../test/views/main/dashboard/widget_test.js | 200 ++---
.../widgets/hbase_average_load_test.js | 4 +-
.../widgets/hbase_regions_in_transition_test.js | 6 +-
.../main/dashboard/widgets/namenode_rpc_test.js | 13 +-
.../text_widget_single_threshold_test.js | 10 +-
.../main/dashboard/widgets/text_widget_test.js | 10 +-
.../widgets/uptime_text_widget_test.js | 2 +-
.../test/views/main/dashboard/widgets_test.js | 669 ++++++---------
contrib/views/pom.xml | 1 -
contrib/views/zeppelin/pom.xml | 190 -----
.../view/zeppelin/ZeppelinServiceCheck.java | 55 --
.../ambari/view/zeppelin/ZeppelinServlet.java | 113 ---
.../zeppelin/src/main/resources/WEB-INF/web.xml | 40 -
.../src/main/resources/view.log4j.properties | 27 -
.../views/zeppelin/src/main/resources/view.xml | 48 --
126 files changed, 2017 insertions(+), 2285 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a58c39c9/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a58c39c9/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a58c39c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java
----------------------------------------------------------------------