ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject [3/3] ambari git commit: AMBARI-9490 remove NAGIOS from Ambari UI. (ababiichuk)
Date Thu, 05 Feb 2015 15:39:28 GMT
AMBARI-9490 remove NAGIOS from Ambari UI. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/905abaf1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/905abaf1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/905abaf1

Branch: refs/heads/trunk
Commit: 905abaf1cfb94e8d22e783f9e3b32c4d6c15b4e9
Parents: 72c8adf
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Thu Feb 5 17:02:17 2015 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Thu Feb 5 17:39:22 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/app.js                           |   4 -
 .../assets/data/alerts/HDP2/host_alerts.json    |  10 -
 ambari-web/app/assets/data/alerts/alerts.json   |  17 --
 .../app/assets/data/configuration/global.json   |  96 --------
 .../cluster_level_actual_configs.json           |   5 -
 .../configurations/cluster_level_configs.json   |   5 -
 .../data/dashboard/HDP2/master_components.json  |  21 --
 .../data/dashboard/serviceComponents.json       |  19 --
 .../data/dashboard/services_multi_hosts.json    |  41 ----
 .../assets/data/hosts/HDP2/hc_host_status.json  |  10 -
 .../app/assets/data/hosts/HDP2/hosts.json       |   9 -
 .../app/assets/data/hosts/HDP2/hosts_init.json  |  10 -
 .../app/assets/data/services/HDP2/services.json |  16 --
 .../services/host_component_actual_configs.json |  35 ---
 .../data/stacks/HDP-2.1/recommendations.json    |   5 +-
 .../stacks/HDP-2.1/recommendations_configs.json |   5 +-
 .../data/stacks/HDP-2.1/service_components.json | 101 ---------
 .../wizard/bootstrap/two_hosts_information.json |  16 --
 .../poll_1.json                                 |  18 --
 .../wizard/deploy/5_hosts/get_hosts_state.json  |   9 -
 .../data/wizard/deploy/5_hosts/poll_1.json      |  18 --
 .../data/wizard/deploy/5_hosts/poll_10.json     |  18 --
 .../data/wizard/deploy/5_hosts/poll_2.json      |  18 --
 .../data/wizard/deploy/5_hosts/poll_3.json      |  18 --
 .../data/wizard/deploy/5_hosts/poll_4.json      |  18 --
 .../data/wizard/deploy/5_hosts/poll_5.json      |  18 --
 .../data/wizard/deploy/5_hosts/poll_7.json      |  18 --
 .../data/wizard/deploy/5_hosts/poll_8.json      |  18 --
 .../data/wizard/deploy/5_hosts/poll_9.json      |  18 --
 .../wizard/deploy/master_failure/poll_1.json    |  18 --
 .../wizard/deploy/master_failure/poll_2.json    |  18 --
 .../wizard/deploy/master_failure/poll_3.json    |  18 --
 .../wizard/deploy/master_failure/poll_4.json    |  18 --
 .../wizard/deploy/slave_failure/poll_1.json     |  18 --
 .../wizard/deploy/slave_failure/poll_2.json     |  18 --
 .../wizard/deploy/slave_failure/poll_3.json     |  18 --
 .../wizard/deploy/slave_failure/poll_4.json     |  18 --
 .../wizard/deploy/slave_warning/poll_1.json     |  18 --
 .../wizard/deploy/slave_warning/poll_10.json    |  18 --
 .../wizard/deploy/slave_warning/poll_2.json     |  18 --
 .../wizard/deploy/slave_warning/poll_3.json     |  18 --
 .../wizard/deploy/slave_warning/poll_4.json     |  18 --
 .../wizard/deploy/slave_warning/poll_5.json     |  18 --
 .../wizard/deploy/slave_warning/poll_6.json     |  18 --
 .../wizard/deploy/slave_warning/poll_7.json     |  18 --
 .../wizard/deploy/slave_warning/poll_8.json     |  18 --
 .../wizard/deploy/slave_warning/poll_9.json     |  18 --
 .../data/wizard/stack/hdp/version/2.0.1.json    |  11 -
 .../data/wizard/stack/hdp/version/2.0.5.json    |  11 -
 .../wizard/stack/hdp/version2.0.1/NAGIOS.json   |  41 ----
 .../wizard/stack/hdp/version2.0.1/global.json   |   9 -
 .../app/assets/data/wizard/stack/stacks.json    | 138 ------------
 ambari-web/app/assets/test/tests.js             |   1 -
 .../controllers/global/cluster_controller.js    |  10 -
 .../app/controllers/main/admin/security.js      |   1 -
 .../main/admin/security/add/step2.js            |  11 -
 .../main/admin/security/add/step3.js            |   3 +-
 ambari-web/app/controllers/main/host/details.js |  10 -
 .../controllers/main/service/info/summary.js    |   4 -
 ambari-web/app/controllers/main/service/item.js |   4 -
 .../app/controllers/wizard/step10_controller.js |  10 +-
 .../app/controllers/wizard/step8_controller.js  |  11 -
 ambari-web/app/data/BIGTOP/site_properties.js   |  77 -------
 ambari-web/app/data/HDP2/secure_configs.js      |   9 -
 ambari-web/app/data/HDP2/secure_properties.js   |  45 ----
 ambari-web/app/data/HDP2/site_properties.js     |  45 ----
 ambari-web/app/data/PHD/site_properties.js      |  92 --------
 ambari-web/app/mappers/service_mapper.js        |   4 +-
 .../app/mappers/service_metrics_mapper.js       |   3 +-
 ambari-web/app/messages.js                      |  13 +-
 .../app/mixins/wizard/addSecurityConfigs.js     |   4 -
 ambari-web/app/models.js                        |   1 -
 ambari-web/app/models/alert.js                  | 205 -----------------
 ambari-web/app/models/quick_links.js            |   7 -
 ambari-web/app/models/service.js                |   1 -
 ambari-web/app/models/service_config.js         |   2 +-
 ambari-web/app/models/stack_service.js          |  12 +-
 .../main/host/details/doDeleteHostPopup.hbs     |   1 -
 ambari-web/app/utils/helper.js                  |   1 +
 .../app/views/common/quick_view_link_view.js    |   8 +-
 .../app/views/main/service/info/summary.js      |   6 -
 ambari-web/app/views/main/service/service.js    |   2 -
 ambari-web/app/views/wizard/step10_view.js      |   8 +-
 .../global/cluster_controller_test.js           |  10 +-
 .../test/controllers/main/dashboard_test.js     |  21 +-
 .../test/controllers/wizard/step10_test.js      |  38 +---
 .../test/controllers/wizard/step4_test.js       |  18 +-
 .../test/controllers/wizard/step8_test.js       |  13 --
 ambari-web/test/models/alert_test.js            | 225 -------------------
 ambari-web/test/models/service_config_test.js   |   4 -
 ambari-web/test/models/service_test.js          |   8 -
 ambari-web/test/models/stack_service_test.js    |   4 -
 ambari-web/test/service_components.js           | 101 ---------
 ambari-web/test/utils/helper_test.js            |   1 -
 .../test/views/common/quick_link_view_test.js   |   2 -
 95 files changed, 31 insertions(+), 2173 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index eb68a68..41e74dc 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -227,10 +227,6 @@ module.exports = Em.Application.create({
       return App.StackService.find().filterProperty('isServiceMetricsService').mapProperty('serviceName');
     }.property('App.router.clusterController.isLoaded'),
 
-    alerting: function () {
-      return App.StackService.find().filterProperty('isAlertingService').mapProperty('serviceName');
-    }.property('App.router.clusterController.isLoaded'),
-
     supportsServiceCheck: function() {
       return App.StackService.find().filterProperty('serviceCheckSupported').mapProperty('serviceName');
     }.property('App.router.clusterController.isLoaded')

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/alerts/HDP2/host_alerts.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/alerts/HDP2/host_alerts.json b/ambari-web/app/assets/data/alerts/HDP2/host_alerts.json
index cce43d9..2ea88c7 100644
--- a/ambari-web/app/assets/data/alerts/HDP2/host_alerts.json
+++ b/ambari-web/app/assets/data/alerts/HDP2/host_alerts.json
@@ -127,16 +127,6 @@
         "output" : "TCP OK - 0.001 second response time on port 8670"
       },
       {
-        "description" : "Nagios status log freshness",
-        "host_name" : "dev01.hortonworks.com",
-        "last_status" : "OK",
-        "last_status_time" : 1389636508,
-        "service_name" : "NAGIOS",
-        "status" : "OK",
-        "status_time" : 1389793693,
-        "output" : "NAGIOS OK: 2 processes, status log updated 2 seconds ago"
-      },
-      {
         "description" : "NameNode host CPU utilization on dev01.hortonworks.com",
         "host_name" : "dev01.hortonworks.com",
         "last_status" : "OK",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/alerts/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/alerts/alerts.json b/ambari-web/app/assets/data/alerts/alerts.json
deleted file mode 100644
index 4ce39ea..0000000
--- a/ambari-web/app/assets/data/alerts/alerts.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "href" : "http://ec2-54-234-53-225.compute-1.amazonaws.com:8080/api/v1/clusters/test/host_components?HostRoles/component_name=NAGIOS_SERVER&fields=HostRoles/nagios_alerts",
-  "items" : [
-    {
-      "href" : "http://ec2-54-234-53-225.compute-1.amazonaws.com:8080/api/v1/clusters/test/hosts/ip-10-191-202-42.ec2.internal/host_components/NAGIOS_SERVER",
-      "HostRoles" : {
-        "cluster_name" : "test",
-        "nagios_alerts" : {"alerts":[{"service_description":"Ganglia [gmetad] Process down","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"1","plugin_output":"TCP OK - 0.004 second response time on port 8651","last_hard_state_change":"1359058506","last_hard_state":"0","last_time_ok":"1359072006","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072006","service_type":"GANGLIA"},{"service_description":"Ganglia collector [gmond] Process down alert for hbasemaster","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.009 second response time on port 8663","last_hard_state_change":"1359058517","last_hard_state":"0","last_time_ok":"1359072002","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072002","service_type":"GANGLIA"},{"service_description":"Ganglia collector [gmond] P
 rocess down alert for jobtracker","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.009 second response time on port 8662","last_hard_state_change":"1359058528","last_hard_state":"0","last_time_ok":"1359072013","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072013","service_type":"GANGLIA"},{"service_description":"Ganglia collector [gmond] Process down alert for namenode","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.004 second response time on port 8661","last_hard_state_change":"1359058540","last_hard_state":"0","last_time_ok":"1359072010","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072010","service_type":"GANGLIA"},{"service_description":"Ganglia collector [gmond] Process down alert for slaves","host_name":"ip-10-191-202-42.e
 c2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.009 second response time on port 8660","last_hard_state_change":"1359058551","last_hard_state":"0","last_time_ok":"1359072006","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072006","service_type":"GANGLIA"},{"service_description":"Percent region servers down","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: total:&lt;1&gt;, affected:&lt;0&gt;","last_hard_state_change":"1359058802","last_hard_state":"0","last_time_ok":"1359072002","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058772","is_flapping":"0","last_check":"1359072002","service_type":"HBASE"},{"service_description":"HBase Web UI down","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: Successfully accessed hbase Web UI","last_hard_state_change
 ":"1359058574","last_hard_state":"0","last_time_ok":"1359072014","last_time_warning":"1359058634","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072014","service_type":"HBASE"},{"service_description":"HBaseMaster CPU utilization","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"2 CPU, average load 14.0% &lt; 200% : OK","last_hard_state_change":"1359058585","last_hard_state":"0","last_time_ok":"1359071785","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071785","service_type":"HBASE"},{"service_description":"HBaseMaster Process down","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.000 second response time on port 60000","last_hard_state_change":"1359058596","last_hard_state":"0","last_time_ok":"1359071991","last_time_warning":"0","last_time_unknown":"0","last_time_crit
 ical":"1359058626","is_flapping":"0","last_check":"1359071991","service_type":"HBASE"},{"service_description":"Corrupt\\/Missing blocks","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: corrupt_blocks:&lt;0&gt;, missing_blocks:&lt;0&gt;, total_blocks:&lt;249&gt;","last_hard_state_change":"1359058509","last_hard_state":"0","last_time_ok":"1359071949","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071949","service_type":"HDFS"},{"service_description":"HDFS Capacity utilization","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: DFSUsedGB:&lt;0.1&gt;, DFSTotalGB:&lt;784.4&gt;","last_hard_state_change":"1359058520","last_hard_state":"0","last_time_ok":"1359071720","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071720","service_type":"HDFS"},{"service_de
 scription":"Namenode RPC Latency","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: RpcQueueTime_avg_time:&lt;0&gt; Secs, RpcProcessingTime_avg_time:&lt;0&gt; Secs","last_hard_state_change":"1359058531","last_hard_state":"0","last_time_ok":"1359071731","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071731","service_type":"HDFS"},{"service_description":"Percent DataNodes down","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: total:&lt;1&gt;, affected:&lt;0&gt;","last_hard_state_change":"1359058543","last_hard_state":"0","last_time_ok":"1359072013","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072013","service_type":"HDFS"},{"service_description":"Percent DataNodes storage full","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","curr
 ent_state":"0","plugin_output":"OK: total:&lt;1&gt;, affected:&lt;0&gt;","last_hard_state_change":"1359058554","last_hard_state":"0","last_time_ok":"1359071994","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071994","service_type":"HDFS"},{"service_description":"Percent TaskTrackers down","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: total:&lt;1&gt;, affected:&lt;0&gt;","last_hard_state_change":"1359058745","last_hard_state":"0","last_time_ok":"1359072005","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058715","is_flapping":"0","last_check":"1359072005","service_type":"MAPREDUCE"},{"service_description":"Nagios status log staleness","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"NAGIOS OK: 2 processes, status log updated 9 seconds ago","last_hard_state_change":"1359058576","last_h
 ard_state":"0","last_time_ok":"1359071776","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071776","service_type":"UNKNOWN"},{"service_description":"Namenode Edit logs directory status","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: All Namenode directories are active","last_hard_state_change":"1359058588","last_hard_state":"0","last_time_ok":"1359071998","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071998","service_type":"HDFS"},{"service_description":"Namenode Host CPU utilization","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"2 CPU, average load 14.5% &lt; 200% : OK","last_hard_state_change":"1359058599","last_hard_state":"0","last_time_ok":"1359071799","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0"
 ,"last_check":"1359071799","service_type":"HDFS"},{"service_description":"Namenode Process down","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.001 second response time on port 8020","last_hard_state_change":"1359058511","last_hard_state":"0","last_time_ok":"1359071996","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058511","is_flapping":"0","last_check":"1359071996","service_type":"HDFS"},{"service_description":"Namenode Web UI down","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: Successfully accessed namenode Web UI","last_hard_state_change":"1359058523","last_hard_state":"0","last_time_ok":"1359071963","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071963","service_type":"HDFS"},{"service_description":"ZKSERVERS Process down","host_name":"ip-10-191-202-42.ec2.internal
 ","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.003 second response time on port 2181","last_hard_state_change":"1359058654","last_hard_state":"0","last_time_ok":"1359071974","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058594","is_flapping":"0","last_check":"1359071974","service_type":"UNKNOWN"},{"service_description":"Percent zookeeper servers down","host_name":"ip-10-191-202-42.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: total:&lt;3&gt;, affected:&lt;0&gt;","last_hard_state_change":"1359058545","last_hard_state":"0","last_time_ok":"1359072015","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072015","service_type":"ZOOKEEPER"},{"service_description":"HIVE-METASTORE status check","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: Hive metaserver status OK","last_hard_state_change":"
 1359058677","last_hard_state":"0","last_time_ok":"1359071997","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058647","is_flapping":"0","last_check":"1359071997","service_type":"HIVE"},{"service_description":"JobHistory Web UI down","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: Successfully accessed jobhistory Web UI","last_hard_state_change":"1359058568","last_hard_state":"0","last_time_ok":"1359072008","last_time_warning":"1359058628","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072008","service_type":"MAPREDUCE"},{"service_description":"JobTracker Web UI down","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: Successfully accessed jobtracker Web UI","last_hard_state_change":"1359058579","last_hard_state":"0","last_time_ok":"1359071959","last_time_warning":"1359058639","last_time_unknown":"0","last_t
 ime_critical":"0","is_flapping":"0","last_check":"1359071959","service_type":"MAPREDUCE"},{"service_description":"Jobtracker CPU utilization","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"2 CPU, average load 2.5% &lt; 200% : OK","last_hard_state_change":"1359058591","last_hard_state":"0","last_time_ok":"1359071791","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071791","service_type":"MAPREDUCE"},{"service_description":"Jobtracker Process down","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.064 second response time on port 50030","last_hard_state_change":"1359058677","last_hard_state":"0","last_time_ok":"1359071997","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058647","is_flapping":"0","last_check":"1359071997","service_type":"MAPREDUCE"},{"service_description":"JobTracke
 r RPC Latency","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: RpcQueueTime_avg_time:&lt;0.2&gt; Secs, RpcProcessingTime_avg_time:&lt;0.24&gt; Secs","last_hard_state_change":"1359058514","last_hard_state":"0","last_time_ok":"1359072014","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072014","service_type":"MAPREDUCE"},{"service_description":"Oozie status check","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: Oozie server status [System mode: NORMAL]","last_hard_state_change":"1359058826","last_hard_state":"0","last_time_ok":"1359071966","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058766","is_flapping":"0","last_check":"1359071966","service_type":"OOZIE"},{"service_description":"ZKSERVERS Process down","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_s
 tate":"0","plugin_output":"TCP OK - 0.001 second response time on port 2181","last_hard_state_change":"1359058548","last_hard_state":"0","last_time_ok":"1359071988","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071988","service_type":"UNKNOWN"},{"service_description":"ZKSERVERS Process down","host_name":"ip-10-204-141-167.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.031 second response time on port 2181","last_hard_state_change":"1359058559","last_hard_state":"0","last_time_ok":"1359071999","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071999","service_type":"UNKNOWN"},{"service_description":"Process down","host_name":"ip-10-80-69-221.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.127 second response time on port 50010","last_hard_state_change":"1359058571","last_hard_state":"0","last
 _time_ok":"1359072011","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359072011","service_type":"UNKNOWN"},{"service_description":"Storage full","host_name":"ip-10-80-69-221.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"OK: Capacity:[], Remaining Capacity:[], percent_full:[0]","last_hard_state_change":"1359058582","last_hard_state":"0","last_time_ok":"1359071782","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"0","is_flapping":"0","last_check":"1359071782","service_type":"UNKNOWN"},{"service_description":"Process down","host_name":"ip-10-80-69-221.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.001 second response time on port 60020","last_hard_state_change":"1359058773","last_hard_state":"0","last_time_ok":"1359071973","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058713","is_flapping":"0","last_check":"135907197
 3","service_type":"UNKNOWN"},{"service_description":"Process down","host_name":"ip-10-80-69-221.ec2.internal","current_attempt":"1","current_state":"0","plugin_output":"TCP OK - 0.001 second response time on port 50060","last_hard_state_change":"1359058725","last_hard_state":"0","last_time_ok":"1359071985","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058665","is_flapping":"0","last_check":"1359071985","service_type":"UNKNOWN"}],"hostcounts":{"up_hosts":4,"down_hosts":0},"servicestates":{"PUPPET":0,"HBASE":"0","HDFS":"0","ZOOKEEPER":0,"HIVE-METASTORE":"0","MAPREDUCE":"0","OOZIE":"0"}},
-        "component_name" : "NAGIOS_SERVER",
-        "host_name" : "ip-10-191-202-42.ec2.internal"
-      },
-      "host" : {
-        "href" : "http://ec2-54-234-53-225.compute-1.amazonaws.com:8080/api/v1/clusters/test/hosts/ip-10-191-202-42.ec2.internal"
-      }
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/configuration/global.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/configuration/global.json b/ambari-web/app/assets/data/configuration/global.json
deleted file mode 100644
index e1bd051..0000000
--- a/ambari-web/app/assets/data/configuration/global.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "href" : "http://dev.hortonworks.com:8080/api/v1/clusters/mycluster/configurations/?type=global&tag=version1",
-  "items" : [
-    {
-      "href" : "http://dev.hortonworks.com:8080/api/v1/clusters/mycluster/configurations?type=global&tag=version1",
-      "tag" : "version1",
-      "type" : "global",
-      "Config" : {
-        "cluster_name" : "mycluster"
-      },
-      "properties" : {
-        "rca_enabled" : "true",
-        "gmetad_user" : "nobody",
-        "hadoop_heapsize" : "1024",
-        "dfs_datanode_http_address" : "50075",
-        "io_sort_mb" : "200",
-        "jtnode_heapsize" : "1024m",
-        "io_sort_spill_percent" : "0.9",
-        "zk_user" : "zookeeper",
-        "fs_checkpoint_size" : "0.5",
-        "mapred_user" : "mapred",
-        "dfs_data_dir" : "/hadoop/hdfs/data",
-        "mapred_system_dir" : "/mapred/system",
-        "mapred_job_map_mem_mb" : "-1",
-        "hdfs_user" : "hdfs",
-        "dfs_name_dir" : "/hadoop/hdfs/namenode",
-        "hdfs_log_dir_prefix" : "/var/log/hadoop",
-        "keytab_path" : "/etc/security/keytabs",
-        "lzo_enabled" : "false",
-        "kadmin_pw" : "",
-        "proxyuser_group" : "users",
-        "gmond_user" : "nobody",
-        "kerberos_domain" : "EXAMPLE.COM",
-        "dfs_datanode_failed_volume_tolerated" : "0",
-        "user_group" : "hadoop",
-        "nagios_group" : "nagios",
-        "nagios_web_login" : "nagiosadmin",
-        "namenode_formatted_mark_dir" : "/var/run/hadoop/hdfs/namenode/formatted/",
-        "dfs_exclude" : "dfs.exclude",
-        "namenode_opt_maxnewsize" : "640m",
-        "hcat_user" : "hcat",
-        "hbase_conf_dir" : "/etc/hbase",
-        "mapred_local_dir" : "/hadoop/mapred",
-        "mapreduce_userlog_retainhours" : "24",
-        "dfs_replication" : "3",
-        "namenode_opt_newsize" : "200m",
-        "namenode_opt_permsize" : "128m",
-        "namenode_opt_maxpermsize" : "256m",
-        "hcat_conf_dir" : "",
-        "nagios_user" : "nagios",
-        "mapred_child_java_opts_sz" : "768",
-        "mapred_red_tasks_max" : "2",
-        "fs_checkpoint_period" : "21600",
-        "apache_artifacts_download_url" : "",
-        "run_dir" : "/var/run/hadoop",
-        "mapred_hosts_include" : "mapred.include",
-        "hive_user" : "hive",
-        "security_enabled" : "false",
-        "sqoop_user" : "sqoop",
-        "hadoop_conf_dir" : "/etc/hadoop",
-        "mapred_map_tasks_max" : "4",
-        "mapred_job_red_mem_mb" : "-1",
-        "hbase_user" : "hbase",
-        "snappy_enabled" : "true",
-        "mapred_hosts_exclude" : "mapred.exclude",
-        "dfs_datanode_address" : "50010",
-        "dfs_block_local_path_access_user" : "hbase",
-        "maxtasks_per_job" : "-1",
-        "ganglia_runtime_dir" : "/var/run/ganglia/hdp",
-        "fs_checkpoint_dir" : "/hadoop/hdfs/namesecondary",
-        "dfs_datanode_data_dir_perm" : "750",
-        "mapred_cluster_map_mem_mb" : "-1",
-        "nagios_web_password" : "1",
-        "dtnode_heapsize" : "1024m",
-        "mapred_cluster_max_map_mem_mb" : "-1",
-        "datanode_du_reserved" : "1",
-        "hadoop_pid_dir_prefix" : "/var/run/hadoop",
-        "jtnode_opt_newsize" : "200m",
-        "mapred_cluster_max_red_mem_mb" : "-1",
-        "oozie_user" : "oozie",
-        "webhcat_user" : "hcat",
-        "mapred_jobstatus_dir" : "file:////mapred/jobstatus",
-        "namenode_heapsize" : "1024m",
-        "nagios_contact" : "mail@mail.ru",
-        "dfs_include" : "dfs.include",
-        "mapred_cluster_red_mem_mb" : "-1",
-        "dfs_webhdfs_enabled" : "false",
-        "rrdcached_base_dir" : "/var/lib/ganglia/rrds",
-        "scheduler_name" : "org.apache.hadoop.mapred.CapacityTaskScheduler",
-        "jtnode_opt_maxnewsize" : "200m",
-        "pig_user" : "pig",
-        "task_controller" : "org.apache.hadoop.mapred.DefaultTaskController"
-      }
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json b/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
index 00aa820..ca665d9 100644
--- a/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
+++ b/ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json
@@ -134,7 +134,6 @@
         "mapred_hosts_exclude" : "mapred.exclude",
         "dfs_block_local_path_access_user" : "hbase",
         "dfs_datanode_data_dir_perm" : "750",
-        "nagios_web_password" : "n",
         "dtnode_heapsize" : "1024m",
         "tickTime" : "2000",
         "mapred_cluster_max_map_mem_mb" : "-1",
@@ -146,7 +145,6 @@
         "mapred_jobstatus_dir" : "file:////mapred/jobstatus",
         "hive_metastore_port" : "9083",
         "namenode_heapsize" : "1024m",
-        "nagios_contact" : "n@n.com",
         "mapred_cluster_red_mem_mb" : "-1",
         "hive_ambari_database" : "MySQL",
         "dataDir" : "/hadoop/zookeeper",
@@ -181,8 +179,6 @@
         "hdfs_enable_shortcircuit_read" : "true",
         "kerberos_domain" : "EXAMPLE.COM",
         "hdfs_support_append" : "true",
-        "nagios_group" : "nagios",
-        "nagios_web_login" : "nagiosadmin",
         "namenode_formatted_mark_dir" : "/var/run/hadoop/hdfs/namenode/formatted/",
         "dfs_exclude" : "dfs.exclude",
         "namenode_opt_maxnewsize" : "640m",
@@ -192,7 +188,6 @@
         "namenode_opt_maxpermsize" : "256m",
         "mapreduce_userlog_retainhours" : "24",
         "hcat_conf_dir" : "",
-        "nagios_user" : "nagios",
         "mapred_child_java_opts_sz" : "768",
         "mapred_red_tasks_max" : "2",
         "regionserver_memstore_lowerlimit" : "0.35",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/configurations/cluster_level_configs.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/configurations/cluster_level_configs.json b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
index b873fdc..2a46b2e 100644
--- a/ambari-web/app/assets/data/configurations/cluster_level_configs.json
+++ b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
@@ -411,7 +411,6 @@
         "mapred_hosts_exclude" : "mapred.exclude",
         "dfs_block_local_path_access_user" : "hbase",
         "dfs_datanode_data_dir_perm" : "750",
-        "nagios_web_password" : "n",
         "dtnode_heapsize" : "1024m",
         "tickTime" : "2000",
         "mapred_cluster_max_map_mem_mb" : "-1",
@@ -423,7 +422,6 @@
         "mapred_jobstatus_dir" : "file:////mapred/jobstatus",
         "hive_metastore_port" : "9083",
         "namenode_heapsize" : "1024m",
-        "nagios_contact" : "n@n.com",
         "mapred_cluster_red_mem_mb" : "-1",
         "hive_ambari_database" : "MySQL",
         "dataDir" : "/hadoop/zookeeper",
@@ -458,8 +456,6 @@
         "hdfs_enable_shortcircuit_read" : "true",
         "kerberos_domain" : "EXAMPLE.COM",
         "hdfs_support_append" : "true",
-        "nagios_group" : "nagios",
-        "nagios_web_login" : "nagiosadmin",
         "namenode_formatted_mark_dir" : "/var/run/hadoop/hdfs/namenode/formatted/",
         "dfs_exclude" : "dfs.exclude",
         "namenode_opt_maxnewsize" : "640m",
@@ -470,7 +466,6 @@
         "smokeuser" : "ambari-qa",
         "mapreduce_userlog_retainhours" : "24",
         "hcat_conf_dir" : "",
-        "nagios_user" : "nagios",
         "mapred_child_java_opts_sz" : "768",
         "mapred_red_tasks_max" : "2",
         "regionserver_memstore_lowerlimit" : "0.35",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/dashboard/HDP2/master_components.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/dashboard/HDP2/master_components.json b/ambari-web/app/assets/data/dashboard/HDP2/master_components.json
index 401d019..4bd2ae8 100644
--- a/ambari-web/app/assets/data/dashboard/HDP2/master_components.json
+++ b/ambari-web/app/assets/data/dashboard/HDP2/master_components.json
@@ -243,27 +243,6 @@
       ]
     },
     {
-      "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/components/NAGIOS_SERVER",
-      "ServiceComponentInfo" : {
-        "category" : "MASTER",
-        "cluster_name" : "perf",
-        "component_name" : "NAGIOS_SERVER",
-        "service_name" : "NAGIOS"
-      },
-      "host_components" : [
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/NAGIOS_SERVER",
-          "HostRoles" : {
-            "cluster_name" : "perf",
-            "component_name" : "NAGIOS_SERVER",
-            "host_name" : "dev01.hortonworks.com",
-            "maintenance_state" : "OFF",
-            "state" : "STARTED"
-          }
-        }
-      ]
-    },
-    {
       "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/components/OOZIE_SERVER",
       "ServiceComponentInfo" : {
         "category" : "MASTER",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/dashboard/serviceComponents.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/dashboard/serviceComponents.json b/ambari-web/app/assets/data/dashboard/serviceComponents.json
index 28601ef..7b68da4 100644
--- a/ambari-web/app/assets/data/dashboard/serviceComponents.json
+++ b/ambari-web/app/assets/data/dashboard/serviceComponents.json
@@ -62,25 +62,6 @@
       ]
     },
     {
-      "href" : "http://ambari/api/clusters/vmc/services/NAGIOS",
-      "ServiceInfo" : {
-        "cluster_name" : "vmc",
-        "service_name" : "NAGIOS"
-      },
-      "components" : [
-        {
-          "href" : "http://ambari/api/clusters/vmc/services/NAGIOS/components/NAGIOS_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "vmc",
-            "desired_configs" : "{}",
-            "state" : "STARTED",
-            "component_name" : "NAGIOS_SERVER",
-            "service_name" : "NAGIOS"
-          }
-        }
-      ]
-    },
-    {
       "href" : "http://ambari/api/clusters/vmc/services/GANGLIA",
       "ServiceInfo" : {
         "cluster_name" : "vmc",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/dashboard/services_multi_hosts.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/dashboard/services_multi_hosts.json b/ambari-web/app/assets/data/dashboard/services_multi_hosts.json
index 70c50d6..824a806 100644
--- a/ambari-web/app/assets/data/dashboard/services_multi_hosts.json
+++ b/ambari-web/app/assets/data/dashboard/services_multi_hosts.json
@@ -669,47 +669,6 @@
       ]
     },
     {
-      "href" : "http://ambari:8080/api/clusters/mycluster/services/NAGIOS",
-      "ServiceInfo" : {
-        "cluster_name" : "mycluster",
-        "service_name" : "NAGIOS"
-      },
-      "components" : [
-        {
-          "href" : "http://ambari:8080/api/clusters/mycluster/services/NAGIOS/components/NAGIOS_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "mycluster",
-            "component_name" : "NAGIOS_SERVER",
-            "service_name" : "NAGIOS"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-83-47-139.ec2.internal/host_components/NAGIOS_SERVER",
-              "HostRoles" : {
-                "configs" : "{}",
-                "cluster_name" : "mycluster",
-                "desired_configs" : "{}",
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "NAGIOS_SERVER",
-                "host_name" : "ip-10-83-47-139.ec2.internal"
-              },
-              "component" : [
-                {
-                  "href" : "http://ambari:8080/api/clusters/mycluster/services/NAGIOS/components/NAGIOS_SERVER",
-                  "ServiceComponentInfo" : {
-                    "cluster_name" : "mycluster",
-                    "component_name" : "NAGIOS_SERVER",
-                    "service_name" : "NAGIOS"
-                  }
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
       "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE",
       "ServiceInfo" : {
         "cluster_name" : "mycluster",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json b/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json
index 8ee61d9..3a4685c 100644
--- a/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json
+++ b/ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json
@@ -101,16 +101,6 @@
           }
         },
         {
-          "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/NAGIOS_SERVER",
-          "HostRoles" : {
-            "cluster_name" : "perf",
-            "component_name" : "NAGIOS_SERVER",
-            "host_name" : "dev01.hortonworks.com",
-            "maintenance_state" : "OFF",
-            "state" : "STARTED"
-          }
-        },
-        {
           "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/NAMENODE",
           "HostRoles" : {
             "cluster_name" : "perf",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/hosts/HDP2/hosts.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/hosts/HDP2/hosts.json b/ambari-web/app/assets/data/hosts/HDP2/hosts.json
index 1ef6384..7d3910a 100644
--- a/ambari-web/app/assets/data/hosts/HDP2/hosts.json
+++ b/ambari-web/app/assets/data/hosts/HDP2/hosts.json
@@ -275,15 +275,6 @@
         },
         {
           "HostRoles" : {
-            "component_name" : "NAGIOS_SERVER",
-            "maintenance_state" : "OFF",
-            "service_name" : "NAGIOS",
-            "stale_configs" : true,
-            "state" : "INIT"
-          }
-        },
-        {
-          "HostRoles" : {
             "component_name" : "NAMENODE",
             "maintenance_state" : "OFF",
             "service_name" : "HDFS",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json b/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json
index 53ebd5d..3e7d292 100644
--- a/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json
+++ b/ambari-web/app/assets/data/hosts/HDP2/hosts_init.json
@@ -209,16 +209,6 @@
           }
         },
         {
-          "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/NAGIOS_SERVER",
-          "HostRoles" : {
-            "cluster_name" : "c1",
-            "component_name" : "NAGIOS_SERVER",
-            "host_name" : "dev01.hortonworks.com",
-            "maintenance_state" : "OFF",
-            "state" : "STARTED"
-          }
-        },
-        {
           "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/NAMENODE",
           "HostRoles" : {
             "cluster_name" : "c1",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/services/HDP2/services.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/services/HDP2/services.json b/ambari-web/app/assets/data/services/HDP2/services.json
index c10dbb6..a2c67dd 100644
--- a/ambari-web/app/assets/data/services/HDP2/services.json
+++ b/ambari-web/app/assets/data/services/HDP2/services.json
@@ -82,22 +82,6 @@
       }
     },
     {
-      "href" : "http://192.168.56.101:8080/api/v1/clusters/cl/services/NAGIOS",
-      "ServiceInfo" : {
-        "maintenance_state" : "OFF",
-        "cluster_name" : "cl",
-        "service_name" : "NAGIOS",
-        "state": "STARTED"
-      },
-      "alerts" : {
-        "summary" : {
-          "CRITICAL" : 0,
-          "OK" : 0,
-          "WARNING" : 0
-        }
-      }
-    },
-    {
       "href" : "http://192.168.56.101:8080/api/v1/clusters/cl/services/OOZIE",
       "ServiceInfo" : {
         "maintenance_state" : "OFF",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/services/host_component_actual_configs.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/services/host_component_actual_configs.json b/ambari-web/app/assets/data/services/host_component_actual_configs.json
index df3f9d3..99c1a7c 100644
--- a/ambari-web/app/assets/data/services/host_component_actual_configs.json
+++ b/ambari-web/app/assets/data/services/host_component_actual_configs.json
@@ -206,41 +206,6 @@
       ]
     },
     {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/NAGIOS",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "NAGIOS"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/NAGIOS/components/NAGIOS_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "STARTED",
-            "component_name" : "NAGIOS_SERVER",
-            "service_name" : "NAGIOS"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-191-202-42.ec2.internal/host_components/NAGIOS_SERVER",
-              "HostRoles" : {
-                "configs" : {
-                  "global" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "NAGIOS_SERVER",
-                "host_name" : "ip-10-191-202-42.ec2.internal"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
       "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/SQOOP",
       "ServiceInfo" : {
         "cluster_name" : "cl1",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json b/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json
index 95bd778..54989c6 100644
--- a/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json
+++ b/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json
@@ -6,7 +6,7 @@
     "stack_version": "2.1.1"
   },
   "hosts": ["dev1.hortonworks.com", "dev2.hortonworks.com", "dev3.hortonworks.com"],
-  "services": ["FALCON", "FLUME", "GANGLIA", "HBASE", "HDFS", "HIVE", "MAPREDUCE2", "NAGIOS", "OOZIE", "PIG", "SQOOP", "STORM", "TEZ", "WEBCHAT", "YARN", "ZOOKEEPER"],
+  "services": ["FALCON", "FLUME", "GANGLIA", "HBASE", "HDFS", "HIVE", "MAPREDUCE2", "OOZIE", "PIG", "SQOOP", "STORM", "TEZ", "WEBCHAT", "YARN", "ZOOKEEPER"],
   "recommendations": {
     "blueprint": {
       "configurations": {
@@ -30,9 +30,6 @@
               "name": "NAMENODE"
             },
             {
-              "name": "NAGIOS_SERVER"
-            },
-            {
               "name": "GANGLIA_SERVER"
             },
             {

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations_configs.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations_configs.json b/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations_configs.json
index da38fcb..2f79f3f 100644
--- a/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations_configs.json
+++ b/ambari-web/app/assets/data/stacks/HDP-2.1/recommendations_configs.json
@@ -5,7 +5,7 @@
       "hosts" : [
         "c6403.ambari.apache.org"
       ],
-      "services": ["HDFS", "MAPREDUCE2", "YARN", "TEZ", "NAGIOS", "GANGLIA", "HIVE", "SQOOP", "OOZIE", "ZOOKEEPER", "FALCON", "STORM", "FLUME", "PIG"],
+      "services": ["HDFS", "MAPREDUCE2", "YARN", "TEZ", "GANGLIA", "HIVE", "SQOOP", "OOZIE", "ZOOKEEPER", "FALCON", "STORM", "FLUME", "PIG"],
       "Recommendation" : {
         "id" : 5
       },
@@ -126,9 +126,6 @@
                 },
                 {
                   "name" : "SECONDARY_NAMENODE"
-                },
-                {
-                  "name" : "NAGIOS_SERVER"
                 }
               ]
             }

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
index c7acf36..cd542bc 100644
--- a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
+++ b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
@@ -778,107 +778,6 @@
       ]
     },
     {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS",
-      "StackServices" : {
-        "comments" : "Nagios Monitoring and Alerting system",
-        "custom_commands" : [ ],
-        "display_name" : "Nagios",
-        "required_services" : [ ],
-        "service_check_supported" : false,
-        "service_name" : "NAGIOS",
-        "service_version" : "3.5.0",
-        "stack_name" : "HDP",
-        "stack_version" : "2.1",
-        "user_name" : null,
-        "config_types" : {
-          "nagios-env" : {
-            "supports" : {
-              "final" : "false"
-            }
-          }
-        }
-      },
-      "components" : [
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER",
-          "StackServiceComponents" : {
-            "cardinality" : "1",
-            "component_category" : "MASTER",
-            "component_name" : "NAGIOS_SERVER",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios Server",
-            "is_client" : false,
-            "is_master" : true,
-            "service_name" : "NAGIOS",
-            "stack_name" : "HDP",
-            "stack_version" : "2.1"
-          },
-          "dependencies" : [
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HCAT",
-              "Dependencies" : {
-                "component_name" : "HCAT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HDFS_CLIENT",
-              "Dependencies" : {
-                "component_name" : "HDFS_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/MAPREDUCE2_CLIENT",
-              "Dependencies" : {
-                "component_name" : "MAPREDUCE2_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/OOZIE_CLIENT",
-              "Dependencies" : {
-                "component_name" : "OOZIE_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/TEZ_CLIENT",
-              "Dependencies" : {
-                "component_name" : "TEZ_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/YARN_CLIENT",
-              "Dependencies" : {
-                "component_name" : "YARN_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
       "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE",
       "StackServices" : {
         "comments" : "System for workflow coordination and execution of Apache Hadoop jobs.  This also includes the installation of the optional Oozie Web Console which relies on and will install the <a target=\"_blank\" href=\"http://www.sencha.com/legal/open-source-faq/\">ExtJS</a> Library.\n      ",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/bootstrap/two_hosts_information.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/bootstrap/two_hosts_information.json b/ambari-web/app/assets/data/wizard/bootstrap/two_hosts_information.json
index 412ce63..a06893f 100644
--- a/ambari-web/app/assets/data/wizard/bootstrap/two_hosts_information.json
+++ b/ambari-web/app/assets/data/wizard/bootstrap/two_hosts_information.json
@@ -75,10 +75,6 @@
               "type" : "not_exist"
             },
             {
-              "name" : "/etc/nagios",
-              "type" : "not_exist"
-            },
-            {
               "name" : "/var/run/hadoop",
               "type" : "not_exist"
             },
@@ -113,18 +109,10 @@
             {
               "name" : "/var/log/hive",
               "type" : "not_exist"
-            },
-            {
-              "name" : "/var/log/nagios",
-              "type" : "not_exist"
             }
           ],
           "rpms" : [
             {
-              "name" : "nagios",
-              "installed" : true
-            },
-            {
               "name" : "ganglia",
               "installed" : true
             },
@@ -244,10 +232,6 @@
           "stackFoldersAndFiles" : [ ],
           "rpms" : [
             {
-              "name" : "nagios",
-              "installed" : false
-            },
-            {
               "name" : "ganglia",
               "installed" : false
             },

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/deploy/4_hosts_install_fail_without_failed_status/poll_1.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/deploy/4_hosts_install_fail_without_failed_status/poll_1.json b/ambari-web/app/assets/data/wizard/deploy/4_hosts_install_fail_without_failed_status/poll_1.json
index 0f594a7..4a8462d 100644
--- a/ambari-web/app/assets/data/wizard/deploy/4_hosts_install_fail_without_failed_status/poll_1.json
+++ b/ambari-web/app/assets/data/wizard/deploy/4_hosts_install_fail_without_failed_status/poll_1.json
@@ -690,24 +690,6 @@
       }
     },
     {
-      "href" : "http://ambari-server:8080/api/v1/clusters/cluster/requests/1/tasks/49",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "ABORTED",
-        "stderr" : "",
-        "host_name" : "host3",
-        "id" : 49,
-        "cluster_name" : "cluster",
-        "attempt_cnt" : 0,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : -1,
-        "stage_id" : 2
-      }
-    },
-    {
       "href" : "http://ambari-server:8080/api/v1/clusters/cluster/requests/1/tasks/38",
       "Tasks" : {
         "exit_code" : 0,

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/deploy/5_hosts/get_hosts_state.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/get_hosts_state.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/get_hosts_state.json
index cc520fa..750038c 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/get_hosts_state.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/get_hosts_state.json
@@ -64,15 +64,6 @@
           }
         },
         {
-          "href" : "http://162.216.148.67:8080/api/v1/clusters/c1/hosts/ambari-1.c.apache.internal/host_components/NAGIOS_SERVER",
-          "HostRoles" : {
-            "cluster_name" : "c1",
-            "component_name" : "NAGIOS_SERVER",
-            "host_name" : "ambari-1.c.apache.internal",
-            "state" : "INSTALLED"
-          }
-        },
-        {
           "href" : "http://162.216.148.67:8080/api/v1/clusters/c1/hosts/ambari-1.c.apache.internal/host_components/NAMENODE",
           "HostRoles" : {
             "cluster_name" : "c1",

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_1.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_1.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_1.json
index fdfb408..ffbe6d2 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_1.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_1.json
@@ -258,24 +258,6 @@
       }
     },
     {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "PENDING",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 0,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : -1,
-        "stage_id" : 1
-      }
-    },
-    {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 999,

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_10.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_10.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_10.json
index b6aae8e..70ea8eb 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_10.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_10.json
@@ -240,24 +240,6 @@
       }
     },
     {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/2/tasks/28",
-      "Tasks" : {
-        "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /Stage[1]/Hdp::Snappy::Package/Hdp::Snappy::Package::Ln[32]/Hdp::Exec[hdp::snappy::package::ln 32]/Exec[hdp::snappy::package::ln 32]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hostgroups.cfg]/content: content changed '{md5}ffff62426c4f7a42c1cb1ca44b324dad' to '{md5}21ad9f95dd93ee39fc87db07b7ea05be'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hosts.cfg]/content: content changed '{md5}fdcc51e399dd2381778a163933ef2beb' to '{md5}afbfd32db940db5fff4701c964169c27'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Services/Service[nagios]/ensure: ensure changed 'stopped' to 'running'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-na
 gios::Server::Services/Service[nagios]: Triggered 'refresh' from 1 events\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 8.78 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Snappy::Package/Hdp::Snappy::Package::Ln[32]/Hdp::Exec[hdp::snappy::package::ln 32]/Exec[hdp::snappy::package::ln 32]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hostgroups.cfg]/content: content changed '{md5}ffff62426c4f7a42c1cb1ca44b324dad' to '{md5}21ad9f95dd93ee39fc87db07b7ea05be'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hosts.cfg]/content: content changed '{md5}fdcc51e399dd2381778a163933ef2beb' to '{md5}afbfd32db940db5fff4701c964169c27'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-
 nagios::Server::Services/Service[nagios]/ensure: ensure changed 'stopped' to 'running'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Services/Service[nagios]: Triggered 'refresh' from 1 events\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 8.78 seconds\u001B[0m",
-        "status" : "COMPLETED",
-        "stderr" : "none",
-        "host_name" : "host5",
-        "id" : 28,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 1,
-        "request_id" : 2,
-        "command" : "START",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352864089985,
-        "stage_id" : 1
-      }
-    },
-    {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/2/tasks/37",
       "Tasks" : {
         "exit_code" : 0,

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_2.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_2.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_2.json
index 822e351..70a01c7 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_2.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_2.json
@@ -78,24 +78,6 @@
       }
     },
     {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "QUEUED",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 1,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352863665856,
-        "stage_id" : 1
-      }
-    },
-    {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/21",
       "Tasks" : {
         "exit_code" : 999,

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_3.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_3.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_3.json
index e179f86..c07994b 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_3.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_3.json
@@ -150,24 +150,6 @@
       }
     },
     {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /Stage[1]/Hdp::Snappy::Package/Hdp::Snappy::Package::Ln[32]/Hdp::Exec[hdp::snappy::package::ln 32]/Exec[hdp::snappy::package::ln 32]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-fping]/Hdp::Package[nagios-fping]/Hdp::Package::Yum[nagios-fping]/Package[fping]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-server]/Hdp::Package[nagios-server]/Hdp::Package::Yum[nagios-server]/Package[nagios-3.2.3]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-plugins]/Hdp::Package[nagios-plugins]/Hdp::Package::Yum[nagios-plugins]/Package[nagios-plugins-1.4.9]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-addons]/Hdp::Package[nagios-addons]/Hdp::Package::Yum[n
 agios-addons]/Package[hdp_mon_nagios_addons]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios]/owner: owner changed 'nagios' to 'hadoop_deploy'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins]/owner: owner changed 'root' to 'hadoop_deploy'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins]/group: group changed 'root' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects]/owner: owner changed 'nagios' to 'hadoop_deploy'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hdfs_blocks.php]/content: content changed '{md5}4dc9db0a18622b3e40e266a9b54e2a1a' to '{md5}e3a5fa882154aaabe18fce6086346b98'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_rpcq_latency.php]/content: content changed '{md5}4fa432abbf0a15a2c73
 cd8eb7e657d6e' to '{md5}1601eec7138fcd957159e6524900a1ce'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_cpu.pl]/ensure: defined content as '{md5}ab87290dee3f032770580d7d7713d086'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hostgroups.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_datanode_storage.php]/ensure: defined content as '{md5}eeae70d7c6686ff4ce9993244dbbdf34'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hosts.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-commands.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hive_metastore_status.sh]/content: content changed '{md5}56469a95f854711ff67e961eb91a1b9a' to '{md5}987ce3f5cd654d9e8d13e9bc9d4b4e16'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_aggregate.php]/content: content changed '{md5}eeddc4cf93d7ca7dbf1e6ea1effcc278' to '{md5}eb
 bacb754b35bcdab9b246a64589f7c6'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-servicegroups.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/contacts.cfg]/content: content changed '{md5}5ee6a28df66ed3cc6f76b46073ced9ac' to '{md5}05c47f03c0800b968023152479f24ccb'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/contacts.cfg]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_templeton_status.sh]/ensure: defined content as '{md5}017d82f1435f2a1059d13968b14174bc'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_puppet_agent_status.php]/ensure: defined content as '{md5}a623c36478c7ab4bf8df595822683762'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/content: content changed '{md5}3a4b1c8fd3b42affa5ae58a385a48000' to '{md5}870993486c9e4336086645a14d327ead'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/group: group changed 'nagios' to 
 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-services.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_oozie_status.sh]/content: content changed '{md5}e672a044b2aa7163ceda92829d43e92c' to '{md5}3124bf8679ce198ba25509e430db325b'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_webui.sh]/content: content changed '{md5}f8e41fdb30d0cd838aefd7ea9e5af4a2' to '{md5}258d5ced025d4b14853cc0b12bdde1f0'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hdfs_capacity.php]/content: content changed '{md5}a3391962ab1c1956610d0cb009df9b8c' to '{md5}398026717db006c423441a223731914f'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 52.10 seconds\u001B[
 0m\n\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_templeton_status.sh]/ensure: defined content as '{md5}017d82f1435f2a1059d13968b14174bc'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_puppet_agent_status.php]/ensure: defined content as '{md5}a623c36478c7ab4bf8df595822683762'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/content: content changed '{md5}3a4b1c8fd3b42affa5ae58a385a48000' to '{md5}870993486c9e4336086645a14d327ead'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-services.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_oozie_status.sh]/content: content changed '{md5}e672a044b2aa7163ceda92829d43e92c' to '{md5}3124bf8679ce198ba25509e430db325b'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_webui.sh]/content: content changed '{md5}f8e41fdb30d0cd838aef
 d7ea9e5af4a2' to '{md5}258d5ced025d4b14853cc0b12bdde1f0'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hdfs_capacity.php]/content: content changed '{md5}a3391962ab1c1956610d0cb009df9b8c' to '{md5}398026717db006c423441a223731914f'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 52.10 seconds\u001B[0m",
-        "status" : "COMPLETED",
-        "stderr" : "none",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 2,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352863665856,
-        "stage_id" : 1
-      }
-    },
-    {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/7",
       "Tasks" : {
         "exit_code" : 0,

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_4.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_4.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_4.json
index a573984..4dc1a25 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_4.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_4.json
@@ -204,24 +204,6 @@
       }
     },
     {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /Stage[1]/Hdp::Snappy::Package/Hdp::Snappy::Package::Ln[32]/Hdp::Exec[hdp::snappy::package::ln 32]/Exec[hdp::snappy::package::ln 32]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-fping]/Hdp::Package[nagios-fping]/Hdp::Package::Yum[nagios-fping]/Package[fping]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-server]/Hdp::Package[nagios-server]/Hdp::Package::Yum[nagios-server]/Package[nagios-3.2.3]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-plugins]/Hdp::Package[nagios-plugins]/Hdp::Package::Yum[nagios-plugins]/Package[nagios-plugins-1.4.9]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-addons]/Hdp::Package[nagios-addons]/Hdp::Package::Yum[n
 agios-addons]/Package[hdp_mon_nagios_addons]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios]/owner: owner changed 'nagios' to 'hadoop_deploy'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins]/owner: owner changed 'root' to 'hadoop_deploy'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins]/group: group changed 'root' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects]/owner: owner changed 'nagios' to 'hadoop_deploy'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hdfs_blocks.php]/content: content changed '{md5}4dc9db0a18622b3e40e266a9b54e2a1a' to '{md5}e3a5fa882154aaabe18fce6086346b98'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_rpcq_latency.php]/content: content changed '{md5}4fa432abbf0a15a2c73
 cd8eb7e657d6e' to '{md5}1601eec7138fcd957159e6524900a1ce'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_cpu.pl]/ensure: defined content as '{md5}ab87290dee3f032770580d7d7713d086'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hostgroups.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_datanode_storage.php]/ensure: defined content as '{md5}eeae70d7c6686ff4ce9993244dbbdf34'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hosts.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-commands.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hive_metastore_status.sh]/content: content changed '{md5}56469a95f854711ff67e961eb91a1b9a' to '{md5}987ce3f5cd654d9e8d13e9bc9d4b4e16'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_aggregate.php]/content: content changed '{md5}eeddc4cf93d7ca7dbf1e6ea1effcc278' to '{md5}eb
 bacb754b35bcdab9b246a64589f7c6'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-servicegroups.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/contacts.cfg]/content: content changed '{md5}5ee6a28df66ed3cc6f76b46073ced9ac' to '{md5}05c47f03c0800b968023152479f24ccb'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/contacts.cfg]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_templeton_status.sh]/ensure: defined content as '{md5}017d82f1435f2a1059d13968b14174bc'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_puppet_agent_status.php]/ensure: defined content as '{md5}a623c36478c7ab4bf8df595822683762'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/content: content changed '{md5}3a4b1c8fd3b42affa5ae58a385a48000' to '{md5}870993486c9e4336086645a14d327ead'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/group: group changed 'nagios' to 
 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-services.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_oozie_status.sh]/content: content changed '{md5}e672a044b2aa7163ceda92829d43e92c' to '{md5}3124bf8679ce198ba25509e430db325b'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_webui.sh]/content: content changed '{md5}f8e41fdb30d0cd838aefd7ea9e5af4a2' to '{md5}258d5ced025d4b14853cc0b12bdde1f0'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hdfs_capacity.php]/content: content changed '{md5}a3391962ab1c1956610d0cb009df9b8c' to '{md5}398026717db006c423441a223731914f'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 52.10 seconds\u001B[
 0m\n\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_templeton_status.sh]/ensure: defined content as '{md5}017d82f1435f2a1059d13968b14174bc'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_puppet_agent_status.php]/ensure: defined content as '{md5}a623c36478c7ab4bf8df595822683762'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/content: content changed '{md5}3a4b1c8fd3b42affa5ae58a385a48000' to '{md5}870993486c9e4336086645a14d327ead'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-services.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_oozie_status.sh]/content: content changed '{md5}e672a044b2aa7163ceda92829d43e92c' to '{md5}3124bf8679ce198ba25509e430db325b'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_webui.sh]/content: content changed '{md5}f8e41fdb30d0cd838aef
 d7ea9e5af4a2' to '{md5}258d5ced025d4b14853cc0b12bdde1f0'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hdfs_capacity.php]/content: content changed '{md5}a3391962ab1c1956610d0cb009df9b8c' to '{md5}398026717db006c423441a223731914f'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 52.10 seconds\u001B[0m",
-        "status" : "COMPLETED",
-        "stderr" : "none",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 2,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352863665856,
-        "stage_id" : 1
-      }
-    },
-    {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_5.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_5.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_5.json
index c81f9fe..94158ec 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_5.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_5.json
@@ -312,24 +312,6 @@
       }
     },
     {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /Stage[1]/Hdp::Snappy::Package/Hdp::Snappy::Package::Ln[32]/Hdp::Exec[hdp::snappy::package::ln 32]/Exec[hdp::snappy::package::ln 32]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-fping]/Hdp::Package[nagios-fping]/Hdp::Package::Yum[nagios-fping]/Package[fping]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-server]/Hdp::Package[nagios-server]/Hdp::Package::Yum[nagios-server]/Package[nagios-3.2.3]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-plugins]/Hdp::Package[nagios-plugins]/Hdp::Package::Yum[nagios-plugins]/Package[nagios-plugins-1.4.9]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Packages/Hdp-nagios::Server::Package[nagios-addons]/Hdp::Package[nagios-addons]/Hdp::Package::Yum[n
 agios-addons]/Package[hdp_mon_nagios_addons]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios]/owner: owner changed 'nagios' to 'hadoop_deploy'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins]/owner: owner changed 'root' to 'hadoop_deploy'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins]/group: group changed 'root' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects]/owner: owner changed 'nagios' to 'hadoop_deploy'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hdfs_blocks.php]/content: content changed '{md5}4dc9db0a18622b3e40e266a9b54e2a1a' to '{md5}e3a5fa882154aaabe18fce6086346b98'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_rpcq_latency.php]/content: content changed '{md5}4fa432abbf0a15a2c73
 cd8eb7e657d6e' to '{md5}1601eec7138fcd957159e6524900a1ce'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_cpu.pl]/ensure: defined content as '{md5}ab87290dee3f032770580d7d7713d086'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hostgroups.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_datanode_storage.php]/ensure: defined content as '{md5}eeae70d7c6686ff4ce9993244dbbdf34'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hosts.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-commands.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hive_metastore_status.sh]/content: content changed '{md5}56469a95f854711ff67e961eb91a1b9a' to '{md5}987ce3f5cd654d9e8d13e9bc9d4b4e16'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_aggregate.php]/content: content changed '{md5}eeddc4cf93d7ca7dbf1e6ea1effcc278' to '{md5}eb
 bacb754b35bcdab9b246a64589f7c6'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-servicegroups.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/contacts.cfg]/content: content changed '{md5}5ee6a28df66ed3cc6f76b46073ced9ac' to '{md5}05c47f03c0800b968023152479f24ccb'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/contacts.cfg]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_templeton_status.sh]/ensure: defined content as '{md5}017d82f1435f2a1059d13968b14174bc'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_puppet_agent_status.php]/ensure: defined content as '{md5}a623c36478c7ab4bf8df595822683762'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/content: content changed '{md5}3a4b1c8fd3b42affa5ae58a385a48000' to '{md5}870993486c9e4336086645a14d327ead'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/group: group changed 'nagios' to 
 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-services.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_oozie_status.sh]/content: content changed '{md5}e672a044b2aa7163ceda92829d43e92c' to '{md5}3124bf8679ce198ba25509e430db325b'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_webui.sh]/content: content changed '{md5}f8e41fdb30d0cd838aefd7ea9e5af4a2' to '{md5}258d5ced025d4b14853cc0b12bdde1f0'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hdfs_capacity.php]/content: content changed '{md5}a3391962ab1c1956610d0cb009df9b8c' to '{md5}398026717db006c423441a223731914f'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 52.10 seconds\u001B[
 0m\n\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_templeton_status.sh]/ensure: defined content as '{md5}017d82f1435f2a1059d13968b14174bc'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_puppet_agent_status.php]/ensure: defined content as '{md5}a623c36478c7ab4bf8df595822683762'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/content: content changed '{md5}3a4b1c8fd3b42affa5ae58a385a48000' to '{md5}870993486c9e4336086645a14d327ead'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/nagios.cfg]/group: group changed 'nagios' to 'hadoop'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-services.cfg]/ensure: created\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_oozie_status.sh]/content: content changed '{md5}e672a044b2aa7163ceda92829d43e92c' to '{md5}3124bf8679ce198ba25509e430db325b'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_webui.sh]/content: content changed '{md5}f8e41fdb30d0cd838aef
 d7ea9e5af4a2' to '{md5}258d5ced025d4b14853cc0b12bdde1f0'\u001B[0m\n\u001B[0;36mnotice: /File[/usr/lib64/nagios/plugins/check_hdfs_capacity.php]/content: content changed '{md5}a3391962ab1c1956610d0cb009df9b8c' to '{md5}398026717db006c423441a223731914f'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 52.10 seconds\u001B[0m",
-        "status" : "COMPLETED",
-        "stderr" : "none",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 2,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352863665856,
-        "stage_id" : 1
-      }
-    },
-    {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/4",
       "Tasks" : {
         "exit_code" : 0,

http://git-wip-us.apache.org/repos/asf/ambari/blob/905abaf1/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_7.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_7.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_7.json
index d0eb880..28da733 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_7.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_7.json
@@ -60,24 +60,6 @@
       }
     },
     {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/2/tasks/28",
-      "Tasks" : {
-        "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /Stage[1]/Hdp::Snappy::Package/Hdp::Snappy::Package::Ln[32]/Hdp::Exec[hdp::snappy::package::ln 32]/Exec[hdp::snappy::package::ln 32]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hostgroups.cfg]/content: content changed '{md5}ffff62426c4f7a42c1cb1ca44b324dad' to '{md5}21ad9f95dd93ee39fc87db07b7ea05be'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hosts.cfg]/content: content changed '{md5}fdcc51e399dd2381778a163933ef2beb' to '{md5}afbfd32db940db5fff4701c964169c27'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Services/Service[nagios]/ensure: ensure changed 'stopped' to 'running'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-na
 gios::Server::Services/Service[nagios]: Triggered 'refresh' from 1 events\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 8.78 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Snappy::Package/Hdp::Snappy::Package::Ln[32]/Hdp::Exec[hdp::snappy::package::ln 32]/Exec[hdp::snappy::package::ln 32]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hostgroups.cfg]/content: content changed '{md5}ffff62426c4f7a42c1cb1ca44b324dad' to '{md5}21ad9f95dd93ee39fc87db07b7ea05be'\u001B[0m\n\u001B[0;36mnotice: /File[/etc/nagios/objects/hadoop-hosts.cfg]/content: content changed '{md5}fdcc51e399dd2381778a163933ef2beb' to '{md5}afbfd32db940db5fff4701c964169c27'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Web_permisssions/Hdp::Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/Exec[htpasswd -c -b  /etc/nagios/htpasswd.users nagiosadmin admin]/returns: executed successfully\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-
 nagios::Server::Services/Service[nagios]/ensure: ensure changed 'stopped' to 'running'\u001B[0m\n\u001B[0;36mnotice: /Stage[2]/Hdp-nagios::Server::Services/Service[nagios]: Triggered 'refresh' from 1 events\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 8.78 seconds\u001B[0m",
-        "status" : "COMPLETED",
-        "stderr" : "none",
-        "host_name" : "host5",
-        "id" : 28,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 1,
-        "request_id" : 2,
-        "command" : "START",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352864089985,
-        "stage_id" : 1
-      }
-    },
-    {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/2/tasks/23",
       "Tasks" : {
         "exit_code" : 0,


Mime
View raw message