Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/718f2ea1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/718f2ea1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/718f2ea1 Branch: refs/heads/branch-dev-patch-upgrade Commit: 718f2ea1832eb10f666fd0519c0cf0c7005b6d4a Parents: 1e89d1d 0ce5fea Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Tue Feb 16 13:29:05 2016 -0500 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Tue Feb 16 13:29:05 2016 -0500 ---------------------------------------------------------------------- .../main/resources/ui/admin-web/app/index.html | 1 + .../loginActivities/HomeDirectoryCtrl.js | 31 + .../stackVersions/StackVersionsCreateCtrl.js | 1 + .../stackVersions/StackVersionsEditCtrl.js | 1 + .../ui/admin-web/app/scripts/i18n.config.js | 13 +- .../resources/ui/admin-web/app/styles/main.css | 3 + .../views/loginActivities/homeDirectory.html | 63 +- .../app/views/loginActivities/loginMessage.html | 2 +- .../views/stackVersions/stackVersionPage.html | 8 + .../src/main/python/ambari_agent/ActionQueue.py | 3 +- .../python/ambari_agent/alerts/port_alert.py | 2 +- .../test/python/ambari_agent/TestActionQueue.py | 59 + .../timeline/AbstractTimelineMetricsSink.java | 92 +- .../src/main/conf/flume-metrics2.properties.j2 | 3 +- .../sink/flume/FlumeTimelineMetricsSink.java | 11 +- .../conf/hadoop-metrics2-hbase.properties.j2 | 8 +- .../src/main/conf/hadoop-metrics2.properties.j2 | 22 +- .../timeline/HadoopTimelineMetricsSink.java | 13 +- .../timeline/HadoopTimelineMetricsSinkTest.java | 6 +- .../conf/unix/metric_monitor.ini | 1 + .../src/main/python/core/config_reader.py | 6 +- .../src/main/python/core/emitter.py | 18 +- .../kafka/KafkaTimelineMetricsReporter.java | 17 +- .../kafka/KafkaTimelineMetricsReporterTest.java | 2 +- .../storm/StormTimelineMetricsReporter.java | 24 +- .../sink/storm/StormTimelineMetricsSink.java | 8 +- .../conf/unix/ambari-metrics-collector | 2 +- .../ApplicationHistoryServer.java | 11 +- .../loadsimulator/net/RestMetricsSender.java | 6 +- .../timeline/TimelineMetricConfiguration.java | 6 +- ambari-server/etc/init/ambari-server.conf | 33 + ambari-server/pom.xml | 12 +- ambari-server/sbin/ambari-server | 6 +- ambari-server/src/main/assemblies/server.xml | 4 + .../server/checks/CheckDatabaseHelper.java | 473 ++++ .../ComponentSSLConfiguration.java | 14 +- .../server/configuration/Configuration.java | 6 +- .../AmbariManagementControllerImpl.java | 6 +- .../BlueprintConfigurationProcessor.java | 4 +- .../internal/HostResourceProvider.java | 12 +- .../internal/PermissionResourceProvider.java | 3 + .../internal/ScaleClusterRequest.java | 28 +- .../ganglia/GangliaPropertyProvider.java | 2 +- .../ganglia/GangliaReportPropertyProvider.java | 2 +- .../metrics/timeline/AMSPropertyProvider.java | 8 +- .../timeline/AMSReportPropertyProvider.java | 2 +- .../server/orm/entities/PermissionEntity.java | 35 +- .../security/ldap/AmbariLdapDataPopulator.java | 11 +- .../server/security/ldap/LdapBatchDto.java | 5 + .../upgrades/RangerConfigCalculation.java | 14 +- .../server/state/cluster/ClusterImpl.java | 12 +- .../state/stack/upgrade/ClusterGrouping.java | 7 + .../state/stack/upgrade/ExecuteHostType.java | 7 + .../state/stack/upgrade/TaskWrapperBuilder.java | 15 +- .../server/topology/ClusterTopologyImpl.java | 51 +- .../server/upgrade/UpgradeCatalog230.java | 1 + .../server/upgrade/UpgradeCatalog240.java | 32 +- ambari-server/src/main/python/ambari-server.py | 7 +- .../main/python/ambari_server/checkDatabase.py | 80 + .../main/python/ambari_server/setupActions.py | 1 + .../src/main/python/ambari_server/utils.py | 4 +- .../src/main/python/ambari_server_main.py | 19 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 17 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 17 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 19 +- .../resources/Ambari-DDL-Postgres-CREATE.sql | 17 +- .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 17 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 17 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 17 +- .../ACCUMULO/1.6.1.2.2.0/metainfo.xml | 1 + .../1.6.1.2.2.0/package/scripts/params.py | 9 +- .../hadoop-metrics2-accumulo.properties.j2 | 7 +- .../0.1.0/configuration/ams-hbase-env.xml | 6 +- .../0.1.0/configuration/ams-site.xml | 14 +- .../0.1.0/configuration/ams-ssl-client.xml | 37 + .../0.1.0/configuration/ams-ssl-server.xml | 64 + .../AMBARI_METRICS/0.1.0/metainfo.xml | 9 + .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 8 + .../package/scripts/metrics_grafana_util.py | 2 +- .../0.1.0/package/scripts/params.py | 12 +- .../0.1.0/package/scripts/service_check.py | 17 +- .../hadoop-metrics2-hbase.properties.j2 | 7 +- .../package/templates/metric_monitor.ini.j2 | 1 + .../metrics_grafana_datasource.json.j2 | 4 +- .../0.1.0/quickLinks/quicklinks.json | 34 + .../FLUME/1.4.0.2.0/metainfo.xml | 1 + .../FLUME/1.4.0.2.0/package/scripts/params.py | 9 +- .../templates/flume-metrics2.properties.j2 | 8 +- .../common-services/HAWQ/2.0.0/metainfo.xml | 1 + .../HBASE/0.96.0.2.0/metainfo.xml | 1 + .../0.96.0.2.0/package/scripts/params_linux.py | 10 +- ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 7 +- ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 7 +- .../common-services/HDFS/2.1.0.2.0/alerts.json | 16 +- .../common-services/HDFS/2.1.0.2.0/metainfo.xml | 1 + .../HIVE/0.12.0.2.0/metainfo.xml | 1 + .../package/scripts/hive_server_interactive.py | 93 + .../0.8.1.2.2/configuration/kafka-broker.xml | 21 + .../KAFKA/0.8.1.2.2/metainfo.xml | 1 + .../KAFKA/0.8.1.2.2/package/scripts/kafka.py | 4 + .../KAFKA/0.8.1.2.2/package/scripts/params.py | 10 +- .../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 11 +- .../4.0.0.2.0/package/scripts/oozie_server.py | 36 +- .../package/scripts/oozie_server_upgrade.py | 4 +- .../4.0.0.2.0/package/scripts/params_linux.py | 3 + .../STORM/0.9.1.2.1/metainfo.xml | 1 + .../0.9.1.2.1/package/scripts/params_linux.py | 13 +- .../0.9.1.2.1/package/templates/config.yaml.j2 | 8 +- .../templates/storm-metrics2.properties.j2 | 10 +- .../common-services/YARN/2.1.0.2.0/metainfo.xml | 2 + .../main/resources/scripts/Ambaripreupload.py | 59 +- .../scripts/shared_initialization.py | 1 + .../2.0.6/hooks/before-START/scripts/params.py | 10 +- .../scripts/shared_initialization.py | 1 + .../templates/hadoop-metrics2.properties.j2 | 25 +- .../stacks/HDP/2.0.6/services/stack_advisor.py | 2 + .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 3 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 5 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 5 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 5 +- .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 5 +- .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 5 +- .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 5 +- .../stacks/HDP/2.3/role_command_order.json | 3 +- .../stacks/HDP/2.3/services/KAFKA/alerts.json | 32 + .../services/RANGER/themes/theme_version_2.json | 20 +- .../services/YARN/configuration/yarn-env.xml | 6 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 5 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 5 +- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 5 +- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 5 +- .../configuration/hive-interactive-site.xml | 2053 ++++++++++++++++++ .../stacks/HDP/2.4/services/HIVE/metainfo.xml | 49 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 5 +- .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 5 +- .../src/main/resources/stacks/stack_advisor.py | 3 +- .../server/checks/CheckDatabaseHelperTest.java | 295 +++ .../ComponentSSLConfigurationTest.java | 6 +- .../BlueprintConfigurationProcessorTest.java | 67 +- .../PermissionResourceProviderTest.java | 2 + .../ganglia/GangliaPropertyProviderTest.java | 26 +- .../GangliaReportPropertyProviderTest.java | 2 +- .../timeline/AMSPropertyProviderTest.java | 30 +- .../timeline/AMSReportPropertyProviderTest.java | 4 +- .../ldap/AmbariLdapDataPopulatorTest.java | 57 + .../upgrades/RangerConfigCalculationTest.java | 27 + .../server/stack/KerberosDescriptorTest.java | 10 +- .../ambari/server/stack/StackManagerTest.java | 4 + .../server/upgrade/UpgradeCatalog240Test.java | 57 +- .../src/test/python/TestAmbariServer.py | 36 + .../AMBARI_METRICS/test_metrics_collector.py | 8 + .../stacks/2.0.6/OOZIE/test_oozie_server.py | 33 +- .../stacks/2.0.6/common/test_stack_advisor.py | 59 + .../python/stacks/2.0.6/configs/default.json | 1146 +++++----- .../2.0.6/configs/default_ams_embedded.json | 7 + .../hooks/before-START/test_before_start.py | 4 + .../stacks/2.2/common/test_stack_advisor.py | 3 +- ambari-server/src/test/resources/os_family.json | 89 +- ambari-web/app/assets/test/tests.js | 4 + ambari-web/app/config.js | 3 +- .../global/background_operations_controller.js | 15 +- .../main/admin/kerberos/step7_controller.js | 12 +- ambari-web/app/controllers/main/host.js | 2 +- .../controllers/main/service/info/configs.js | 4 +- ambari-web/app/controllers/main/service/item.js | 11 +- ambari-web/app/controllers/wizard.js | 4 +- .../app/controllers/wizard/step1_controller.js | 2 + .../app/controllers/wizard/step7_controller.js | 35 +- .../app/controllers/wizard/step8_controller.js | 30 +- .../app/mappers/service_metrics_mapper.js | 3 +- ambari-web/app/messages.js | 3 + .../app/mixins/common/widgets/widget_mixin.js | 29 +- .../mixins/wizard/assign_master_components.js | 37 +- ambari-web/app/models/host_component.js | 1 + ambari-web/app/models/quick_links.js | 12 + ambari-web/app/routes/add_service_routes.js | 1 + ambari-web/app/styles/alerts.less | 25 +- ambari-web/app/styles/application.less | 12 +- .../templates/common/host_progress_popup.hbs | 5 + .../admin/stack_upgrade/edit_repositories.hbs | 7 + .../main/alerts/instance_service_host.hbs | 30 +- ambari-web/app/templates/wizard/step1.hbs | 7 + ambari-web/app/utils/ajax/ajax.js | 15 + .../utils/configs/rm_ha_config_initializer.js | 2 +- ambari-web/app/utils/host_progress_popup.js | 10 +- ambari-web/app/views/application.js | 22 +- .../configs/widgets/config_widget_view.js | 3 - .../common/host_progress_popup_body_view.js | 75 +- .../app/views/common/log_file_search_view.js | 2 +- ambari-web/app/views/common/modal_popup.js | 27 + .../modal_popups/log_file_search_popup.js | 12 +- .../app/views/common/quick_view_link_view.js | 3 + .../views/common/widget/graph_widget_view.js | 18 +- .../admin/highAvailability/progress_view.js | 4 +- .../stack_upgrade/upgrade_version_box_view.js | 8 +- .../main/alerts/definition_details_view.js | 8 + ambari-web/app/views/main/host/add_view.js | 3 + .../app/views/main/host/configs_service.js | 3 + ambari-web/app/views/main/host/menu.js | 6 +- ambari-web/app/views/main/host/summary.js | 9 +- .../global/background_operations_test.js | 16 + ambari-web/test/controllers/wizard_test.js | 5 +- .../test/mixins/common/widget_mixin_test.js | 2 +- .../host_progress_popup_body_view_test.js | 54 +- .../views/common/log_file_search_view_test.js | 2 +- .../test/views/common/quick_link_view_test.js | 5 + .../highAvailability/progress_view_test.js | 4 +- .../test/views/main/host/add_view_test.js | 141 ++ .../views/main/host/combo_search_box_test.js | 42 + .../views/main/host/config_service_menu_test.js | 140 ++ .../test/views/main/host/config_service_test.js | 46 + .../views/main/host/host_alerts_view_test.js | 140 +- ambari-web/test/views/main/host/menu_test.js | 43 +- ambari-web/test/views/main/host/summary_test.js | 277 ++- pom.xml | 17 + 215 files changed, 6513 insertions(+), 1235 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js ---------------------------------------------------------------------- diff --cc ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js index 931b7ec,002d393..190670a --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js @@@ -23,6 -23,9 +23,7 @@@ angular.module('ambariAdminConsole' $scope.createController = true; $scope.osList = []; $scope.skipValidation = false; + $scope.useRedhatSatellite = false; - $scope.selectedOS = 0; - $scope.repoSubversion = ""; $scope.clusterName = $routeParams.clusterName; $scope.subversionPattern = /^\d+\.\d+(-\d+)?$/; http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js ---------------------------------------------------------------------- diff --cc ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js index cd9cf40,3c38444..b86515f --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js @@@ -23,12 -23,8 +23,13 @@@ angular.module('ambariAdminConsole' $scope.editController = true; $scope.osList = []; $scope.skipValidation = false; + $scope.useRedhatSatellite = false; $scope.selectedOS = 0; + $scope.upgradeStack = { + stack_name: '', + stack_version: '', + display_name: '' + }; $scope.loadStackVersionInfo = function () { return Stack.getRepo($routeParams.versionId, $routeParams.stackName).then(function (response) { http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js ---------------------------------------------------------------------- diff --cc ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js index aa0b830,0c67831..4caf85f --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js @@@ -308,27 -311,19 +315,29 @@@ angular.module('ambariAdminConsole' 'os': 'OS', 'baseURL': 'Base URL', 'skipValidation': 'Skip Repository Base URL validation (Advanced)', + 'noVersions': 'Select version to display details.', + 'contents': { + 'title': 'Contents', + 'empty': 'No contents to display' + }, + 'details': { + 'stackName': 'Stack Name', + 'displayName': 'Display Name', + 'version': 'Version', + 'actualVersion': 'Actual Version', + 'releaseNotes': 'Release Notes' + }, + 'useRedhatSatellite': 'Use RedHat Satellite/Spacewalk', - - 'changeBaseURLConfirmation': { 'title': 'Confirm Base URL Change', 'message': 'You are about to change repository Base URLs that are already in use. Please confirm that you intend to make this change and that the new Base URLs point to the same exact Stack version and build' }, 'alerts': { - 'baseURLs': 'Provide Base URLs for the Operating Systems you are configuring. Uncheck all other Operating Systems.', + 'baseURLs': 'Provide Base URLs for the Operating Systems you are configuring.', 'validationFailed': 'Some of the repositories failed validation. Make changes to the base url or skip validation if you are sure that urls are correct', 'skipValidationWarning': '<b>Warning:</b> This is for advanced users only. Use this option if you want to skip validation for Repository Base URLs.', + 'useRedhatSatelliteWarning': 'Disable distributed repositories and use RedHat Satellite/Spacewalk channels instead', 'filterListError': 'Fetch stack version filter list error', 'versionCreated': 'Created version <a href="#/stackVersions/{{stackName}}/{{versionName}}/edit">{{stackName}}-{{versionName}}</a>', 'versionCreationError': 'Version creation error', http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-web/app/messages.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-web/app/utils/host_progress_popup.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718f2ea1/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js ----------------------------------------------------------------------