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/11/11 21:43:06 UTC

[03/17] ambari git commit: AMBARI-8276 - Alerts: Remove Nagios Service From The Stack (jonathanhurley)

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/api_testscripts/curl-setup-multiple-hbase-master.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/api_testscripts/curl-setup-multiple-hbase-master.sh b/ambari-server/src/test/resources/api_testscripts/curl-setup-multiple-hbase-master.sh
index bf29e0d..ddbd8cd 100644
--- a/ambari-server/src/test/resources/api_testscripts/curl-setup-multiple-hbase-master.sh
+++ b/ambari-server/src/test/resources/api_testscripts/curl-setup-multiple-hbase-master.sh
@@ -32,11 +32,11 @@ echo AGENT_HOST2=$AGENT_HOST2
 echo '########### Create cluster ###########'
 curl -i -X POST -d "{\"Clusters\": {\"version\" : \"HDP-1.2.0\"}}" http://$SERVER_HOST:8080/api/v1/clusters/c1
 echo '########### Set service names ###########'
-curl -i -X POST -d "[{\"ServiceInfo\":{\"service_name\":\"HDFS\"}},{\"ServiceInfo\":{\"service_name\":\"MAPREDUCE\"}},{\"ServiceInfo\":{\"service_name\":\"NAGIOS\"}},{\"ServiceInfo\":{\"service_name\":\"GANGLIA\"}},{\"ServiceInfo\":{\"service_name\":\"HBASE\"}},{\"ServiceInfo\":{\"service_name\":\"ZOOKEEPER\"}}]" http://$SERVER_HOST:8080/api/v1/clusters/c1/services
+curl -i -X POST -d "[{\"ServiceInfo\":{\"service_name\":\"HDFS\"}},{\"ServiceInfo\":{\"service_name\":\"MAPREDUCE\"}},{\"ServiceInfo\":{\"service_name\":\"GANGLIA\"}},{\"ServiceInfo\":{\"service_name\":\"HBASE\"}},{\"ServiceInfo\":{\"service_name\":\"ZOOKEEPER\"}}]" http://$SERVER_HOST:8080/api/v1/clusters/c1/services
 echo '########### Create configs ###########'
 
 echo '########### Create global config ###########'
-curl -i -X POST -d "{\"type\":\"global\",\"tag\":\"version1\",\"properties\":{\"dfs_name_dir\":\"/hadoop/hdfs/namenode\",\"fs_checkpoint_dir\":\"/hadoop/hdfs/namesecondary\",\"dfs_data_dir\":\"/hadoop/hdfs/data\",\"hdfs_log_dir_prefix\":\"/var/log/hadoop\",\"hadoop_pid_dir_prefix\":\"/var/run/hadoop\",\"dfs_webhdfs_enabled\":false,\"hadoop_heapsize\":\"1024\",\"namenode_heapsize\":\"1024m\",\"namenode_opt_newsize\":\"200m\",\"namenode_opt_maxnewsize\":\"640m\",\"namenode_opt_permsize\":\"128m\",\"namenode_opt_maxpermsize\":\"256m\",\"datanode_du_reserved\":\"1\",\"dtnode_heapsize\":\"1024m\",\"dfs_datanode_failed_volume_tolerated\":\"0\",\"fs_checkpoint_period\":\"21600\",\"fs_checkpoint_size\":\"0.5\",\"dfs_exclude\":\"dfs.exclude\",\"dfs_include\":\"dfs.include\",\"dfs_replication\":\"3\",\"dfs_block_local_path_access_user\":\"hbase\",\"dfs_datanode_data_dir_perm\":\"750\",\"security_enabled\":false,\"kerberos_domain\":\"EXAMPLE.COM\",\"kadmin_pw\":\"\",\"keytab_path\":\"/etc/secu
 rity/keytabs\",\"namenode_formatted_mark_dir\":\"/var/run/hadoop/hdfs/namenode/formatted/\",\"hcat_conf_dir\":\"\",\"mapred_local_dir\":\"/hadoop/mapred\",\"mapred_system_dir\":\"/mapred/system\",\"scheduler_name\":\"org.apache.hadoop.mapred.CapacityTaskScheduler\",\"jtnode_opt_newsize\":\"200m\",\"jtnode_opt_maxnewsize\":\"200m\",\"jtnode_heapsize\":\"1024m\",\"mapred_map_tasks_max\":\"4\",\"mapred_red_tasks_max\":\"2\",\"mapred_cluster_map_mem_mb\":\"-1\",\"mapred_cluster_red_mem_mb\":\"-1\",\"mapred_cluster_max_map_mem_mb\":\"-1\",\"mapred_cluster_max_red_mem_mb\":\"-1\",\"mapred_job_map_mem_mb\":\"-1\",\"mapred_job_red_mem_mb\":\"-1\",\"mapred_child_java_opts_sz\":\"768\",\"io_sort_mb\":\"200\",\"io_sort_spill_percent\":\"0.9\",\"mapreduce_userlog_retainhours\":\"24\",\"maxtasks_per_job\":\"-1\",\"lzo_enabled\":false,\"snappy_enabled\":true,\"rca_enabled\":true,\"mapred_hosts_exclude\":\"mapred.exclude\",\"mapred_hosts_include\":\"mapred.include\",\"mapred_jobstatus_dir\":\"file
 :////mapred/jobstatus\",\"task_controller\":\"org.apache.hadoop.mapred.DefaultTaskController\",\"hbase_log_dir\":\"/var/log/hbase\",\"hbase_pid_dir\":\"/var/run/hbase\",\"hbase_regionserver_heapsize\":\"1024m\",\"hbase_regionserver_xmn_max\":\"512\",\"hbase_regionserver_xmn_ratio\":\"0.2\",\"hbase_master_heapsize\":\"1024m\",\"hstore_compactionthreshold\":\"3\",\"hfile_blockcache_size\":\"0.25\",\"hstorefile_maxsize\":\"1073741824\",\"regionserver_handlers\":\"30\",\"hregion_majorcompaction\":\"86400000\",\"hregion_blockmultiplier\":\"2\",\"hregion_memstoreflushsize\":\"134217728\",\"client_scannercaching\":\"100\",\"zookeeper_sessiontimeout\":\"60000\",\"hfile_max_keyvalue_size\":\"10485760\",\"hbase_hdfs_root_dir\":\"/apps/hbase/data\",\"hbase_tmp_dir\":\"/var/log/hbase\",\"hdfs_enable_shortcircuit_read\":true,\"hdfs_enable_shortcircuit_skipchecksum\":false,\"hdfs_support_append\":true,\"hstore_blockingstorefiles\":7,\"regionserver_memstore_lab\":true,\"regionserver_memstore_lower
 limit\":\"0.35\",\"regionserver_memstore_upperlimit\":\"0.4\",\"zk_data_dir\":\"/hadoop/zookeeper\",\"zk_log_dir\":\"/var/log/zookeeper\",\"zk_pid_dir\":\"/var/run/zookeeper\",\"zk_pid_file\":\"/var/run/zookeeper/zookeeper_server.pid\",\"tickTime\":\"2000\",\"initLimit\":\"10\",\"syncLimit\":\"5\",\"clientPort\":\"2181\",\"nagios_user\":\"nagios\",\"nagios_group\":\"nagios\",\"nagios_web_login\":\"nagiosadmin\",\"nagios_web_password\":\"password\",\"nagios_contact\":\"x@x.x\",\"hbase_conf_dir\":\"/etc/hbase\",\"proxyuser_group\":\"users\",\"dfs_datanode_address\":\"50010\",\"dfs_datanode_http_address\":\"50075\",\"apache_artifacts_download_url\":\"\",\"ganglia_runtime_dir\":\"/var/run/ganglia/hdp\",\"gmetad_user\":\"nobody\",\"gmond_user\":\"nobody\",\"ganglia_shell_cmds_dir\":\"/usr/libexec/hdp/ganglia\",\"webserver_group\":\"apache\",\"java64_home\":\"/usr/jdk/jdk1.6.0_31\",\"run_dir\":\"/var/run/hadoop\",\"hadoop_conf_dir\":\"/etc/hadoop\",\"hcat_metastore_port\":\"/usr/lib/hcata
 log/share/hcatalog\",\"hcat_lib\":\"/usr/lib/hcatalog/share/hcatalog\",\"hcat_dbroot\":\"/usr/lib/hcatalog/share/hcatalog\",\"hdfs_user\":\"hdfs\",\"mapred_user\":\"mapred\",\"hbase_user\":\"hbase\",\"hive_user\":\"hive\",\"hcat_user\":\"hcat\",\"webhcat_user\":\"hcat\",\"oozie_user\":\"oozie\",\"oozie_conf_dir\":\"/etc/oozie\",\"pig_conf_dir\":\"/etc/pig\",\"pig_user\":\"pig\",\"sqoop_conf_dir\":\"/etc/sqoop\",\"sqoop_lib\":\"/usr/lib/sqoop/lib/\",\"sqoop_user\":\"sqoop\",\"zk_user\":\"zookeeper\",\"user_group\":\"hadoop\",\"zk_conf_dir\":\"/etc/conf/\"}}" http://$SERVER_HOST:8080/api/v1/clusters/c1/configurations
+curl -i -X POST -d "{\"type\":\"global\",\"tag\":\"version1\",\"properties\":{\"dfs_name_dir\":\"/hadoop/hdfs/namenode\",\"fs_checkpoint_dir\":\"/hadoop/hdfs/namesecondary\",\"dfs_data_dir\":\"/hadoop/hdfs/data\",\"hdfs_log_dir_prefix\":\"/var/log/hadoop\",\"hadoop_pid_dir_prefix\":\"/var/run/hadoop\",\"dfs_webhdfs_enabled\":false,\"hadoop_heapsize\":\"1024\",\"namenode_heapsize\":\"1024m\",\"namenode_opt_newsize\":\"200m\",\"namenode_opt_maxnewsize\":\"640m\",\"namenode_opt_permsize\":\"128m\",\"namenode_opt_maxpermsize\":\"256m\",\"datanode_du_reserved\":\"1\",\"dtnode_heapsize\":\"1024m\",\"dfs_datanode_failed_volume_tolerated\":\"0\",\"fs_checkpoint_period\":\"21600\",\"fs_checkpoint_size\":\"0.5\",\"dfs_exclude\":\"dfs.exclude\",\"dfs_include\":\"dfs.include\",\"dfs_replication\":\"3\",\"dfs_block_local_path_access_user\":\"hbase\",\"dfs_datanode_data_dir_perm\":\"750\",\"security_enabled\":false,\"kerberos_domain\":\"EXAMPLE.COM\",\"kadmin_pw\":\"\",\"keytab_path\":\"/etc/secu
 rity/keytabs\",\"namenode_formatted_mark_dir\":\"/var/run/hadoop/hdfs/namenode/formatted/\",\"hcat_conf_dir\":\"\",\"mapred_local_dir\":\"/hadoop/mapred\",\"mapred_system_dir\":\"/mapred/system\",\"scheduler_name\":\"org.apache.hadoop.mapred.CapacityTaskScheduler\",\"jtnode_opt_newsize\":\"200m\",\"jtnode_opt_maxnewsize\":\"200m\",\"jtnode_heapsize\":\"1024m\",\"mapred_map_tasks_max\":\"4\",\"mapred_red_tasks_max\":\"2\",\"mapred_cluster_map_mem_mb\":\"-1\",\"mapred_cluster_red_mem_mb\":\"-1\",\"mapred_cluster_max_map_mem_mb\":\"-1\",\"mapred_cluster_max_red_mem_mb\":\"-1\",\"mapred_job_map_mem_mb\":\"-1\",\"mapred_job_red_mem_mb\":\"-1\",\"mapred_child_java_opts_sz\":\"768\",\"io_sort_mb\":\"200\",\"io_sort_spill_percent\":\"0.9\",\"mapreduce_userlog_retainhours\":\"24\",\"maxtasks_per_job\":\"-1\",\"lzo_enabled\":false,\"snappy_enabled\":true,\"rca_enabled\":true,\"mapred_hosts_exclude\":\"mapred.exclude\",\"mapred_hosts_include\":\"mapred.include\",\"mapred_jobstatus_dir\":\"file
 :////mapred/jobstatus\",\"task_controller\":\"org.apache.hadoop.mapred.DefaultTaskController\",\"hbase_log_dir\":\"/var/log/hbase\",\"hbase_pid_dir\":\"/var/run/hbase\",\"hbase_regionserver_heapsize\":\"1024m\",\"hbase_regionserver_xmn_max\":\"512\",\"hbase_regionserver_xmn_ratio\":\"0.2\",\"hbase_master_heapsize\":\"1024m\",\"hstore_compactionthreshold\":\"3\",\"hfile_blockcache_size\":\"0.25\",\"hstorefile_maxsize\":\"1073741824\",\"regionserver_handlers\":\"30\",\"hregion_majorcompaction\":\"86400000\",\"hregion_blockmultiplier\":\"2\",\"hregion_memstoreflushsize\":\"134217728\",\"client_scannercaching\":\"100\",\"zookeeper_sessiontimeout\":\"60000\",\"hfile_max_keyvalue_size\":\"10485760\",\"hbase_hdfs_root_dir\":\"/apps/hbase/data\",\"hbase_tmp_dir\":\"/var/log/hbase\",\"hdfs_enable_shortcircuit_read\":true,\"hdfs_enable_shortcircuit_skipchecksum\":false,\"hdfs_support_append\":true,\"hstore_blockingstorefiles\":7,\"regionserver_memstore_lab\":true,\"regionserver_memstore_lower
 limit\":\"0.35\",\"regionserver_memstore_upperlimit\":\"0.4\",\"zk_data_dir\":\"/hadoop/zookeeper\",\"zk_log_dir\":\"/var/log/zookeeper\",\"zk_pid_dir\":\"/var/run/zookeeper\",\"zk_pid_file\":\"/var/run/zookeeper/zookeeper_server.pid\",\"tickTime\":\"2000\",\"initLimit\":\"10\",\"syncLimit\":\"5\",\"clientPort\":\"2181\",\"hbase_conf_dir\":\"/etc/hbase\",\"proxyuser_group\":\"users\",\"dfs_datanode_address\":\"50010\",\"dfs_datanode_http_address\":\"50075\",\"apache_artifacts_download_url\":\"\",\"ganglia_runtime_dir\":\"/var/run/ganglia/hdp\",\"gmetad_user\":\"nobody\",\"gmond_user\":\"nobody\",\"ganglia_shell_cmds_dir\":\"/usr/libexec/hdp/ganglia\",\"webserver_group\":\"apache\",\"java64_home\":\"/usr/jdk/jdk1.6.0_31\",\"run_dir\":\"/var/run/hadoop\",\"hadoop_conf_dir\":\"/etc/hadoop\",\"hcat_metastore_port\":\"/usr/lib/hcatalog/share/hcatalog\",\"hcat_lib\":\"/usr/lib/hcatalog/share/hcatalog\",\"hcat_dbroot\":\"/usr/lib/hcatalog/share/hcatalog\",\"hdfs_user\":\"hdfs\",\"mapred_us
 er\":\"mapred\",\"hbase_user\":\"hbase\",\"hive_user\":\"hive\",\"hcat_user\":\"hcat\",\"webhcat_user\":\"hcat\",\"oozie_user\":\"oozie\",\"oozie_conf_dir\":\"/etc/oozie\",\"pig_conf_dir\":\"/etc/pig\",\"pig_user\":\"pig\",\"sqoop_conf_dir\":\"/etc/sqoop\",\"sqoop_lib\":\"/usr/lib/sqoop/lib/\",\"sqoop_user\":\"sqoop\",\"zk_user\":\"zookeeper\",\"user_group\":\"hadoop\",\"zk_conf_dir\":\"/etc/conf/\"}}" http://$SERVER_HOST:8080/api/v1/clusters/c1/configurations
 echo '########### Create core-site config ###########'
 curl -i -X POST -d "{\"type\":\"core-site\",\"tag\":\"version1\",\"properties\":{\"io.file.buffer.size\":\"131072\",\"io.serializations\":\"org.apache.hadoop.io.serializer.WritableSerialization\",\"io.compression.codec.lzo.class\":\"com.hadoop.compression.lzo.LzoCodec\",\"fs.trash.interval\":\"360\",\"ipc.client.idlethreshold\":\"8000\",\"ipc.client.connection.maxidletime\":\"30000\",\"ipc.client.connect.max.retries\":\"50\",\"webinterface.private.actions\":\"false\",\"fs.default.name\":\"hdfs://1.ambari.ua:8020\",\"fs.checkpoint.dir\":\"/hadoop/hdfs/namesecondary\",\"fs.checkpoint.period\":\"21600\",\"fs.checkpoint.size\":\"0.5\",\"fs.checkpoint.edits.dir\":\"/hadoop/hdfs/namesecondary\"}}" http://$SERVER_HOST:8080/api/v1/clusters/c1/configurations
 echo '########### Create hdfs-site config ###########'
@@ -49,8 +49,6 @@ echo '########### Attach configs to HDFS ###########'
 curl -i -X PUT -d "{\"config\":{\"global\":\"version1\",\"core-site\":\"version1\",\"hdfs-site\":\"version1\"}}" http://$SERVER_HOST:8080/api/v1/clusters/c1/services/HDFS
 echo '########### Attach configs to MAPREDUCE ###########'
 curl -i -X PUT -d "{\"config\":{\"global\":\"version1\",\"core-site\":\"version1\",\"mapred-site\":\"version1\"}}" http://$SERVER_HOST:8080/api/v1/clusters/c1/services/MAPREDUCE
-echo '########### Attach configs to NAGIOS ###########'
-curl -i -X PUT -d "{\"config\":{\"global\":\"version1\"}}" http://$SERVER_HOST:8080/api/v1/clusters/c1/services/NAGIOS
 echo '########### Attach configs to GANGLIA ###########'
 curl -i -X PUT -d "{\"config\":{\"global\":\"version1\"}}" http://$SERVER_HOST:8080/api/v1/clusters/c1/services/GANGLIA
 echo '########### Attach configs to HBASE ###########'
@@ -61,8 +59,6 @@ echo '########### Add components to HDFS ###########'
 curl -i -X POST -d "{\"components\":[{\"ServiceComponentInfo\":{\"component_name\":\"NAMENODE\"}},{\"ServiceComponentInfo\":{\"component_name\":\"SECONDARY_NAMENODE\"}},{\"ServiceComponentInfo\":{\"component_name\":\"DATANODE\"}},{\"ServiceComponentInfo\":{\"component_name\":\"HDFS_CLIENT\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/services?ServiceInfo/service_name=HDFS
 echo '########### Add components to MAPREDUCE ###########'
 curl -i -X POST -d "{\"components\":[{\"ServiceComponentInfo\":{\"component_name\":\"JOBTRACKER\"}},{\"ServiceComponentInfo\":{\"component_name\":\"TASKTRACKER\"}},{\"ServiceComponentInfo\":{\"component_name\":\"MAPREDUCE_CLIENT\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/services?ServiceInfo/service_name=MAPREDUCE
-echo '########### Add components to NAGIOS ###########'
-curl -i -X POST -d "{\"components\":[{\"ServiceComponentInfo\":{\"component_name\":\"NAGIOS_SERVER\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/services?ServiceInfo/service_name=NAGIOS
 echo '########### Add components to GANGLIA ###########'
 curl -i -X POST -d "{\"components\":[{\"ServiceComponentInfo\":{\"component_name\":\"GANGLIA_SERVER\"}},{\"ServiceComponentInfo\":{\"component_name\":\"GANGLIA_MONITOR\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/services?ServiceInfo/service_name=GANGLIA
 echo '########### Add components to HBASE ###########'
@@ -76,7 +72,6 @@ echo '########### Deploy components to hosts ###########'
 curl -i -X POST -d "{\"host_components\":[{\"HostRoles\":{\"component_name\":\"NAMENODE\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/hosts?Hosts/host_name=$AGENT_HOST1
 curl -i -X POST -d "{\"host_components\":[{\"HostRoles\":{\"component_name\":\"SECONDARY_NAMENODE\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/hosts?Hosts/host_name=$AGENT_HOST2
 curl -i -X POST -d "{\"host_components\":[{\"HostRoles\":{\"component_name\":\"JOBTRACKER\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/hosts?Hosts/host_name=$AGENT_HOST2
-curl -i -X POST -d "{\"host_components\":[{\"HostRoles\":{\"component_name\":\"NAGIOS_SERVER\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/hosts?Hosts/host_name=$AGENT_HOST1
 curl -i -X POST -d "{\"host_components\":[{\"HostRoles\":{\"component_name\":\"GANGLIA_SERVER\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/hosts?Hosts/host_name=$AGENT_HOST1
 curl -i -X POST -d "{\"host_components\":[{\"HostRoles\":{\"component_name\":\"HBASE_MASTER\"}}]}" "http://$SERVER_HOST:8080/api/v1/clusters/c1/hosts?Hosts/host_name=$AGENT_HOST1|Hosts/host_name=$AGENT_HOST2"
 curl -i -X POST -d "{\"host_components\":[{\"HostRoles\":{\"component_name\":\"ZOOKEEPER_SERVER\"}}]}" http://$SERVER_HOST:8080/api/v1/clusters/c1/hosts?Hosts/host_name=$AGENT_HOST1

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/deploy_HDP2.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/deploy_HDP2.sh b/ambari-server/src/test/resources/deploy_HDP2.sh
index f9bed8a..e9a9396 100644
--- a/ambari-server/src/test/resources/deploy_HDP2.sh
+++ b/ambari-server/src/test/resources/deploy_HDP2.sh
@@ -19,7 +19,7 @@ curl -i -X POST -d '{"Clusters": {"version" : "HDP-2.0.1"}}' -u admin:admin http
 echo "-----------------------Cluster-----------------------"
 curl -i -X POST -d '[{"ServiceInfo":{"service_name":"HDFS"}},{"ServiceInfo":{"service_name":"YARN"}}, {"ServiceInfo":{"service_name":"MAPREDUCEv2"}}, {"ServiceInfo":{"service_name":"TEZ"}}]' -u admin:admin http://localhost:8080/api/v1/clusters/c1/services
 echo "-----------------------Services-----------------------"
-curl -i -X PUT -d '{"Clusters":{"desired_configs":{"type":"global","tag":"version1","properties":{"hive_lib":"/usr/lib/hive/lib/","hadoop_heapsize":"1024","hive_log_dir":"/var/log/hive","dfs_datanode_http_address":"50075","zk_user":"zookeeper","dfs_data_dir":"/grid/0/hadoop/hdfs/data,/grid/1/hadoop/hdfs/data","clientPort":"2181","hdfs_user":"hdfs","hive_dbroot":"/usr/lib/hive/lib","dfs_name_dir":"/grid/0/hadoop/hdfs/namenode,/grid/1/hadoop/hdfs/namenode","hfile_blockcache_size":"0.25","kadmin_pw":"","gmond_user":"nobody","hregion_majorcompaction":"86400000","user_group":"hadoop","dfs_datanode_failed_volume_tolerated":"0","zk_pid_file":"/var/run/zookeeper/zookeeper_server.pid","zookeeper_sessiontimeout":"60000","hcat_user":"hcat","zk_log_dir":"/var/log/zookeeper","oozie_derby_database":"Derby","hbase_conf_dir":"/etc/hbase","oozie_data_dir":"/grid/0/hadoop/oozie/data","dfs_replication":"3","fs_checkpoint_period":"21600","hive_database_type":"mysql","hbase_hdfs_root_dir":"/apps/hbase/d
 ata","run_dir":"/var/run/hadoop","oozie_log_dir":"/var/log/oozie","hbase_pid_dir":"/var/run/hbase","hive_user":"hive","security_enabled":"false","dfs_datanode_address":"50010","dfs_block_local_path_access_user":"hbase","dfs_datanode_data_dir_perm":"750","nagios_web_password":"admin","dtnode_heapsize":"1024m","tickTime":"2000","oozie_database":"New Derby Database","regionserver_memstore_upperlimit":"0.4","datanode_du_reserved":"1","hbase_tmp_dir":"/var/log/hbase","java64_home":"/usr/jdk/jdk1.6.0_31","oozie_user":"oozie","hive_metastore_port":"9083","namenode_heapsize":"1024m","nagios_contact":"a@d.m","oozie_JPAService_url":"${oozie.data.dir}/${oozie.db.schema.name}-db;create\u003dtrue","hive_ambari_database":"MySQL","oozie_jdbc_driver":"org.apache.derby.jdbc.EmbeddedDriver","zk_data_dir":"/grid/0/hadoop/zookeeper","hive_pid_dir":"/var/run/hive","mysql_connector_url":"${download_url}/mysql-connector-java-5.1.18.zip","hregion_blockmultiplier":"2","oozie_pid_dir":"/var/run/oozie","gmeta
 d_user":"nobody","oozie_metastore_user_name":"oozie","hive_metastore_user_passwd":"admin","hcat_log_dir":"/var/log/webhcat","hive_hostname":"HOST","syncLimit":"5","mapred_user":"mapred","fs_checkpoint_size":"0.5","initLimit":"10","hive_database":"New MySQL Database","hive_jdbc_driver":"com.mysql.jdbc.Driver","hive_conf_dir":"/etc/hive/conf","hdfs_log_dir_prefix":"/var/log/hadoop","keytab_path":"/etc/security/keytabs","proxyuser_group":"users","hive_database_name":"hive","client_scannercaching":"100","hcat_pid_dir":"/var/run/webhcat","hdfs_enable_shortcircuit_read":"true","kerberos_domain":"EXAMPLE.COM","nagios_group":"nagios","hdfs_support_append":"true","nagios_web_login":"nagiosadmin","oozie_database_type":"derby","namenode_formatted_mark_dir":"/var/run/hadoop/hdfs/namenode/formatted/","dfs_exclude":"dfs.exclude","namenode_opt_maxnewsize":"640m","oozie_database_name":"oozie","regionserver_memstore_lab":"true","namenode_opt_newsize":"200m","namenode_opt_permsize":"128m","namenode_o
 pt_maxpermsize":"256m","smokeuser":"ambari-qa","nagios_user":"nagios","hcat_conf_dir":"","regionserver_memstore_lowerlimit":"0.35","apache_artifacts_download_url":"","hive_metastore_user_name":"hive","hstore_blockingstorefiles":"7","hadoop_conf_dir":"/etc/hadoop","oozie_metastore_user_passwd":"admin","hbase_user":"hbase","ganglia_runtime_dir":"/var/run/ganglia/hdp","fs_checkpoint_dir":"/grid/0/hadoop/hdfs/namesecondary","zk_pid_dir":"/var/run/zookeeper","hfile_max_keyvalue_size":"10485760","hive_aux_jars_path":"/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar","hstore_compactionthreshold":"3","hregion_memstoreflushsize":"134217728","hadoop_pid_dir_prefix":"/var/run/hadoop","hbase_log_dir":"/var/log/hbase","webhcat_user":"hcat","regionserver_handlers":"30","hbase_regionserver_heapsize":"1024m","hbase_regionserver_xmn_max":"512","hbase_regionserver_xmn_ratio":"0.2","dfs_include":"dfs.include","dfs_webhdfs_enabled":"true","rrdcached_base_dir":"/var/lib/ganglia/rrds","hstorefile_maxsi
 ze":"1073741824","hbase_master_heapsize":"1024m"}}}}' -u admin:admin http://localhost:8080/api/v1/clusters/c1
+curl -i -X PUT -d '{"Clusters":{"desired_configs":{"type":"global","tag":"version1","properties":{"hive_lib":"/usr/lib/hive/lib/","hadoop_heapsize":"1024","hive_log_dir":"/var/log/hive","dfs_datanode_http_address":"50075","zk_user":"zookeeper","dfs_data_dir":"/grid/0/hadoop/hdfs/data,/grid/1/hadoop/hdfs/data","clientPort":"2181","hdfs_user":"hdfs","hive_dbroot":"/usr/lib/hive/lib","dfs_name_dir":"/grid/0/hadoop/hdfs/namenode,/grid/1/hadoop/hdfs/namenode","hfile_blockcache_size":"0.25","kadmin_pw":"","gmond_user":"nobody","hregion_majorcompaction":"86400000","user_group":"hadoop","dfs_datanode_failed_volume_tolerated":"0","zk_pid_file":"/var/run/zookeeper/zookeeper_server.pid","zookeeper_sessiontimeout":"60000","hcat_user":"hcat","zk_log_dir":"/var/log/zookeeper","oozie_derby_database":"Derby","hbase_conf_dir":"/etc/hbase","oozie_data_dir":"/grid/0/hadoop/oozie/data","dfs_replication":"3","fs_checkpoint_period":"21600","hive_database_type":"mysql","hbase_hdfs_root_dir":"/apps/hbase/d
 ata","run_dir":"/var/run/hadoop","oozie_log_dir":"/var/log/oozie","hbase_pid_dir":"/var/run/hbase","hive_user":"hive","security_enabled":"false","dfs_datanode_address":"50010","dfs_block_local_path_access_user":"hbase","dfs_datanode_data_dir_perm":"750","dtnode_heapsize":"1024m","tickTime":"2000","oozie_database":"New Derby Database","regionserver_memstore_upperlimit":"0.4","datanode_du_reserved":"1","hbase_tmp_dir":"/var/log/hbase","java64_home":"/usr/jdk/jdk1.6.0_31","oozie_user":"oozie","hive_metastore_port":"9083","namenode_heapsize":"1024m","oozie_JPAService_url":"${oozie.data.dir}/${oozie.db.schema.name}-db;create\u003dtrue","hive_ambari_database":"MySQL","oozie_jdbc_driver":"org.apache.derby.jdbc.EmbeddedDriver","zk_data_dir":"/grid/0/hadoop/zookeeper","hive_pid_dir":"/var/run/hive","mysql_connector_url":"${download_url}/mysql-connector-java-5.1.18.zip","hregion_blockmultiplier":"2","oozie_pid_dir":"/var/run/oozie","gmetad_user":"nobody","oozie_metastore_user_name":"oozie","h
 ive_metastore_user_passwd":"admin","hcat_log_dir":"/var/log/webhcat","hive_hostname":"HOST","syncLimit":"5","mapred_user":"mapred","fs_checkpoint_size":"0.5","initLimit":"10","hive_database":"New MySQL Database","hive_jdbc_driver":"com.mysql.jdbc.Driver","hive_conf_dir":"/etc/hive/conf","hdfs_log_dir_prefix":"/var/log/hadoop","keytab_path":"/etc/security/keytabs","proxyuser_group":"users","hive_database_name":"hive","client_scannercaching":"100","hcat_pid_dir":"/var/run/webhcat","hdfs_enable_shortcircuit_read":"true","kerberos_domain":"EXAMPLE.COM","hdfs_support_append":"true","oozie_database_type":"derby","namenode_formatted_mark_dir":"/var/run/hadoop/hdfs/namenode/formatted/","dfs_exclude":"dfs.exclude","namenode_opt_maxnewsize":"640m","oozie_database_name":"oozie","regionserver_memstore_lab":"true","namenode_opt_newsize":"200m","namenode_opt_permsize":"128m","namenode_opt_maxpermsize":"256m","smokeuser":"ambari-qa","hcat_conf_dir":"","regionserver_memstore_lowerlimit":"0.35","apa
 che_artifacts_download_url":"","hive_metastore_user_name":"hive","hstore_blockingstorefiles":"7","hadoop_conf_dir":"/etc/hadoop","oozie_metastore_user_passwd":"admin","hbase_user":"hbase","ganglia_runtime_dir":"/var/run/ganglia/hdp","fs_checkpoint_dir":"/grid/0/hadoop/hdfs/namesecondary","zk_pid_dir":"/var/run/zookeeper","hfile_max_keyvalue_size":"10485760","hive_aux_jars_path":"/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar","hstore_compactionthreshold":"3","hregion_memstoreflushsize":"134217728","hadoop_pid_dir_prefix":"/var/run/hadoop","hbase_log_dir":"/var/log/hbase","webhcat_user":"hcat","regionserver_handlers":"30","hbase_regionserver_heapsize":"1024m","hbase_regionserver_xmn_max":"512","hbase_regionserver_xmn_ratio":"0.2","dfs_include":"dfs.include","dfs_webhdfs_enabled":"true","rrdcached_base_dir":"/var/lib/ganglia/rrds","hstorefile_maxsize":"1073741824","hbase_master_heapsize":"1024m"}}}}' -u admin:admin http://localhost:8080/api/v1/clusters/c1
 echo "-----------------------Global configs-----------------------"
 curl -i -X PUT -d `echo '{"Clusters":{"desired_configs":{"type":"core-site","tag":"version1","properties":{"io.file.buffer.size":"131072","io.serializations":"org.apache.hadoop.io.serializer.WritableSerialization","io.compression.codecs":"","io.compression.codec.lzo.class":"com.hadoop.compression.lzo.LzoCodec","fs.default.name":"hdfs://HOST:8020","fs.trash.interval":"360","fs.checkpoint.dir":"","fs.checkpoint.edits.dir":"${fs.checkpoint.dir}","fs.checkpoint.period":"21600","fs.checkpoint.size":"536870912","ipc.client.idlethreshold":"8000","ipc.client.connection.maxidletime":"30000","ipc.client.connect.max.retries":"50","webinterface.private.actions":"false","hadoop.security.authentication":"","hadoop.security.authorization":"","hadoop.security.auth_to_local":""}}}}' | sed s/HOST/$HOST/g` -u admin:admin http://localhost:8080/api/v1/clusters/c1
 echo "-----------------------core-site-----------------------"

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/gsInstaller-hosts.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/gsInstaller-hosts.txt b/ambari-server/src/test/resources/gsInstaller-hosts.txt
index 7d4b74c..1bd85f4 100644
--- a/ambari-server/src/test/resources/gsInstaller-hosts.txt
+++ b/ambari-server/src/test/resources/gsInstaller-hosts.txt
@@ -32,4 +32,3 @@ OOZIE OOZIE_CLIENT ip-10-190-97-104.ec2.internal
 OOZIE OOZIE_SERVER ip-10-8-113-183.ec2.internal
 GANGLIA GANGLIA ip-10-190-97-104.ec2.internal
 GANGLIA GANGLIA_MONITOR ip-10-190-97-104.ec2.internal
-NAGIOS NAGIOS_SERVER ip-10-190-97-104.ec2.internal

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/nagios_alerts.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/nagios_alerts.txt b/ambari-server/src/test/resources/nagios_alerts.txt
deleted file mode 100644
index e5f04d6..0000000
--- a/ambari-server/src/test/resources/nagios_alerts.txt
+++ /dev/null
@@ -1,605 +0,0 @@
-{
-    "alerts": [
-        {
-            "service_description": "Ambari Agent process",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.000 second response time on port 8670",
-            "last_hard_state_change": "1389125372",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288692",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288692",
-            "service_type": "AMBARI"
-        },
-        {
-            "service_description": "Ganglia Monitor process for HBase Master",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.032 second response time on port 8663",
-            "last_hard_state_change": "1389125380",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288714",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "GANGLIA"
-        },
-        {
-            "service_description": "Ganglia Monitor process for JobTracker",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.001 second response time on port 8662",
-            "last_hard_state_change": "1389125389",
-            "long_plugin_output": "AMBARIPASSIVE=2\n",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288714",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "GANGLIA"
-        },
-        {
-            "service_description": "Ganglia Monitor process for NameNode",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.001 second response time on port 8661",
-            "last_hard_state_change": "1389125397",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288714",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "GANGLIA"
-        },
-        {
-            "service_description": "Ganglia Server process",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.000 second response time on port 8651",
-            "last_hard_state_change": "1389125406",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288714",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "GANGLIA"
-        },
-        {
-            "service_description": "Percent RegionServers live",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "3",
-            "current_state": "2",
-            "plugin_output": "CRITICAL: total:<1>, affected:<1>",
-            "last_hard_state_change": "1389145364",
-            "last_hard_state": "2",
-            "last_time_ok": "1389057717",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "1389288711",
-            "is_flapping": "0",
-            "last_check": "1389288711",
-            "service_type": "HBASE"
-        },
-        {
-            "service_description": "HBase Master CPU utilization on c6401.ambari.apache.org",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "1 CPU, load 7.0% < 200% : OK",
-            "last_hard_state_change": "",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288443",
-            "last_time_warning": "0",
-            "last_time_unknown": "1389034859",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288443",
-            "service_type": "HBASE"
-        },
-        {
-            "service_description": "HBase Master process on c6401.ambari.apache.org",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "4",
-            "current_state": "2",
-            "plugin_output": "Connection refused",
-            "last_hard_state_change": "1389158776",
-            "last_hard_state": "2",
-            "last_time_ok": "1389100994",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "1389288714",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "HBASE"
-        },
-        {
-            "service_description": "Blocks health",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: corrupt_blocks:<0>, missing_blocks:<0>, total_blocks:<17>",
-            "last_hard_state_change": "1389125440",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288640",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288640",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "HDFS capacity utilization",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: DFSUsedGB:<0>, DFSTotalGB:<462.4>",
-            "last_hard_state_change": "1389125448",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288648",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288648",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "NameNode RPC latency on c6401.ambari.apache.org",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: RpcQueueTime_avg_time:<0> Secs, RpcProcessingTime_avg_time:<0> Secs",
-            "last_hard_state_change": "1389125457",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288664",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288664",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "Percent DataNodes live",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: total:<1>, affected:<0>",
-            "last_hard_state_change": "1389125465",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288714",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "Percent DataNodes with space available",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: total:<1>, affected:<0>",
-            "last_hard_state_change": "1389125375",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288684",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288684",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "Percent TaskTrackers live",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: total:<1>, affected:<0>",
-            "last_hard_state_change": "1389125383",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288703",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288703",
-            "service_type": "MAPREDUCE"
-        },
-        {
-            "service_description": "Nagios status log freshness",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "NAGIOS OK: 5 processes, status log updated 8 seconds ago",
-            "last_hard_state_change": "1389125392",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288592",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288592",
-            "service_type": "NAGIOS"
-        },
-        {
-            "service_description": "NameNode Web UI on c6401.ambari.apache.org",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: Successfully accessed namenode Web UI",
-            "last_hard_state_change": "1389125400",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288720",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288720",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "NameNode edit logs directory status on c6401.ambari.apache.org",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: All NameNode directories are active",
-            "last_hard_state_change": "1389125409",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288714",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "NameNode host CPU utilization on c6401.ambari.apache.org",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "1 CPU, load 7.0% < 200% : OK",
-            "last_hard_state_change": "1389125417",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288437",
-            "last_time_warning": "0",
-            "last_time_unknown": "1389034853",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288437",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "NameNode process on c6401.ambari.apache.org",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.001 second response time on port 8020",
-            "last_hard_state_change": "1389125426",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288714",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "Percent ZooKeeper Servers live",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: total:<3>, affected:<0>",
-            "last_hard_state_change": "1389125434",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288714",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "ZOOKEEPER"
-        },
-        {
-            "service_description": "ZooKeeper Server process",
-            "host_name": "c6401.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.004 second response time on port 2181",
-            "last_hard_state_change": "1389125443",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288703",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288703",
-            "service_type": "ZOOKEEPER"
-        },
-        {
-            "service_description": "Ambari Agent process",
-            "host_name": "c6402.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.000 second response time on port 8670",
-            "last_hard_state_change": "1389125451",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288711",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288711",
-            "service_type": "AMBARI"
-        },
-        {
-            "service_description": "HistoryServer Web UI",
-            "host_name": "c6402.ambari.apache.org",
-            "current_attempt": "3",
-            "current_state": "1",
-            "plugin_output": "WARNING: HistoryServer Web UI not accessible : http://c6402.ambari.apache.org:51111/jobhistoryhome.jsp",
-            "last_hard_state_change": "1389125580",
-            "last_hard_state": "1",
-            "last_time_ok": "0",
-            "last_time_warning": "1389288720",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288720",
-            "service_type": "MAPREDUCE"
-        },
-        {
-            "service_description": "JobTracker CPU utilization",
-            "host_name": "c6402.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "1 CPU, load 2.0% < 200% : OK",
-            "last_hard_state_change": "1389125468",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288668",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288668",
-            "service_type": "MAPREDUCE"
-        },
-        {
-            "service_description": "JobTracker Web UI",
-            "host_name": "c6402.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: Successfully accessed jobtracker Web UI",
-            "last_hard_state_change": "1389125378",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288684",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288684",
-            "service_type": "MAPREDUCE"
-        },
-        {
-            "service_description": "JobTracker process",
-            "host_name": "c6402.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.000 second response time on port 50030",
-            "last_hard_state_change": "1389125386",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288713",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288713",
-            "service_type": "MAPREDUCE"
-        },
-        {
-            "service_description": "JobTracker RPC latency",
-            "host_name": "c6402.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: RpcQueueTime_avg_time:<0.09> Secs, RpcProcessingTime_avg_time:<0.03> Secs",
-            "last_hard_state_change": "1389125395",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288595",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288595",
-            "service_type": "MAPREDUCE"
-        },
-        {
-            "service_description": "Secondary NameNode process",
-            "host_name": "c6402.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.001 second response time on port 50090",
-            "last_hard_state_change": "1389125403",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288723",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288723",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "ZooKeeper Server process",
-            "host_name": "c6402.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.000 second response time on port 2181",
-            "last_hard_state_change": "1389125412",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288672",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288672",
-            "service_type": "ZOOKEEPER"
-        },
-        {
-            "service_description": "MapReduce local dir space",
-            "host_name": "c6403.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: MapReduce local dir space is available.",
-            "last_hard_state_change": "1389125420",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288714",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288714",
-            "service_type": "UNKNOWN"
-        },
-        {
-            "service_description": "Ambari Agent process",
-            "host_name": "c6403.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.001 second response time on port 8670",
-            "last_hard_state_change": "1389125428",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288688",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288688",
-            "service_type": "AMBARI"
-        },
-        {
-            "service_description": "DataNode process",
-            "host_name": "c6403.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.027 second response time on port 50075",
-            "last_hard_state_change": "1389125437",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288684",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288684",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "DataNode space",
-            "host_name": "c6403.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "OK: Capacity:[524208947200], Remaining Capacity:[496455069696], percent_full:[5.2944303320735]",
-            "last_hard_state_change": "1389125445",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288645",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288645",
-            "service_type": "HDFS"
-        },
-        {
-            "service_description": "RegionServer process",
-            "host_name": "c6403.ambari.apache.org",
-            "current_attempt": "3",
-            "current_state": "2",
-            "plugin_output": "Connection refused",
-            "last_hard_state_change": "1389145384",
-            "last_hard_state": "2",
-            "last_time_ok": "1389057677",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "1389288664",
-            "is_flapping": "0",
-            "last_check": "1389288664",
-            "service_type": "HBASE"
-        },
-        {
-            "service_description": "TaskTracker process",
-            "host_name": "c6403.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.001 second response time on port 50060",
-            "last_hard_state_change": "1389125462",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288722",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288722",
-            "service_type": "MAPREDUCE"
-        },
-        {
-            "service_description": "ZooKeeper Server process",
-            "host_name": "c6403.ambari.apache.org",
-            "current_attempt": "1",
-            "current_state": "0",
-            "plugin_output": "TCP OK - 0.000 second response time on port 2181",
-            "last_hard_state_change": "1389125471",
-            "last_hard_state": "0",
-            "last_time_ok": "1389288671",
-            "last_time_warning": "0",
-            "last_time_unknown": "0",
-            "last_time_critical": "0",
-            "is_flapping": "0",
-            "last_check": "1389288671",
-            "service_type": "ZOOKEEPER"
-        },
-        {
-          "service_description" : "Hive Metastore status",
-          "host_name" : "c6404.ambari.apache.org",
-          "current_attempt" : "1",
-          "current_state" : "0",
-          "plugin_output" : "CRITICAL: Error accessing Hive Metastore status [Exception in thread "main" java.lang.RuntimeException: java.lang.RuntimeException: Unable to instantiate org.apache.hadoop.hive.metastore.HiveMetaStoreClient",
-          "last_hard_state_change" : "1392736649",
-          "last_hard_state" : "0",
-          "last_time_ok" : "1392736799",
-          "last_time_warning" : "0",
-          "last_time_unknown" : "0",
-          "last_time_critical" : "1392736619",
-          "is_flapping" : "0",
-          "last_check" : "1392736799",
-          "long_plugin_output" : "at org.apache.hadoop.hive.ql.session.SessionState.start(SessionState.java:319)\\nat org.apache.hive.hcatalog.cli.HCatCli.main(HCatCli.java:138)\\nat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\\nat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\\nat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\\nat java.lang.reflect.Method.invoke(Method.java:597)\\nat org.apache.hadoop.util.RunJar.main(RunJar.java:212)\\nCaused by: java.lang.RuntimeException: Unable to instantiate org.apache.hadoop.hive.metastore.HiveMetaStoreClient\\nat org.apache.hadoop.hive.metastore.MetaStoreUtils.newInstance(MetaStoreUtils.java:1345)\\nat org.apache.hadoop.hive.metastore.RetryingMetaStoreClient.<init>(RetryingMetaStoreClient.java:62)\\nat org.apache.hadoop.hive.metastore.RetryingMetaStoreClient.getProxy(RetryingMetaStoreClient.java:72)\\nat org.apache.hadoop.hive.ql.metadata.Hive.creat
 eMetaStoreClient(Hive.java:2434)\\nat org.apache.hadoop.hive.ql.metadata.Hive.getMSC(Hive.java:2446)\\nat org.apache.hadoop.hive.ql.session.SessionState.start(SessionState.java:313)\\n... 6 more\\nCaused by: java.lang.reflect.InvocationTargetException\\nat sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)\\nat sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:39)\\nat sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27)\\nat java.lang.reflect.Constructor.newInstance(Constructor.java:513)\\nat org.apache.hadoop.hive.metastore.MetaStoreUtils.newInstance(MetaStoreUtils.java:1343)\\n... 11 more\\nCaused by: MetaException(message:Could not connect to meta store using any of the URIs provided. Most recent failure: org.apache.thrift.transport.TTransportException: java.net.ConnectException: Connection refused\\nat org.apache.thrift.transport.TSocket.open(TSocket.java:185)\\nat org.apac
 he.hadoop.hive.metastore.HiveMetaStoreClient.open(HiveMetaStoreClient.java:300)\\nat org.apache.hadoop.hive.metastore.HiveMetaStoreClient.<init>(HiveMetaStoreClient.java:181)\\nat sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)\\nat sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:39)\\nat sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:27)\\nat java.lang.reflect.Constructor.newInstance(Constructor.java:513)\\nat org.apache.hadoop.hive.metastore.MetaStoreUtils.newInstance(MetaStoreUtils.java:1343)\\nat org.apache.hadoop.hive.metastore.RetryingMetaStoreClient.<init>(RetryingMetaStoreClient.java:62)\\nat org.apache.hadoop.hive.metastore.RetryingMetaStoreClient.getProxy(RetryingMetaStoreClient.java:72)\\nat org.apache.hadoop.hive.ql.metadata.Hive.createMetaStoreClient(Hive.java:2434)\\nat org.apache.hadoop.hive.ql.metadata.Hive.getMSC(Hive.java:2446)\\nat org.apach
 e.hadoop.hive.ql.session.SessionState.start(SessionState.java:313)\\nat org.apache.hive.hcatalog.cli.HCatCli.main(HCatCli.java:138)\\nat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\\nat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\\nat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\\nat java.lang.reflect.Method.invoke(Method.java:597)\\nat org.apache.hadoop.util.RunJar.main(RunJar.java:212)\\nCaused by: java.net.ConnectException: Connection refused\\nat java.net.PlainSocketImpl.socketConnect(Native Method)\\nat java.net.PlainSocketImpl.doConnect(PlainSocketImpl.java:351)\\nat java.net.PlainSocketImpl.connectToAddress(PlainSocketImpl.java:213)\\nat java.net.PlainSocketImpl.connect(PlainSocketImpl.java:200)\\nat java.net.SocksSocketImpl.connect(SocksSocketImpl.java:366)\\nat java.net.Socket.connect(Socket.java:529)\\nat org.apache.thrift.transport.TSocket.open(TSocket.java:180)\\n... 18 more\\n)\\n
 at org.apache.hadoop.hive.metastore.HiveMetaStoreClient.open(HiveMetaStoreClient.java:346)\\nat org.apache.hadoop.hive.metastore.HiveMetaStoreClient.<init>(HiveMetaStoreClient.java:181)\\n... 16 more]\\nAMBARIPASSIVE=2\\n",
-          "service_type" : "HIVE"
-        }
-    ],
-    "hostcounts": {
-        "up_hosts": "4",
-        "down_hosts": "0"
-    },
-    "servicestates": {
-        "PUPPET": "0"
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/NAGIOS/metainfo.xml
deleted file mode 100644
index 4b9872f..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/services/NAGIOS/metainfo.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>NAGIOS</name>
-      <comment>Nagios Monitoring and Alerting system</comment>
-      <version>3.2.3</version>
-
-      <components>
-        <component>
-          <name>NAGIOS_SERVER</name>
-          <category>MASTER</category>
-          <cardinality>1</cardinality>
-          <commandScript>
-            <script>scripts/nagios_server.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>perl</name>
-            </package>
-            <package>
-              <name>perl-Net-SNMP</name>
-            </package>
-            <package>
-              <name>nagios-plugins-1.4.9</name>
-            </package>
-            <package>
-              <name>nagios-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-www-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-devel-3.5.0-99</name>
-            </package>
-            <package>
-              <name>fping</name>
-            </package>
-            <package>
-              <name>hdp_mon_nagios_addons</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>suse</osFamily>
-          <package>
-            <name>php5-json</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>centos5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>oraclelinux5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-      </osSpecifics>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/configuration/global.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/configuration/global.xml
deleted file mode 100644
index 61a2b90..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/configuration/global.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <property>
-    <name>nagios_user</name>
-    <value>nagios</value>
-    <description>Nagios Username.</description>
-  </property>
-  <property>
-    <name>nagios_group</name>
-    <value>nagios</value>
-    <description>Nagios Group.</description>
-  </property>
-  <property>
-    <name>nagios_web_login</name>
-    <value>nagiosadmin</value>
-    <description>Nagios web user.</description>
-  </property>
-  <property>
-    <name>nagios_web_password</name>
-    <value></value>
-    <description>Nagios Admin Password.</description>
-  </property>
-  <property>
-    <name>nagios_contact</name>
-    <value></value>
-    <description>Hadoop Admin Email.</description>
-  </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/metainfo.xml
deleted file mode 100644
index 4b9872f..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/NAGIOS/metainfo.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>NAGIOS</name>
-      <comment>Nagios Monitoring and Alerting system</comment>
-      <version>3.2.3</version>
-
-      <components>
-        <component>
-          <name>NAGIOS_SERVER</name>
-          <category>MASTER</category>
-          <cardinality>1</cardinality>
-          <commandScript>
-            <script>scripts/nagios_server.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>perl</name>
-            </package>
-            <package>
-              <name>perl-Net-SNMP</name>
-            </package>
-            <package>
-              <name>nagios-plugins-1.4.9</name>
-            </package>
-            <package>
-              <name>nagios-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-www-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-devel-3.5.0-99</name>
-            </package>
-            <package>
-              <name>fping</name>
-            </package>
-            <package>
-              <name>hdp_mon_nagios_addons</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>suse</osFamily>
-          <package>
-            <name>php5-json</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>centos5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>oraclelinux5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-      </osSpecifics>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NAGIOS/metainfo.xml
deleted file mode 100644
index 4b9872f..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/services/NAGIOS/metainfo.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>NAGIOS</name>
-      <comment>Nagios Monitoring and Alerting system</comment>
-      <version>3.2.3</version>
-
-      <components>
-        <component>
-          <name>NAGIOS_SERVER</name>
-          <category>MASTER</category>
-          <cardinality>1</cardinality>
-          <commandScript>
-            <script>scripts/nagios_server.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>perl</name>
-            </package>
-            <package>
-              <name>perl-Net-SNMP</name>
-            </package>
-            <package>
-              <name>nagios-plugins-1.4.9</name>
-            </package>
-            <package>
-              <name>nagios-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-www-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-devel-3.5.0-99</name>
-            </package>
-            <package>
-              <name>fping</name>
-            </package>
-            <package>
-              <name>hdp_mon_nagios_addons</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>suse</osFamily>
-          <package>
-            <name>php5-json</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>centos5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>oraclelinux5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-      </osSpecifics>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml
deleted file mode 100644
index 4b0e6b1..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/1.3.4/services/NAGIOS/metainfo.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>NAGIOS</name>
-      <comment>Nagios Monitoring and Alerting system</comment>
-      <version>3.5.0</version>
-      <components>
-        <component>
-            <name>NAGIOS_SERVER</name>
-            <category>MASTER</category>
-            <cardinality>1</cardinality>
-            <commandScript>
-              <script>scripts/nagios_server.py</script>
-              <scriptType>PYTHON</scriptType>
-              <timeout>600</timeout>
-            </commandScript>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>perl</name>
-            </package>
-            <package>
-              <name>perl-Net-SNMP</name>
-            </package>
-            <package>
-              <name>nagios-plugins-1.4.9</name>
-            </package>
-            <package>
-              <name>nagios-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-www-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-devel-3.5.0-99</name>
-            </package>
-            <package>
-              <name>fping</name>
-            </package>
-            <package>
-              <name>hdp_mon_nagios_addons</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>suse</osFamily>
-          <package>
-            <name>php5-json</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>centos5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>oraclelinux5</osFamily>
-          <package>
-            <name>php-pecl-json.x86_64</name>
-          </package>
-        </osSpecific>
-      </osSpecifics>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/NAGIOS/metainfo.xml
deleted file mode 100644
index dafd3c3..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/NAGIOS/metainfo.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>NAGIOS</name>
-      <comment>Nagios Monitoring and Alerting system</comment>
-      <version>3.2.3</version>
-
-      <components>
-        <component>
-          <name>NAGIOS_SERVER</name>
-          <category>MASTER</category>
-          <commandScript>
-            <script>scripts/nagios_server.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>perl</name>
-            </package>
-            <package>
-              <name>perl-Net-SNMP</name>
-            </package>
-            <package>
-              <name>nagios-plugins</name>
-            </package>
-            <package>
-              <name>nagios</name>
-            </package>
-            <package>
-              <name>nagios-www</name>
-            </package>
-            <package>
-              <name>nagios-devel</name>
-            </package>
-            <package>
-              <name>fping</name>
-            </package>
-            <package>
-              <name>hdp_mon_nagios_addons</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>suse11</osFamily>
-          <packages>
-            <package>
-              <name>php5-json</name>
-            </package>
-            <package>
-              <name>apache2-mod_php5</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5</osFamily>
-          <packages>
-            <package>
-              <name>php-pecl-json.x86_64</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-      <monitoringService>true</monitoringService>
-    </service>
-  </services>
-</metainfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
deleted file mode 100644
index 28c73b5..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>NAGIOS</name>
-      <comment>Nagios Monitoring and Alerting system</comment>
-      <version>3.5.0</version>
-      <components>
-        <component>
-          <name>NAGIOS_SERVER</name>
-          <category>MASTER</category>
-          <commandScript>
-            <script>scripts/nagios_server.py</script>
-            <scriptType>PYTHON</scriptType>
-            <timeout>600</timeout>
-          </commandScript>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>perl</name>
-            </package>
-            <package>
-              <name>perl-Net-SNMP</name>
-            </package>
-            <package>
-              <name>nagios-plugins</name>
-            </package>
-            <package>
-              <name>nagios</name>
-            </package>
-            <package>
-              <name>nagios-www</name>
-            </package>
-            <package>
-              <name>nagios-devel</name>
-            </package>
-            <package>
-              <name>fping</name>
-            </package>
-            <package>
-              <name>hdp_mon_nagios_addons</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>suse11</osFamily>
-          <packages>
-            <package>
-              <name>php5-json</name>
-            </package>
-            <package>
-              <name>apache2-mod_php5</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5</osFamily>
-          <packages>
-            <package>
-              <name>php-pecl-json.x86_64</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-      <monitoringService>true</monitoringService>
-    </service>
-  </services>
-</metainfo>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/stacks/HDP/2.0.6/role_command_order.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/role_command_order.json b/ambari-server/src/test/resources/stacks/HDP/2.0.6/role_command_order.json
index 1c2181c..6154004 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/role_command_order.json
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6/role_command_order.json
@@ -3,8 +3,6 @@
   "_comment" : "blockedRole-blockedCommand: [blockerRole1-blockerCommand1, blockerRole2-blockerCommand2, ...]",
   "general_deps" : {
     "_comment" : "dependencies for all cases",
-    "NAGIOS_SERVER-INSTALL" : ["HIVE_CLIENT-INSTALL", "HCAT-INSTALL",
-        "MAPREDUCE_CLIENT-INSTALL", "OOZIE_CLIENT-INSTALL"],
     "HBASE_MASTER-START": ["ZOOKEEPER_SERVER-START"],
     "HBASE_REGIONSERVER-START": ["HBASE_MASTER-START"],
     "OOZIE_SERVER-START": ["JOBTRACKER-START", "TASKTRACKER-START"],
@@ -13,12 +11,6 @@
     "HIVE_SERVER-START": ["TASKTRACKER-START", "MYSQL_SERVER-START"],
     "HUE_SERVER-START": ["HIVE_SERVER-START", "HCAT-START", "OOZIE_SERVER-START"],
     "FLUME_HANDLER-START": ["OOZIE_SERVER-START"],
-    "NAGIOS_SERVER-START": ["HBASE_MASTER-START", "HBASE_REGIONSERVER-START",
-        "GANGLIA_SERVER-START", "GANGLIA_MONITOR-START", "HCAT-START",
-        "HIVE_SERVER-START", "HIVE_METASTORE-START", "HUE_SERVER-START",
-        "JOBTRACKER-START", "TASKTRACKER-START", "ZOOKEEPER_SERVER-START",
-        "MYSQL_SERVER-START", "OOZIE_SERVER-START", "PIG-START", "SQOOP-START",
-        "WEBHCAT_SERVER-START", "FLUME_HANDLER-START"],
     "MAPREDUCE_SERVICE_CHECK-SERVICE_CHECK": ["JOBTRACKER-START", "TASKTRACKER-START"],
     "OOZIE_SERVICE_CHECK-SERVICE_CHECK": ["OOZIE_SERVER-START", "MAPREDUCE2_SERVICE_CHECK-SERVICE_CHECK"],
     "WEBHCAT_SERVICE_CHECK-SERVICE_CHECK": ["WEBHCAT_SERVER-START"],
@@ -48,8 +40,7 @@
     "WEBHCAT_SERVER-UPGRADE" : ["OOZIE_CLIENT-UPGRADE"],
     "PIG-UPGRADE" : ["WEBHCAT_SERVER-UPGRADE"],
     "SQOOP-UPGRADE" : ["PIG-UPGRADE"],
-    "NAGIOS_SERVER-UPGRADE" : ["SQOOP-UPGRADE"],
-    "GANGLIA_SERVER-UPGRADE" : ["NAGIOS_SERVER-UPGRADE"],
+    "GANGLIA_SERVER-UPGRADE" : ["SQOOP-UPGRADE"],
     "GANGLIA_MONITOR-UPGRADE" : ["GANGLIA_SERVER-UPGRADE"]
   },
   "_comment" : "GLUSTERFS-specific dependencies",
@@ -71,8 +62,6 @@
     "TASKTRACKER-START": ["NAMENODE-START", "DATANODE-START"],
     "HIVE_SERVER-START": ["DATANODE-START"],
     "WEBHCAT_SERVER-START": ["DATANODE-START"],
-    "NAGIOS_SERVER-START": ["NAMENODE-START", "SECONDARY_NAMENODE-START",
-        "DATANODE-START", "RESOURCEMANAGER-START", "NODEMANAGER-START", "HISTORYSERVER-START"],
     "HDFS_SERVICE_CHECK-SERVICE_CHECK": ["NAMENODE-START", "DATANODE-START",
         "SECONDARY_NAMENODE-START"],
     "MAPREDUCE2_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START",
@@ -93,7 +82,6 @@
   "namenode_optional_ha": {
     "NAMENODE-START": ["JOURNALNODE-START", "ZOOKEEPER_SERVER-START"],
     "ZKFC-START": ["NAMENODE-START"],
-    "NAGIOS_SERVER-START": ["ZKFC-START", "JOURNALNODE-START"],
     "HDFS_SERVICE_CHECK-SERVICE_CHECK": ["ZKFC-START"]
   },
   "_comment" : "Dependencies that are used in ResourceManager HA cluster",

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
deleted file mode 100644
index 958eb14..0000000
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/NAGIOS/metainfo.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>NAGIOS</name>
-      <displayName>Nagios</displayName>
-      <comment>Nagios Monitoring and Alerting system</comment>
-      <version>3.5.0</version>
-      <components>
-        <component>
-           <name>NAGIOS_SERVER</name>
-           <displayName>Nagios Server</displayName>
-           <category>MASTER</category>
-           <cardinality>1</cardinality>
-          <dependencies>
-            <dependency>
-              <name>HDFS/HDFS_CLIENT</name>
-              <scope>host</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-            <dependency>
-              <name>MAPREDUCE2/MAPREDUCE2_CLIENT</name>
-              <scope>host</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-            <dependency>
-              <name>OOZIE/OOZIE_CLIENT</name>
-              <scope>host</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-            <dependency>
-              <name>YARN/YARN_CLIENT</name>
-              <scope>host</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-            <dependency>
-              <name>TEZ/TEZ_CLIENT</name>
-              <scope>host</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-            <dependency>
-              <name>HCATALOG/HCAT</name>
-              <scope>host</scope>
-              <auto-deploy>
-                <enabled>true</enabled>
-              </auto-deploy>
-            </dependency>
-          </dependencies>
-           <commandScript>
-             <script>scripts/nagios_server.py</script>
-             <scriptType>PYTHON</scriptType>
-             <timeout>600</timeout>
-           </commandScript>
-        </component>
-      </components>
-      <osSpecifics>
-        <osSpecific>
-          <osFamily>any</osFamily>
-          <packages>
-            <package>
-              <name>perl</name>
-            </package>
-            <package>
-              <name>nagios-plugins-1.4.9</name>
-            </package>
-            <package>
-              <name>nagios-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-www-3.5.0-99</name>
-            </package>
-            <package>
-              <name>nagios-devel-3.5.0-99</name>
-            </package>
-            <package>
-              <name>fping</name>
-            </package>
-            <package>
-              <name>hdp_mon_nagios_addons</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>suse11</osFamily>
-          <packages>
-            <package>
-              <name>php5*-json</name>
-            </package>
-            <package>
-              <name>apache2?mod_php*</name>
-            </package>
-            <package>
-              <name>php-curl</name>
-            </package>
-          </packages>
-        </osSpecific>
-        <osSpecific>
-          <osFamily>redhat5</osFamily>
-          <packages>
-            <package>
-              <name>php-pecl-json.x86_64</name>
-            </package>
-          </packages>
-        </osSpecific>
-      </osSpecifics>
-      <configuration-dependencies>
-        <config-type>global</config-type>
-      </configuration-dependencies>
-      <monitoringService>true</monitoringService>
-    </service>
-  </services>
-</metainfo>