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/f0da4fa4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0da4fa4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0da4fa4 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: f0da4fa49ec8ce420ce4f495855af9b3e3b8d975 Parents: 561c6f2 aad2133 Author: Jonathan Hurley <[email protected]> Authored: Wed Sep 28 10:17:25 2016 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Wed Sep 28 10:17:25 2016 -0400 ---------------------------------------------------------------------- .../ambari-metrics/datasource.js | 64 +++ ambari-server/pom.xml | 36 ++ .../ambari/server/checks/CheckDescription.java | 5 +- .../server/checks/UpgradeCheckRegistry.java | 76 +++ .../PreUpgradeCheckResourceProvider.java | 27 +- .../server/stack/CommonServiceDirectory.java | 50 +- .../ambari/server/stack/ServiceDirectory.java | 112 +++- .../ambari/server/stack/ServiceModule.java | 8 +- .../apache/ambari/server/stack/StackModule.java | 37 +- .../server/stack/StackServiceDirectory.java | 81 +-- .../stack/UpdateActiveRepoVersionOnStartup.java | 9 +- .../apache/ambari/server/state/ServiceInfo.java | 14 + ambari-server/src/main/resources/alerts.json | 31 ++ .../HDF/grafana-kafka-home.json | 10 +- .../HDF/grafana-storm-kafka-offset.json | 258 +++++++++ .../HDP/grafana-kafka-home.json | 10 +- .../HDP/grafana-storm-kafka-offset.json | 258 +++++++++ .../2.1.0.2.0/package/scripts/params_linux.py | 7 + .../YARN/2.1.0.2.0/package/scripts/yarn.py | 548 +++++++++---------- .../main/resources/host_scripts/alert_ulimit.py | 83 +++ .../scripts/shared_initialization.py | 2 +- .../PreUpgradeCheckResourceProviderTest.java | 255 +++++++++ .../sample/checks/SampleServiceCheck.java | 52 ++ .../ambari/server/stack/ServiceModuleTest.java | 30 + .../server/stack/StackManagerExtensionTest.java | 7 + .../UpdateActiveRepoVersionOnStartupTest.java | 28 +- .../test/python/host_scripts/TestAlertUlimit.py | 44 ++ .../stacks/2.0.6/YARN/test_historyserver.py | 1 - .../stacks/2.0.6/YARN/test_resourcemanager.py | 54 +- .../stacks/2.1/YARN/test_apptimelineserver.py | 40 +- .../test/python/stacks/2.3/YARN/test_ats_1_5.py | 188 +++---- ambari-server/src/test/python/unitTests.py | 25 +- ambari-web/app/assets/licenses/NOTICE.txt | 3 + .../service/widgets/create/step2_controller.js | 26 + ambari-web/app/messages.js | 13 +- .../app/mixins/common/configs/configs_loader.js | 2 +- ambari-web/app/models/cluster_states.js | 4 +- ambari-web/app/routes/add_kerberos_routes.js | 4 +- .../main/service/widgets/create/expression.hbs | 10 +- .../main/service/widgets/create/step2_graph.hbs | 6 +- .../service/widgets/create/step2_number.hbs | 6 +- .../service/widgets/create/step2_template.hbs | 6 +- ambari-web/app/utils/string_utils.js | 7 +- .../views/common/configs/config_history_flow.js | 46 +- .../app/views/common/rolling_restart_view.js | 19 +- .../views/main/dashboard/widgets/hdfs_links.js | 2 +- ambari-web/app/views/main/service/item.js | 3 +- .../service/widgets/create/expression_view.js | 16 +- ambari-web/brunch-config.js | 3 +- .../resourceManager/wizard_controller_test.js | 1 - .../common/configs/configs_loader_test.js | 10 +- ambari-web/test/models/cluster_test.js | 12 +- .../objects/service_config_property_test.js | 31 +- .../configs/theme/sub_section_tab_test.js | 2 +- .../test/views/main/host/log_metrics_test.js | 1 - ambari-web/test/views/main/host_test.js | 4 +- ambari-web/vendor/scripts/pluralize.js | 461 ++++++++++++++++ .../MICROSOFT_R/8.0.0/metainfo.xml | 4 +- .../MICROSOFT_R/8.0.0/service_advisor.py | 22 +- 59 files changed, 2514 insertions(+), 660 deletions(-) ----------------------------------------------------------------------
