Merge branch 'trunk' into branch-alerts-dev
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/445a53cf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/445a53cf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/445a53cf Branch: refs/heads/branch-alerts-dev Commit: 445a53cf5bcbba89ff04131d9802e205bfc3ab42 Parents: 3e54f95 e069b30 Author: Jonathan Hurley <[email protected]> Authored: Fri Oct 3 23:15:57 2014 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Fri Oct 3 23:15:57 2014 -0400 ---------------------------------------------------------------------- ambari-admin/pom.xml | 19 +- .../main/resources/ui/admin-web/app/index.html | 4 +- .../resources/ui/admin-web/app/scripts/app.js | 1 - .../app/scripts/controllers/NavbarCtrl.js | 8 +- .../ambariViews/CreateViewInstanceCtrl.js | 8 +- .../controllers/ambariViews/ViewsEditCtrl.js | 22 +- .../controllers/ambariViews/ViewsListCtrl.js | 5 +- .../clusters/ClustersManageAccessCtrl.js | 6 +- .../controllers/groups/GroupsCreateCtrl.js | 7 +- .../controllers/groups/GroupsEditCtrl.js | 34 +- .../app/scripts/controllers/mainCtrl.js | 17 +- .../controllers/users/UsersCreateCtrl.js | 7 +- .../scripts/controllers/users/UsersShowCtrl.js | 49 +- .../ui/admin-web/app/scripts/services/Alert.js | 106 ++ .../ui/admin-web/app/scripts/services/Auth.js | 9 +- .../ui/admin-web/app/scripts/services/Group.js | 2 +- .../app/scripts/services/PermissionLoader.js | 8 +- .../ui/admin-web/app/scripts/services/User.js | 2 +- .../admin-web/app/scripts/services/uiAlert.js | 115 -- .../resources/ui/admin-web/app/styles/main.css | 96 ++ .../admin-web/app/views/ambariViews/edit.html | 2 +- .../src/main/resources/ui/admin-web/bower.json | 15 +- .../main/resources/ui/admin-web/package.json | 19 + .../resources/ui/admin-web/test/e2e/signout.js | 43 + .../resources/ui/admin-web/test/karma.conf.js | 58 + .../ui/admin-web/test/protractor-conf.js | 51 + .../resources/ui/admin-web/test/spec/test.js | 30 - .../test/unit/controllers/mainCtrl_test.js | 54 + .../resource_management/TestFileSystem.py | 117 ++ .../python/resource_management/core/logger.py | 18 +- .../resource_management/core/providers/mount.py | 86 +- .../libraries/functions/dfs_datanode_helper.py | 149 +++ .../libraries/functions/file_system.py | 72 ++ ambari-server/pom.xml | 9 + .../internal/AbstractProviderModule.java | 24 +- .../BlueprintConfigurationProcessor.java | 4 + .../controller/internal/ResourceImpl.java | 19 +- .../internal/StackDefinedPropertyProvider.java | 227 ++-- .../server/controller/jmx/JMXHostProvider.java | 13 - .../controller/jmx/JMXPropertyProvider.java | 274 +---- .../controller/metrics/MetricsHostProvider.java | 38 + .../controller/metrics/MetricsProvider.java | 302 +++++ .../metrics/RestMetricsPropertyProvider.java | 448 ++++++++ .../apache/ambari/server/view/ViewRegistry.java | 2 +- .../src/main/package/deb/control/preinst | 8 + .../src/main/package/rpm/preinstall.sh | 8 + ambari-server/src/main/python/ambari-server.py | 6 +- .../YARN/configuration/capacity-scheduler.xml | 2 +- .../0.8/services/YARN/package/scripts/yarn.py | 9 +- .../services/HDFS/configuration/hadoop-env.xml | 6 + .../HDFS/package/scripts/hdfs_datanode.py | 38 +- .../services/HDFS/package/scripts/params.py | 2 + .../configuration/capacity-scheduler.xml | 2 +- .../YARN/configuration/capacity-scheduler.xml | 2 +- .../services/YARN/package/scripts/yarn.py | 19 +- .../HBASE/package/scripts/hbase_decommission.py | 62 +- .../services/HBASE/package/scripts/params.py | 2 +- .../services/HDFS/configuration/hadoop-env.xml | 7 +- .../HDFS/package/scripts/hdfs_datanode.py | 27 +- .../services/HDFS/package/scripts/params.py | 12 +- .../services/HDFS/package/scripts/utils.py | 91 +- .../2.0.6/services/HIVE/package/scripts/hive.py | 30 +- .../YARN/configuration/capacity-scheduler.xml | 2 +- .../2.0.6/services/YARN/package/scripts/yarn.py | 9 +- .../templates/zookeeper_client_jaas.conf.j2 | 1 - .../stacks/HDP/2.0.6/services/stack_advisor.py | 27 +- .../YARN/configuration/capacity-scheduler.xml | 2 +- .../services/YARN/package/scripts/yarn.py | 19 +- .../FALCON/configuration/falcon-env.xml | 2 +- .../services/FALCON/package/scripts/falcon.py | 6 +- .../package/templates/startup.properties.j2 | 89 -- .../stacks/HDP/2.1/services/STORM/metrics.json | 55 +- .../YARN/configuration/capacity-scheduler.xml | 2 +- .../stacks/HDP/2.1/services/stack_advisor.py | 4 +- .../configuration/falcon-startup.properties.xml | 84 ++ .../services/HDFS/configuration/hadoop-env.xml | 192 ++++ .../services/HIVE/configuration/hive-site.xml | 29 + .../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 2 +- .../stacks/HDP/2.2/services/STORM/metrics.json | 1079 ++++++++++++++++++ .../stacks/HDP/2.2/services/stack_advisor.py | 151 +++ .../api/util/StackExtensionHelperTest.java | 2 +- .../BlueprintConfigurationProcessorTest.java | 6 + .../StackDefinedPropertyProviderTest.java | 357 +++--- .../controller/jmx/JMXPropertyProviderTest.java | 513 --------- .../metrics/JMXPropertyProviderTest.java | 522 +++++++++ .../src/test/python/TestAmbariServer.py | 123 +- .../python/stacks/1.3.2/configs/default.json | 3 +- .../python/stacks/1.3.2/configs/secured.json | 3 +- .../stacks/2.0.6/HBASE/test_hbase_master.py | 6 +- .../python/stacks/2.0.6/HDFS/test_datanode.py | 136 +++ .../stacks/2.0.6/HIVE/test_hive_client.py | 16 +- .../stacks/2.0.6/HIVE/test_hive_metastore.py | 52 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 52 +- .../stacks/2.0.6/YARN/test_historyserver.py | 30 - .../stacks/2.0.6/YARN/test_mapreduce2_client.py | 30 - .../stacks/2.0.6/YARN/test_nodemanager.py | 60 +- .../stacks/2.0.6/YARN/test_resourcemanager.py | 30 - .../stacks/2.0.6/YARN/test_yarn_client.py | 50 - .../python/stacks/2.0.6/configs/default.json | 3 +- .../python/stacks/2.0.6/configs/secured.json | 3 +- .../stacks/2.1/FALCON/test_falcon_server.py | 2 + .../stacks/2.1/HIVE/test_hive_metastore.py | 52 +- .../stacks/2.1/YARN/test_apptimelineserver.py | 20 - .../stacks/2.2/common/test_stack_advisor.py | 311 +++++ .../src/test/python/stacks/utils/RMFTestCase.py | 19 +- .../YARN/configuration/capacity-scheduler.xml | 2 +- .../HDP/2.1.1/services/STORM/metrics.json | 209 ++-- ambari-web/app/assets/test/tests.js | 1 + ambari-web/app/controllers/installer.js | 7 +- .../app/controllers/main/admin/repositories.js | 7 +- .../main/dashboard/config_history_controller.js | 2 +- ambari-web/app/controllers/main/host.js | 4 +- ambari-web/app/controllers/main/host/details.js | 281 +++-- ambari-web/app/controllers/main/service/item.js | 3 +- .../app/controllers/main/views_controller.js | 3 + ambari-web/app/data/HDP2/site_properties.js | 17 +- ambari-web/app/data/site_properties.js | 17 +- .../mappers/service_config_version_mapper.js | 23 + ambari-web/app/messages.js | 2 +- ambari-web/app/models/service_config_version.js | 4 +- ambari-web/app/router.js | 15 +- ambari-web/app/routes/installer.js | 2 +- ambari-web/app/styles/application.less | 2 +- ambari-web/app/templates/main/host/configs.hbs | 22 +- ambari-web/app/utils/config.js | 6 +- ambari-web/app/views/main/host/configs.js | 6 +- .../app/views/main/host/configs_service_menu.js | 37 +- ambari-web/package.json | 47 +- ambari-web/pom.xml | 28 +- .../controllers/main/admin/repositories_test.js | 17 +- .../dashboard/config_history_controller_test.js | 8 +- .../test/controllers/main/host/details_test.js | 51 + .../controllers/main/views_controller_test.js | 48 + .../test/controllers/wizard/step9_test.js | 26 +- ambari-web/test/views/application_test.js | 2 +- .../view/filebrowser/FileOperationService.java | 37 + .../apache/ambari/view/filebrowser/HdfsApi.java | 21 + .../files/src/main/resources/ui/app/adapter.js | 59 +- .../resources/ui/app/components/breadCrumbs.js | 47 + .../resources/ui/app/components/bsPopover.js | 21 + .../resources/ui/app/components/bulkCheckbox.js | 40 + .../resources/ui/app/components/chmodInput.js | 79 ++ .../ui/app/components/confirmDelete.js | 59 + .../resources/ui/app/components/contextMenu.js | 36 +- .../resources/ui/app/components/mkdirInput.js | 45 + .../ui/app/components/popoverDelete.js | 50 + .../resources/ui/app/components/renameInput.js | 7 +- .../resources/ui/app/components/sortArrow.js | 39 + .../ui/app/components/toggleContext.js | 56 + .../resources/ui/app/components/uploader.js | 13 +- .../main/resources/ui/app/controllers/error.js | 5 +- .../main/resources/ui/app/controllers/file.js | 104 +- .../main/resources/ui/app/controllers/files.js | 103 +- .../resources/ui/app/controllers/filesAlert.js | 10 + .../src/main/resources/ui/app/initialize.js | 24 +- .../src/main/resources/ui/app/routes/file.js | 3 + .../resources/ui/app/styles/application.less | 67 +- .../ui/app/templates/components/chmodInput.hbs | 100 ++ .../ui/app/templates/components/contextMenu.hbs | 43 + .../ui/app/templates/components/deleteBulk.hbs | 46 + .../app/templates/components/deletePopover.hbs | 38 + .../ui/app/templates/components/mkdirInput.hbs | 37 + .../ui/app/templates/components/renameInput.hbs | 38 + .../ui/app/templates/components/uploader.hbs | 35 + .../main/resources/ui/app/templates/files.hbs | 229 ++-- .../ui/app/templates/util/contextMenu.hbs | 56 - .../ui/app/templates/util/deleteBulk.hbs | 38 - .../ui/app/templates/util/deletePopover.hbs | 38 - .../resources/ui/app/templates/util/fileRow.hbs | 84 ++ .../ui/app/templates/util/renameInput.hbs | 38 - .../ui/app/templates/util/uploader.hbs | 35 - .../src/main/resources/ui/app/views/file.js | 182 +-- .../main/resources/ui/app/views/filesAlert.js | 23 + .../files/src/main/resources/ui/bower.json | 10 +- .../main/resources/ui/vendor/js/bsPopover.js | 190 +++ contrib/views/files/src/main/resources/view.xml | 2 +- .../resources/ui/app/scripts/helpers/ajax.js | 6 + .../resources/ui/app/scripts/helpers/jobs.js | 3 + .../view/slider/SliderAppsViewController.java | 19 +- .../slider/SliderAppsViewControllerImpl.java | 245 +++- .../apache/ambari/view/slider/ViewStatus.java | 40 + .../slider/rest/client/AmbariHttpClient.java | 72 +- .../data/resource/slider-properties-2.json | 8 + .../src/main/resources/ui/app/assets/index.html | 9 - .../app/controllers/application_controller.js | 27 + .../createAppWizard/step3_controller.js | 9 +- .../ui/app/controllers/slider_app_controller.js | 7 + .../app/controllers/slider_apps_controller.js | 2 +- .../ui/app/controllers/slider_controller.js | 50 +- .../src/main/resources/ui/app/helpers/ajax.js | 20 + .../src/main/resources/ui/app/helpers/helper.js | 10 +- .../src/main/resources/ui/app/initialize.js | 11 +- .../ui/app/mappers/slider_apps_mapper.js | 3 + .../main/resources/ui/app/mixins/with_panels.js | 5 +- .../main/resources/ui/app/models/slider_app.js | 3 + .../resources/ui/app/models/slider_config.js | 14 +- .../src/main/resources/ui/app/routes/main.js | 19 +- .../main/resources/ui/app/styles/common.less | 11 + .../main/resources/ui/app/styles/wizard.less | 19 +- .../resources/ui/app/templates/application.hbs | 27 +- .../ui/app/templates/createAppWizard/step1.hbs | 60 +- .../ui/app/templates/slider_app/configs.hbs | 32 +- .../ui/app/templates/slider_app/summary.hbs | 7 - .../src/main/resources/ui/app/translations.js | 25 +- .../resources/ui/app/views/application_view.js | 7 +- .../ui/app/views/createAppWizard/step1_view.js | 3 +- .../ui/app/views/create_app_wizard_view.js | 2 + .../ui/app/views/slider_app/configs_view.js | 7 +- .../ui/app/views/slider_app/summary_view.js | 7 - .../ui/test/integration/pages/index_test.js | 9 +- .../integration/pages/slider_errors_test.js | 46 + .../processes/create_new_app_test.js | 199 ++++ .../views/slider/src/main/resources/view.xml | 117 +- docs/pom.xml | 16 +- 214 files changed, 8147 insertions(+), 3203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/445a53cf/ambari-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/445a53cf/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java index f50955c,b5164fe..da6c886 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java @@@ -41,25 -29,20 +41,26 @@@ import org.apache.ambari.server.control import org.apache.ambari.server.controller.ganglia.GangliaComponentPropertyProvider; import org.apache.ambari.server.controller.ganglia.GangliaHostComponentPropertyProvider; import org.apache.ambari.server.controller.ganglia.GangliaHostPropertyProvider; -import org.apache.ambari.server.controller.ganglia.GangliaReportPropertyProvider; import org.apache.ambari.server.controller.ganglia.GangliaHostProvider; +import org.apache.ambari.server.controller.ganglia.GangliaReportPropertyProvider; import org.apache.ambari.server.controller.jmx.JMXHostProvider; import org.apache.ambari.server.controller.jmx.JMXPropertyProvider; + import org.apache.ambari.server.controller.metrics.MetricsHostProvider; import org.apache.ambari.server.controller.nagios.NagiosPropertyProvider; -import org.apache.ambari.server.controller.spi.*; +import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; +import org.apache.ambari.server.controller.spi.NoSuchResourceException; +import org.apache.ambari.server.controller.spi.Predicate; +import org.apache.ambari.server.controller.spi.PropertyProvider; +import org.apache.ambari.server.controller.spi.ProviderModule; +import org.apache.ambari.server.controller.spi.Request; +import org.apache.ambari.server.controller.spi.Resource; +import org.apache.ambari.server.controller.spi.ResourceProvider; +import org.apache.ambari.server.controller.spi.SystemException; +import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; import org.apache.ambari.server.controller.utilities.PredicateBuilder; import org.apache.ambari.server.controller.utilities.PropertyHelper; -import org.apache.ambari.server.controller.AmbariManagementController; - -import com.google.inject.Inject; - import org.apache.ambari.server.controller.utilities.StreamProvider; +import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.DesiredConfig; import org.apache.ambari.server.state.HostState; import org.apache.ambari.server.state.Service; http://git-wip-us.apache.org/repos/asf/ambari/blob/445a53cf/ambari-web/app/controllers/main/host.js ----------------------------------------------------------------------
