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/05 13:53:58 UTC
git commit: AMBARI-4947. Change Hive alerts to move away from Hive
metadata queries to port checks.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk c9466c7c0 -> c6f9ff782
AMBARI-4947. Change Hive alerts to move away from Hive metadata queries to port checks.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c6f9ff78
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c6f9ff78
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c6f9ff78
Branch: refs/heads/trunk
Commit: c6f9ff782631d6b76d7d3e0df09cf1a27e3ea8bc
Parents: c9466c7
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Wed Mar 5 14:52:55 2014 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Wed Mar 5 14:53:09 2014 +0200
----------------------------------------------------------------------
.../NAGIOS/package/files/check_wrapper.sh | 3 +++
.../services/NAGIOS/package/scripts/params.py | 1 +
.../package/templates/hadoop-services.cfg.j2 | 20 ++++++++++++++------
.../NAGIOS/package/files/check_wrapper.sh | 3 +++
.../services/NAGIOS/package/scripts/params.py | 1 +
.../package/templates/hadoop-services.cfg.j2 | 20 ++++++++++++++------
.../src/addOns/nagios/scripts/nagios_alerts.php | 1 +
7 files changed, 37 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6f9ff78/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 f0fbbf4..23326cc 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
@@ -20,6 +20,9 @@ function real_component() {
HIVE-METASTORE)
realCompName="HIVE_METASTORE"
;;
+ HIVE-SERVER)
+ realCompName="HIVE_SERVER"
+ ;;
FLUME)
realCompName="FLUME_SERVER"
;;
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6f9ff78/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
index 5e0942e..bc4fee2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
@@ -63,6 +63,7 @@ journalnode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.
datanode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.datanode.http.address'])
flume_port = "4159"
hive_metastore_port = config['configurations']['global']['hive_metastore_port'] #"9083"
+hive_server_port = "10000"
templeton_port = config['configurations']['webhcat-site']['templeton.port'] #"50111"
hbase_rs_port = "60030"
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6f9ff78/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 3ba3d91..24a8821 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
@@ -662,13 +662,21 @@ define service {
define service {
hostgroup_name hiveserver
use hadoop-service
- service_description HIVE-METASTORE::Hive Metastore status
+ service_description HIVE-METASTORE::Hive Metastore process
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 %}
- check_command check_hive_metastore_status!{{ hive_metastore_port }}!{{ java64_home }}!false
- {% endif %}
+ check_command check_tcp_wrapper!{{ hive_metastore_port }}!-w 1 -c 1
+ normal_check_interval 0.5
+ retry_check_interval 0.5
+ max_check_attempts 3
+}
+
+# HIVE Server check
+define service {
+ hostgroup_name hiveserver
+ use hadoop-service
+ service_description HIVE-SERVER::HiveServer2 process
+ servicegroups HIVE
+ check_command check_tcp_wrapper!{{ hive_server_port }}!-w 1 -c 1
normal_check_interval 0.5
retry_check_interval 0.5
max_check_attempts 3
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6f9ff78/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 1c74191..b92bc98 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
@@ -23,6 +23,9 @@ function real_component() {
HIVE-METASTORE)
realCompName="HIVE_METASTORE"
;;
+ HIVE-SERVER)
+ realCompName="HIVE_SERVER"
+ ;;
FLUME)
realCompName="FLUME_SERVER"
;;
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6f9ff78/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
index a971f8b..813c626 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
@@ -63,6 +63,7 @@ journalnode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.
datanode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.datanode.http.address'])
flume_port = "4159"
hive_metastore_port = config['configurations']['global']['hive_metastore_port'] #"9083"
+hive_server_port = "10000"
templeton_port = config['configurations']['webhcat-site']['templeton.port'] #"50111"
hbase_rs_port = "60030"
storm_ui_port = config['configurations']['storm-site']['ui.port']
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6f9ff78/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 73c5335..5b8fb6d 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
@@ -702,13 +702,21 @@ define service {
define service {
hostgroup_name hiveserver
use hadoop-service
- service_description HIVE-METASTORE::Hive Metastore status
+ service_description HIVE-METASTORE::Hive Metastore process
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 %}
- check_command check_hive_metastore_status!{{ hive_metastore_port }}!{{ java64_home }}!false
- {% endif %}
+ check_command check_tcp_wrapper!{{ hive_metastore_port }}!-w 1 -c 1
+ normal_check_interval 0.5
+ retry_check_interval 0.5
+ max_check_attempts 3
+}
+
+# HIVE Server check
+define service {
+ hostgroup_name hiveserver
+ use hadoop-service
+ service_description HIVE-SERVER::HiveServer2 process
+ servicegroups HIVE
+ check_command check_tcp_wrapper!{{ hive_server_port }}!-w 1 -c 1
normal_check_interval 0.5
retry_check_interval 0.5
max_check_attempts 3
http://git-wip-us.apache.org/repos/asf/ambari/blob/c6f9ff78/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 7f13924..ace6ed2 100644
--- a/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
+++ b/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
@@ -380,6 +380,7 @@ function hdp_mon_generate_response( $response_data )
$pieces[0] = "HBASE";
break;
case "HIVE-METASTORE":
+ case "HIVE-SERVER":
$pieces[0] = "HIVE";
break;
case "ZKSERVERS":