AMBARI-4936. Nagios, HIVE-METASTORE servicegroup is not correct, should be HIVE.(vbrodetskyi)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh

@@ -2,14 +2,6 @@
 
 function real_service() {
   desc=$NAGIOS_SERVICEGROUPNAME
-  case "$desc" in
-    HIVE-METASTORE)
-      desc="HIVE"
-    ;;
-    *)
-    ;;
-  esac
-
   eval "$1='$desc'"
 }
 

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2

@@ -76,8 +76,8 @@ define servicegroup {
 {% endif %}
 {% if hostgroup_defs['hiveserver'] %}
 define servicegroup {
-  servicegroup_name  HIVE-METASTORE
-  alias  HIVE-METASTORE Checks
+  servicegroup_name  HIVE
+  alias  HIVE Checks
 }
 {% endif %}
 {% if hostgroup_defs['zookeeper-servers'] %}

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2

@@ -663,7 +663,7 @@ define service {
         hostgroup_name          hiveserver
         use                     hadoop-service
         service_description     HIVE-METASTORE::Hive Metastore status
-        servicegroups           HIVE-METASTORE
+        servicegroups           HIVE
         {% if security_enabled %}
         check_command           check_hive_metastore_status!{{ hive_metastore_port }}!{{ java64_home }}!true!{{ nagios_keytab_path }}!{{ nagios_principal_name }}!{{ kinit_path_local }}
         {% else %}

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh

@@ -2,14 +2,6 @@
 
 function real_service() {
   desc=$NAGIOS_SERVICEGROUPNAME
-  case "$desc" in
-    HIVE-METASTORE)
-      desc="HIVE"
-    ;;
-    *)
-    ;;
-  esac
-
   eval "$1='$desc'"
 }
 

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2

@@ -58,8 +58,8 @@ define servicegroup {
 {% endif %}
 {% if hostgroup_defs['hiveserver'] %}
 define servicegroup {
-  servicegroup_name  HIVE-METASTORE
-  alias  HIVE-METASTORE Checks
+  servicegroup_name  HIVE
+  alias  HIVE Checks
 }
 {% endif %}
 {% if hostgroup_defs['zookeeper-servers'] %}

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2

@@ -689,7 +689,7 @@ define service {
         hostgroup_name          hiveserver
         use                     hadoop-service
         service_description     HIVE-METASTORE::Hive Metastore status
-        servicegroups           HIVE-METASTORE
+        servicegroups           HIVE
         {% if security_enabled %}
         check_command           check_hive_metastore_status!{{ hive_metastore_port }}!{{ java64_home }}!true!{{ nagios_keytab_path }}!{{ nagios_principal_name }}!{{ kinit_path_local }}
         {% else %}

contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php

@@ -95,7 +95,7 @@ function hdp_mon_generate_response( $response_data )
   define ("MAPREDUCE_SERVICE_CHECK", "JOBTRACKER::JobTracker process down");
   define ("HBASE_SERVICE_CHECK", "HBASEMASTER::HBaseMaster process down");
   define ("ZOOKEEPER_SERVICE_CHECK", "ZOOKEEPER::Percent ZooKeeper Servers down");
-  define ("HIVE_METASTORE_SERVICE_CHECK", "HIVE-METASTORE::Hive Metastore status check");
+  define ("HIVE_SERVICE_CHECK", "HIVE-METASTORE::Hive Metastore status check");
   define ("OOZIE_SERVICE_CHECK", "OOZIE::Oozie Server status check");
   define ("WEBHCAT_SERVICE_CHECK", "WEBHCAT::WebHCat Server status check");
   define ("PUPPET_SERVICE_CHECK", "PUPPET::Puppet agent down");
@@ -182,10 +182,10 @@ function hdp_mon_generate_response( $response_data )
         }
         continue;
       }
-      if (getParameter($object, "service_description") == HIVE_METASTORE_SERVICE_CHECK) {
-        $services_object["HIVE-METASTORE"] = getParameter($object, "last_hard_state");
-        if ($services_object["HIVE-METASTORE"] >= 1) {
-          $services_object["HIVE-METASTORE"] = 1;
+      if (getParameter($object, "service_description") == HIVE_SERVICE_CHECK) {
+        $services_object["HIVE"] = getParameter($object, "last_hard_state");
+        if ($services_object["HIVE"] >= 1) {
+          $services_object["HIVE"] = 1;
         }
         continue;
       }