Browse Source

AMBARI-2768. Host Checks > Show Report is showing bogus information for FILES AND FOLDERS. (Oleg Nechiporenko via yusaku)

Yusaku Sako 12 years ago
parent
commit
d100c9b44c

+ 1 - 1
ambari-web/app/controllers/wizard/step3_controller.js

@@ -1043,7 +1043,7 @@ App.WizardStep3Controller = Em.Controller.extend({
           newContent += warningsByHost.filterProperty('warnings.length').mapProperty('name').join(' ');
           if (content.findProperty('category', 'fileFolders').warnings.length) {
             newContent += Em.I18n.t('installer.step3.hostWarningsPopup.report.fileFolders');
-            newContent += content.findProperty('category', 'fileFolders').warnings.mapProperty('name').join(' ') +  Em.I18n.t('installer.step3.hostWarningsPopup.report.folder');
+            newContent += content.findProperty('category', 'fileFolders').warnings.mapProperty('name').join(' ');
           }
           if (content.findProperty('category', 'process').warnings.length) {
             newContent += Em.I18n.t('installer.step3.hostWarningsPopup.report.process');

+ 1 - 1
ambari-web/app/messages.js

@@ -333,7 +333,7 @@ Em.I18n.translations = {
   'installer.step3.hostWarningsPopup.report':'Show Report',
   'installer.step3.hostWarningsPopup.report.header': '<p style="font-family: monospace">######################################<br># Host Checks Report<br>#<br># Generated: ',
   'installer.step3.hostWarningsPopup.report.hosts': '<br>######################################<br><br>######################################<br># Hosts<br>#<br># A space delimited list of hosts which have issues.<br># Provided so that administrators can easily copy hostnames into scripts, email etc.<br>######################################<br>HOSTS<br>',
-  'installer.step3.hostWarningsPopup.report.fileFolders': '<br><br>######################################<br># Files and Folders<br>#<br># A space delimited list of files and folders which should not exist.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: rm -r /etc/hadoop /etc/hbase /etc/some\\ /folder<br>######################################<br>FILES AND FOLDERS<br>',
+  'installer.step3.hostWarningsPopup.report.fileFolders': '<br><br>######################################<br># Files and Folders<br>#<br># A space delimited list of files and folders which should not exist.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: rm -r /etc/hadoop /etc/hbase<br>######################################<br>FILES AND FOLDERS<br>',
   'installer.step3.hostWarningsPopup.report.process': '<br><br>######################################<br># Processes<br>#<br># A comma separated list of process tuples which should not be running.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br>######################################<br>PROCESSES<br>',
   'installer.step3.hostWarningsPopup.report.package': '<br><br>######################################<br># Packages<br>#<br># A space delimited list of software packages which should be uninstalled.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: yum remove hadoop-hdfs nagios<br>######################################<br>PACKAGES<br>',
   'installer.step3.hostWarningsPopup.report.service': '<br><br>######################################<br># Services<br>#<br># A space delimited list of services which should be up and running.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: services start ntpd httpd<br>######################################<br>SERVICES<br>',