You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2013/12/20 15:46:42 UTC
git commit: AMBARI-4134. host checks report not including iptables
warnings. (Mikhail Bayuk via alexantonenko)
Updated Branches:
refs/heads/trunk 07404fb2d -> 40da324a4
AMBARI-4134. host checks report not including iptables warnings. (Mikhail Bayuk via alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/40da324a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/40da324a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/40da324a
Branch: refs/heads/trunk
Commit: 40da324a431ab146c1a0d60e92d73e00c78de7f5
Parents: 07404fb
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Dec 20 16:46:43 2013 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Dec 20 16:46:43 2013 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step3_controller.js | 4 ++++
ambari-web/app/messages.js | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/40da324a/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index 43050f0..e84fefd 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/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(' ');
http://git-wip-us.apache.org/repos/asf/ambari/blob/40da324a/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index a571d34..679ee8d 100644
--- a/ambari-web/app/messages.js
+++ b/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>',