AMBARI-9490 remove NAGIOS from Ambari UI. (ababiichuk)

ambari-web/app/app.js

@@ -227,10 +227,6 @@ module.exports = Em.Application.create({
       return App.StackService.find().filterProperty('isServiceMetricsService').mapProperty('serviceName');
     }.property('App.router.clusterController.isLoaded'),
 
-    alerting: function () {
-      return App.StackService.find().filterProperty('isAlertingService').mapProperty('serviceName');
-    }.property('App.router.clusterController.isLoaded'),
-
     supportsServiceCheck: function() {
       return App.StackService.find().filterProperty('serviceCheckSupported').mapProperty('serviceName');
     }.property('App.router.clusterController.isLoaded')

ambari-web/app/assets/data/alerts/HDP2/host_alerts.json

@@ -126,16 +126,6 @@
         "status_time" : 1389793887,
         "output" : "TCP OK - 0.001 second response time on port 8670"
       },
-      {
-        "description" : "Nagios status log freshness",
-        "host_name" : "dev01.hortonworks.com",
-        "last_status" : "OK",
-        "last_status_time" : 1389636508,
-        "service_name" : "NAGIOS",
-        "status" : "OK",
-        "status_time" : 1389793693,
-        "output" : "NAGIOS OK: 2 processes, status log updated 2 seconds ago"
-      },
       {
         "description" : "NameNode host CPU utilization on dev01.hortonworks.com",
         "host_name" : "dev01.hortonworks.com",

ambari-web/app/assets/data/configuration/global.json

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

ambari-web/app/assets/data/configurations/cluster_level_actual_configs.json

@@ -134,7 +134,6 @@
         "mapred_hosts_exclude" : "mapred.exclude",
         "dfs_block_local_path_access_user" : "hbase",
         "dfs_datanode_data_dir_perm" : "750",
-        "nagios_web_password" : "n",
         "dtnode_heapsize" : "1024m",
         "tickTime" : "2000",
         "mapred_cluster_max_map_mem_mb" : "-1",
@@ -146,7 +145,6 @@
         "mapred_jobstatus_dir" : "file:////mapred/jobstatus",
         "hive_metastore_port" : "9083",
         "namenode_heapsize" : "1024m",
-        "nagios_contact" : "n@n.com",
         "mapred_cluster_red_mem_mb" : "-1",
         "hive_ambari_database" : "MySQL",
         "dataDir" : "/hadoop/zookeeper",
@@ -181,8 +179,6 @@
         "hdfs_enable_shortcircuit_read" : "true",
         "kerberos_domain" : "EXAMPLE.COM",
         "hdfs_support_append" : "true",
-        "nagios_group" : "nagios",
-        "nagios_web_login" : "nagiosadmin",
         "namenode_formatted_mark_dir" : "/var/run/hadoop/hdfs/namenode/formatted/",
         "dfs_exclude" : "dfs.exclude",
         "namenode_opt_maxnewsize" : "640m",
@@ -192,7 +188,6 @@
         "namenode_opt_maxpermsize" : "256m",
         "mapreduce_userlog_retainhours" : "24",
         "hcat_conf_dir" : "",
-        "nagios_user" : "nagios",
         "mapred_child_java_opts_sz" : "768",
         "mapred_red_tasks_max" : "2",
         "regionserver_memstore_lowerlimit" : "0.35",

ambari-web/app/assets/data/configurations/cluster_level_configs.json

@@ -411,7 +411,6 @@
         "mapred_hosts_exclude" : "mapred.exclude",
         "dfs_block_local_path_access_user" : "hbase",
         "dfs_datanode_data_dir_perm" : "750",
-        "nagios_web_password" : "n",
         "dtnode_heapsize" : "1024m",
         "tickTime" : "2000",
         "mapred_cluster_max_map_mem_mb" : "-1",
@@ -423,7 +422,6 @@
         "mapred_jobstatus_dir" : "file:////mapred/jobstatus",
         "hive_metastore_port" : "9083",
         "namenode_heapsize" : "1024m",
-        "nagios_contact" : "n@n.com",
         "mapred_cluster_red_mem_mb" : "-1",
         "hive_ambari_database" : "MySQL",
         "dataDir" : "/hadoop/zookeeper",
@@ -458,8 +456,6 @@
         "hdfs_enable_shortcircuit_read" : "true",
         "kerberos_domain" : "EXAMPLE.COM",
         "hdfs_support_append" : "true",
-        "nagios_group" : "nagios",
-        "nagios_web_login" : "nagiosadmin",
         "namenode_formatted_mark_dir" : "/var/run/hadoop/hdfs/namenode/formatted/",
         "dfs_exclude" : "dfs.exclude",
         "namenode_opt_maxnewsize" : "640m",
@@ -470,7 +466,6 @@
         "smokeuser" : "ambari-qa",
         "mapreduce_userlog_retainhours" : "24",
         "hcat_conf_dir" : "",
-        "nagios_user" : "nagios",
         "mapred_child_java_opts_sz" : "768",
         "mapred_red_tasks_max" : "2",
         "regionserver_memstore_lowerlimit" : "0.35",

ambari-web/app/assets/data/dashboard/HDP2/master_components.json

@@ -242,27 +242,6 @@
         }
       ]
     },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/components/NAGIOS_SERVER",
-      "ServiceComponentInfo" : {
-        "category" : "MASTER",
-        "cluster_name" : "perf",
-        "component_name" : "NAGIOS_SERVER",
-        "service_name" : "NAGIOS"
-      },
-      "host_components" : [
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/NAGIOS_SERVER",
-          "HostRoles" : {
-            "cluster_name" : "perf",
-            "component_name" : "NAGIOS_SERVER",
-            "host_name" : "dev01.hortonworks.com",
-            "maintenance_state" : "OFF",
-            "state" : "STARTED"
-          }
-        }
-      ]
-    },
     {
       "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/components/OOZIE_SERVER",
       "ServiceComponentInfo" : {

ambari-web/app/assets/data/dashboard/serviceComponents.json

@@ -61,25 +61,6 @@
         }
       ]
     },
-    {
-      "href" : "http://ambari/api/clusters/vmc/services/NAGIOS",
-      "ServiceInfo" : {
-        "cluster_name" : "vmc",
-        "service_name" : "NAGIOS"
-      },
-      "components" : [
-        {
-          "href" : "http://ambari/api/clusters/vmc/services/NAGIOS/components/NAGIOS_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "vmc",
-            "desired_configs" : "{}",
-            "state" : "STARTED",
-            "component_name" : "NAGIOS_SERVER",
-            "service_name" : "NAGIOS"
-          }
-        }
-      ]
-    },
     {
       "href" : "http://ambari/api/clusters/vmc/services/GANGLIA",
       "ServiceInfo" : {

ambari-web/app/assets/data/dashboard/services_multi_hosts.json

@@ -668,47 +668,6 @@
         }
       ]
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/services/NAGIOS",
-      "ServiceInfo" : {
-        "cluster_name" : "mycluster",
-        "service_name" : "NAGIOS"
-      },
-      "components" : [
-        {
-          "href" : "http://ambari:8080/api/clusters/mycluster/services/NAGIOS/components/NAGIOS_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "mycluster",
-            "component_name" : "NAGIOS_SERVER",
-            "service_name" : "NAGIOS"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ambari:8080/api/clusters/mycluster/hosts/ip-10-83-47-139.ec2.internal/host_components/NAGIOS_SERVER",
-              "HostRoles" : {
-                "configs" : "{}",
-                "cluster_name" : "mycluster",
-                "desired_configs" : "{}",
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "NAGIOS_SERVER",
-                "host_name" : "ip-10-83-47-139.ec2.internal"
-              },
-              "component" : [
-                {
-                  "href" : "http://ambari:8080/api/clusters/mycluster/services/NAGIOS/components/NAGIOS_SERVER",
-                  "ServiceComponentInfo" : {
-                    "cluster_name" : "mycluster",
-                    "component_name" : "NAGIOS_SERVER",
-                    "service_name" : "NAGIOS"
-                  }
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/services/HBASE",
       "ServiceInfo" : {

ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json

@@ -100,16 +100,6 @@
             "state" : "INSTALLED"
           }
         },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/NAGIOS_SERVER",
-          "HostRoles" : {
-            "cluster_name" : "perf",
-            "component_name" : "NAGIOS_SERVER",
-            "host_name" : "dev01.hortonworks.com",
-            "maintenance_state" : "OFF",
-            "state" : "STARTED"
-          }
-        },
         {
           "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/NAMENODE",
           "HostRoles" : {

ambari-web/app/assets/data/hosts/HDP2/hosts.json

@@ -273,15 +273,6 @@
             "state" : "INSTALL_FAILED"
           }
         },
-        {
-          "HostRoles" : {
-            "component_name" : "NAGIOS_SERVER",
-            "maintenance_state" : "OFF",
-            "service_name" : "NAGIOS",
-            "stale_configs" : true,
-            "state" : "INIT"
-          }
-        },
         {
           "HostRoles" : {
             "component_name" : "NAMENODE",

ambari-web/app/assets/data/hosts/HDP2/hosts_init.json

@@ -208,16 +208,6 @@
             "state" : "STARTED"
           }
         },
-        {
-          "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/NAGIOS_SERVER",
-          "HostRoles" : {
-            "cluster_name" : "c1",
-            "component_name" : "NAGIOS_SERVER",
-            "host_name" : "dev01.hortonworks.com",
-            "maintenance_state" : "OFF",
-            "state" : "STARTED"
-          }
-        },
         {
           "href" : "http://dev01.hortonworks.com:8080/api/v1/clusters/c1/hosts/dev01.hortonworks.com/host_components/NAMENODE",
           "HostRoles" : {

ambari-web/app/assets/data/services/HDP2/services.json

@@ -81,22 +81,6 @@
         }
       }
     },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/clusters/cl/services/NAGIOS",
-      "ServiceInfo" : {
-        "maintenance_state" : "OFF",
-        "cluster_name" : "cl",
-        "service_name" : "NAGIOS",
-        "state": "STARTED"
-      },
-      "alerts" : {
-        "summary" : {
-          "CRITICAL" : 0,
-          "OK" : 0,
-          "WARNING" : 0
-        }
-      }
-    },
     {
       "href" : "http://192.168.56.101:8080/api/v1/clusters/cl/services/OOZIE",
       "ServiceInfo" : {

ambari-web/app/assets/data/services/host_component_actual_configs.json

@@ -205,41 +205,6 @@
         }
       ]
     },
-    {
-      "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/NAGIOS",
-      "ServiceInfo" : {
-        "cluster_name" : "cl1",
-        "service_name" : "NAGIOS"
-      },
-      "components" : [
-        {
-          "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/NAGIOS/components/NAGIOS_SERVER",
-          "ServiceComponentInfo" : {
-            "cluster_name" : "cl1",
-            "desired_configs" : { },
-            "state" : "STARTED",
-            "component_name" : "NAGIOS_SERVER",
-            "service_name" : "NAGIOS"
-          },
-          "host_components" : [
-            {
-              "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/hosts/ip-10-191-202-42.ec2.internal/host_components/NAGIOS_SERVER",
-              "HostRoles" : {
-                "configs" : {
-                  "global" : "version1"
-                },
-                "cluster_name" : "cl1",
-                "desired_configs" : { },
-                "desired_state" : "STARTED",
-                "state" : "STARTED",
-                "component_name" : "NAGIOS_SERVER",
-                "host_name" : "ip-10-191-202-42.ec2.internal"
-              }
-            }
-          ]
-        }
-      ]
-    },
     {
       "href" : "http://ec2-184-73-46-113.compute-1.amazonaws.com:8080/api/v1/clusters/cl1/services/SQOOP",
       "ServiceInfo" : {

ambari-web/app/assets/data/stacks/HDP-2.1/recommendations.json

@@ -6,7 +6,7 @@
     "stack_version": "2.1.1"
   },
   "hosts": ["dev1.hortonworks.com", "dev2.hortonworks.com", "dev3.hortonworks.com"],
-  "services": ["FALCON", "FLUME", "GANGLIA", "HBASE", "HDFS", "HIVE", "MAPREDUCE2", "NAGIOS", "OOZIE", "PIG", "SQOOP", "STORM", "TEZ", "WEBCHAT", "YARN", "ZOOKEEPER"],
+  "services": ["FALCON", "FLUME", "GANGLIA", "HBASE", "HDFS", "HIVE", "MAPREDUCE2", "OOZIE", "PIG", "SQOOP", "STORM", "TEZ", "WEBCHAT", "YARN", "ZOOKEEPER"],
   "recommendations": {
     "blueprint": {
       "configurations": {
@@ -29,9 +29,6 @@
             {
               "name": "NAMENODE"
             },
-            {
-              "name": "NAGIOS_SERVER"
-            },
             {
               "name": "GANGLIA_SERVER"
             },

ambari-web/app/assets/data/stacks/HDP-2.1/recommendations_configs.json

@@ -5,7 +5,7 @@
       "hosts" : [
         "c6403.ambari.apache.org"
       ],
-      "services": ["HDFS", "MAPREDUCE2", "YARN", "TEZ", "NAGIOS", "GANGLIA", "HIVE", "SQOOP", "OOZIE", "ZOOKEEPER", "FALCON", "STORM", "FLUME", "PIG"],
+      "services": ["HDFS", "MAPREDUCE2", "YARN", "TEZ", "GANGLIA", "HIVE", "SQOOP", "OOZIE", "ZOOKEEPER", "FALCON", "STORM", "FLUME", "PIG"],
       "Recommendation" : {
         "id" : 5
       },
@@ -126,9 +126,6 @@
                 },
                 {
                   "name" : "SECONDARY_NAMENODE"
-                },
-                {
-                  "name" : "NAGIOS_SERVER"
                 }
               ]
             }

ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json

@@ -777,107 +777,6 @@
         }
       ]
     },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS",
-      "StackServices" : {
-        "comments" : "Nagios Monitoring and Alerting system",
-        "custom_commands" : [ ],
-        "display_name" : "Nagios",
-        "required_services" : [ ],
-        "service_check_supported" : false,
-        "service_name" : "NAGIOS",
-        "service_version" : "3.5.0",
-        "stack_name" : "HDP",
-        "stack_version" : "2.1",
-        "user_name" : null,
-        "config_types" : {
-          "nagios-env" : {
-            "supports" : {
-              "final" : "false"
-            }
-          }
-        }
-      },
-      "components" : [
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER",
-          "StackServiceComponents" : {
-            "cardinality" : "1",
-            "component_category" : "MASTER",
-            "component_name" : "NAGIOS_SERVER",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios Server",
-            "is_client" : false,
-            "is_master" : true,
-            "service_name" : "NAGIOS",
-            "stack_name" : "HDP",
-            "stack_version" : "2.1"
-          },
-          "dependencies" : [
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HCAT",
-              "Dependencies" : {
-                "component_name" : "HCAT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HDFS_CLIENT",
-              "Dependencies" : {
-                "component_name" : "HDFS_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/MAPREDUCE2_CLIENT",
-              "Dependencies" : {
-                "component_name" : "MAPREDUCE2_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/OOZIE_CLIENT",
-              "Dependencies" : {
-                "component_name" : "OOZIE_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/TEZ_CLIENT",
-              "Dependencies" : {
-                "component_name" : "TEZ_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/YARN_CLIENT",
-              "Dependencies" : {
-                "component_name" : "YARN_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            }
-          ]
-        }
-      ]
-    },
     {
       "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE",
       "StackServices" : {

ambari-web/app/assets/data/wizard/bootstrap/two_hosts_information.json

@@ -74,10 +74,6 @@
               "name" : "/etc/ganglia",
               "type" : "not_exist"
             },
-            {
-              "name" : "/etc/nagios",
-              "type" : "not_exist"
-            },
             {
               "name" : "/var/run/hadoop",
               "type" : "not_exist"
@@ -113,17 +109,9 @@
             {
               "name" : "/var/log/hive",
               "type" : "not_exist"
-            },
-            {
-              "name" : "/var/log/nagios",
-              "type" : "not_exist"
             }
           ],
           "rpms" : [
-            {
-              "name" : "nagios",
-              "installed" : true
-            },
             {
               "name" : "ganglia",
               "installed" : true
@@ -243,10 +231,6 @@
         "last_agent_env" : {
           "stackFoldersAndFiles" : [ ],
           "rpms" : [
-            {
-              "name" : "nagios",
-              "installed" : false
-            },
             {
               "name" : "ganglia",
               "installed" : false

ambari-web/app/assets/data/wizard/deploy/4_hosts_install_fail_without_failed_status/poll_1.json

@@ -689,24 +689,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari-server:8080/api/v1/clusters/cluster/requests/1/tasks/49",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "ABORTED",
-        "stderr" : "",
-        "host_name" : "host3",
-        "id" : 49,
-        "cluster_name" : "cluster",
-        "attempt_cnt" : 0,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : -1,
-        "stage_id" : 2
-      }
-    },
     {
       "href" : "http://ambari-server:8080/api/v1/clusters/cluster/requests/1/tasks/38",
       "Tasks" : {

ambari-web/app/assets/data/wizard/deploy/5_hosts/get_hosts_state.json

@@ -63,15 +63,6 @@
             "state" : "INSTALLED"
           }
         },
-        {
-          "href" : "http://162.216.148.67:8080/api/v1/clusters/c1/hosts/ambari-1.c.apache.internal/host_components/NAGIOS_SERVER",
-          "HostRoles" : {
-            "cluster_name" : "c1",
-            "component_name" : "NAGIOS_SERVER",
-            "host_name" : "ambari-1.c.apache.internal",
-            "state" : "INSTALLED"
-          }
-        },
         {
           "href" : "http://162.216.148.67:8080/api/v1/clusters/c1/hosts/ambari-1.c.apache.internal/host_components/NAMENODE",
           "HostRoles" : {

ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_1.json

@@ -257,24 +257,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "PENDING",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 0,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : -1,
-        "stage_id" : 1
-      }
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {

ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_2.json

@@ -77,24 +77,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "QUEUED",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 1,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352863665856,
-        "stage_id" : 1
-      }
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/21",
       "Tasks" : {

ambari-web/app/assets/data/wizard/deploy/master_failure/poll_1.json

@@ -257,24 +257,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "PENDING",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 0,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : -1,
-        "stage_id" : 1
-      }
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {

ambari-web/app/assets/data/wizard/deploy/master_failure/poll_2.json

@@ -77,24 +77,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "QUEUED",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 1,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352863665856,
-        "stage_id" : 1
-      }
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/21",
       "Tasks" : {

ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_1.json

@@ -257,24 +257,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "PENDING",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 0,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : -1,
-        "stage_id" : 1
-      }
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {

ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_2.json

@@ -77,24 +77,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "QUEUED",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 1,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352863665856,
-        "stage_id" : 1
-      }
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/21",
       "Tasks" : {

ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_1.json

@@ -257,24 +257,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "PENDING",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 0,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : -1,
-        "stage_id" : 1
-      }
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {

ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_2.json

@@ -77,24 +77,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/10",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "QUEUED",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 10,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 1,
-        "request_id" : 1,
-        "command" : "INSTALL",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : 1352863665856,
-        "stage_id" : 1
-      }
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/21",
       "Tasks" : {

ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_6.json

@@ -239,24 +239,6 @@
         "stage_id" : 1
       }
     },
-    {
-      "href" : "http://ambari:8080/api/clusters/mycluster/requests/2/tasks/28",
-      "Tasks" : {
-        "exit_code" : 999,
-        "stdout" : "",
-        "status" : "PENDING",
-        "stderr" : "",
-        "host_name" : "host5",
-        "id" : 28,
-        "cluster_name" : "mycluster",
-        "attempt_cnt" : 0,
-        "request_id" : 2,
-        "command" : "START",
-        "role" : "NAGIOS_SERVER",
-        "start_time" : -1,
-        "stage_id" : 1
-      }
-    },
     {
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/2/tasks/24",
       "Tasks" : {

ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.1.json

@@ -100,17 +100,6 @@
         "service_version" : "2.0.3.22-1"
       }
     },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/NAGIOS",
-      "StackServices" : {
-        "user_name" : "root",
-        "stack_version" : "2.0.1",
-        "service_name" : "NAGIOS",
-        "stack_name" : "HDP",
-        "comments" : "Nagios Monitoring and Alerting system",
-        "service_version" : "3.2.3"
-      }
-    },
     {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/TEZ",
       "StackServices" : {

ambari-web/app/assets/data/wizard/stack/hdp/version/2.0.5.json

@@ -100,17 +100,6 @@
         "service_version" : "2.0.3.22-1"
       }
     },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/NAGIOS",
-      "StackServices" : {
-        "user_name" : "root",
-        "stack_version" : "2.0.1",
-        "service_name" : "NAGIOS",
-        "stack_name" : "HDP",
-        "comments" : "Nagios Monitoring and Alerting system",
-        "service_version" : "3.2.3"
-      }
-    },
     {
       "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/TEZ",
       "StackServices" : {

ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/NAGIOS.json

@@ -1,41 +0,0 @@
-{
-  "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/NAGIOS/configurations?fields=*",
-  "items" : [
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/NAGIOS/configurations/nagios_group",
-      "StackConfigurations" : {
-        "property_description" : "",
-        "property_name" : "nagios_group",
-        "property_value" : "nagios",
-        "service_name" : "NAGIOS",
-        "stack_name" : "HDP",
-        "stack_version" : "2.0.1",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/NAGIOS/configurations/nagios_user",
-      "StackConfigurations" : {
-        "property_description" : "Nagios process user.",
-        "property_name" : "nagios_user",
-        "property_value" : "nagios",
-        "service_name" : "NAGIOS",
-        "stack_name" : "HDP",
-        "stack_version" : "2.0.1",
-        "type" : "global.xml"
-      }
-    },
-    {
-      "href" : "http://192.168.56.101:8080/api/v1/stacks2/HDP/versions/2.0.1/stackServices/NAGIOS/configurations/nagios_web_login",
-      "StackConfigurations" : {
-        "property_description" : "Web user name.",
-        "property_name" : "nagios_web_login",
-        "property_value" : "nagiosadmin",
-        "service_name" : "NAGIOS",
-        "stack_name" : "HDP",
-        "stack_version" : "2.0.1",
-        "type" : "global.xml"
-      }
-    }
-  ]
-}

ambari-web/app/assets/data/wizard/stack/hdp/version2.0.1/global.json

@@ -171,15 +171,6 @@
         }
       ]
     },
-    {
-      "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/NAGIOS",
-      "StackServices" : {
-        "stack_version" : "1.3.0",
-        "service_name" : "NAGIOS",
-        "stack_name" : "HDP"
-      },
-      "configurations" : [ ]
-    },
     {
       "href" : "http://dev.hortonworks.com:8080/api/v1/stacks2/HDP/versions/1.3.0/stackServices/HCATALOG",
       "StackServices" : {

ambari-web/app/assets/data/wizard/stack/stacks.json

@@ -266,29 +266,6 @@
             }
           }
         },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.0/services/NAGIOS",
-          "StackServices" : {
-            "comments" : "Nagios Monitoring and Alerting system",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios",
-            "required_services" : null,
-            "service_check_supported" : false,
-            "service_name" : "NAGIOS",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "2.0",
-            "user_name" : null,
-            "config_types" : {
-              "nagios-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
         {
           "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.0/services/OOZIE",
           "StackServices" : {
@@ -727,29 +704,6 @@
             }
           }
         },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.0.6/services/NAGIOS",
-          "StackServices" : {
-            "comments" : "Nagios Monitoring and Alerting system",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios",
-            "required_services" : null,
-            "service_check_supported" : false,
-            "service_name" : "NAGIOS",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "2.0.6",
-            "user_name" : null,
-            "config_types" : {
-              "nagios-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
         {
           "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.0.6/services/OOZIE",
           "StackServices" : {
@@ -1223,29 +1177,6 @@
             }
           }
         },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.0.6.GlusterFS/services/NAGIOS",
-          "StackServices" : {
-            "comments" : "Nagios Monitoring and Alerting system",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios",
-            "required_services" : null,
-            "service_check_supported" : false,
-            "service_name" : "NAGIOS",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "2.0.6.GlusterFS",
-            "user_name" : null,
-            "config_types" : {
-              "nagios-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
         {
           "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.0.6.GlusterFS/services/OOZIE",
           "StackServices" : {
@@ -1721,29 +1652,6 @@
             }
           }
         },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS",
-          "StackServices" : {
-            "comments" : "Nagios Monitoring and Alerting system",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios",
-            "required_services" : [ ],
-            "service_check_supported" : false,
-            "service_name" : "NAGIOS",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "2.1",
-            "user_name" : null,
-            "config_types" : {
-              "nagios-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
         {
           "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE",
           "StackServices" : {
@@ -2316,29 +2224,6 @@
             }
           }
         },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1.GlusterFS/services/NAGIOS",
-          "StackServices" : {
-            "comments" : "Nagios Monitoring and Alerting system",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios",
-            "required_services" : null,
-            "service_check_supported" : false,
-            "service_name" : "NAGIOS",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "2.1.GlusterFS",
-            "user_name" : null,
-            "config_types" : {
-              "nagios-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
         {
           "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.1.GlusterFS/services/OOZIE",
           "StackServices" : {
@@ -2962,29 +2847,6 @@
             }
           }
         },
-        {
-          "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.2/services/NAGIOS",
-          "StackServices" : {
-            "comments" : "Nagios Monitoring and Alerting system",
-            "custom_commands" : [ ],
-            "display_name" : "Nagios",
-            "required_services" : [ ],
-            "service_check_supported" : false,
-            "service_name" : "NAGIOS",
-            "service_version" : "3.5.0",
-            "stack_name" : "HDP",
-            "stack_version" : "2.2",
-            "user_name" : null,
-            "config_types" : {
-              "nagios-env" : {
-                "supports" : {
-                  "adding_forbidden" : "false",
-                  "final" : "false"
-                }
-              }
-            }
-          }
-        },
         {
           "href" : "http://192.168.56.101:8080/api/v1/stacks/HDP/versions/2.2/services/OOZIE",
           "StackServices" : {

ambari-web/app/assets/test/tests.js

@@ -235,7 +235,6 @@ var files = ['test/init_model_test',
   'test/models/service/flume_test',
   'test/models/service/hdfs_test',
   'test/models/service/yarn_test',
-  'test/models/alert_test',
   'test/models/alert_config_test',
   'test/models/alert_definition_test',
   'test/models/alert_instance_test',

ambari-web/app/controllers/global/cluster_controller.js

@@ -25,7 +25,6 @@ App.ClusterController = Em.Controller.extend({
   clusterDataLoadedPercent: 'width:0', // 0 to 1
 
   isGangliaUrlLoaded: false,
-  isNagiosUrlLoaded: false,
 
   /**
    * Provides the URL to use for Ganglia server. This URL
@@ -35,15 +34,6 @@ App.ClusterController = Em.Controller.extend({
    */
   gangliaUrl: null,
 
-  /**
-   * Provides the URL to use for NAGIOS server. This URL
-   * is helpful in getting alerts data from server and also
-   * in populating links in UI.
-   *
-   * If null is returned, it means NAGIOS service is not installed.
-   */
-  nagiosUrl: null,
-
   clusterName: function () {
     return App.get('clusterName');
   }.property('App.clusterName'),

ambari-web/app/controllers/main/admin/security.js

@@ -96,7 +96,6 @@ App.MainAdminSecurityController = Em.Controller.extend({
     'smokeuser': {defaultValue: 'ambari-qa', siteName: 'cluster-env', serviceName: 'CLUSTER'},
     'zk_user': {defaultValue: 'zookeeper', siteName: 'zookeeper-env', serviceName: 'ZOOKEEPER'},
     'oozie_user': {defaultValue: 'oozie', siteName: 'oozie-env', serviceName: 'OOZIE'},
-    'nagios_user': {defaultValue: 'nagios', siteName: 'nagios-env', serviceName: 'NAGIOS'},
     'user_group': {defaultValue: 'hadoop', siteName: 'hadoop-env', serviceName: 'HDFS'},
     'storm_user': {defaultValue: 'storm', siteName: 'storm-env', serviceName: 'STORM'},
     'falcon_user': {defaultValue: 'falcon', siteName: 'falcon-env', serviceName: 'FALCON'},

ambari-web/app/controllers/main/admin/security/add/step2.js

@@ -76,11 +76,6 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({
       configName: 'webhcatserver_host',
       components: ['WEBHCAT_SERVER']
     },
-    {
-      serviceName: 'NAGIOS',
-      configName: 'nagios_server',
-      components: ['NAGIOS_SERVER']
-    },
     {
       serviceName: 'HDFS',
       configName: 'namenode_host',
@@ -173,12 +168,6 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({
       configName: 'webhcatserver_host',
       principalName: 'webHCat_http_principal_name',
       primaryName: 'HTTP/'
-    },
-    {
-      serviceName: 'NAGIOS',
-      configName: 'nagios_server',
-      principalName: 'nagios_principal_name',
-      primaryName: 'nagios/'
     }
   ],
 

ambari-web/app/controllers/main/admin/security/add/step3.js

@@ -40,7 +40,6 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
       'HIVE_SERVER': 'hive_user',
       'HIVE_METASTORE': 'hive_user',
       'OOZIE_SERVER': 'oozie_user',
-      'NAGIOS_SERVER': 'nagios_user',
       'HBASE_MASTER': 'hbase_user',
       'HBASE_REGIONSERVER': 'hbase_user',
       'SUPERVISOR': 'storm_user',
@@ -348,7 +347,7 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
    */
   setHostComponentsSecureValue: function (result, host, addedPrincipalsHost, securityUsers, hadoopGroupId) {
     var componentsToDisplay = ['NAMENODE', 'SECONDARY_NAMENODE', 'DATANODE', 'JOBTRACKER', 'ZOOKEEPER_SERVER', 'HIVE_SERVER', 'HIVE_METASTORE',
-      'TASKTRACKER', 'OOZIE_SERVER', 'NAGIOS_SERVER', 'HBASE_MASTER', 'HBASE_REGIONSERVER', 'HISTORYSERVER', 'RESOURCEMANAGER', 'NODEMANAGER',
+      'TASKTRACKER', 'OOZIE_SERVER', 'HBASE_MASTER', 'HBASE_REGIONSERVER', 'HISTORYSERVER', 'RESOURCEMANAGER', 'NODEMANAGER',
       'JOURNALNODE', 'SUPERVISOR', 'NIMBUS', 'STORM_UI_SERVER','FALCON_SERVER', 'KNOX_GATEWAY', 'APP_TIMELINE_SERVER'];
     if (App.get('isHadoop22Stack')) {
       componentsToDisplay.push('DRPC_SERVER');

ambari-web/app/controllers/main/host/details.js

@@ -240,9 +240,6 @@ App.MainHostDetailsController = Em.Controller.extend({
       lastComponentError: Em.View.extend({
         template: Em.Handlebars.compile(Em.I18n.t('hosts.host.deleteComponent.popup.warning').format(displayName))
       }),
-      restartNagiosMsg: Em.View.extend({
-        template: Em.Handlebars.compile(Em.I18n.t('hosts.host.deleteComponent.popup.msg2').format(displayName))
-      }),
       deleteComponentMsg: function () {
         return Em.I18n.t('hosts.host.deleteComponent.popup.msg1').format(displayName);
       }.property(),
@@ -478,10 +475,6 @@ App.MainHostDetailsController = Em.Controller.extend({
         templateName: require('templates/main/host/details/addComponentPopup')
       }),
 
-      restartNagiosMsg: Em.View.extend({
-        template: Em.Handlebars.compile(Em.I18n.t('hosts.host.addComponent.note').format(message))
-      }),
-
       onPrimary: function () {
         this.hide();
         if (component.get('componentName') === 'CLIENTS') {
@@ -999,9 +992,6 @@ App.MainHostDetailsController = Em.Controller.extend({
       installComponentMessage: function () {
         return Em.I18n.t('hosts.host.installComponent.msg').format(displayName);
       }.property(),
-      restartNagiosMsg: Em.View.extend({
-        template: Em.Handlebars.compile(Em.I18n.t('hosts.host.addComponent.note').format(displayName))
-      }),
       bodyClass: Em.View.extend({
         templateName: require('templates/main/host/details/installComponentPopup')
       }),

ambari-web/app/controllers/main/service/info/summary.js

@@ -94,10 +94,6 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
     App.router.get('mainServiceItemController').set('routeToConfigs', false);
   },
 
-  nagiosUrl: function () {
-    return App.router.get('clusterController.nagiosUrl');
-  }.property('App.router.clusterController.nagiosUrl'),
-
   showServiceAlertsPopup: function (event) {
     var service = event.context;
     return App.ModalPopup.show({

ambari-web/app/controllers/main/service/item.js

@@ -619,10 +619,6 @@ App.MainServiceItemController = Em.Controller.extend({
         templateName: require('templates/main/service/add_host_popup')
       }),
 
-      restartNagiosMsg: Em.View.extend({
-        template: Em.Handlebars.compile(Em.I18n.t('hosts.host.addComponent.note').format(componentDisplayName))
-      }),
-
       onPrimary: function () {
         var selectedHost = this.get('selectedHost');
 

ambari-web/app/controllers/wizard/step10_controller.js

@@ -26,14 +26,6 @@ App.WizardStep10Controller = Em.Controller.extend({
    */
   clusterInfo: [],
 
-  /**
-   * Show message about required Nagios restart if AddHostWizard or AddServiceWizard used and Nagios is installed
-   * @type {bool}
-   */
-  isNagiosRestartRequired: function () {
-    return this.get('content.controllerName') !== 'installerController' && App.Service.find('NAGIOS').get('isLoaded');
-  }.property('content.controllerName'),
-
   /**
    * is Add service wizard the ongoing wizard
    * @type {bool}
@@ -186,7 +178,7 @@ App.WizardStep10Controller = Em.Controller.extend({
     components.forEach(function (_component) {
       var component = Em.Object.create(_component);
       if (['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER', 'HISTORYSERVER', 'RESOURCEMANAGER', 'HBASE_MASTER',
-        'HIVE_SERVER', 'OOZIE_SERVER', 'GANGLIA_SERVER', 'NAGIOS_SERVER'].contains(component.component)) {
+        'HIVE_SERVER', 'OOZIE_SERVER', 'GANGLIA_SERVER'].contains(component.component)) {
         this.loadMasterComponent(component);
       }
     }, this);

ambari-web/app/controllers/wizard/step8_controller.js

@@ -846,17 +846,6 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
     }
   },
 
-  /**
-   * Set displayed Nagion Admin value
-   * @method loadNagiosAdminValue
-   */
-  loadNagiosAdminValue: function () {
-    var config = this.get('content.serviceConfigProperties');
-    var adminLoginName = config.findProperty('name', 'nagios_web_login');
-    var adminEmail = config.findProperty('name', 'nagios_contact');
-    return adminLoginName.value + ' / (' + adminEmail.value + ')';
-  },
-
   /**
    * Onclick handler for <code>next</code> button
    * @method submit

ambari-web/app/data/BIGTOP/site_properties.js

@@ -3043,51 +3043,6 @@ module.exports =
       "filename": "oozie-env.xml",
       "category": "Advanced oozie-env"
     },
-  /**********************************************NAGIOS***************************************/
-    {
-      "id": "puppet var",
-      "name": "nagios_web_login",
-      "displayName": "Nagios Admin username",
-      "description": "Nagios Web UI Admin username",
-      "defaultValue": "nagiosadmin",
-      "isReconfigurable": false,
-      "displayType": "user",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "NAGIOS",
-      "category": "General",
-      "filename": "nagios-env.xml",
-      "index": 0
-    },
-    {
-      "id": "puppet var",
-      "name": "nagios_web_password",
-      "displayName": "Nagios Admin password",
-      "description": "Nagios Web UI Admin password",
-      "defaultValue": "",
-      "isReconfigurable": true,
-      "displayType": "password",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "NAGIOS",
-      "filename": "nagios-env.xml",
-      "category": "General",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
-      "name": "nagios_contact",
-      "displayName": "Hadoop Admin email",
-      "description": "Hadoop Administrator email for alert notification",
-      "defaultValue": "",
-      "displayType": "email",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "NAGIOS",
-      "filename": "nagios-env.xml",
-      "category": "General",
-      "index": 2
-    },
   /**********************************************ZOOKEEPER***************************************/
     {
       "id": "puppet var",
@@ -3710,38 +3665,6 @@ module.exports =
       "category": "Users and Groups",
       "belongsToService": []
     },
-    {
-      "id": "puppet var",
-      "name": "nagios_user",
-      "displayName": "Nagios User",
-      "description": "User to run Nagios as",
-      "defaultValue": "nagios",
-      "isReconfigurable": false,
-      "displayType": "user",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "MISC",
-      "filename": "nagios-env.xml",
-      "category": "Users and Groups",
-      "belongsToService": ["NAGIOS"],
-      "index": 14
-    },
-    {
-      "id": "puppet var",
-      "name": "nagios_group",
-      "displayName": "Nagios Group",
-      "description": "Nagios Group",
-      "defaultValue": "nagios",
-      "isReconfigurable": false,
-      "displayType": "user",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "MISC",
-      "filename": "nagios-env.xml",
-      "category": "Users and Groups",
-      "belongsToService": ["NAGIOS"],
-      "index": 13
-    },
     {
       "id": "puppet var",
       "name": "tez_user",

ambari-web/app/data/HDP2/secure_configs.js

@@ -113,15 +113,6 @@ var configs = [
     sites: ['oozie-env','oozie-site'],
     configs: configProperties.filterProperty('serviceName', 'OOZIE')
   },
-  {
-    serviceName: 'NAGIOS',
-    displayName: 'Nagios',
-    configCategories: [
-      App.ServiceConfigCategory.create({ name: 'Nagios Server', displayName:  'Nagios Server'})
-    ],
-    sites: ['nagios-env'],
-    configs: configProperties.filterProperty('serviceName', 'NAGIOS')
-  },
   {
     serviceName: 'STORM',
     displayName: 'Storm',

ambari-web/app/data/HDP2/secure_properties.js

@@ -981,51 +981,6 @@ var props = {
       "category": "ZooKeeper Server",
       "component": "ZOOKEEPER_SERVER"
     },
-
-  /**********************************************NAGIOS***************************************/
-    {
-      "id": "puppet var",
-      "name": "nagios_server",
-      "displayName": "Nagios Server host",
-      "value": "",
-      "defaultValue": "localhost",
-      "description": "Nagios server host",
-      "displayType": "masterHost",
-      "isVisible": true,
-      "isOverridable": false,
-      "serviceName": "NAGIOS",
-      "category": "Nagios Server"
-    },
-    {
-      "id": "puppet var",
-      "name": "nagios_principal_name",
-      "displayName": "Principal name",
-      "value": "",
-      "defaultValue": "nagios",
-      "description": "Primary name for Nagios server",
-      "displayType": "principal",
-      "isVisible": true,
-      "isOverridable": false,
-      "serviceName": "NAGIOS",
-      "filename": "nagios-env.xml",
-      "category": "Nagios Server",
-      "component": "NAGIOS_SERVER"
-    },
-    {
-      "id": "puppet var",
-      "name": "nagios_keytab_path",
-      "displayName": " Path to keytab file",
-      "value": "",
-      "defaultValue": "/etc/security/keytabs/nagios.service.keytab",
-      "description": "Path to the Nagios server keytab file",
-      "displayType": "directory",
-      "isVisible": true,
-      "isOverridable": false,
-      "serviceName": "NAGIOS",
-      "filename": "nagios-env.xml",
-      "category": "Nagios Server",
-      "component": "NAGIOS_SERVER"
-    },
   /**********************************************Falcon***************************************/
     {
       "id": "puppet var",

ambari-web/app/data/HDP2/site_properties.js

@@ -3635,51 +3635,6 @@ var hdp2properties = [
     "filename": "oozie-env.xml",
     "category": "Advanced oozie-env"
   },
-/**********************************************NAGIOS***************************************/
-  {
-    "id": "puppet var",
-    "name": "nagios_web_login",
-    "displayName": "Nagios Admin username",
-    "description": "Nagios Web UI Admin username",
-    "defaultValue": "nagiosadmin",
-    "isReconfigurable": false,
-    "displayType": "user",
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "NAGIOS",
-    "category": "General",
-    "filename": "nagios-env.xml",
-    "index": 0
-  },
-  {
-    "id": "puppet var",
-    "name": "nagios_web_password",
-    "displayName": "Nagios Admin password",
-    "description": "Nagios Web UI Admin password",
-    "defaultValue": "",
-    "isReconfigurable": true,
-    "displayType": "password",
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "NAGIOS",
-    "filename": "nagios-env.xml",
-    "category": "General",
-    "index": 1
-  },
-  {
-    "id": "puppet var",
-    "name": "nagios_contact",
-    "displayName": "Hadoop Admin email",
-    "description": "Hadoop Administrator email for alert notification",
-    "defaultValue": "",
-    "displayType": "email",
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "NAGIOS",
-    "filename": "nagios-env.xml",
-    "category": "General",
-    "index": 2
-  },
 /**********************************************ZOOKEEPER***************************************/
   {
     "id": "puppet var",

ambari-web/app/data/PHD/site_properties.js

@@ -2900,51 +2900,6 @@ module.exports =
       "filename": "oozie-env.xml",
       "category": "Advanced oozie-env"
     },
-  /**********************************************NAGIOS***************************************/
-    {
-      "id": "puppet var",
-      "name": "nagios_web_login",
-      "displayName": "Nagios Admin username",
-      "description": "Nagios Web UI Admin username",
-      "defaultValue": "nagiosadmin",
-      "isReconfigurable": false,
-      "displayType": "user",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "NAGIOS",
-      "category": "General",
-      "filename": "nagios-env.xml",
-      "index": 0
-    },
-    {
-      "id": "puppet var",
-      "name": "nagios_web_password",
-      "displayName": "Nagios Admin password",
-      "description": "Nagios Web UI Admin password",
-      "defaultValue": "",
-      "isReconfigurable": true,
-      "displayType": "password",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "NAGIOS",
-      "filename": "nagios-env.xml",
-      "category": "General",
-      "index": 1
-    },
-    {
-      "id": "puppet var",
-      "name": "nagios_contact",
-      "displayName": "Hadoop Admin email",
-      "description": "Hadoop Administrator email for alert notification",
-      "defaultValue": "",
-      "displayType": "email",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "NAGIOS",
-      "filename": "nagios-env.xml",
-      "category": "General",
-      "index": 2
-    },
   /**********************************************ZOOKEEPER***************************************/
     {
       "id": "puppet var",
@@ -3567,38 +3522,6 @@ module.exports =
       "category": "Users and Groups",
       "belongsToService": []
     },
-    {
-      "id": "puppet var",
-      "name": "nagios_user",
-      "displayName": "Nagios User",
-      "description": "User to run Nagios as",
-      "defaultValue": "nagios",
-      "isReconfigurable": false,
-      "displayType": "user",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "MISC",
-      "filename": "nagios-env.xml",
-      "category": "Users and Groups",
-      "belongsToService": ["NAGIOS"],
-      "index": 14
-    },
-    {
-      "id": "puppet var",
-      "name": "nagios_group",
-      "displayName": "Nagios Group",
-      "description": "Nagios Group",
-      "defaultValue": "nagios",
-      "isReconfigurable": false,
-      "displayType": "user",
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "MISC",
-      "filename": "nagios-env.xml",
-      "category": "Users and Groups",
-      "belongsToService": ["NAGIOS"],
-      "index": 13
-    },
     {
       "id": "puppet var",
       "name": "tez_user",
@@ -3629,21 +3552,6 @@ module.exports =
       "belongsToService": ["SQOOP"],
       "index": 17
     },
-    {
-      "id": "puppet var",
-      "name": "rrdcached_base_dir",
-      "displayName": "Ganglia rrdcached base directory",
-      "description": "Default directory for saving the rrd files on ganglia server",
-      "defaultValue": "/var/lib/ganglia/rrds",
-      "displayType": "directory",
-      "isReconfigurable": true,
-      "isOverridable": false,
-      "isVisible": true,
-      "serviceName": "GANGLIA",
-      "filename": "nagios-env.xml",
-      "category": "General",
-      "belongsToService": ["GANGLIA"]
-    },
     {
       "id": "puppet var",
       "name": "ignore_groupsusers_create",

ambari-web/app/mappers/service_mapper.js

@@ -29,7 +29,7 @@ App.serviceMapper = App.QuickDataMapper.create({
         cachedService.ServiceInfo.state = service.ServiceInfo.state;
         cachedService.ServiceInfo.passive_state = service.ServiceInfo.maintenance_state;
 
-        //check whether Nagios installed and started
+        //check whether Alerts installed and started
         if (service.legacy_alerts) {
           cachedService.ServiceInfo.critical_alerts_count = service.legacy_alerts.summary.CRITICAL + service.legacy_alerts.summary.WARNING;
         }
@@ -44,7 +44,7 @@ App.serviceMapper = App.QuickDataMapper.create({
           components: []
         };
 
-        //check whether Nagios installed and started
+        //check whether Alerts installed and started
         if (service.legacy_alerts) {
           serviceData.ServiceInfo.critical_alerts_count = service.legacy_alerts.summary.CRITICAL + service.legacy_alerts.summary.WARNING;
         }

ambari-web/app/mappers/service_metrics_mapper.js

@@ -347,7 +347,7 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     }, this)
   },
   /**
-   * Map quick links to services:OOZIE,GANGLIA,NAGIOS
+   * Map quick links to services:OOZIE,GANGLIA
    * @param finalJson
    * @param item
    */
@@ -356,7 +356,6 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     var quickLinks = {
       OOZIE: [19],
       GANGLIA: [20],
-      NAGIOS: [21],
       STORM: [31],
       FALCON: [32],
       RANGER: [33]

ambari-web/app/messages.js

@@ -354,7 +354,6 @@ Em.I18n.translations = {
   'host.trimspacesValidation': 'Cannot contain leading or trailing whitespace',
 
   'services.hdfs.rebalance.title' : 'HDFS Rebalance',
-  'services.nagios.description':'Nagios Monitoring and Alerting system',
   'services.ganglia.description':'Ganglia Metrics Collection system',
   'services.hdfs.description':'Apache Hadoop Distributed File System',
   'services.glusterfs.description':'Apache Hadoop Compatible File System (must be installed manually)',
@@ -397,7 +396,6 @@ Em.I18n.translations = {
   'services.alerts.brLastCheck': '<br>Last Checked {0}',
   'services.alerts.occurredOn': 'Occurred on {0}, {1}',
   'services.alerts.goToService': 'Go to Service',
-  'services.alerts.goToNagios': 'Go to Nagios Web UI',
 
   'services.summary.selectHostForComponent': 'Select the host to add {0} component',
   'services.summary.allHostsAlreadyRunComponent': 'All hosts already running {0} component',
@@ -532,7 +530,7 @@ Em.I18n.translations = {
   'installer.step3.hostWarningsPopup.report.fileFolders': '<br><br>######################################<br># Files and Folders<br>#<br># A space delimited list of files and folders which should not exist.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: rm -r /etc/hadoop /etc/hbase<br>######################################<br>FILES AND FOLDERS<br>',
   'installer.step3.hostWarningsPopup.report.reverseLookup': '<br><br>######################################<br># Reverse Lookup<br># <br># The hostname was not found in the reverse DNS lookup. This may result in incorrect behavior. <br># Please check the DNS setup and fix the issue.<br>######################################<br>REVERSE LOOKUP<br>',
   'installer.step3.hostWarningsPopup.report.process': '<br><br>######################################<br># Processes<br>#<br># A comma separated list of process tuples which should not be running.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br>######################################<br>PROCESSES<br>',
-  'installer.step3.hostWarningsPopup.report.package': '<br><br>######################################<br># Packages<br>#<br># A space delimited list of software packages which should be uninstalled.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: yum remove hadoop-hdfs nagios<br>######################################<br>PACKAGES<br>',
+  'installer.step3.hostWarningsPopup.report.package': '<br><br>######################################<br># Packages<br>#<br># A space delimited list of software packages which should be uninstalled.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: yum remove hadoop-hdfs yarn<br>######################################<br>PACKAGES<br>',
   'installer.step3.hostWarningsPopup.report.service': '<br><br>######################################<br># Services<br>#<br># A space delimited list of services which should be up and running.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: services start ntpd httpd<br>######################################<br>SERVICES<br>',
   'installer.step3.hostWarningsPopup.report.user': '<br><br>######################################<br># Users<br>#<br># A space delimited list of users who should not exist.<br># Provided so that administrators can easily copy paths into scripts, email etc.<br># Example: userdel hdfs<br>######################################<br>USERS<br>',
   'installer.step3.hostWarningsPopup.report.folder': '\\ /folder',
@@ -801,9 +799,6 @@ Em.I18n.translations = {
 
   'installer.step10.header':'Summary',
   'installer.step10.body':'Here is the summary of the install process.',
-  'installer.step10.nagiosRestartRequired':' Restarting Nagios service is required for alerts and ' +
-    'notifications to work properly.  After clicking on the Complete button to dismiss this wizard, go to ' +
-    '<i>Services -> Nagios</i> to restart the Nagios service.',
   'installer.step10.staleServicesRestartRequired':' You may also need to restart other services for the newly added ' +
     'services to function properly (for example, HDFS and YARN/MapReduce need to be restarted after adding Oozie). After closing this ' +
     'wizard, please restart all services that have the restart indicator <i class="icon-refresh"></i> next to the service name.',
@@ -1585,9 +1580,6 @@ Em.I18n.translations = {
   'services.service.info.menu.configs':'Configs',
   'services.service.info.summary.hostsRunningMonitor':'{0}/{1}',
   'services.service.info.summary.serversHostCount':'{0} more',
-  'services.service.info.summary.nagiosWebUI':'Nagios Web UI',
-  'services.service.info.summary.nagios.noAlerts':'No alerts',
-  'services.service.info.summary.nagios.alerts':'Nagios service required for viewing alerts',
 
   'services.service.config.final':'Final',
   'services.service.config.saved':'Save Configuration Changes',
@@ -2024,7 +2016,6 @@ Em.I18n.translations = {
   'host.host.componentFilter.slave':'Slave Components',
   'host.host.componentFilter.client':'Client Components',
   'hosts.host.deleteComponent.popup.msg1':'Are you sure you want to delete {0}?',
-  'hosts.host.deleteComponent.popup.msg2':'<b>Important:</b> After this <i>{0}</i> is deleted, go to <i>Services -> Nagios</i> to restart the Nagios service.  This is required for the alerts and notifications to work properly.',
   'hosts.host.deleteComponent.popup.deleteZooKeeperServer':'Deleting <i>ZooKeeper Server</i> may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>',
   'hosts.host.deleteComponent.popup.warning':'<b>WARNING!</b> Delete the last <i>{0}</i> component in the cluster?</br>Deleting the last component in the cluster could result in permanent loss of service data.',
   'hosts.host.deleteComponent.popup.confirm':'Confirm Delete',
@@ -2036,7 +2027,6 @@ Em.I18n.translations = {
   'host.host.addComponent.popup.dependedComponents.body': '{0} requires {1} to be installed along with it on the same host. Please add them first and then try adding {0}',
   'host.host.addComponent.popup.dependedComponents.header': 'Component dependencies',
   'hosts.host.zooKeeper.configs.save.note': 'This configuration is created by ambari while installing/deleting zookeeper component on a host',
-  'hosts.host.addComponent.note':'<b>Important:</b> After this <i>{0}</i> is installed, go to <i>Services -> Nagios</i> to restart the Nagios service.  This is required for the alerts and notifications to work properly.',
   'hosts.host.addComponent.securityNote':'You are running your cluster in secure mode. You must set up the keytab for {0} on {1} before you proceed. Otherwise, the component will not be able to start properly.',
   'hosts.host.addComponent.popup.confirm':'Confirm Add',
   'hosts.host.datanode.decommission':'Decommission DataNode',
@@ -2083,7 +2073,6 @@ Em.I18n.translations = {
   'hosts.decommission.tooltip.warning':'Cannot {0} since {1} is not running',
   'hosts.delete.popup.body':'Are you sure you want to delete host <i>{0}</i>?',
   'hosts.delete.popup.body.msg1':'By removing this host, Ambari will ignore future communications from this host. Software packages will not be removed from the host. The components on the host should not be restarted. If you wish to readd this host to the cluster, be sure to clean the host.',
-  'hosts.delete.popup.body.msg2':'After deleting this host, Nagios should be restarted to remove this host from Nagios monitoring. Go to the <i>Services</i> page to restart Nagios.',
   'hosts.delete.popup.body.msg3':'If this host was hosting a Zookeeper Server, the Zookeeper Service should be restarted. Go to the <i>Services</i> page.',
   'hosts.delete.popup.body.msg4':'<b>WARNING!</b> Delete the last <i>{0}</i> component[s] in the cluster?</br>Deleting the last components in the cluster could result in permanent loss of service data.',
   'hosts.delete.popup.body.msg.unknownComponents':'This host does not appear to be online and Ambari communication with the Agent has been lost.',

ambari-web/app/mixins/wizard/addSecurityConfigs.js

@@ -73,10 +73,6 @@ App.AddSecurityConfigs = Em.Mixin.create({
    */
   secureConfigs: function () {
     var configs = [
-      {
-        name: 'nagios_principal_name',
-        serviceName: 'NAGIOS'
-      },
       {
         name: 'zookeeper_principal_name',
         serviceName: 'ZOOKEEPER'

ambari-web/app/models.js

@@ -43,7 +43,6 @@ require('models/service/mapreduce2');
 require('models/service/hbase');
 require('models/service/flume');
 require('models/service/storm');
-require('models/alert');
 require('models/alert_definition');
 require('models/alert_instance');
 require('models/alert_notification');

ambari-web/app/models/alert.js

@@ -1,205 +0,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.
- */
-
-var App = require('app');
-
-/**
- * Defines structure for App.Alert class. Keys mentioned here are for JSON data
- * which comes back from NAGIOS server.
- */
-App.Alert = Em.Object.extend({
-  title: null,//service_description in ajax response
-  serviceType: null,
-  status: null,//current_state in ajax response
-  message: null,//plugin_output in ajax response
-  hostName: null,
-  lastCheck: null,
-  lastTime: null,
-
-  date: function () {
-    return DS.attr.transforms.date.from(this.get('lastTime'));
-  }.property('lastTime'),
-
-  /**
-   * Used to show correct icon in UI
-   */
-  isOk: function () {
-    return this.get('status') == "0";
-  }.property('status'),
-
-  /**
-   * Used to show correct icon in UI
-   */
-  isWarning: function () {
-    return this.get('status') == "1";
-  }.property('status'),
-
-  /**
-   * Used to show correct icon in UI
-   */
-  isCritical: function() {
-    return this.get('status') == '2';
-  }.property('status'),
-
-  /**
-   * Used to show correct icon in UI
-   */
-  isPassive: function() {
-    return this.get('status') == '3';
-  }.property('status'),
-
-  /**
-   * Used to show only required alerts at the service level
-   */
-  ignoredForServices: function() {
-    return ['NodeManager health', 'NodeManager process', 'TaskTracker process', 'RegionServer process', 'DataNode process', 'DataNode space', 'ZooKeeper Server process', 'Supervisors process'].contains(this.get('title'));
-  }.property('title'),
-
-  /**
-   * Used to show only required alerts at the host level
-   */
-  ignoredForHosts: function() {
-    return this.get('title').indexOf('Percent') != -1;
-  }.property('title'),
-
-  /**
-   * Provides how long ago this alert happened.
-   * 
-   * @type {String}
-   */
-  timeSinceAlert: function () {
-    var d = this.get('date');
-    if (d) {
-      var timeFormat = this.t('services.alerts.OK.timePrefix');
-      switch (this.get('status')) {
-        case "1":
-          timeFormat = this.t('services.alerts.WARN.timePrefix');
-          break;
-        case "2":
-          timeFormat = this.t('services.alerts.CRIT.timePrefix');
-          break;
-        case "3":
-          timeFormat = this.t('services.alerts.MAINT.timePrefix');
-          break;
-        case "4":
-          timeFormat = this.t('services.alerts.UNKNOWN.timePrefix');
-          break;
-      }
-      var prevSuffix = $.timeago.settings.strings.suffixAgo;
-      $.timeago.settings.strings.suffixAgo = '';
-      var since = timeFormat.format($.timeago(this.makeTimeAtleastMinuteAgo(d)));
-      $.timeago.settings.strings.suffixAgo = prevSuffix;
-      return since;
-    } else if (d == 0) {
-      var timeFormat = this.t('services.alerts.OK.timePrefixShort');
-      switch (this.get('status')) {
-        case "1":
-          timeFormat = this.t('services.alerts.WARN.timePrefixShort');
-          break;
-        case "2":
-          timeFormat = this.t('services.alerts.CRIT.timePrefixShort');
-          break;
-        case "3":
-          timeFormat = this.t('services.alerts.MAINT.timePrefixShort');
-          break;
-        case "4":
-          timeFormat = this.t('services.alerts.UNKNOWN.timePrefixShort');
-          break;
-      }
-      return timeFormat;
-    } else {
-      return "";
-    }
-  }.property('date', 'status'),
-  
-  makeTimeAtleastMinuteAgo: function(d){
-    var time = d.getTime();
-    var diff = App.dateTime() - time;
-    if (diff < 60000) {
-      diff = 60000 - diff;
-      return new Date(time - diff);
-    }
-    return d;
-  },
-
-  /**
-   * Provides more details about when this alert happened.
-   * 
-   * @type {String}
-   */
-  timeSinceAlertDetails: function () {
-    var details = "";
-    var date = this.get('date');
-    if (date) {
-      var dateString = date.toDateString();
-      dateString = dateString.substr(dateString.indexOf(" ") + 1);
-      dateString = Em.I18n.t('services.alerts.occurredOn').format(dateString, date.toLocaleTimeString());
-      details += dateString;
-    }
-    var lastCheck = this.get('lastCheck');
-    if (lastCheck) {
-      lastCheck = new Date(lastCheck * 1000);
-      details = details ? details + Em.I18n.t('services.alerts.brLastCheck').format($.timeago(lastCheck)) : Em.I18n.t('services.alerts.lastCheck').format($.timeago(lastCheck));
-    }
-    return details;
-  }.property('lastCheck', 'date'),
-
-  /**
-   * Used to show appropriate service label in UI
-   */
-  serviceName: function () {
-    if (this.get('serviceType')) {
-      var type = this.get('serviceType').toLowerCase();
-      switch (type) {
-        case 'hdfs':
-          return 'HDFS';
-        case 'hbase':
-          return "HBase";
-        case 'zookeeper':
-          return "Zookeeper";
-        case 'oozie':
-          return "Oozie";
-        case 'hive':
-          return 'Hive';
-      }
-    }
-    return null;
-  }.property('serviceType'),
-
-  /**
-   * Used to provide appropriate service link in UI
-   */
-  serviceLink: function () {
-    if (this.get('serviceType')) {
-      var type = this.get('serviceType').toLowerCase();
-      switch (type) {
-        case 'hdfs':
-          return '#/main/services/HDFS/summary';
-        case 'hbase':
-          return '#/main/services/HBASE/summary';
-        case 'zookeeper':
-          return '#/main/services/ZOOKEEPER/summary';
-        case 'oozie':
-          return '#/main/services/OOZIE/summary';
-        case 'hive':
-          return '#/main/services/HIVE/summary';
-      }
-    }
-    return null;
-  }.property('serviceType')
-});

ambari-web/app/models/quick_links.js

@@ -171,13 +171,6 @@ App.QuickLinks.FIXTURES = [
     template:'%@://%@/ganglia'
 
   },
-  {
-    id:21,
-    label:'Nagios Web UI',
-    url:'%@://%@/nagios',
-    service_id: 'NAGIOS',
-    template:'%@://%@/nagios'
-  },
   {
     id:23,
     label:'ResourceManager UI',

ambari-web/app/models/service.js

@@ -83,7 +83,6 @@ App.Service = DS.Model.extend({
   serviceTypes: function() {
     var typeServiceMap = {
       GANGLIA: ['MONITORING'],
-      NAGIOS:  ['MONITORING'],
       HDFS: ['HA_MODE'],
       YARN: ['HA_MODE']
     };

ambari-web/app/models/service_config.js

@@ -95,7 +95,7 @@ App.ServiceConfigCategory = Ember.Object.extend({
 
   isForMasterComponent: function () {
     var masterServices = [ 'NameNode', 'SNameNode', 'JobTracker', 'HBase Master', 'Oozie Master',
-      'Hive Metastore', 'WebHCat Server', 'ZooKeeper Server', 'Nagios', 'Ganglia' ];
+      'Hive Metastore', 'WebHCat Server', 'ZooKeeper Server', 'Ganglia' ];
 
     return (masterServices.contains(this.get('name')));
   }.property('name'),

ambari-web/app/models/stack_service.js

@@ -95,7 +95,7 @@ App.StackService = DS.Model.extend({
 
   // Is the service required for monitoring of other hadoop ecosystem services
   isMonitoringService: function () {
-    var services = ['NAGIOS', 'GANGLIA'];
+    var services = ['GANGLIA'];
     return services.contains(this.get('serviceName'));
   }.property('serviceName'),
 
@@ -111,12 +111,6 @@ App.StackService = DS.Model.extend({
       return services.contains(this.get('serviceName'));
   }.property('serviceName'),
 
-  // Is the service required for reporting aleerts
-  isAlertingService: function () {
-      var services = ['NAGIOS'];
-      return services.contains(this.get('serviceName'));
-  }.property('serviceName'),
-
   coSelectedServices: function () {
     var coSelectedServices = App.StackService.coSelected[this.get('serviceName')];
     if (!!coSelectedServices) {
@@ -195,7 +189,6 @@ App.StackService.displayOrder = [
   'MAPREDUCE2',
   'YARN',
   'TEZ',
-  'NAGIOS',
   'GANGLIA',
   'HIVE',
   'HBASE',
@@ -218,9 +211,6 @@ App.StackService.reviewPageHandlers = {
   'HIVE': {
     'Database': 'loadHiveDbValue'
   },
-  'NAGIOS': {
-    'Administrator': 'loadNagiosAdminValue'
-  },
   'OOZIE': {
     'Database': 'loadOozieDbValue'
   }

ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs

@@ -39,5 +39,4 @@
   {{/if}}
   {{t hosts.delete.popup.body.msg1}}
 </div>
-<div class='alert'>{{{t common.important}}} {{t hosts.delete.popup.body.msg2}}</div>
 <div class='alert'>{{{t common.important}}} {{t hosts.delete.popup.body.msg3}}</div>

ambari-web/app/utils/helper.js

@@ -481,6 +481,7 @@ App.format = {
       // for Decommission command, make sure the hostname is in lower case
        result = result.split(':')[0] + ': ' + result.split(':')[1].toLowerCase();
     }
+    //TODO check if UI use this
     if (result === ' Nagios Update Ignore Actionexecute') {
        result = Em.I18n.t('common.maintenance.task');
     }

ambari-web/app/views/common/quick_view_link_view.js

@@ -276,13 +276,13 @@ App.QuickViewLinks = Em.View.extend({
 
   /**
    * services that supports security. this array is used to find out protocol.
-   * becides GANGLIA, NAGIOS, YARN, MAPREDUCE2. These properties use
+   * becides GANGLIA, YARN, MAPREDUCE2. These properties use
    * their properties to know protocol
    */
   servicesSupportsHttps: ["HDFS", "HBASE"],
 
   /**
-   * setProtocol - if cluster is secure for some services (GANGLIA, NAGIOS, MAPREDUCE2, YARN and servicesSupportsHttps)
+   * setProtocol - if cluster is secure for some services (GANGLIA, MAPREDUCE2, YARN and servicesSupportsHttps)
    * protocol becomes "https" otherwise "http" (by default)
    * @param {String} service_id - service name
    * @param {Object} configProperties
@@ -300,9 +300,6 @@ App.QuickViewLinks = Em.View.extend({
       case "GANGLIA":
         return (ambariProperties && ambariProperties['ganglia.https'] == true) ? "https" : "http";
         break;
-      case "NAGIOS":
-        return (ambariProperties && ambariProperties['nagios.https'] == true) ? "https" : "http";
-        break;
       case "YARN":
         var yarnProperties = configProperties && configProperties.findProperty('type', 'yarn-site');
         if (yarnProperties && yarnProperties.properties) {
@@ -367,7 +364,6 @@ App.QuickViewLinks = Em.View.extend({
       case "hbase":
       case "oozie":
       case "ganglia":
-      case "nagios":
       case "storm":
       case "falcon":
         return "_blank";

ambari-web/app/views/main/service/info/summary.js

@@ -67,12 +67,6 @@ App.MainServiceInfoSummaryView = Em.View.extend(App.UserPref, {
     return App.get('services.hasClient');
   }.property('App.services.hasClient'),
 
-  noTemplateService: function () {
-    var serviceName = this.get("service.serviceName");
-    //services with only master components
-    return serviceName == "NAGIOS";
-  }.property('controller.content'),
-
   hasManyServers: function () {
     return this.get('servers').length > 1;
   }.property('servers'),

ambari-web/app/views/main/service/service.js

@@ -19,8 +19,6 @@
 var App = require('app');
 var uiEffects = require('utils/ui_effects');
 
-require('models/alert');
-
 App.MainDashboardServiceHealthView = Em.View.extend({
   classNameBindings: ["healthStatus", "healthStatusClass"],
   //template: Em.Handlebars.compile(""),

ambari-web/app/views/wizard/step10_view.js

@@ -29,13 +29,9 @@ App.WizardStep10View = Em.View.extend({
 
   serviceRestartText: function () {
     var controller = this.get('controller');
-    if (controller.get('isNagiosRestartRequired') && controller.get('isAddServiceWizard'))
-      return Em.I18n.t('common.important')  + Em.I18n.t('installer.step10.nagiosRestartRequired') + Em.I18n.t('installer.step10.staleServicesRestartRequired');
-    else if (controller.get('isNagiosRestartRequired'))
-      return Em.I18n.t('common.important') + Em.I18n.t('installer.step10.nagiosRestartRequired');
-    else if (controller.get('isAddServiceWizard'))
+    if (controller.get('isAddServiceWizard'))
       return Em.I18n.t('common.important') + Em.I18n.t('installer.step10.staleServicesRestartRequired');
     else
       return '';
-  }.property('controller.isNagiosRestartRequired','controller.isAddServiceWizard')
+  }.property('controller.isAddServiceWizard')
 });

ambari-web/test/controllers/global/cluster_controller_test.js

@@ -30,7 +30,7 @@ var modelSetup = require('test/init_model_test');
 describe('App.clusterController', function () {
   var controller = App.ClusterController.create();
   App.Service.FIXTURES = [
-    {service_name: 'NAGIOS'}
+    {service_name: 'GANGLIA'}
   ];
 
   describe('#updateLoadStatus()', function () {
@@ -250,22 +250,22 @@ describe('App.clusterController', function () {
   describe('#gangliaWebProtocol', function () {
     var testCases = [
       {
-        title: 'if ambariProperties is null then nagiosWebProtocol should be "http"',
+        title: 'if ambariProperties is null then gangliaWebProtocol should be "http"',
         data: null,
         result: 'http'
       },
       {
-        title: 'if ambariProperties is empty object then nagiosWebProtocol should be "http"',
+        title: 'if ambariProperties is empty object then gangliaWebProtocol should be "http"',
         data: {},
         result: 'http'
       },
       {
-        title: 'if nagios.https is false then nagiosWebProtocol should be "http"',
+        title: 'if ganglia.https is false then gangliaWebProtocol should be "http"',
         data: {'ganglia.https': false},
         result: 'http'
       },
       {
-        title: 'if nagios.https is true then nagiosWebProtocol should be "http"',
+        title: 'if ganglia.https is true then gangliaWebProtocol should be "http"',
         data: {'ganglia.https': true},
         result: 'https'
       }

ambari-web/test/controllers/main/dashboard_test.js

@@ -14,23 +14,4 @@
  * 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.
- */
-
-/*
-var App = require('app');
-
-require('models/alert'); 
-App.Alert.FIXTURES = [{ status: 'ok' }, { status: 'corrupt' }, { status: 'corrupt',}];
-require('controllers/main/dashboard');
- 
-describe('MainDashboard', function () {
- 
-  var controller = App.MainDashboardController.create();
-  
-  describe('#alertsCount', function () {
-    it('should return 2 if 2 alerts has status corrupt', function () {
-        expect(controller.get('alertsCount')).to.equal(2);
-    })
-  })
-})
-*/
+ */

ambari-web/test/controllers/wizard/step10_test.js

@@ -395,7 +395,7 @@ describe('App.WizardStep10Controller', function () {
 
   describe('#loadMasterComponents', function() {
 
-    var components = Em.A(['NAMENODE','SECONDARY_NAMENODE','JOBTRACKER','HISTORYSERVER','RESOURCEMANAGER','HBASE_MASTER','HIVE_SERVER','OOZIE_SERVER','GANGLIA_SERVER','NAGIOS_SERVER']);
+    var components = Em.A(['NAMENODE','SECONDARY_NAMENODE','JOBTRACKER','HISTORYSERVER','RESOURCEMANAGER','HBASE_MASTER','HIVE_SERVER','OOZIE_SERVER','GANGLIA_SERVER']);
 
     d3.range(1, components.length).forEach(function(i) {
       d3.range(1, i).forEach(function(j) {
@@ -411,42 +411,6 @@ describe('App.WizardStep10Controller', function () {
 
   });
 
-  describe('#isNagiosRestartRequired', function() {
-    Em.A([
-      {
-        controllerName: 'addServiceController',
-        isLoaded: true,
-        e: true
-      },
-      {
-        controllerName: 'installerController',
-        isLoaded: true,
-        e: false
-      },
-      {
-        controllerName: 'addServiceController',
-        isLoaded: false,
-        e: false
-      },
-      {
-        controllerName: 'installerController',
-        isLoaded: false,
-        e: false
-      }
-    ]).forEach(function (test) {
-        it(test.controllerName + ' Nagios loaded' + test.isLoaded.toString(), function () {
-          controller.set('content.controllerName', test.controllerName);
-          sinon.stub(App.Service, 'find', function() {
-            return Em.Object.create({
-              isLoaded: test.isLoaded
-            })
-          });
-          expect(controller.get('isNagiosRestartRequired')).to.equal(test.e);
-          App.Service.find.restore();
-        });
-      });
-  });
-
   describe('#loadRegisteredHosts', function() {
     it('should add object to clusterInfo', function() {
       var masterComponentHosts = [{hostName: 'h1'}, {hostName: 'h2'}, {hostName: 'h3'}],

ambari-web/test/controllers/wizard/step4_test.js

@@ -24,7 +24,7 @@ require('controllers/wizard/step4_controller');
 describe('App.WizardStep4Controller', function () {
 
   var services = [
-    'HDFS', 'NAGIOS', 'GANGLIA', 'OOZIE', 'HIVE', 'HBASE', 'PIG', 'SCOOP', 'ZOOKEEPER',
+    'HDFS', 'GANGLIA', 'OOZIE', 'HIVE', 'HBASE', 'PIG', 'SCOOP', 'ZOOKEEPER',
     'YARN', 'MAPREDUCE2', 'FALCON', 'TEZ', 'STORM', 'AMS', 'RANGER'
   ];
 
@@ -42,7 +42,7 @@ describe('App.WizardStep4Controller', function () {
         'isInstalled': false,
         isPrimaryDFS: serviceName == 'HDFS',
         isDFS: ['HDFS','GLUSTERFS'].contains(serviceName),
-        isMonitoringService: ['NAGIOS','GANGLIA'].contains(serviceName),
+        isMonitoringService: ['GANGLIA'].contains(serviceName),
         requiredServices: App.StackService.find(serviceName).get('requiredServices'),
         displayNameOnSelectServicePage: App.format.role(serviceName),
         coSelectedServices: function() {
@@ -244,11 +244,11 @@ describe('App.WizardStep4Controller', function () {
           errorsExpected: ['serviceCheck_YARN', 'ambariMetricsCheck']
         },
         {
-          services: ['HDFS', 'ZOOKEEPER', 'FALCON', 'NAGIOS'],
+          services: ['HDFS', 'ZOOKEEPER', 'FALCON'],
           errorsExpected: ['serviceCheck_OOZIE', 'ambariMetricsCheck']
         },
         {
-          services: ['HDFS', 'ZOOKEEPER', 'GANGLIA', 'NAGIOS', 'HIVE'],
+          services: ['HDFS', 'ZOOKEEPER', 'GANGLIA', 'HIVE'],
           errorsExpected: ['serviceCheck_YARN', 'ambariMetricsCheck']
         },
         {
@@ -256,7 +256,7 @@ describe('App.WizardStep4Controller', function () {
           errorsExpected: ['serviceCheck_YARN', 'multipleDFS', 'ambariMetricsCheck']
         },
         {
-          services: ['HDFS','ZOOKEEPER', 'NAGIOS', 'GANGLIA'],
+          services: ['HDFS','ZOOKEEPER', 'GANGLIA'],
           errorsExpected: ['ambariMetricsCheck']
         },
         {
@@ -276,11 +276,11 @@ describe('App.WizardStep4Controller', function () {
           errorsExpected: ['serviceCheck_YARN']
         },
         {
-          services: ['HDFS', 'ZOOKEEPER', 'FALCON', 'NAGIOS', 'AMS'],
+          services: ['HDFS', 'ZOOKEEPER', 'FALCON', 'AMS'],
           errorsExpected: ['serviceCheck_OOZIE']
         },
         {
-          services: ['HDFS', 'ZOOKEEPER', 'GANGLIA', 'NAGIOS', 'HIVE', 'AMS'],
+          services: ['HDFS', 'ZOOKEEPER', 'GANGLIA', 'HIVE', 'AMS'],
           errorsExpected: ['serviceCheck_YARN']
         },
         {
@@ -288,7 +288,7 @@ describe('App.WizardStep4Controller', function () {
           errorsExpected: ['serviceCheck_YARN', 'multipleDFS']
         },
         {
-          services: ['HDFS','ZOOKEEPER', 'NAGIOS', 'GANGLIA', 'AMS'],
+          services: ['HDFS','ZOOKEEPER', 'GANGLIA', 'AMS'],
           errorsExpected: []
         },
         {
@@ -346,7 +346,7 @@ describe('App.WizardStep4Controller', function () {
         errorsExpected: ['serviceCheck_YARN', 'serviceCheck_TEZ', 'multipleDFS']
       },
       {
-        services: ['HDFS','ZOOKEEPER', 'NAGIOS', 'GANGLIA'],
+        services: ['HDFS','ZOOKEEPER', 'GANGLIA'],
         confirmPopupCount: 0,
         errorsExpected: []
       }

ambari-web/test/controllers/wizard/step8_test.js

@@ -739,19 +739,6 @@ describe('App.WizardStep8Controller', function () {
       });
   });
 
-  describe('#loadNagiosAdminValue', function() {
-    it('should use serviceConfigProperties nagios_web_login and nagios_contact', function() {
-      installerStep8Controller.set('content', {
-        serviceConfigProperties: [
-          {name: 'nagios_web_login', value: 'admin'},
-          {name: 'nagios_contact', value: 'admin@admin.com'}
-        ]
-      });
-      var nagiosAdmin = installerStep8Controller.loadNagiosAdminValue();
-      expect(nagiosAdmin).to.equal('admin / (admin@admin.com)');
-    });
-  });
-
   describe('#submit', function() {
     beforeEach(function() {
       sinon.stub(installerStep8Controller, 'submitProceed', Em.K);

ambari-web/test/models/alert_test.js

@@ -1,225 +0,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.
- */
-
-var App = require('app');
-
-require('models/alert');
-
-var alert,
-  sampleTime = 1399312800,
-  statusCases = [
-    {
-      status: 0,
-      property: 'isOk',
-      format: 'OK'
-    },
-    {
-      status: 1,
-      property: 'isWarning',
-      format: 'WARN'
-    },
-    {
-      status: 2,
-      property: 'isCritical',
-      format: 'CRIT'
-    },
-    {
-      status: 3,
-      property: 'isPassive',
-      format: 'MAINT'
-    },
-    {
-      status: 4,
-      property: '',
-      format: 'UNKNOWN'
-    }
-  ],
-  ignoredCases = [
-    {
-      title: 'title',
-      result: false
-    },
-    {
-      title: 'Percent',
-      result: true
-    }
-  ],
-  serviceTypeCases = [
-    {
-      type: 'HDFS',
-      name: 'HDFS',
-      link: '#/main/services/HDFS/summary'
-    },
-    {
-      type: 'HBASE',
-      name: 'HBase',
-      link: '#/main/services/HBASE/summary'
-    },
-    {
-      type: 'ZOOKEEPER',
-      name: 'Zookeeper',
-      link: '#/main/services/ZOOKEEPER/summary'
-    },
-    {
-      type: 'OOZIE',
-      name: 'Oozie',
-      link: '#/main/services/OOZIE/summary'
-    },
-    {
-      type: 'HIVE',
-      name: 'Hive',
-      link: '#/main/services/HIVE/summary'
-    },
-    {
-      type: 'service',
-      name: null,
-      link: null
-    },
-    {
-      type: null,
-      name: null,
-      link: null
-    }
-  ],
-  titles = ['NodeManager health', 'NodeManager process', 'TaskTracker process', 'RegionServer process', 'DataNode process', 'DataNode space', 'ZooKeeper Server process', 'Supervisors process'];
-
-describe('App.Alert', function () {
-
-  beforeEach(function() {
-    alert = App.Alert.create();
-  });
-
-  describe('#date', function () {
-    it('is Mon May 05 2014', function () {
-      alert.set('lastTime', sampleTime);
-      expect(alert.get('date').toDateString()).to.equal('Mon May 05 2014');
-    });
-  });
-
-  statusCases.forEach(function (item) {
-    var status = item.status,
-      property = item.property;
-    if (property) {
-      describe('#' + property, function () {
-        it('status ' + status + ' is for ' + property, function () {
-          alert.set('status', status);
-          expect(alert.get(property)).to.be.true;
-          var falseStates = statusCases.mapProperty('property').without(property).without('');
-          var falseStatuses = [];
-          falseStates.forEach(function (state) {
-            falseStatuses.push(alert.get(state));
-          });
-          expect(falseStatuses).to.eql([false, false, false]);
-        });
-      });
-    }
-  });
-
-  describe('#ignoredForServices', function () {
-    titles.forEach(function (item) {
-      it('should be true for ' + item, function () {
-        alert.set('title', item);
-        expect(alert.get('ignoredForServices')).to.be.true;
-      });
-    });
-    it('should be false', function () {
-      alert.set('title', 'title');
-      expect(alert.get('ignoredForServices')).to.be.false;
-    });
-  });
-
-  describe('#ignoredForHosts', function () {
-    ignoredCases.forEach(function (item) {
-      it('should be ' + item.result, function () {
-        alert.set('title', item.title);
-        expect(alert.get('ignoredForHosts')).to.equal(item.result);
-      });
-    });
-  });
-
-  describe('#timeSinceAlert', function () {
-    statusCases.forEach(function (item) {
-      var format = item.format;
-      it('should indicate ' + format + ' status duration', function () {
-        alert.setProperties({
-          lastTime: sampleTime,
-          status: item.status.toString()
-        });
-        expect(alert.get('timeSinceAlert')).to.have.string(format);
-        expect(alert.get('timeSinceAlert.length')).to.be.above(format.length);
-        alert.set('lastTime', 0);
-        expect(alert.get('timeSinceAlert')).to.equal(format);
-      });
-    });
-    it('should be empty', function () {
-      alert.set('lastTime', undefined);
-      expect(alert.get('timeSinceAlert')).to.be.empty;
-    });
-  });
-
-  describe('#makeTimeAtleastMinuteAgo', function () {
-    it('should set the minute-ago time', function () {
-      var time = App.dateTime() - 50000,
-        date = new Date(time - 10000);
-      alert.set('lastTime', time);
-      expect(alert.makeTimeAtleastMinuteAgo(alert.get('date'))).to.be.at.least(date);
-    });
-    it('should return the actual time', function () {
-      var time = App.dateTime() - 70000;
-      alert.set('lastTime', time);
-      expect(alert.makeTimeAtleastMinuteAgo(alert.get('date'))).to.eql(alert.get('date'));
-    });
-  });
-
-  describe('#timeSinceAlertDetails', function () {
-    it ('should return the appropriate string', function () {
-      alert.set('lastTime', sampleTime);
-      var occurred = Em.I18n.t('services.alerts.occurredOn').format('May 05 2014', alert.get('date').toLocaleTimeString());
-      var brChecked = Em.I18n.t('services.alerts.brLastCheck').format($.timeago(sampleTime));
-      var checked = Em.I18n.t('services.alerts.lastCheck').format($.timeago(sampleTime));
-      expect(alert.get('timeSinceAlertDetails')).to.equal(occurred);
-      alert.set('lastCheck', sampleTime / 1000);
-      expect(alert.get('timeSinceAlertDetails')).to.equal(occurred + brChecked);
-      alert.set('lastTime', undefined);
-      expect(alert.get('timeSinceAlertDetails')).to.equal(checked);
-    });
-    it ('should be empty', function () {
-      alert.set('lastCheck', undefined);
-      expect(alert.get('timeSinceAlertDetails')).to.be.empty;
-    });
-  });
-
-  describe('#serviceName', function () {
-    serviceTypeCases.forEach(function (item) {
-      it('should be ' + item.name, function () {
-        alert.set('serviceType', item.type);
-        expect(alert.get('serviceName')).to.equal(item.name);
-      });
-    });
-  });
-
-  describe('#serviceLink', function () {
-    serviceTypeCases.forEach(function (item) {
-      it('should be ' + item.link, function () {
-        alert.set('serviceType', item.type);
-        expect(alert.get('serviceLink')).to.equal(item.link);
-      });
-    });
-  });
-
-});

ambari-web/test/models/service_config_test.js

@@ -110,10 +110,6 @@ var serviceConfig,
       name: 'ZooKeeper Server',
       master: true
     },
-    {
-      name: 'Nagios',
-      master: true
-    },
     {
       name: 'Ganglia',
       master: true

ambari-web/test/models/service_test.js

@@ -107,10 +107,6 @@ var service,
       name: 'GANGLIA',
       configurable: true
     },
-    {
-      name: 'NAGIOS',
-      configurable: true
-    },
     {
       name: 'ZOOKEEPER',
       configurable: true
@@ -268,10 +264,6 @@ describe('App.Service', function () {
         serviceName: 'GANGLIA',
         result: ['MONITORING']
       },
-      {
-        serviceName: 'NAGIOS',
-        result: ['MONITORING']
-      },
       {
         serviceName: 'HDFS',
         result: ['HA_MODE']

ambari-web/test/models/stack_service_test.js

@@ -140,10 +140,6 @@ describe('App.StackService', function () {
         serviceName: 'HDFS',
         result: false
       },
-      {
-        serviceName: 'NAGIOS',
-        result: true
-      },
       {
         serviceName: 'GANGLIA',
         result: true

ambari-web/test/service_components.js

@@ -807,107 +807,6 @@ module.exports = {
         }
       ]
     },
-    {
-      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS",
-      "StackServices" : {
-        "comments" : "Nagios Monitoring and Alerting system",
-        "custom_commands" : [ ],
-        "service_check_supported" : false,
-        "service_name" : "NAGIOS",
-        "display_name" : "Nagios",
-        "service_version" : "3.5.0",
-        "stack_name" : "HDP",
-        "stack_version" : "2.1",
-        "user_name" : null,
-        "required_services" : [ ],
-        "config_types" : {
-          "nagios-env" : {
-            "supports" : {
-              "final" : "false"
-            }
-          }
-        }
-      },
-      "components" : [
-        {
-          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER",
-          "StackServiceComponents" : {
-            "cardinality" : "1",
-            "component_category" : "MASTER",
-            "component_name" : "NAGIOS_SERVER",
-            "display_name" : "Nagios Server",
-            "custom_commands" : [ ],
-            "is_client" : false,
-            "is_master" : true,
-            "service_name" : "NAGIOS",
-            "stack_name" : "HDP",
-            "stack_version" : "2.1"
-          },
-          "dependencies" : [
-            {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HCAT",
-              "Dependencies" : {
-                "component_name" : "HCAT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HDFS_CLIENT",
-              "Dependencies" : {
-                "component_name" : "HDFS_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/MAPREDUCE2_CLIENT",
-              "Dependencies" : {
-                "component_name" : "MAPREDUCE2_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/OOZIE_CLIENT",
-              "Dependencies" : {
-                "component_name" : "OOZIE_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/TEZ_CLIENT",
-              "Dependencies" : {
-                "component_name" : "TEZ_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            },
-            {
-              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/YARN_CLIENT",
-              "Dependencies" : {
-                "component_name" : "YARN_CLIENT",
-                "dependent_component_name" : "NAGIOS_SERVER",
-                "dependent_service_name" : "NAGIOS",
-                "stack_name" : "HDP",
-                "stack_version" : "2.1"
-              }
-            }
-          ]
-        }
-      ]
-    },
     {
       "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE",
       "StackServices" : {

ambari-web/test/utils/helper_test.js

@@ -252,7 +252,6 @@ describe('utils/helper', function() {
           'MAPREDUCE2_CLIENT': 'MapReduce2 Client',
           'MAPREDUCE2_SERVICE_CHECK': 'MapReduce2 Service Check',
           'MYSQL_SERVER': 'MySQL Server',
-          'NAGIOS_SERVER': 'Nagios Server',
           'NAMENODE': 'NameNode',
           'NAMENODE_SERVICE_CHECK': 'NameNode Service Check',
           'NIMBUS': 'Nimbus',

ambari-web/test/views/common/quick_link_view_test.js

@@ -28,8 +28,6 @@ describe('App.QuickViewLinks', function () {
       { serviceName: "GANGLIA", ambariProperties: { 'ganglia.https': true }, m: "https for ganglia", result: "https" },
       { serviceName: "GANGLIA", ambariProperties: { 'ganglia.https': false }, m: "http for ganglia 1", result: "http" },
       { serviceName: "GANGLIA", m: "http for ganglia 2", result: "http" },
-      { serviceName: "NAGIOS", ambariProperties: { 'nagios.https': true }, m: "https for nagios", result: "https" },
-      { serviceName: "NAGIOS", ambariProperties: { 'nagios.https': false }, m: "http for nagios", result: "http" },
       { serviceName: "YARN", configProperties: [
         { type: 'yarn-site', properties: { 'yarn.http.policy': 'HTTPS_ONLY' }}
       ], m: "https for yarn", result: "https" },