You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2014/03/04 19:36:24 UTC
git commit: AMBARI-4936. Nagios,
HIVE-METASTORE servicegroup is not correct, should be HIVE.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 6d532d89b -> 6fdec13f3
AMBARI-4936. Nagios, HIVE-METASTORE servicegroup is not correct, should be HIVE.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6fdec13f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6fdec13f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6fdec13f
Branch: refs/heads/trunk
Commit: 6fdec13f3c9fa45e1767837f7fc1fd7658469b9c
Parents: 6d532d8
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Tue Mar 4 20:35:51 2014 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Tue Mar 4 20:36:06 2014 +0200
----------------------------------------------------------------------
.../1.3.2/services/NAGIOS/package/files/check_wrapper.sh | 8 --------
.../NAGIOS/package/templates/hadoop-servicegroups.cfg.j2 | 4 ++--
.../NAGIOS/package/templates/hadoop-services.cfg.j2 | 2 +-
.../2.0.6/services/NAGIOS/package/files/check_wrapper.sh | 8 --------
.../NAGIOS/package/templates/hadoop-servicegroups.cfg.j2 | 4 ++--
.../NAGIOS/package/templates/hadoop-services.cfg.j2 | 2 +-
.../addons/src/addOns/nagios/scripts/nagios_alerts.php | 10 +++++-----
7 files changed, 11 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fdec13f/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh
index 3e4c61a..f0fbbf4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_wrapper.sh
+++ b/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'"
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fdec13f/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2
index 233051f..523bf4f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2
+++ b/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'] %}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fdec13f/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 5b56354..3ba3d91 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/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 %}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fdec13f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh
index 0982606..1c74191 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_wrapper.sh
+++ b/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'"
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fdec13f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2
index a22f208..592d549 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-servicegroups.cfg.j2
+++ b/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'] %}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fdec13f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index edc36c6..7697293 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/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 %}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fdec13f/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
----------------------------------------------------------------------
diff --git a/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php b/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
index ddae4c0..e1ee38f 100644
--- a/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
+++ b/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;
}