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/c11a4113 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c11a4113 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c11a4113 Branch: refs/heads/trunk Commit: c11a41138b02994e54070177efc99241bebfade0 Parents: 0f2c337 f57f9b2 Author: Nate Cole <nc...@hortonworks.com> Authored: Fri Feb 5 16:55:44 2016 -0500 Committer: Nate Cole <nc...@hortonworks.com> Committed: Fri Feb 5 16:55:44 2016 -0500 ---------------------------------------------------------------------- .../loginActivities/LoginActivitiesMainCtrl.js | 4 +- .../loginActivities/LoginMessageMainCtrl.js | 5 +- .../stackVersions/StackVersionsCreateCtrl.js | 2 +- .../stackVersions/StackVersionsEditCtrl.js | 10 + .../ui/admin-web/app/scripts/i18n.config.js | 6 +- .../ui/admin-web/app/scripts/routes.js | 9 +- .../admin-web/app/scripts/services/Cluster.js | 15 +- .../ui/admin-web/app/scripts/services/Stack.js | 2 +- .../ui/admin-web/app/views/leftNavbar.html | 2 +- .../app/views/loginActivities/loginMessage.html | 25 +- .../app/views/loginActivities/main.html | 4 +- .../src/main/resources/ui/admin-web/gulpfile.js | 1 - ambari-agent/pom.xml | 118 +++++-- .../src/main/package/dependencies.properties | 32 ++ .../libraries/functions/conf_select.py | 2 +- .../src/main/repo/install_ambari_tarball.py | 250 +++++++++++++ ambari-metrics/ambari-metrics-assembly/pom.xml | 348 +++++++++++++------ .../src/main/assembly/grafana.xml | 59 ++++ ambari-metrics/ambari-metrics-grafana/README.md | 243 +++++++++++++ .../ambari-metrics/datasource.js | 304 ++++++++++++++++ .../ambari-metrics/directives.js | 36 ++ .../ambari-metrics/partials/config.html | 19 + .../ambari-metrics/partials/query.editor.html | 133 +++++++ .../ambari-metrics/partials/query.options.html | 42 +++ .../ambari-metrics/plugin.json | 14 + .../ambari-metrics/queryCtrl.js | 131 +++++++ .../conf/unix/ambari-metrics-grafana | 181 ++++++++++ .../conf/unix/ams-grafana-env.sh | 29 ++ .../conf/unix/ams-grafana.ini | 255 ++++++++++++++ ambari-metrics/ambari-metrics-grafana/pom.xml | 125 +++++++ .../screenshots/1-add-datasource.png | Bin 0 -> 108602 bytes .../screenshots/10-choose-hostname.png | Bin 0 -> 298654 bytes .../11-choose-agg-rate-precision.png | Bin 0 -> 276486 bytes .../screenshots/12-change-panel-title.png | Bin 0 -> 258642 bytes .../screenshots/13-save-dashboard.png | Bin 0 -> 262005 bytes .../screenshots/14-change-timerange.png | Bin 0 -> 310766 bytes .../screenshots/15-change-units.png | Bin 0 -> 322069 bytes .../screenshots/16-display-style-graph-1.png | Bin 0 -> 285467 bytes .../screenshots/17-series-specific-override.png | Bin 0 -> 302825 bytes .../screenshots/18-override-time.png | Bin 0 -> 255655 bytes .../screenshots/19-edit-graph.png | Bin 0 -> 191904 bytes .../screenshots/2-datasource-details.png | Bin 0 -> 125313 bytes .../screenshots/3-test-datasource.png | Bin 0 -> 136121 bytes .../screenshots/4-dashboard-dropdown.png | Bin 0 -> 126964 bytes .../screenshots/5-dashboard-graph-menu.png | Bin 0 -> 146851 bytes .../screenshots/6-graph-panels.png | Bin 0 -> 105383 bytes .../screenshots/7-choose-datasource.png | Bin 0 -> 246860 bytes .../screenshots/8-choose-component.png | Bin 0 -> 199123 bytes .../screenshots/9-choose-metric.png | Bin 0 -> 216473 bytes .../screenshots/add-dashboard.png | Bin 0 -> 107965 bytes .../screenshots/full-dashboard.png | Bin 0 -> 161956 bytes .../src/main/assemblies/empty.xml | 21 ++ .../metrics/timeline/PhoenixHBaseAccessor.java | 53 +-- .../webapp/TimelineWebServices.java | 7 +- .../timeline/AbstractMiniHBaseClusterTest.java | 1 + .../timeline/PhoenixHBaseAccessorTest.java | 2 +- ambari-metrics/pom.xml | 5 + ambari-server/conf/unix/install-helper.sh | 52 +-- ambari-server/pom.xml | 148 +++++--- ambari-server/src/main/assemblies/server.xml | 2 +- .../ambari/server/agent/HeartbeatMonitor.java | 45 ++- .../resources/ClusterResourceDefinition.java | 3 +- .../ambari/server/checks/CheckDescription.java | 8 + .../HardcodedStackVersionPropertiesCheck.java | 132 +++++++ .../server/configuration/Configuration.java | 8 + .../AmbariManagementControllerImpl.java | 44 ++- .../ambari/server/controller/AmbariServer.java | 22 +- .../server/controller/KerberosHelper.java | 26 +- .../server/controller/KerberosHelperImpl.java | 5 + .../internal/AlertTargetResourceProvider.java | 12 +- .../BlueprintConfigurationProcessor.java | 206 +++++++---- .../serveraction/upgrades/FixLzoCodecPath.java | 103 ++++++ .../upgrades/OozieConfigCalculation.java | 94 +++++ .../topology/ClusterConfigurationRequest.java | 63 +++- .../ambari/server/topology/Configuration.java | 15 + .../server/upgrade/UpgradeCatalog222.java | 46 +++ .../src/main/package/deb/control/postinst | 6 +- .../src/main/package/deb/control/preinst | 23 +- .../src/main/package/deb/control/prerm | 6 +- .../src/main/package/dependencies.properties | 33 ++ .../0.1.0/configuration/ams-grafana-env.xml | 59 ++++ .../0.1.0/configuration/ams-grafana-ini.xml | 282 +++++++++++++++ .../0.1.0/configuration/ams-site.xml | 4 +- .../AMBARI_METRICS/0.1.0/metainfo.xml | 18 + .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 30 ++ .../0.1.0/package/scripts/metrics_collector.py | 2 +- .../0.1.0/package/scripts/metrics_grafana.py | 65 ++++ .../0.1.0/package/scripts/metrics_monitor.py | 2 +- .../0.1.0/package/scripts/params.py | 9 + .../0.1.0/package/scripts/status.py | 4 + .../0.1.0/package/scripts/status_params.py | 1 + .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 3 + .../OOZIE/4.2.0.2.3/configuration/oozie-env.xml | 3 + .../stacks/HDP/2.0.6/role_command_order.json | 8 +- .../stacks/HDP/2.0.6/services/stack_advisor.py | 32 +- .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 12 + .../services/OOZIE/configuration/oozie-env.xml | 3 + .../services/RANGER/themes/theme_version_1.json | 20 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 12 + .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 13 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 12 + .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 8 + .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 7 + .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 8 + .../services/RANGER/themes/theme_version_2.json | 20 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 15 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 18 +- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 8 + .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 8 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 15 + .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 8 + ...ardcodedStackVersionPropertiesCheckTest.java | 60 ++++ .../AmbariManagementControllerImplTest.java | 12 + .../server/controller/AmbariServerTest.java | 9 + .../server/controller/KerberosHelperTest.java | 66 +++- .../AlertTargetResourceProviderTest.java | 150 +++++++- .../BlueprintConfigurationProcessorTest.java | 243 ++++++++++++- .../upgrades/FixLzoCodecPathTest.java | 76 ++++ .../upgrades/OozieConfigCalculationTest.java | 87 +++++ .../ClusterConfigurationRequestTest.java | 172 ++++++++- .../ClusterInstallWithoutStartTest.java | 2 + .../server/topology/ConfigurationTest.java | 14 + .../server/topology/TopologyManagerTest.java | 2 + .../server/upgrade/UpgradeCatalog222Test.java | 81 +++++ .../AMBARI_METRICS/test_metrics_grafana.py | 75 ++++ .../stacks/2.0.6/common/test_stack_advisor.py | 54 ++- .../python/stacks/2.0.6/configs/default.json | 9 + ambari-web/app/assets/licenses/NOTICE.txt | 5 +- ambari-web/app/assets/test/tests.js | 2 + ambari-web/app/config.js | 4 +- ambari-web/app/controllers.js | 4 + .../app/controllers/global/update_controller.js | 4 +- .../hawq/activateStandby/step1_controller.js | 23 ++ .../hawq/activateStandby/step2_controller.js | 105 ++++++ .../hawq/activateStandby/step3_controller.js | 126 +++++++ .../hawq/activateStandby/wizard_controller.js | 128 +++++++ .../nameNode/rollback_controller.js | 34 +- .../nameNode/step3_controller.js | 3 + .../nameNode/step9_controller.js | 23 +- .../main/admin/highAvailability_controller.js | 9 + .../main/admin/service_auto_start.js | 21 +- .../alerts/definition_configs_controller.js | 13 +- .../manage_alert_notifications_controller.js | 7 + ambari-web/app/controllers/main/host/details.js | 39 ++- ambari-web/app/controllers/main/service/item.js | 112 ++++-- .../app/controllers/wizard/step7_controller.js | 2 +- .../HDP2.3/hawq_activate_standby_properties.js | 43 +++ ambari-web/app/data/HDP2.3/site_properties.js | 7 + ambari-web/app/data/HDP2/ha_properties.js | 68 +++- ambari-web/app/data/controller_route.js | 4 + ambari-web/app/messages.js | 60 +++- ambari-web/app/mixins.js | 1 + .../app/mixins/common/infinite_scroll_mixin.js | 173 +++++++++ .../wizard/wizardProgressPageController.js | 30 ++ ambari-web/app/models/alerts/alert_config.js | 1 + ambari-web/app/models/host_component.js | 9 +- ambari-web/app/models/stack_service.js | 2 +- ambari-web/app/router.js | 2 +- .../app/routes/activate_hawq_standby_routes.js | 179 ++++++++++ ambari-web/app/routes/main.js | 13 + ambari-web/app/styles/alerts.less | 2 +- ambari-web/app/styles/application.less | 7 +- ambari-web/app/styles/log_file_search.less | 155 +++++++++ ambari-web/app/styles/widgets.less | 71 ++-- .../app/templates/common/log_file_search.hbs | 109 ++++++ .../hawq/activateStandby/step1.hbs | 28 ++ .../hawq/activateStandby/step2.hbs | 53 +++ .../hawq/activateStandby/step3.hbs | 18 + .../hawq/activateStandby/wizard.hbs | 44 +++ .../templates/main/admin/service_auto_start.hbs | 11 +- ambari-web/app/templates/main/host/logs.hbs | 62 ++++ ambari-web/app/templates/main/service/item.hbs | 2 +- ambari-web/app/utils/ajax/ajax.js | 11 +- .../hawq_activate_standby_config_initializer.js | 53 +++ .../utils/configs/hawq_ha_config_initializer.js | 2 +- ambari-web/app/utils/db.js | 1 + ambari-web/app/views.js | 8 + .../configs/widgets/config_widget_view.js | 3 + .../app/views/common/form/datepicker_view.js | 37 ++ .../app/views/common/log_file_search_view.js | 272 +++++++++++++++ .../modal_popups/log_file_search_popup.js | 26 ++ .../app/views/common/quick_view_link_view.js | 14 +- ambari-web/app/views/main/admin.js | 12 +- .../hawq/activateStandby/step1_view.js | 26 ++ .../hawq/activateStandby/step2_view.js | 29 ++ .../hawq/activateStandby/step3_view.js | 36 ++ .../hawq/activateStandby/wizard_view.js | 74 ++++ .../app/views/main/admin/service_auto_start.js | 64 +++- ambari-web/app/views/main/host/logs_view.js | 147 ++++++++ ambari-web/app/views/main/host/menu.js | 11 +- ambari-web/app/views/main/menu.js | 12 +- ambari-web/app/views/main/service/item.js | 2 + ambari-web/config.coffee | 2 + ambari-web/karma.conf.js | 1 + ambari-web/pom.xml | 3 +- .../activateStandby/step2_controller_test.js | 87 +++++ .../nameNode/step3_controller_test.js | 49 ++- .../definitions_configs_controller_test.js | 26 ++ .../test/controllers/main/service/item_test.js | 122 +++++-- .../test/controllers/wizard/step7_test.js | 20 +- .../views/common/log_file_search_view_test.js | 103 ++++++ .../test/views/common/quick_link_view_test.js | 13 +- ambari-web/test/views/main/host/menu_test.js | 20 +- .../vendor/scripts/bootstrap-contextmenu.js | 205 +++++++++++ pom.xml | 22 +- 205 files changed, 8085 insertions(+), 664 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c11a4113/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c11a4113/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 9c5b2eb,39a6700..cd9cf40 --- 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 @@@ -80,37 -69,58 +80,47 @@@ angular.module('ambariAdminConsole' }); }; - $scope.isDeletable = function() { - return !($scope.repoStatus == 'current' || $scope.repoStatus == 'installed'); + /** + * Load supported OS list + */ + $scope.afterStackVersionRead = function () { + Stack.getSupportedOSList($scope.upgradeStack.stack_name, $scope.upgradeStack.stack_version) + .then(function (data) { + var operatingSystems = data.operating_systems; + operatingSystems.map(function (os) { + var existingOSHash = {}; + angular.forEach($scope.osList, function (os) { + existingOSHash[os.OperatingSystems.os_type] = os; + }); + // if os not in the list, mark as un-selected, add this to the osList + if (!existingOSHash[os.OperatingSystems.os_type]) { + os.selected = false; + os.repositories.forEach(function(repo) { + repo.Repositories.base_url = ''; + }); + $scope.osList.push(os); + } + }); + }) + .catch(function (data) { + Alert.error($t('versions.alerts.osListError'), data.message); + }); }; - $scope.addMissingOSList = function() { - return Stack.getSupportedOSList($scope.stackName, $scope.stackVersion) - .then(function (data) { - var existingOSHash = {}; - angular.forEach($scope.osList, function (os) { - existingOSHash[os.OperatingSystems.os_type] = os; - }); - var osList = data.operating_systems.map(function (os) { - return existingOSHash[os.OperatingSystems.os_type] || { - OperatingSystems: { - os_type : os.OperatingSystems.os_type - }, - repositories: [ - { - Repositories: { - base_url: '', - repo_id: 'HDP-' + $routeParams.versionId, - repo_name: 'HDP' - } - }, - { - Repositories: { - base_url: '', - repo_id: 'HDP-UTILS-' + $routeParams.versionId, - repo_name: 'HDP-UTILS' - } - } - ], - selected: false - }; - }); - $scope.osList = osList; - }) - .catch(function (data) { - Alert.error($t('versions.alerts.osListError'), data.message); - }); + $scope.isDeletable = function() { + return !($scope.repoStatus == 'current' || $scope.repoStatus == 'installed'); }; + $scope.disableUnusedOS = function() { + Cluster.getClusterOS().then(function(usedOS){ + angular.forEach($scope.osList, function (os) { + if (os.OperatingSystems.os_type !== usedOS) { + os.disabled = true; + } + }); + }); + }; + $scope.defaulfOSRepos = {}; $scope.save = function () { http://git-wip-us.apache.org/repos/asf/ambari/blob/c11a4113/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c11a4113/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c11a4113/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ----------------------------------------------------------------------