You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/03/13 02:48:03 UTC
[1/3] ambari git commit: AMBARI-10051: Remove iptables hardcoding to
make firewall check messages more generic (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 7b1500ef5 -> 776c93f06
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/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 21f9e33..59837dc 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -1591,9 +1591,9 @@ App.WizardStep3Controller = Em.Controller.extend({
host.warnings.push(warning);
}
- var firewallRunning = _host.Hosts.last_agent_env.iptablesIsRunning;
+ var firewallRunning = _host.Hosts.last_agent_env.firewallRunning;
if (firewallRunning !== null && firewallRunning) {
- var name = Em.I18n.t('installer.step3.hostWarningsPopup.firewall.name');
+ var name = _host.Hosts.last_agent_env.firewallName + " Running";
warning = warnings.filterProperty('category', 'firewall').findProperty('name', name);
if (warning) {
warning.hosts.push(_host.Hosts.host_name);
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index f273485..3ac4bee 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -561,7 +561,6 @@ Em.I18n.translations = {
'installer.step3.hostWarningsPopup.thp.message':'The following hosts have Transparent Huge Pages (THP) enabled. THP should be disabled to avoid potential Hadoop performance issues.',
'installer.step3.hostWarningsPopup.firewall':'Firewall Issues',
'installer.step3.hostWarningsPopup.firewall.message':'Firewall is running on the following hosts. Please configure the firewall to allow communications on the ports documented in the <i>Configuring Ports</i> section of the <a target=\"_blank\" href=\"http://ambari.apache.org/current/installing-hadoop-using-ambari/content/\">Ambari documentation</a>',
- 'installer.step3.hostWarningsPopup.firewall.name':'<i>iptables</i> Running',
'installer.step3.hostWarningsPopup.process':'Process Issues',
'installer.step3.hostWarningsPopup.processes.message':'The following processes should not be running',
'installer.step3.hostWarningsPopup.fileAndFolder':'File and Folder Issues',
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-web/test/controllers/wizard/step3_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step3_test.js b/ambari-web/test/controllers/wizard/step3_test.js
index 5e3841c..af7b9e4 100644
--- a/ambari-web/test/controllers/wizard/step3_test.js
+++ b/ambari-web/test/controllers/wizard/step3_test.js
@@ -1707,8 +1707,8 @@ describe('App.WizardStep3Controller', function () {
it('should parse firewall warnings', function () {
var items = [
- {Hosts: {host_name: 'c1', last_agent_env: {iptablesIsRunning: true}}},
- {Hosts: {host_name: 'c2', last_agent_env: {iptablesIsRunning: false}}}
+ {Hosts: {host_name: 'c1', last_agent_env: {firewallRunning: true, firewallName: "iptables"}}},
+ {Hosts: {host_name: 'c2', last_agent_env: {firewallRunning: false, firewallName: "iptables"}}}
];
c.parseWarnings({items: items});
@@ -1722,8 +1722,8 @@ describe('App.WizardStep3Controller', function () {
it('should parse firewall warnings (2)', function () {
var items = [
- {Hosts: {host_name: 'c1', last_agent_env: {iptablesIsRunning: true}}},
- {Hosts: {host_name: 'c2', last_agent_env: {iptablesIsRunning: true}}}
+ {Hosts: {host_name: 'c1', last_agent_env: {firewallRunning: true, firewallName: "iptables"}}},
+ {Hosts: {host_name: 'c2', last_agent_env: {firewallRunning: true, firewallName: "iptables"}}}
];
c.parseWarnings({items: items});
[2/3] ambari git commit: AMBARI-10051: Remove iptables hardcoding to
make firewall check messages more generic (jluniya)
Posted by jl...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-server/src/test/python/stacks/2.2/common/2/hosts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/2/hosts.json b/ambari-server/src/test/python/stacks/2.2/common/2/hosts.json
index ac86de6..a549312 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/2/hosts.json
+++ b/ambari-server/src/test/python/stacks/2.2/common/2/hosts.json
@@ -59,7 +59,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956063,
@@ -130,7 +131,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948855,
@@ -201,7 +203,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948309,
@@ -272,7 +275,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948670,
@@ -343,7 +347,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957394,
@@ -406,7 +411,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955935,
@@ -469,7 +475,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956632,
@@ -532,7 +539,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954117,
@@ -595,7 +603,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949809,
@@ -658,7 +667,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954221,
@@ -721,7 +731,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957734,
@@ -784,7 +795,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953434,
@@ -847,7 +859,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957310,
@@ -910,7 +923,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952778,
@@ -973,7 +987,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952531,
@@ -1036,7 +1051,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952702,
@@ -1099,7 +1115,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952459,
@@ -1162,7 +1179,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956601,
@@ -1225,7 +1243,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952541,
@@ -1288,7 +1307,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952426,
@@ -1351,7 +1371,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956430,
@@ -1414,7 +1435,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948993,
@@ -1477,7 +1499,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953416,
@@ -1540,7 +1563,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953409,
@@ -1603,7 +1627,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957375,
@@ -1666,7 +1691,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951820,
@@ -1729,7 +1755,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952889,
@@ -1792,7 +1819,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949901,
@@ -1855,7 +1883,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953558,
@@ -1918,7 +1947,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953832,
@@ -1981,7 +2011,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954850,
@@ -2044,7 +2075,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953593,
@@ -2107,7 +2139,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956416,
@@ -2170,7 +2203,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812958197,
@@ -2233,7 +2267,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953186,
@@ -2296,7 +2331,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954602,
@@ -2359,7 +2395,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812958193,
@@ -2422,7 +2459,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952419,
@@ -2485,7 +2523,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957780,
@@ -2548,7 +2587,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957610,
@@ -2611,7 +2651,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952707,
@@ -2674,7 +2715,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952719,
@@ -2737,7 +2779,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952933,
@@ -2800,7 +2843,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953238,
@@ -2863,7 +2907,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953721,
@@ -2926,7 +2971,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954059,
@@ -2989,7 +3035,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953657,
@@ -3052,7 +3099,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954407,
@@ -3115,7 +3163,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953441,
@@ -3178,7 +3227,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957279,
@@ -3241,7 +3291,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953520,
@@ -3304,7 +3355,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956820,
@@ -3367,7 +3419,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956397,
@@ -3430,7 +3483,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949570,
@@ -3493,7 +3547,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812950010,
@@ -3556,7 +3611,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952329,
@@ -3619,7 +3675,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953787,
@@ -3682,7 +3739,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954645,
@@ -3745,7 +3803,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812950966,
@@ -3808,7 +3867,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953609,
@@ -3871,7 +3931,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952695,
@@ -3934,7 +3995,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949287,
@@ -3997,7 +4059,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948304,
@@ -4060,7 +4123,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949695,
@@ -4123,7 +4187,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952567,
@@ -4186,7 +4251,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953581,
@@ -4249,7 +4315,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956140,
@@ -4312,7 +4379,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953880,
@@ -4375,7 +4443,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952809,
@@ -4438,7 +4507,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952812,
@@ -4501,7 +4571,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953051,
@@ -4564,7 +4635,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953246,
@@ -4627,7 +4699,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956413,
@@ -4690,7 +4763,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951106,
@@ -4753,7 +4827,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951233,
@@ -4816,7 +4891,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812950168,
@@ -4879,7 +4955,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949924,
@@ -4942,7 +5019,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956469,
@@ -5005,7 +5083,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957167,
@@ -5068,7 +5147,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949155,
@@ -5131,7 +5211,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954503,
@@ -5194,7 +5275,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956971,
@@ -5257,7 +5339,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956075,
@@ -5320,7 +5403,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953283,
@@ -5383,7 +5467,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957882,
@@ -5446,7 +5531,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951677,
@@ -5509,7 +5595,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956475,
@@ -5572,7 +5659,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955852,
@@ -5635,7 +5723,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956810,
@@ -5698,7 +5787,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955789,
@@ -5761,7 +5851,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956051,
@@ -5824,7 +5915,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948955,
@@ -5887,7 +5979,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955214,
@@ -5950,7 +6043,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952773,
@@ -6013,7 +6107,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953877,
@@ -6076,7 +6171,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956093,
@@ -6139,7 +6235,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953431,
@@ -6202,7 +6299,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956401,
@@ -6265,7 +6363,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948869,
@@ -6328,7 +6427,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952460,
@@ -6391,7 +6491,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949670,
@@ -6454,7 +6555,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949640,
@@ -6517,7 +6619,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953441,
@@ -6580,7 +6683,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953369,
@@ -6643,7 +6747,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956381,
@@ -6706,7 +6811,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953511,
@@ -6769,7 +6875,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948884,
@@ -6832,7 +6939,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948403,
@@ -6895,7 +7003,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953409,
@@ -6958,7 +7067,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952880,
@@ -7021,7 +7131,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955640,
@@ -7084,7 +7195,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955970,
@@ -7147,7 +7259,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948722,
@@ -7210,7 +7323,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953973,
@@ -7273,7 +7387,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957194,
@@ -7336,7 +7451,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953051,
@@ -7399,7 +7515,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955953,
@@ -7462,7 +7579,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953302,
@@ -7525,7 +7643,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955704,
@@ -7588,7 +7707,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952754,
@@ -7651,7 +7771,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953079,
@@ -7714,7 +7835,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951778,
@@ -7777,7 +7899,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953327,
@@ -7840,7 +7963,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948421,
@@ -7903,7 +8027,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812950621,
@@ -7966,7 +8091,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952606,
@@ -8029,7 +8155,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948786,
@@ -8092,7 +8219,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955160,
@@ -8155,7 +8283,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954068,
@@ -8218,7 +8347,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954249,
@@ -8281,7 +8411,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812958063,
@@ -8344,7 +8475,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956502,
@@ -8407,7 +8539,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955178,
@@ -8470,7 +8603,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955688,
@@ -8533,7 +8667,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956844,
@@ -8596,7 +8731,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956941,
@@ -8659,7 +8795,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812958162,
@@ -8722,7 +8859,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957527,
@@ -8785,7 +8923,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956856,
@@ -8848,7 +8987,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953691,
@@ -8911,7 +9051,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952906,
@@ -8974,7 +9115,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955550,
@@ -9037,7 +9179,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951923,
@@ -9100,7 +9243,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951913,
@@ -9163,7 +9307,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953859,
@@ -9226,7 +9371,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953327,
@@ -9289,7 +9435,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953738,
@@ -9352,7 +9499,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953863,
@@ -9415,7 +9563,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948874,
@@ -9478,7 +9627,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951911,
@@ -9541,7 +9691,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949771,
@@ -9604,7 +9755,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954724,
@@ -9667,7 +9819,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951780,
@@ -9730,7 +9883,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952703,
@@ -9793,7 +9947,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953785,
@@ -9856,7 +10011,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955585,
@@ -9919,7 +10075,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952024,
@@ -9982,7 +10139,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955650,
@@ -10045,7 +10203,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957285,
@@ -10108,7 +10267,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954096,
@@ -10171,7 +10331,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957838,
@@ -10234,7 +10395,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953769,
@@ -10297,7 +10459,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954144,
@@ -10360,7 +10523,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953818,
@@ -10423,7 +10587,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953747,
@@ -10486,7 +10651,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953214,
@@ -10549,7 +10715,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953738,
@@ -10612,7 +10779,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953838,
@@ -10675,7 +10843,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953214,
@@ -10738,7 +10907,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951895,
@@ -10801,7 +10971,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954244,
@@ -10864,7 +11035,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952800,
@@ -10927,7 +11099,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956394,
@@ -10990,7 +11163,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952237,
@@ -11053,7 +11227,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953728,
@@ -11116,7 +11291,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953137,
@@ -11179,7 +11355,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957175,
@@ -11242,7 +11419,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955602,
@@ -11305,7 +11483,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957558,
@@ -11368,7 +11547,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957049,
@@ -11431,7 +11611,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952098,
@@ -11494,7 +11675,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812958225,
@@ -11557,7 +11739,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956353,
@@ -11620,7 +11803,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953381,
@@ -11683,7 +11867,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956894,
@@ -11746,7 +11931,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957534,
@@ -11809,7 +11995,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956959,
@@ -11872,7 +12059,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953976,
@@ -11935,7 +12123,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953283,
@@ -11998,7 +12187,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812958097,
@@ -12061,7 +12251,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957347,
@@ -12124,7 +12315,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956288,
@@ -12187,7 +12379,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948545,
@@ -12250,7 +12443,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956924,
@@ -12313,7 +12507,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953832,
@@ -12376,7 +12571,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957698,
@@ -12439,7 +12635,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952589,
@@ -12502,7 +12699,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948685,
@@ -12565,7 +12763,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956350,
@@ -12628,7 +12827,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956848,
@@ -12691,7 +12891,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812950716,
@@ -12754,7 +12955,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957718,
@@ -12817,7 +13019,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955515,
@@ -12880,7 +13083,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955696,
@@ -12943,7 +13147,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956137,
@@ -13006,7 +13211,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953372,
@@ -13069,7 +13275,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951570,
@@ -13132,7 +13339,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952418,
@@ -13195,7 +13403,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953436,
@@ -13258,7 +13467,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954715,
@@ -13321,7 +13531,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957075,
@@ -13384,7 +13595,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953032,
@@ -13447,7 +13659,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952887,
@@ -13510,7 +13723,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953140,
@@ -13573,7 +13787,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951539,
@@ -13636,7 +13851,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953031,
@@ -13699,7 +13915,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953902,
@@ -13762,7 +13979,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953557,
@@ -13825,7 +14043,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953609,
@@ -13888,7 +14107,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952762,
@@ -13951,7 +14171,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955542,
@@ -14014,7 +14235,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956941,
@@ -14077,7 +14299,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949772,
@@ -14140,7 +14363,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956959,
@@ -14203,7 +14427,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956508,
@@ -14266,7 +14491,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953098,
@@ -14329,7 +14555,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956673,
@@ -14392,7 +14619,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953358,
@@ -14455,7 +14683,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955701,
@@ -14518,7 +14747,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953381,
@@ -14581,7 +14811,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954184,
@@ -14644,7 +14875,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953471,
@@ -14707,7 +14939,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956245,
@@ -14770,7 +15003,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957198,
@@ -14833,7 +15067,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956038,
@@ -14896,7 +15131,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949717,
@@ -14959,7 +15195,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949800,
@@ -15022,7 +15259,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948622,
@@ -15085,7 +15323,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952593,
@@ -15148,7 +15387,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953283,
@@ -15211,7 +15451,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955384,
@@ -15274,7 +15515,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954849,
@@ -15337,7 +15579,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812951861,
@@ -15400,7 +15643,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956496,
@@ -15463,7 +15707,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954407,
@@ -15526,7 +15771,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955661,
@@ -15589,7 +15835,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956832,
@@ -15652,7 +15899,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953109,
@@ -15715,7 +15963,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957459,
@@ -15778,7 +16027,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957554,
@@ -15841,7 +16091,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953122,
@@ -15904,7 +16155,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948590,
@@ -15967,7 +16219,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954116,
@@ -16030,7 +16283,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956102,
@@ -16093,7 +16347,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953706,
@@ -16156,7 +16411,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953785,
@@ -16219,7 +16475,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953403,
@@ -16282,7 +16539,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956442,
@@ -16345,7 +16603,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812958072,
@@ -16408,7 +16667,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948318,
@@ -16471,7 +16731,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948619,
@@ -16534,7 +16795,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955813,
@@ -16597,7 +16859,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812949350,
@@ -16660,7 +16923,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952963,
@@ -16723,7 +16987,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953650,
@@ -16786,7 +17051,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812957688,
@@ -16849,7 +17115,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956697,
@@ -16912,7 +17179,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812952937,
@@ -16975,7 +17243,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956637,
@@ -17038,7 +17307,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956848,
@@ -17101,7 +17371,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956415,
@@ -17164,7 +17435,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956083,
@@ -17227,7 +17499,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812955850,
@@ -17290,7 +17563,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812958094,
@@ -17353,7 +17627,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812958200,
@@ -17416,7 +17691,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948613,
@@ -17479,7 +17755,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812948682,
@@ -17542,7 +17819,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812953328,
@@ -17605,7 +17883,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812954729,
@@ -17668,7 +17947,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1413812956529,
@@ -17731,7 +18011,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time"
<TRUNCATED>
[3/3] ambari git commit: AMBARI-10051: Remove iptables hardcoding to
make firewall check messages more generic (jluniya)
Posted by jl...@apache.org.
AMBARI-10051: Remove iptables hardcoding to make firewall check messages more generic (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/776c93f0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/776c93f0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/776c93f0
Branch: refs/heads/trunk
Commit: 776c93f0606815f57e0c78ca5af583b8ceba5e1f
Parents: 7b1500e
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu Mar 12 18:47:55 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Thu Mar 12 18:47:55 2015 -0700
----------------------------------------------------------------------
.../src/main/python/ambari_agent/HostInfo.py | 27 +-
.../test/python/ambari_agent/TestHostInfo.py | 15 +-
.../groovy-client/src/test/resources/hosts.json | 3 +-
.../src/main/python/ambari_commons/firewall.py | 28 +-
.../apache/ambari/server/agent/AgentEnv.java | 20 +-
.../python/ambari_server/serverConfiguration.py | 2 +-
.../main/python/ambari_server/serverSetup.py | 2 +-
.../src/main/python/ambari_server_main.py | 4 +-
.../ambari/server/agent/AgentResourceTest.java | 5 +-
.../src/test/python/TestAmbariServer.py | 18 +-
.../test/python/custom_actions/TestCheckHost.py | 9 +-
.../test/python/stacks/2.1/common/hosts.json | 27 +-
.../test/python/stacks/2.2/common/2/hosts.json | 1191 ++++++++++++------
.../app/controllers/wizard/step3_controller.js | 4 +-
ambari-web/app/messages.js | 1 -
.../test/controllers/wizard/step3_test.js | 8 +-
16 files changed, 892 insertions(+), 472 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-agent/src/main/python/ambari_agent/HostInfo.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index 516221d..b0b96cc 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -101,6 +101,12 @@ class HostInfo(object):
else:
return self.current_umask
+ def checkFirewall(self):
+ return Firewall().getFirewallObject().check_firewall()
+
+ def getFirewallName(self):
+ return Firewall().getFirewallObject().get_firewall_name()
+
def checkReverseLookup(self):
"""
Check if host fqdn resolves to current host ip
@@ -229,9 +235,6 @@ class HostInfoLinux(HostInfo):
else:
return ""
- def checkIptables(self):
- return Firewall().getFirewallObject().check_iptables()
-
def hadoopVarRunCount(self):
if not os.path.exists('/var/run/hadoop'):
return 0
@@ -277,7 +280,8 @@ class HostInfoLinux(HostInfo):
dict['umask'] = str(self.getUMask())
dict['transparentHugePage'] = self.getTransparentHugePage()
- dict['iptablesIsRunning'] = self.checkIptables()
+ dict['firewallRunning'] = self.checkFirewall()
+ dict['firewallName'] = self.getFirewallName()
dict['reverseLookup'] = self.checkReverseLookup()
# If commands are in progress or components are already mapped to this host
# Then do not perform certain expensive host checks
@@ -340,18 +344,6 @@ class HostInfoWindows(HostInfo):
result['status'] = "Available"
results.append(result)
- def checkIptables(self):
- from ambari_commons.os_windows import run_powershell_script, CHECK_FIREWALL_SCRIPT
-
- out = run_powershell_script(CHECK_FIREWALL_SCRIPT)
- if out[0] != 0:
- logger.warn("Unable to check firewall status:{0}".format(out[2]))
- return False
- profiles_status = [i for i in out[1].split("\n") if not i == ""]
- if "1" in profiles_status:
- return True
- return False
-
def createAlerts(self, alerts):
# TODO AMBARI-7849 Implement createAlerts for Windows
return alerts
@@ -404,7 +396,8 @@ class HostInfoWindows(HostInfo):
dict['umask'] = str(self.getUMask())
- dict['iptablesIsRunning'] = self.checkIptables()
+ dict['firewallRunning'] = self.checkFirewall()
+ dict['firewallName'] = self.getFirewallName()
dict['reverseLookup'] = self.checkReverseLookup()
# If commands are in progress or components are already mapped to this host
# Then do not perform certain expensive host checks
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
index fcab6b8..5ea67ce 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
@@ -256,7 +256,7 @@ class TestHostInfo(TestCase):
@patch.object(HostInfoLinux, 'etcAlternativesConf')
@patch.object(HostInfoLinux, 'hadoopVarRunCount')
@patch.object(HostInfoLinux, 'hadoopVarLogCount')
- @patch.object(HostInfoLinux, 'checkIptables')
+ @patch.object(HostInfoLinux, 'checkFirewall')
def test_hostinfo_register_suse(self, cit_mock, hvlc_mock, hvrc_mock, eac_mock, cf_mock, jp_mock,
cls_mock, cu_mock, gir_mock, gipbr_mock, gipbn_mock,
gpd_mock, aip_mock, aap_mock, whcf_mock, os_umask_mock, get_os_type_mock):
@@ -294,7 +294,7 @@ class TestHostInfo(TestCase):
@patch.object(HostInfoLinux, 'etcAlternativesConf')
@patch.object(HostInfoLinux, 'hadoopVarRunCount')
@patch.object(HostInfoLinux, 'hadoopVarLogCount')
- @patch.object(HostInfoLinux, 'checkIptables')
+ @patch.object(HostInfoLinux, 'checkFirewall')
@patch.object(HostInfoLinux, 'getTransparentHugePage')
def test_hostinfo_register(self, get_transparentHuge_page_mock, cit_mock, hvlc_mock, hvrc_mock, eac_mock, cf_mock, jp_mock,
cls_mock, cu_mock, gir_mock, gipbr_mock, gipbn_mock,
@@ -331,7 +331,8 @@ class TestHostInfo(TestCase):
self.assertEqual(dict['alternatives'], [])
self.assertEqual(dict['stackFoldersAndFiles'], [])
self.assertEqual(dict['existingUsers'], [])
- self.assertTrue(dict['iptablesIsRunning'])
+ self.assertTrue(dict['firewallRunning'])
+ self.assertEqual(dict['firewallName'], "iptables")
@patch("os.path.exists")
@patch("os.path.islink")
@@ -511,11 +512,11 @@ class TestHostInfo(TestCase):
@patch.object(OSCheck, "get_os_type")
@patch.object(OSCheck, "get_os_major_version")
@patch("ambari_commons.firewall.run_os_command")
- def test_IpTablesRunning(self, run_os_command_mock, get_os_major_version_mock, get_os_type_mock, get_os_family_mock):
+ def test_FirewallRunning(self, run_os_command_mock, get_os_major_version_mock, get_os_type_mock, get_os_family_mock):
get_os_type_mock.return_value = ""
get_os_family_mock.return_value = OSConst.REDHAT_FAMILY
run_os_command_mock.return_value = 0, "Table: filter", ""
- self.assertTrue(Firewall().getFirewallObject().check_iptables())
+ self.assertTrue(Firewall().getFirewallObject().check_firewall())
@patch.object(socket, "getfqdn")
@@ -547,11 +548,11 @@ class TestHostInfo(TestCase):
@patch.object(OSCheck, "get_os_type")
@patch.object(OSCheck, "get_os_major_version")
@patch("ambari_commons.firewall.run_os_command")
- def test_IpTablesStopped(self, run_os_command_mock, get_os_major_version_mock, get_os_type_mock, get_os_family_mock):
+ def test_FirewallStopped(self, run_os_command_mock, get_os_major_version_mock, get_os_type_mock, get_os_family_mock):
get_os_type_mock.return_value = ""
get_os_family_mock.return_value = OSConst.REDHAT_FAMILY
run_os_command_mock.return_value = 3, "", ""
- self.assertFalse(Firewall().getFirewallObject().check_iptables())
+ self.assertFalse(Firewall().getFirewallObject().check_firewall())
@not_for_platform(PLATFORM_WINDOWS)
@patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = ('redhat','11','Final')))
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-client/groovy-client/src/test/resources/hosts.json
----------------------------------------------------------------------
diff --git a/ambari-client/groovy-client/src/test/resources/hosts.json b/ambari-client/groovy-client/src/test/resources/hosts.json
index 81ed565..b1fa47e 100644
--- a/ambari-client/groovy-client/src/test/resources/hosts.json
+++ b/ambari-client/groovy-client/src/test/resources/hosts.json
@@ -75,7 +75,8 @@
]
},
"umask" : 18,
- "iptablesIsRunning" : true
+ "firewallRunning" : true,
+ "firewallName" : "iptables"
},
"last_heartbeat_time" : 1401222535701,
"last_registration_time" : 1401180386121,
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-common/src/main/python/ambari_commons/firewall.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/ambari_commons/firewall.py b/ambari-common/src/main/python/ambari_commons/firewall.py
index 311e6d5..2c4108e 100644
--- a/ambari-common/src/main/python/ambari_commons/firewall.py
+++ b/ambari-common/src/main/python/ambari_commons/firewall.py
@@ -63,7 +63,10 @@ class FirewallChecks(object):
self.stdoutdata = None
self.stderrdata = None
# stdout message
- self.MESSAGE_CHECK_FIREWALL = 'Checking iptables...'
+ self.MESSAGE_CHECK_FIREWALL = 'Checking firewall status...'
+
+ def get_firewall_name(self):
+ return self.FIREWALL_SERVICE_NAME
def get_command(self):
return "%s %s %s" % (self.SERVICE_CMD, self.FIREWALL_SERVICE_NAME, self.SERVICE_SUBCMD)
@@ -83,7 +86,7 @@ class FirewallChecks(object):
self.stdoutdata = out
self.stderrdata = err
- def check_iptables(self):
+ def check_firewall(self):
try:
self.run_command()
return self.check_result()
@@ -144,15 +147,20 @@ class SuseFirewallChecks(FirewallChecks):
class WindowsFirewallChecks(FirewallChecks):
def __init__(self):
super(WindowsFirewallChecks, self).__init__()
- self.MESSAGE_CHECK_FIREWALL = 'Checking firewall status...'
+ self.FIREWALL_SERVICE_NAME = "MpsSvc"
def run_command(self):
- from ambari_commons.os_windows import run_powershell_script, CHECK_FIREWALL_SCRIPT
+ from ambari_commons.os_windows import run_powershell_script, CHECK_FIREWALL_SCRIPT, WinServiceController, SERVICE_STATUS_RUNNING
- retcode, out, err = run_powershell_script(CHECK_FIREWALL_SCRIPT)
- self.returncode = retcode
- self.stdoutdata = out
- self.stderrdata = err
+ if WinServiceController.QueryStatus(self.FIREWALL_SERVICE_NAME) != SERVICE_STATUS_RUNNING:
+ self.returncode = 0
+ self.stdoutdata = ""
+ self.stderrdata = ""
+ else:
+ retcode, out, err = run_powershell_script(CHECK_FIREWALL_SCRIPT)
+ self.returncode = retcode
+ self.stdoutdata = out
+ self.stderrdata = err
def check_result(self):
if self.returncode != 0:
@@ -170,5 +178,5 @@ class WindowsFirewallChecks(FirewallChecks):
print_warning_msg(
"Following firewall profiles are enabled:{0}. Make sure that the firewall is properly configured.".format(
",".join(enabled_profiles)))
- return False
- return True
+ return True
+ return False
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java
index c3e9c53..ede3965 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java
@@ -60,7 +60,9 @@ public class AgentEnv {
private String transparentHugePage;
- private Boolean iptablesIsRunning;
+ private Boolean firewallRunning;
+
+ private String firewallName;
private Boolean reverseLookup;
@@ -136,12 +138,20 @@ public class AgentEnv {
return hostHealth;
}
- public Boolean getIptablesIsRunning() {
- return iptablesIsRunning;
+ public Boolean getFirewallRunning() {
+ return firewallRunning;
+ }
+
+ public void setFirewallRunning(Boolean firewallRunning) {
+ this.firewallRunning = firewallRunning;
+ }
+
+ public String getFirewallName() {
+ return firewallName;
}
- public void setIptablesIsRunning(Boolean iptablesIsRunning) {
- this.iptablesIsRunning = iptablesIsRunning;
+ public void setFirewallName(String firewallName) {
+ this.firewallName = firewallName;
}
public static class HostHealth {
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-server/src/main/python/ambari_server/serverConfiguration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index a00be1b..35d14f5 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -342,7 +342,7 @@ class ServerConfigDefaultsLinux(ServerConfigDefaults):
self.MESSAGE_ERROR_SETUP_NOT_ROOT = "Ambari-server setup should be run with root-level privileges"
self.MESSAGE_ERROR_RESET_NOT_ROOT = "Ambari-server reset should be run with root-level privileges"
self.MESSAGE_ERROR_UPGRADE_NOT_ROOT = "Ambari-server upgrade must be run with root-level privileges"
- self.MESSAGE_CHECK_FIREWALL = "Checking iptables..."
+ self.MESSAGE_CHECK_FIREWALL = "Checking firewall status..."
configDefaults = ServerConfigDefaults()
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-server/src/main/python/ambari_server/serverSetup.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 2b4e06b..1701f09 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -291,7 +291,7 @@ def check_ambari_user():
def check_firewall():
firewall_obj = Firewall().getFirewallObject()
- firewall_on = firewall_obj.check_iptables()
+ firewall_on = firewall_obj.check_firewall()
if firewall_obj.stderrdata and len(firewall_obj.stderrdata) > 0:
print firewall_obj.stderrdata
if firewall_on:
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-server/src/main/python/ambari_server_main.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server_main.py b/ambari-server/src/main/python/ambari_server_main.py
index 09dfc96..1847f94 100644
--- a/ambari-server/src/main/python/ambari_server_main.py
+++ b/ambari-server/src/main/python/ambari_server_main.py
@@ -131,8 +131,8 @@ def ensure_server_security_is_configured():
@OsFamilyFuncImpl(OsFamilyImpl.DEFAULT)
def ensure_server_security_is_configured():
if not is_root():
- print "Unable to check iptables status when starting without root privileges."
- print "Please do not forget to disable or adjust iptables if needed"
+ print "Unable to check firewall status when starting without root privileges."
+ print "Please do not forget to disable or adjust firewall if needed"
def get_ulimit_open_files(properties):
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
index c3e4b9b..c12e737 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
@@ -198,7 +198,7 @@ public class AgentResourceTest extends JerseyTest {
", \"existingUsers\": "+ ExistingUserJSON +
", \"umask\": \"18\", \"installedPackages\": "+
PackageDetailJSON +", \"stackFoldersAndFiles\": "+ DirectoryJSON +
- ", \"iptablesIsRunning\": \"true\", \"transparentHugePage\": \"never\"}";
+ ", \"firewallRunning\": \"true\", \"firewallName\": \"iptables\", \"transparentHugePage\": \"never\"}";
AgentEnv.Directory[] dirs = getJsonFormString(
DirectoryJSON, AgentEnv.Directory[].class);
Assert.assertEquals("/var/lib", dirs[0].getName());
@@ -234,7 +234,8 @@ public class AgentResourceTest extends JerseyTest {
AgentEnvJSON, AgentEnv.class);
Assert.assertTrue(18 == agentEnv.getUmask());
Assert.assertEquals("never", agentEnv.getTransparentHugePage());
- Assert.assertTrue(Boolean.TRUE == agentEnv.getIptablesIsRunning());
+ Assert.assertTrue(Boolean.TRUE == agentEnv.getFirewallRunning());
+ Assert.assertEquals("iptables", agentEnv.getFirewallName());
Assert.assertEquals("/etc/alternatives/hdfs-conf", agentEnv.getAlternatives()[0].getName());
Assert.assertEquals("/etc/hadoop/conf.dist", agentEnv.getAlternatives()[0].getTarget());
Assert.assertEquals("abc", agentEnv.getAlternatives()[1].getName());
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-server/src/test/python/TestAmbariServer.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py
index cae847d..83c27a6 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -1302,7 +1302,7 @@ class TestAmbariServer(TestCase):
@patch.object(OSCheck, "get_os_family")
@patch.object(OSCheck, "get_os_type")
@patch.object(OSCheck, "get_os_major_version")
- def test_check_iptables_is_running(self, get_os_major_version_mock, get_os_type_mock, get_os_family_mock, popen_mock):
+ def test_check_firewall_is_running(self, get_os_major_version_mock, get_os_type_mock, get_os_family_mock, popen_mock):
get_os_major_version_mock.return_value = 18
get_os_type_mock.return_value = OSConst.OS_FEDORA
@@ -1314,10 +1314,10 @@ class TestAmbariServer(TestCase):
p.returncode = 0
popen_mock.return_value = p
self.assertEqual("Fedora18FirewallChecks", firewall_obj.__class__.__name__)
- self.assertTrue(firewall_obj.check_iptables())
+ self.assertTrue(firewall_obj.check_firewall())
p.communicate.return_value = ("", "err")
p.returncode = 3
- self.assertFalse(firewall_obj.check_iptables())
+ self.assertFalse(firewall_obj.check_firewall())
self.assertEqual("err", firewall_obj.stderrdata)
@@ -1328,10 +1328,10 @@ class TestAmbariServer(TestCase):
p.communicate.return_value = ("Status: active", "err")
p.returncode = 0
self.assertEqual("UbuntuFirewallChecks", firewall_obj.__class__.__name__)
- self.assertTrue(firewall_obj.check_iptables())
+ self.assertTrue(firewall_obj.check_firewall())
p.communicate.return_value = ("Status: inactive", "err")
p.returncode = 0
- self.assertFalse(firewall_obj.check_iptables())
+ self.assertFalse(firewall_obj.check_firewall())
self.assertEqual("err", firewall_obj.stderrdata)
get_os_type_mock.return_value = ""
@@ -1341,10 +1341,10 @@ class TestAmbariServer(TestCase):
p.communicate.return_value = ("### iptables", "err")
p.returncode = 0
self.assertEqual("SuseFirewallChecks", firewall_obj.__class__.__name__)
- self.assertTrue(firewall_obj.check_iptables())
+ self.assertTrue(firewall_obj.check_firewall())
p.communicate.return_value = ("SuSEfirewall2 not active", "err")
p.returncode = 0
- self.assertFalse(firewall_obj.check_iptables())
+ self.assertFalse(firewall_obj.check_firewall())
self.assertEqual("err", firewall_obj.stderrdata)
get_os_type_mock.return_value = ""
@@ -1354,10 +1354,10 @@ class TestAmbariServer(TestCase):
p.communicate.return_value = ("Table: filter", "err")
p.returncode = 0
self.assertEqual("FirewallChecks", firewall_obj.__class__.__name__)
- self.assertTrue(firewall_obj.check_iptables())
+ self.assertTrue(firewall_obj.check_firewall())
p.communicate.return_value = ("", "err")
p.returncode = 3
- self.assertFalse(firewall_obj.check_iptables())
+ self.assertFalse(firewall_obj.check_firewall())
self.assertEqual("err", firewall_obj.stderrdata)
pass
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-server/src/test/python/custom_actions/TestCheckHost.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/custom_actions/TestCheckHost.py b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
index ff16298..e0ef2d7 100644
--- a/ambari-server/src/test/python/custom_actions/TestCheckHost.py
+++ b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
@@ -251,10 +251,10 @@ class TestCheckHost(TestCase):
@patch('ambari_agent.HostInfo.HostInfoLinux.checkLiveServices')
@patch('ambari_agent.HostInfo.HostInfoLinux.getUMask')
@patch('ambari_agent.HostInfo.HostInfoLinux.getTransparentHugePage')
- @patch('ambari_agent.HostInfo.HostInfoLinux.checkIptables')
+ @patch('ambari_agent.HostInfo.HostInfoLinux.checkFirewall')
@patch('ambari_agent.HostInfo.HostInfoLinux.checkReverseLookup')
@patch('time.time')
- def testLastAgentEnv(self, time_mock, checkReverseLookup_mock, checkIptables_mock, getTransparentHugePage_mock,
+ def testLastAgentEnv(self, time_mock, checkReverseLookup_mock, checkFirewall_mock, getTransparentHugePage_mock,
getUMask_mock, checkLiveServices_mock, javaProcs_mock, put_structured_out_mock,
get_tmp_dir_mock, get_config_mock, systemmock):
jsonFilePath = os.path.join(TestCheckHost.current_dir+"/../../resources/custom_actions", "check_last_agent_env.json")
@@ -270,7 +270,7 @@ class TestCheckHost(TestCase):
# ensure the correct function was called
self.assertTrue(time_mock.called)
self.assertTrue(checkReverseLookup_mock.called)
- self.assertTrue(checkIptables_mock.called)
+ self.assertTrue(checkFirewall_mock.called)
self.assertTrue(getTransparentHugePage_mock.called)
self.assertTrue(getUMask_mock.called)
self.assertTrue(checkLiveServices_mock.called)
@@ -280,7 +280,8 @@ class TestCheckHost(TestCase):
last_agent_env_check_result = put_structured_out_mock.call_args[0][0]
self.assertTrue('last_agent_env_check' in last_agent_env_check_result)
self.assertTrue('hostHealth' in last_agent_env_check_result['last_agent_env_check'])
- self.assertTrue('iptablesIsRunning' in last_agent_env_check_result['last_agent_env_check'])
+ self.assertTrue('firewallRunning' in last_agent_env_check_result['last_agent_env_check'])
+ self.assertTrue('firewallName' in last_agent_env_check_result['last_agent_env_check'])
self.assertTrue('reverseLookup' in last_agent_env_check_result['last_agent_env_check'])
self.assertTrue('alternatives' in last_agent_env_check_result['last_agent_env_check'])
self.assertTrue('umask' in last_agent_env_check_result['last_agent_env_check'])
http://git-wip-us.apache.org/repos/asf/ambari/blob/776c93f0/ambari-server/src/test/python/stacks/2.1/common/hosts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/common/hosts.json b/ambari-server/src/test/python/stacks/2.1/common/hosts.json
index ad6ac46..b8f8610 100644
--- a/ambari-server/src/test/python/stacks/2.1/common/hosts.json
+++ b/ambari-server/src/test/python/stacks/2.1/common/hosts.json
@@ -49,7 +49,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1412083477169,
@@ -110,7 +111,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1412083476356,
@@ -171,7 +173,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1412083481320,
@@ -232,7 +235,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1412083477282,
@@ -293,7 +297,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1412083478406,
@@ -354,7 +359,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1412083479135,
@@ -415,7 +421,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1412083477378,
@@ -476,7 +483,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1412083477295,
@@ -537,7 +545,8 @@
},
"umask" : 18,
"transparentHugePage" : "always",
- "iptablesIsRunning" : true,
+ "firewallRunning" : true,
+ "firewallName" : "iptables",
"reverseLookup" : true
},
"last_heartbeat_time" : 1412083478342,