Merge branch 'trunk' into branch-feature-AMBARI-18634
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ce19737 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ce19737 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ce19737 Branch: refs/heads/branch-feature-AMBARI-18634 Commit: 3ce19737cdbc07428fbf33bbf3e48ea2579bbb7b Parents: 4024e13 fa7704d Author: Nate Cole <nc...@hortonworks.com> Authored: Tue Nov 8 15:23:27 2016 -0500 Committer: Nate Cole <nc...@hortonworks.com> Committed: Tue Nov 8 15:23:27 2016 -0500 ---------------------------------------------------------------------- ambari-agent/conf/unix/agent-multiplier.py | 372 ++++++++++++++++++ ambari-agent/conf/unix/ambari-agent.ini | 1 + .../src/main/python/ambari_agent/ActionQueue.py | 36 +- .../src/main/python/ambari_agent/Controller.py | 10 + .../src/main/python/ambari_agent/HostInfo.py | 23 +- .../ambari_agent/PythonReflectiveExecutor.py | 20 +- .../ambari_agent/StatusCommandsExecutor.py | 91 +++++ .../src/main/python/ambari_agent/main.py | 21 +- .../test/python/ambari_agent/TestActionQueue.py | 76 +--- .../test/python/ambari_agent/TestController.py | 1 + .../test/python/ambari_agent/TestHostInfo.py | 26 +- .../src/test/python/ambari_agent/TestMain.py | 3 +- .../libraries/functions/curl_krb_request.py | 4 +- .../server/configuration/Configuration.java | 8 + .../ambari/server/controller/AmbariServer.java | 23 ++ .../logging/LogSearchDataRetrievalService.java | 124 ++++-- .../server/upgrade/UpgradeCatalog240.java | 20 +- .../server/upgrade/UpgradeCatalog250.java | 4 +- .../python/ambari_server/serverConfiguration.py | 13 + .../src/main/python/ambari_server/utils.py | 9 +- .../SPARK/1.2.1/package/scripts/params.py | 10 +- .../2.1.0.2.0/package/scripts/service_check.py | 4 +- .../package/files/alert_webhcat_server.py | 4 +- .../templates/hadoop-metrics2.properties.j2 | 2 - .../stacks/HDP/2.3/services/RANGER/metainfo.xml | 6 +- .../stacks/HDP/2.4/services/RANGER/metainfo.xml | 6 +- .../stacks/HDP/2.5/services/HIVE/metainfo.xml | 4 + .../stacks/HDP/2.5/services/KNOX/metainfo.xml | 4 + .../stacks/HDP/2.5/services/RANGER/metainfo.xml | 4 + .../stacks/HDP/2.6/services/SPARK/kerberos.json | 126 ++++++ .../LogSearchDataRetrievalServiceTest.java | 209 +++++++++- .../server/upgrade/UpgradeCatalog240Test.java | 6 + .../server/upgrade/UpgradeCatalog250Test.java | 11 +- ambari-server/src/test/python/TestUtils.py | 17 +- .../2.0.6/YARN/test_yarn_service_check.py | 9 +- ambari-web/app/config.js | 2 +- ambari-web/app/controllers/main/host/details.js | 20 +- ambari-web/app/messages.js | 2 + .../models/configs/objects/service_config.js | 61 ++- .../app/models/stack_service_component.js | 4 +- .../main/host/details/deleteComponentPopup.hbs | 3 + ambari-web/app/utils/ajax/ajax.js | 5 +- ambari-web/app/utils/helper.js | 2 + .../configs/service_configs_by_category_view.js | 3 + .../main/host/details/host_component_view.js | 6 +- .../admin/kerberos/step4_controller_test.js | 21 +- .../configs/objects/service_config_test.js | 5 +- contrib/views/hawq/README.md | 92 ++--- contrib/views/hawq/pom.xml | 381 +++++++++++-------- .../apache/ambari/view/hawq/HAWQDataSource.java | 94 +++++ .../ambari/view/hawq/HAWQViewServlet.java | 109 ------ .../ambari/view/hawq/JsonApiResource.java | 98 +++++ .../apache/ambari/view/hawq/QueryResource.java | 36 ++ .../ambari/view/hawq/QueryResourceProvider.java | 225 +++++++++++ .../apache/ambari/view/hawq/QueryService.java | 70 ++++ .../hawq/src/main/resources/WEB-INF/web.xml | 37 -- .../src/main/resources/ui/app/adapters/query.js | 14 +- .../views/hawq/src/main/resources/ui/app/app.js | 2 +- .../resources/ui/app/components/query-table.js | 6 +- .../src/main/resources/ui/app/models/query.js | 32 +- .../hawq/src/main/resources/ui/app/resolver.js | 2 +- .../hawq/src/main/resources/ui/app/router.js | 6 +- .../main/resources/ui/app/routes/application.js | 5 +- .../src/main/resources/ui/app/routes/main.js | 31 +- .../main/resources/ui/app/serializers/query.js | 51 ++- .../src/main/resources/ui/app/styles/app.scss | 10 +- .../resources/ui/app/templates/application.hbs | 2 +- .../ui/app/templates/components/query-table.hbs | 12 +- .../main/resources/ui/app/templates/main.hbs | 2 +- .../src/main/resources/ui/app/utils/utils.js | 72 ++-- .../views/hawq/src/main/resources/ui/bower.json | 5 +- .../src/main/resources/ui/config/environment.js | 4 +- .../hawq/src/main/resources/ui/package.json | 4 +- .../ui/tests/acceptance/application-test.js | 23 +- .../ui/tests/helpers/module-for-acceptance.js | 4 +- .../resources/ui/tests/helpers/test-helper.js | 103 +++-- .../integration/components/query-table-test.js | 77 ++-- .../src/main/resources/ui/tests/test-helper.js | 6 +- .../ui/tests/unit/adapters/query-test.js | 13 +- .../ui/tests/unit/models/query-test.js | 13 +- .../resources/ui/tests/unit/routes/main-test.js | 11 +- .../ui/tests/unit/serializers/query-test.js | 71 +++- .../resources/ui/tests/unit/utils/utils-test.js | 80 ++-- .../src/main/resources/view.log4j.properties | 27 ++ contrib/views/hawq/src/main/resources/view.xml | 45 +++ .../ambari/view/hawq/HAWQDataSourceTest.java | 170 +++++++++ .../view/hawq/QueryResourceProviderTest.java | 200 ++++++++++ .../hive2/resources/uploads/UploadService.java | 21 +- .../ui/hive-web/app/controllers/upload-table.js | 10 +- .../ui/hive-web/app/templates/upload-table.hbs | 5 + .../hive/resources/uploads/UploadService.java | 27 +- .../ui/hive-web/app/controllers/upload-table.js | 11 +- .../ui/hive-web/app/templates/upload-table.hbs | 7 +- .../resources/upload/OpenCSVParserTest.java | 20 + .../view/hive/resources/upload/OpenCSVTest.java | 17 +- contrib/views/pom.xml | 1 + 96 files changed, 2944 insertions(+), 861 deletions(-) ----------------------------------------------------------------------
