You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/16 14:50:56 UTC

[16/27] AMBARI-7296. HCatalog and WebHCat services should not be managed as separate service (should be part of Hive service) (jaimin)

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/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
index bcf804f..4ce39ea 100644
--- a/ambari-web/app/assets/data/alerts/alerts.json
+++ b/ambari-web/app/assets/data/alerts/alerts.json
@@ -5,7 +5,7 @@
       "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:<1>, affected:<0>","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% < 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:<0>, missing_blocks:<0>, total_blocks:<249>","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:<0.1>, DFSTotalGB:<784.4>","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:<0> Secs, RpcProcessingTime_avg_time:<0> 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:<1>, affected:<0>","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:<1>, affected:<0>","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:<1>, affected:<0>","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% < 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:<3>, affected:<0>","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% < 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:<0.2> Secs, RpcProcessingTime_avg_time:<0.24> 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":"WEBHCAT status check","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_sta
 te":"0","plugin_output":"","last_hard_state_change":"1359058897","last_hard_state":"0","last_time_ok":"1359071977","last_time_warning":"0","last_time_unknown":"0","last_time_critical":"1359058837","is_flapping":"","last_check":"","service_type":"WEBHCAT"},{"service_description":"ZKSERVERS Process down","host_name":"ip-10-12-194-214.ec2.internal","current_attempt":"1","current_state":"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":"1359071973","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"
 }},
+        "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:<1>, affected:<0>","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% < 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:<0>, missing_blocks:<0>, total_blocks:<249>","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:<0.1>, DFSTotalGB:<784.4>","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:<0> Secs, RpcProcessingTime_avg_time:<0> 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:<1>, affected:<0>","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:<1>, affected:<0>","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:<1>, affected:<0>","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% < 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:<3>, affected:<0>","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% < 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:<0.2> Secs, RpcProcessingTime_avg_time:<0.24> 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"
       },

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/dashboard/services.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/dashboard/services.json b/ambari-web/app/assets/data/dashboard/services.json
index 9f7ec8a..b1dbc8e 100644
--- a/ambari-web/app/assets/data/dashboard/services.json
+++ b/ambari-web/app/assets/data/dashboard/services.json
@@ -1056,42 +1056,6 @@
       ]
     },
     {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/WEBHCAT",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "WEBHCAT"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/WEBHCAT/components/WEBHCAT_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "STARTED",
-            "component_name" : "WEBHCAT_SERVER",
-            "service_name" : "WEBHCAT"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/WEBHCAT_SERVER",
-              "HostRoles" : {
-                "configs" : {
-                  "global" : "version1",
-                  "webhcat-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "WEBHCAT_SERVER",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
       "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE",
       "ServiceInfo" : {
         "cluster_name" : "cl1",
@@ -1506,87 +1470,6 @@
       ]
     },
     {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HCATALOG",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "HCATALOG"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HCATALOG/components/HCAT",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "INSTALLED",
-            "component_name" : "HCAT",
-            "service_name" : "HCATALOG"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-16-48-4B.compute-1.internal/host_components/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "host_name" : "domU-12-31-39-16-48-4B.compute-1.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-110-79-42.ec2.internal/host_components/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "host_name" : "ip-10-110-79-42.ec2.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-110-38-164.ec2.internal/host_components/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "host_name" : "ip-10-110-38-164.ec2.internal"
-              }
-            },
-            {
-              "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/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "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/ZOOKEEPER",
       "ServiceInfo" : {
         "cluster_name" : "cl1",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/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 2533488..0e2e3fc 100644
--- a/ambari-web/app/assets/data/hosts/HDP2/hosts.json
+++ b/ambari-web/app/assets/data/hosts/HDP2/hosts.json
@@ -115,15 +115,6 @@
         },
         {
           "HostRoles" : {
-            "component_name" : "HCAT",
-            "maintenance_state" : "OFF",
-            "service_name" : "HCATALOG",
-            "stale_configs" : false,
-            "state" : "INSTALL_FAILED"
-          }
-        },
-        {
-          "HostRoles" : {
             "component_name" : "HDFS_CLIENT",
             "maintenance_state" : "OFF",
             "service_name" : "HDFS",
@@ -315,7 +306,7 @@
           "HostRoles" : {
             "component_name" : "WEBHCAT_SERVER",
             "maintenance_state" : "OFF",
-            "service_name" : "WEBHCAT",
+            "service_name" : "HIVE",
             "stale_configs" : false,
             "state" : "INSTALL_FAILED"
           }

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/services/HDP2/components_state.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/services/HDP2/components_state.json b/ambari-web/app/assets/data/services/HDP2/components_state.json
index 900737f..cbcb149 100644
--- a/ambari-web/app/assets/data/services/HDP2/components_state.json
+++ b/ambari-web/app/assets/data/services/HDP2/components_state.json
@@ -38,15 +38,6 @@
     },
     {
       "ServiceComponentInfo" : {
-        "component_name" : "HCAT",
-        "installed_count" : 1,
-        "service_name" : "HCATALOG",
-        "started_count" : 0,
-        "total_count" : 1
-      }
-    },
-    {
-      "ServiceComponentInfo" : {
         "component_name" : "DATANODE",
         "installed_count" : 0,
         "service_name" : "HDFS",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/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 3cb544d..c10dbb6 100644
--- a/ambari-web/app/assets/data/services/HDP2/services.json
+++ b/ambari-web/app/assets/data/services/HDP2/services.json
@@ -50,22 +50,6 @@
       }
     },
     {
-      "href" : "http://192.168.56.101:8080/api/v1/clusters/cl/services/HCATALOG",
-      "ServiceInfo" : {
-        "maintenance_state" : "OFF",
-        "cluster_name" : "cl",
-        "service_name" : "HCATALOG",
-        "state": "STARTED"
-      },
-      "alerts" : {
-        "summary" : {
-          "CRITICAL" : 0,
-          "OK" : 0,
-          "WARNING" : 0
-        }
-      }
-    },
-    {
       "href" : "http://192.168.56.101:8080/api/v1/clusters/cl/services/HDFS",
       "ServiceInfo" : {
         "maintenance_state" : "OFF",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/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 ef80049..8956fee 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
@@ -1078,42 +1078,7 @@
         }
       ]
     },
-    {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/WEBHCAT",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "WEBHCAT"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/WEBHCAT/components/WEBHCAT_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "STARTED",
-            "component_name" : "WEBHCAT_SERVER",
-            "service_name" : "WEBHCAT"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/WEBHCAT_SERVER",
-              "HostRoles" : {
-                "configs" : {
-                  "global" : "version1",
-                  "webhcat-site" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "WEBHCAT_SERVER",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            }
-          ]
-        }
-      ]
-    },
+
     {
       "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HUE",
       "ServiceInfo" : {
@@ -1457,87 +1422,6 @@
       ]
     },
     {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HCATALOG",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "HCATALOG"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/HCATALOG/components/HCAT",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "INSTALLED",
-            "component_name" : "HCAT",
-            "service_name" : "HCATALOG"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-16-48-4B.compute-1.internal/host_components/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "host_name" : "domU-12-31-39-16-48-4B.compute-1.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/domU-12-31-39-0E-E6-01.compute-1.internal/host_components/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "host_name" : "domU-12-31-39-0E-E6-01.compute-1.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-110-79-42.ec2.internal/host_components/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "host_name" : "ip-10-110-79-42.ec2.internal"
-              }
-            },
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-110-38-164.ec2.internal/host_components/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "host_name" : "ip-10-110-38-164.ec2.internal"
-              }
-            },
-            {
-              "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/HCAT",
-              "HostRoles" : {
-                "configs" : { },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "INSTALLED",
-                "state" : "INSTALLED",
-                "component_name" : "HCAT",
-                "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/ZOOKEEPER",
       "ServiceInfo" : {
         "cluster_name" : "cl1",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/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 1b851bf..95bd778 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", "HCATALOG", "HDFS", "HIVE", "MAPREDUCE2", "NAGIOS", "OOZIE", "PIG", "SQOOP", "STORM", "TEZ", "WEBCHAT", "YARN", "ZOOKEEPER"],
+  "services": ["FALCON", "FLUME", "GANGLIA", "HBASE", "HDFS", "HIVE", "MAPREDUCE2", "NAGIOS", "OOZIE", "PIG", "SQOOP", "STORM", "TEZ", "WEBCHAT", "YARN", "ZOOKEEPER"],
   "recommendations": {
     "blueprint": {
       "configurations": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/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 4efe599..6dacfeb 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
@@ -1,6 +1,6 @@
 {
   "hosts": ["ab2test-5.c.pramod-thangali.internal", "ab2test-6.c.pramod-thangali.internal", "ab2test-7.c.pramod-thangali.internal"],
-  "services": ["HDFS", "MAPREDUCE2", "YARN", "TEZ", "NAGIOS", "GANGLIA", "HIVE", "HCATALOG", "WEBHCAT", "SQOOP", "OOZIE", "ZOOKEEPER", "FALCON", "STORM", "FLUME", "PIG"],
+  "services": ["HDFS", "MAPREDUCE2", "YARN", "TEZ", "NAGIOS", "GANGLIA", "HIVE", "SQOOP", "OOZIE", "ZOOKEEPER", "FALCON", "STORM", "FLUME", "PIG"],
   "recommendations": {
   "blueprint": {
     "host_groups": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/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 7bf0093..7c56a30 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
@@ -320,42 +320,6 @@
       ]
     },
     {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/HCATALOG",
-      "StackServices" : {
-        "comments" : "This is comment for HCATALOG service",
-        "custom_commands" : [ ],
-        "display_name" : "HCatalog",
-        "required_services" : [
-          "HIVE"
-        ],
-        "service_check_supported" : true,
-        "service_name" : "HCATALOG",
-        "service_version" : "0.12.0.2.1",
-        "stack_name" : "HDP",
-        "stack_version" : "2.1",
-        "user_name" : null,
-        "config_types" : { }
-      },
-      "serviceComponents" : [
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/HCATALOG/components/HCAT",
-          "StackServiceComponents" : {
-            "cardinality" : null,
-            "component_category" : "CLIENT",
-            "component_name" : "HCAT",
-            "custom_commands" : [ ],
-            "display_name" : "HCat",
-            "is_client" : true,
-            "is_master" : false,
-            "service_name" : "HCATALOG",
-            "stack_name" : "HDP",
-            "stack_version" : "2.1"
-          },
-          "dependencies" : [ ]
-        }
-      ]
-    },
-    {
       "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS",
       "StackServices" : {
         "comments" : "Apache Hadoop Distributed File System",
@@ -558,6 +522,22 @@
           "dependencies" : [ ]
         },
         {
+          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/HCATALOG/components/HCAT",
+          "StackServiceComponents" : {
+            "cardinality" : null,
+            "component_category" : "CLIENT",
+            "component_name" : "HCAT",
+            "custom_commands" : [ ],
+            "display_name" : "HCat",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "HCATALOG",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
           "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_METASTORE",
           "StackServiceComponents" : {
             "cardinality" : "1",
@@ -635,6 +615,73 @@
           ]
         },
         {
+          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "WEBHCAT_SERVER",
+            "custom_commands" : [ ],
+            "display_name" : "WebHCat Server",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "WEBHCAT",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/HDFS_CLIENT",
+              "Dependencies" : {
+                "component_name" : "HDFS_CLIENT",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "WEBHCAT",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/MAPREDUCE2_CLIENT",
+              "Dependencies" : {
+                "component_name" : "MAPREDUCE2_CLIENT",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "WEBHCAT",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/YARN_CLIENT",
+              "Dependencies" : {
+                "component_name" : "YARN_CLIENT",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "WEBHCAT",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/ZOOKEEPER_CLIENT",
+              "Dependencies" : {
+                "component_name" : "ZOOKEEPER_CLIENT",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "WEBHCAT",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/ZOOKEEPER_SERVER",
+              "Dependencies" : {
+                "component_name" : "ZOOKEEPER_SERVER",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "WEBHCAT",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        },
+        {
           "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/MYSQL_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "0-1",
@@ -1236,105 +1283,6 @@
       ]
     },
     {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT",
-      "StackServices" : {
-        "comments" : "This is comment for WEBHCAT service",
-        "custom_commands" : [ ],
-        "display_name" : "WebHCat",
-        "required_services" : [
-          "HIVE",
-          "ZOOKEEPER"
-        ],
-        "service_check_supported" : true,
-        "service_name" : "WEBHCAT",
-        "service_version" : "0.13.0.2.1",
-        "stack_name" : "HDP",
-        "stack_version" : "2.1",
-        "user_name" : null,
-        "config_types" : {
-          "webhcat-env" : {
-            "supports" : {
-              "final" : "false"
-            }
-          },
-          "webhcat-site" : {
-            "supports" : {
-              "final" : "true"
-            }
-          }
-        }
-      },
-      "serviceComponents" : [
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER",
-          "StackServiceComponents" : {
-            "cardinality" : "1",
-            "component_category" : "MASTER",
-            "component_name" : "WEBHCAT_SERVER",
-            "custom_commands" : [ ],
-            "display_name" : "WebHCat Server",
-            "is_client" : false,
-            "is_master" : true,
-            "service_name" : "WEBHCAT",
-            "stack_name" : "HDP",
-            "stack_version" : "2.1"
-          },
-          "dependencies" : [
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/HDFS_CLIENT",
-              "Dependencies" : {
-                "component_name" : "HDFS_CLIENT",
-                "dependent_component_name" : "WEBHCAT_SERVER",
-                "dependent_service_name" : "WEBHCAT",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/MAPREDUCE2_CLIENT",
-              "Dependencies" : {
-                "component_name" : "MAPREDUCE2_CLIENT",
-                "dependent_component_name" : "WEBHCAT_SERVER",
-                "dependent_service_name" : "WEBHCAT",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/YARN_CLIENT",
-              "Dependencies" : {
-                "component_name" : "YARN_CLIENT",
-                "dependent_component_name" : "WEBHCAT_SERVER",
-                "dependent_service_name" : "WEBHCAT",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/ZOOKEEPER_CLIENT",
-              "Dependencies" : {
-                "component_name" : "ZOOKEEPER_CLIENT",
-                "dependent_component_name" : "WEBHCAT_SERVER",
-                "dependent_service_name" : "WEBHCAT",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/WEBHCAT/components/WEBHCAT_SERVER/dependencies/ZOOKEEPER_SERVER",
-              "Dependencies" : {
-                "component_name" : "ZOOKEEPER_SERVER",
-                "dependent_component_name" : "WEBHCAT_SERVER",
-                "dependent_service_name" : "WEBHCAT",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
       "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/YARN",
       "StackServices" : {
         "comments" : "Apache Hadoop NextGen MapReduce (YARN)",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.0.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.0.json b/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.0.json
index c91a038..9aaa741 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.0.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.0.json
@@ -247,24 +247,6 @@
       "master" : true
     }
   }, {
-    "name" : "HCATALOG",
-    "version" : "0.4.0.1-1",
-    "user" : "root",
-    "comment" : "This is comment for HCATALOG service",
-    "components" : [ {
-      "name" : "HCAT",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    } ],
-    "clientOnlyService" : true,
-    "clientComponent" : {
-      "name" : "HCAT",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    }
-  }, {
     "name" : "HIVE",
     "version" : "0.9.0.1-1",
     "user" : "root",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.1.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.1.json b/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.1.json
index e267e76..18a4bea 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.1.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version/1.2.1.json
@@ -112,17 +112,6 @@
       }
     },
     {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/HCATALOG",
-      "StackServices" : {
-        "user_name" : "root",
-        "stack_version" : "1.2.1",
-        "service_name" : "HCATALOG",
-        "stack_name" : "HDP",
-        "comments" : "This is comment for HCATALOG service",
-        "service_version" : "0.5.0"
-      }
-    },
-    {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/HIVE",
       "StackServices" : {
         "user_name" : "root",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.0.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.0.json b/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.0.json
index f313fc1..3750e3f 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.0.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.0.json
@@ -112,17 +112,6 @@
       }
     },
     {
-      "href" : "http://ec2-23-20-124-167.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/HCATALOG",
-      "StackServices" : {
-        "user_name" : "root",
-        "stack_version" : "1.2.1",
-        "service_name" : "HCATALOG",
-        "stack_name" : "HDP",
-        "comments" : "This is comment for HCATALOG service",
-        "service_version" : "0.5.0"
-      }
-    },
-    {
       "href" : "http://ec2-23-20-124-167.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/GANGLIA",
       "StackServices" : {
         "user_name" : "root",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.1.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.1.json b/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.1.json
index 27631ee..20743c9 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.1.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version/1.3.1.json
@@ -123,17 +123,6 @@
       }
     },
     {
-      "href" : "http://ec2-23-20-124-167.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/HCATALOG",
-      "StackServices" : {
-        "user_name" : "root",
-        "stack_version" : "1.2.1",
-        "service_name" : "HCATALOG",
-        "stack_name" : "HDP",
-        "comments" : "This is comment for HCATALOG service",
-        "service_version" : "0.5.0"
-      }
-    },
-    {
       "href" : "http://ec2-23-20-124-167.compute-1.amazonaws.com:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/GANGLIA",
       "StackServices" : {
         "user_name" : "root",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json b/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json
index 5a28464..439fae1 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json
@@ -35,17 +35,6 @@
       }
     },
     {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/HCATALOG",
-      "StackServices" : {
-        "user_name" : "root",
-        "stack_version" : "2.0.1",
-        "service_name" : "HCATALOG",
-        "stack_name" : "HDP",
-        "comments" : "This is comment for HCATALOG service",
-        "service_version" : "0.5.0.22-1"
-      }
-    },
-    {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/WEBHCAT",
       "StackServices" : {
         "user_name" : "root",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.5.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.5.json b/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.5.json
index fb7d747..e1b8f67 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.5.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.5.json
@@ -35,17 +35,6 @@
       }
     },
     {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/HCATALOG",
-      "StackServices" : {
-        "user_name" : "root",
-        "stack_version" : "2.0.1",
-        "service_name" : "HCATALOG",
-        "stack_name" : "HDP",
-        "comments" : "This is comment for HCATALOG service",
-        "service_version" : "0.5.0.22-1"
-      }
-    },
-    {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/WEBHCAT",
       "StackServices" : {
         "user_name" : "root",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json b/ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json
index ca4439d..4c5ba7f 100644
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json
+++ b/ambari-web/app/assets/data/wizard/stack/hdp/version0.1.json
@@ -215,23 +215,6 @@
       "master" : true
     }
   }, {
-    "name" : "HCATALOG",
-    "version" : "1.0",
-    "user" : "root",
-    "comment" : "This is comment for HCATALOG service",
-    "components" : [ {
-      "name" : "HCAT",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    } ],
-    "clientComponent" : {
-      "name" : "HCAT",
-      "category" : "CLIENT",
-      "client" : true,
-      "master" : false
-    }
-  }, {
     "name" : "HIVE",
     "version" : "1.0",
     "user" : "root",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version01/HCATALOG.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version01/HCATALOG.json b/ambari-web/app/assets/data/wizard/stack/hdp/version01/HCATALOG.json
deleted file mode 100644
index c6bb7b6..0000000
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version01/HCATALOG.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name" : "HCATALOG",
-  "version" : "0.4.0.1-1",
-  "user" : "root",
-  "comment" : "This is comment for HCATALOG service",
-  "properties" : [ ],
-  "components" : [ {
-    "name" : "HCAT",
-    "category" : "CLIENT",
-    "client" : true,
-    "master" : false
-  } ],
-  "clientOnlyService" : true,
-  "clientComponent" : {
-    "name" : "HCAT",
-    "category" : "CLIENT",
-    "client" : true,
-    "master" : false
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/HCATALOG.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/HCATALOG.json b/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/HCATALOG.json
deleted file mode 100644
index 957bcd3..0000000
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version1.2.1/HCATALOG.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/HCATALOG/configurations?fields=*",
-  "items" : [ ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HCATALOG.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HCATALOG.json b/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HCATALOG.json
deleted file mode 100644
index 1180bad..0000000
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version1.3.0/HCATALOG.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HCATALOG/configurations?fields=*",
-  "items" : [ ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version131/HCATALOG.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version131/HCATALOG.json b/ambari-web/app/assets/data/wizard/stack/hdp/version131/HCATALOG.json
deleted file mode 100644
index 1180bad..0000000
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version131/HCATALOG.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HCATALOG/configurations?fields=*",
-  "items" : [ ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HCATALOG.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HCATALOG.json b/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HCATALOG.json
deleted file mode 100644
index 1180bad..0000000
--- a/ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/HCATALOG.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HCATALOG/configurations?fields=*",
-  "items" : [ ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/assets/data/wizard/stack/stacks.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/wizard/stack/stacks.json b/ambari-web/app/assets/data/wizard/stack/stacks.json
index ebf9d7b..4f51def 100644
--- a/ambari-web/app/assets/data/wizard/stack/stacks.json
+++ b/ambari-web/app/assets/data/wizard/stack/stacks.json
@@ -21,17 +21,6 @@
           }
         },
         {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HCATALOG",
-          "StackServices" : {
-            "user_name" : "root",
-            "stack_version" : "1.3.0",
-            "service_name" : "HCATALOG",
-            "stack_name" : "HDP",
-            "service_version" : "0.5.0",
-            "comments" : "This is comment for HCATALOG service"
-          }
-        },
-        {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/MAPREDUCE",
           "StackServices" : {
             "user_name" : "mapred",
@@ -98,17 +87,6 @@
           }
         },
         {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/WEBHCAT",
-          "StackServices" : {
-            "user_name" : "root",
-            "stack_version" : "1.3.0",
-            "service_name" : "WEBHCAT",
-            "stack_name" : "HDP",
-            "service_version" : "0.5.0",
-            "comments" : "This is comment for WEBHCAT service"
-          }
-        },
-        {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/SQOOP",
           "StackServices" : {
             "user_name" : "root",
@@ -196,17 +174,6 @@
           }
         },
         {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/HCATALOG",
-          "StackServices" : {
-            "user_name" : "root",
-            "stack_version" : "1.2.1",
-            "service_name" : "HCATALOG",
-            "stack_name" : "HDP",
-            "service_version" : "0.5.0",
-            "comments" : "This is comment for HCATALOG service"
-          }
-        },
-        {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/HDFS",
           "StackServices" : {
             "user_name" : "root",
@@ -273,17 +240,6 @@
           }
         },
         {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/WEBHCAT",
-          "StackServices" : {
-            "user_name" : "root",
-            "stack_version" : "1.2.1",
-            "service_name" : "WEBHCAT",
-            "stack_name" : "HDP",
-            "service_version" : "0.5.0",
-            "comments" : "This is comment for WEBHCAT service"
-          }
-        },
-        {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.2.1/stackServices/SQOOP",
           "StackServices" : {
             "user_name" : "root",
@@ -360,17 +316,6 @@
           }
         },
         {
-          "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.2.0/stackServices/HCATALOG",
-          "StackServices" : {
-            "user_name" : "root",
-            "stack_version" : "1.2.0",
-            "service_name" : "HCATALOG",
-            "stack_name" : "HDP",
-            "service_version" : "0.5.0",
-            "comments" : "This is comment for HCATALOG service"
-          }
-        },
-        {
           "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.2.0/stackServices/WEBHCAT",
           "StackServices" : {
             "user_name" : "root",

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/controllers/main/admin/security/add/step2.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security/add/step2.js b/ambari-web/app/controllers/main/admin/security/add/step2.js
index 4172299..df500c7 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step2.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step2.js
@@ -76,7 +76,7 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({
       components: ['HIVE_SERVER']
     },
     {
-      serviceName: 'WEBHCAT',
+      serviceName: 'HIVE',
       configName: 'webhcatserver_host',
       components: ['WEBHCAT_SERVER']
     },
@@ -168,7 +168,7 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({
       primaryName: 'HTTP/'
     },
     {
-      serviceName: 'WEBHCAT',
+      serviceName: 'HIVE',
       configName: 'webhcatserver_host',
       principalName: 'webHCat_http_principal_name',
       primaryName: 'HTTP/'

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js b/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
index f06d64e..ecb6f20 100644
--- a/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
+++ b/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
@@ -122,7 +122,7 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
     var proxyUserGroup = misc_configs.findProperty('name', 'proxyuser_group');
     //stack, with version lower than 2.1, doesn't have Falcon service
     if (proxyUserGroup) {
-      var proxyServices = ['HIVE', 'WEBHCAT', 'OOZIE', 'FALCON'];
+      var proxyServices = ['HIVE', 'OOZIE', 'FALCON'];
       var services = Em.A([]);
       proxyServices.forEach(function (serviceName) {
         var stackService = App.StackService.find(serviceName);

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index cea4630..2f79685 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -1698,7 +1698,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
   addDynamicProperties: function (configs) {
     var allConfigs = this.get('stepConfigs').findProperty('serviceName', this.get('content.serviceName')).get('configs');
     var templetonHiveProperty = allConfigs.someProperty('name', 'templeton.hive.properties');
-    if (!templetonHiveProperty && this.get('content.serviceName') === 'WEBHCAT') {
+    if (!templetonHiveProperty && this.get('content.serviceName') === 'HIVE') {
       configs.pushObject({
         "name": "templeton.hive.properties",
         "templateName": ["hivemetastore_host"],
@@ -2136,7 +2136,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       hostProperty: 'hivemetastore_host',
       componentName: 'HIVE_SERVER',
       serviceName: 'HIVE',
-      serviceUseThis: ['WEBHCAT']
+      serviceUseThis: ['HIVE']
     },
     {
       hostProperty: 'oozieserver_host',
@@ -2160,7 +2160,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
     {
       hostProperty: 'webhcatserver_host',
       componentName: 'WEBHCAT_SERVER',
-      serviceName: 'WEBHCAT',
+      serviceName: 'HIVE',
       serviceUseThis: [],
       m: true
     },
@@ -2168,7 +2168,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
       hostProperty: 'zookeeperserver_hosts',
       componentName: 'ZOOKEEPER_SERVER',
       serviceName: 'ZOOKEEPER',
-      serviceUseThis: ['HBASE', 'WEBHCAT'],
+      serviceUseThis: ['HBASE', 'HIVE'],
       m: true
     },
     {

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index fc62a4e..edb524c 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -96,7 +96,7 @@ App.MainServiceItemController = Em.Controller.extend({
   }.property('content.serviceName'),
 
   isConfigurable: function () {
-    return !App.get('services.noConfigTypes').concat('HCATALOG').contains(this.get('content.serviceName'));
+    return !App.get('services.noConfigTypes').contains(this.get('content.serviceName'));
   }.property('App.services.noConfigTypes','content.serviceName'),
 
   allHosts: [],

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 414dfdd..8afc87d 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -166,14 +166,13 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, {
 
   /**
    * List of installed service names
-   * Sqoop and HCatalog are excluded if not installer wizard running
    * @type {string[]}
    */
   installedServiceNames: function () {
     var serviceNames = this.get('content.services').filterProperty('isInstalled').mapProperty('serviceName');
     if (this.get('content.controllerName') !== 'installerController') {
       serviceNames = serviceNames.filter(function(_serviceName){
-        return !App.get('services.noConfigTypes').concat('HCATALOG').contains(_serviceName);
+        return !App.get('services.noConfigTypes').contains(_serviceName);
       });
     }
     return serviceNames;

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 7b7ae11..0607e9c 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1601,7 +1601,6 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
       oozieUser = this.get('configs').someProperty('name', 'oozie_user') ? this.get('configs').findProperty('name', 'oozie_user').value : null,
       isHiveSelected = installedAndSelectedServices.someProperty('serviceName', 'HIVE'),
       hiveUser = this.get('configs').someProperty('name', 'hive_user') ? this.get('configs').findProperty('name', 'hive_user').value : null,
-      isHcatSelected = installedAndSelectedServices.someProperty('serviceName', 'WEBHCAT'),
       hcatUser = this.get('configs').someProperty('name', 'hcat_user') ? this.get('configs').findProperty('name', 'hcat_user').value : null,
       isGLUSTERFSSelected = installedAndSelectedServices.someProperty('serviceName', 'GLUSTERFS');
 
@@ -1610,7 +1609,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
       if (
         (isOozieSelected || (_coreSiteObj.name != 'hadoop.proxyuser.' + oozieUser + '.hosts' && _coreSiteObj.name != 'hadoop.proxyuser.' + oozieUser + '.groups')) &&
         (isHiveSelected || (_coreSiteObj.name != 'hadoop.proxyuser.' + hiveUser + '.hosts' && _coreSiteObj.name != 'hadoop.proxyuser.' + hiveUser + '.groups')) &&
-        (isHcatSelected || (_coreSiteObj.name != 'hadoop.proxyuser.' + hcatUser + '.hosts' && _coreSiteObj.name != 'hadoop.proxyuser.' + hcatUser + '.groups'))) {
+        (isHiveSelected || (_coreSiteObj.name != 'hadoop.proxyuser.' + hcatUser + '.hosts' && _coreSiteObj.name != 'hadoop.proxyuser.' + hcatUser + '.groups'))) {
         coreSiteProperties[_coreSiteObj.name] = App.config.escapeXMLCharacters(_coreSiteObj.value);
       }
       if (isGLUSTERFSSelected && _coreSiteObj.name == "fs.default.name") {

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/data/HDP2/secure_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/secure_configs.js b/ambari-web/app/data/HDP2/secure_configs.js
index da543e0..833697d 100644
--- a/ambari-web/app/data/HDP2/secure_configs.js
+++ b/ambari-web/app/data/HDP2/secure_configs.js
@@ -84,20 +84,11 @@ module.exports = [
     displayName: 'Hive',
     filename: 'hive-site',
     configCategories: [
-      App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName: 'Hive Metastore and Hive Server 2'})
-    ],
-    sites: ['hive-site'],
-    configs: configProperties.filterProperty('serviceName', 'HIVE')
-  },
-  {
-    serviceName: 'WEBHCAT',
-    displayName: 'WebHCat',
-    filename: 'webhcat-site',
-    configCategories: [
+      App.ServiceConfigCategory.create({ name: 'Hive Metastore', displayName: 'Hive Metastore and Hive Server 2'}),
       App.ServiceConfigCategory.create({ name: 'WebHCat Server', displayName : 'WebHCat Server'})
     ],
-    sites: ['webhcat-site'],
-    configs: configProperties.filterProperty('serviceName', 'WEBHCAT')
+    sites: ['hive-site','webhcat-site'],
+    configs: configProperties.filterProperty('serviceName', 'HIVE')
   },
   {
     serviceName: 'HBASE',

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/data/HDP2/secure_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/secure_mapping.js b/ambari-web/app/data/HDP2/secure_mapping.js
index cb92e5a..5d9261c 100644
--- a/ambari-web/app/data/HDP2/secure_mapping.js
+++ b/ambari-web/app/data/HDP2/secure_mapping.js
@@ -505,7 +505,7 @@ module.exports = [
     "foreignKey": null,
     "value": "<templateName[0]>@<templateName[1]>",
     "filename": "webhcat-site.xml",
-    "serviceName": "WEBHCAT"
+    "serviceName": "HIVE"
   },
   {
     "name": "templeton.kerberos.keytab",
@@ -513,7 +513,7 @@ module.exports = [
     "foreignKey": null,
     "value": "<templateName[0]>",
     "filename": "webhcat-site.xml",
-    "serviceName": "WEBHCAT"
+    "serviceName": "HIVE"
   },
   {
     "name": "templeton.kerberos.secret",
@@ -521,7 +521,7 @@ module.exports = [
     "foreignKey": null,
     "value": "secret",
     "filename": "webhcat-site.xml",
-    "serviceName": "WEBHCAT"
+    "serviceName": "HIVE"
   },
   {
     "name": "templeton.hive.properties",
@@ -530,7 +530,7 @@ module.exports = [
     "value": "hive.metastore.local=false,hive.metastore.uris=thrift://<templateName[0]>:9083,hive." +
       "metastore.sasl.enabled=true,hive.metastore.execute.setugi=true,hive.metastore.warehouse.dir=/apps/hive/warehouse,hive.exec.mode.local.auto=false,hive.metastore.kerberos.principal=<templateName[1]>@<templateName[2]>",
     "filename": "webhcat-site.xml",
-    "serviceName": "WEBHCAT"
+    "serviceName": "HIVE"
   },
   {
     "name": "hbase.coprocessor.master.classes",
@@ -689,7 +689,7 @@ module.exports = [
     "foreignKey": ["webHCat_http_primary_name"],
     "value": "<templateName[0]>",
     "filename": "core-site.xml",
-    "serviceName": "WEBHCAT"
+    "serviceName": "HIVE"
   },
   {
     "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
@@ -697,7 +697,7 @@ module.exports = [
     "foreignKey": ["webHCat_http_primary_name"],
     "value": "<templateName[0]>",
     "filename": "core-site.xml",
-    "serviceName": "WEBHCAT"
+    "serviceName": "HIVE"
   }
 ];
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/601014ed/ambari-web/app/data/HDP2/secure_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/secure_properties.js b/ambari-web/app/data/HDP2/secure_properties.js
index a2c3b98..95d17cd 100644
--- a/ambari-web/app/data/HDP2/secure_properties.js
+++ b/ambari-web/app/data/HDP2/secure_properties.js
@@ -663,8 +663,6 @@ module.exports =
       "serviceName": "YARN",
       "category": "NodeManager"
     },
-
-  /**********************************************WEBHCAT***************************************/
     {
       "id": "puppet var",
       "name": "webhcatserver_host",
@@ -675,7 +673,7 @@ module.exports =
       "displayType": "masterHost",
       "isVisible": true,
       "isOverridable": false,
-      "serviceName": "WEBHCAT",
+      "serviceName": "HIVE",
       "category": "WebHCat Server"
     },
     {
@@ -688,7 +686,7 @@ module.exports =
       "displayType": "principal",
       "isVisible": true,
       "isOverridable": false,
-      "serviceName": "WEBHCAT",
+      "serviceName": "HIVE",
       "category": "WebHCat Server"
     },
     {
@@ -701,7 +699,7 @@ module.exports =
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,
-      "serviceName": "WEBHCAT",
+      "serviceName": "HIVE",
       "category": "WebHCat Server"
     },