Updated Branches: refs/heads/trunk c25d5ad3a -> 713f6ca9f
AMBARI-3045. Warn if the available space is less than 16 GB at the partition where rrd logs are being stored. (Andrii Babiichuk via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/713f6ca9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/713f6ca9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/713f6ca9 Branch: refs/heads/trunk Commit: 713f6ca9f5b29a1dc851b6400dda8ac3925176bc Parents: c25d5ad Author: Yusaku Sako <[email protected]> Authored: Thu Aug 29 18:44:33 2013 +0300 Committer: Yusaku Sako <[email protected]> Committed: Thu Aug 29 18:44:33 2013 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step7_controller.js | 6 +++++- ambari-web/app/data/HDP2/global_properties.js | 2 +- ambari-web/app/data/global_properties.js | 2 +- ambari-web/app/messages.js | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/713f6ca9/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index 6ed35b3..b46e6eb 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -17,7 +17,7 @@ */ var App = require('app'); - +var numberUtils = require('utils/number_utils'); /** * By Step 7, we have the following information stored in App.db and set on this * controller by the router. @@ -42,6 +42,10 @@ App.WizardStep7Controller = Em.Controller.extend({ miscModalVisible: false, //If miscConfigChange Modal is shown + gangliaAvailableSpace: null, + + gangliaMoutDir:'/', + isSubmitDisabled: function () { return (!this.stepConfigs.filterProperty('showConfig', true).everyProperty('errorCount', 0) || this.get("miscModalVisible")); }.property('[email protected]', 'miscModalVisible'), http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/713f6ca9/ambari-web/app/data/HDP2/global_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js index a52672e..9d770bb 100644 --- a/ambari-web/app/data/HDP2/global_properties.js +++ b/ambari-web/app/data/HDP2/global_properties.js @@ -2330,7 +2330,7 @@ module.exports = { "id": "puppet var", "name": "rrdcached_base_dir", - "displayName": "Ganglia rrd cached base directory", + "displayName": "Ganglia rrdcached base directory", "description": "Default directory for saving the rrd files on ganglia server", "defaultValue": "/var/lib/ganglia/rrds", "displayType": "directory", http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/713f6ca9/ambari-web/app/data/global_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/global_properties.js b/ambari-web/app/data/global_properties.js index c6c7dd7..463fdd9 100644 --- a/ambari-web/app/data/global_properties.js +++ b/ambari-web/app/data/global_properties.js @@ -2784,7 +2784,7 @@ module.exports = { "id": "puppet var", "name": "rrdcached_base_dir", - "displayName": "Ganglia rrd cached base directory", + "displayName": "Ganglia rrdcached base directory", "description": "Default directory for saving the rrd files on ganglia server", "defaultValue": "/var/lib/ganglia/rrds", "displayType": "directory", http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/713f6ca9/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 54ddc2f..3890034 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -438,6 +438,8 @@ Em.I18n.translations = { 'installer.step7.ConfigErrMsg.message':'Error in custom configuration. Some properties entered in the box are already exposed on this page', 'installer.step7.popup.currentValue':'Current Value', 'installer.step7.popup.adjustedValue':'Adjusted Value', + 'installer.step7.popup.rddWarning.header':'Warning: disk space low on {0}', + 'installer.step7.popup.rddWarning.body':'A minimum of 16GB is recommended for the Ganglia Server logs but the disk mount "{0}" on {1} does not have enough space ({2} free). Go to the Misc tab and change Ganglia rrdcached base directory with more than 16GB of disk space. If you proceed without changing it, {1} will likely run out of disk space and become inoperable.', 'installer.step8.header':'Review', 'installer.step8.body':'Please review the configuration before installation',
