Browse Source

AMBARI-4134. host checks report not including iptables warnings. (Mikhail Bayuk via alexantonenko)

Alex Antonenko 11 years ago
parent
commit
40da324a43

+ 4 - 0
ambari-web/app/controllers/wizard/step3_controller.js

@@ -1158,6 +1158,10 @@ App.WizardStep3Controller = Em.Controller.extend({
           newContent += Em.I18n.t('installer.step3.hostWarningsPopup.report.header') + new Date;
           newContent += Em.I18n.t('installer.step3.hostWarningsPopup.report.hosts');
           newContent += warningsByHost.filterProperty('warnings.length').mapProperty('name').join(' ');
+          if (content.findProperty('category', 'firewall').warnings.length) {
+            newContent += Em.I18n.t('installer.step3.hostWarningsPopup.report.firewall');
+            newContent += content.findProperty('category', 'firewall').warnings.mapProperty('name').join('<br>');
+          }
           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(' ');

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

@@ -363,6 +363,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.firewall': '<br><br>######################################<br># Firewall<br>#<br># A newline delimited list of firewall issues.<br>######################################<br>FIREWALL<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>',