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/02/19 19:27:24 UTC
git commit: AMBARI-4741. Alerts for ATS Component.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk d46396018 -> e884fe2e6
AMBARI-4741. Alerts for ATS Component.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e884fe2e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e884fe2e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e884fe2e
Branch: refs/heads/trunk
Commit: e884fe2e645e56edac65f121249b1bdbbc4cbf00
Parents: d463960
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Wed Feb 19 20:26:14 2014 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Wed Feb 19 20:26:14 2014 +0200
----------------------------------------------------------------------
.../HDP/2.0.6/services/NAGIOS/package/scripts/params.py | 5 ++++-
.../NAGIOS/package/templates/hadoop-services.cfg.j2 | 12 ++++++++++++
.../addons/src/addOns/nagios/scripts/nagios_alerts.php | 1 +
3 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e884fe2e/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 69c7c75..c16c038 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
@@ -65,6 +65,7 @@ flume_port = "4159"
hive_metastore_port = config['configurations']['global']['hive_metastore_port'] #"9083"
templeton_port = config['configurations']['webhcat-site']['templeton.port'] #"50111"
hbase_rs_port = "60030"
+ahs_port = get_port_from_url(config['configurations']['yarn-site']['yarn.ahs.webapp.address'])
# this is different for HDP1
nn_metrics_property = "FSNamesystem"
@@ -126,6 +127,7 @@ _zookeeper_hosts = default("/clusterHostInfo/zookeeper_hosts", None)
_flume_hosts = default("/clusterHostInfo/flume_hosts", None)
_nagios_server_host = default("/clusterHostInfo/nagios_server_host",None)
_ganglia_server_host = default("/clusterHostInfo/ganglia_server_host",None)
+_app_timeline_server_hosts = default("/clusterHostInfo/app_timeline_server_hosts",None)
hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts",None)
_hive_server_host = default("/clusterHostInfo/hive_server_host",None)
@@ -160,5 +162,6 @@ hostgroup_defs = {
'resourcemanager' : _rm_host,
'nodemanagers' : _nm_hosts,
'historyserver2' : _hs_host,
- 'journalnodes' : _journalnode_hosts
+ 'journalnodes' : _journalnode_hosts,
+ 'ats-servers' : _app_timeline_server_hosts
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e884fe2e/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 2b3fe1e..fa322e0 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
@@ -654,3 +654,15 @@ define service {
}
{% endif %}
+{% if hostgroup_defs['ats-servers'] %}
+define service {
+ hostgroup_name ats-servers
+ use hadoop-service
+ service_description APP_TIMELINE_SERVER::ATS process
+ servicegroups YARN
+ check_command check_tcp_wrapper!{{ ahs_port }}!-w 1 -c 1
+ normal_check_interval 1
+ retry_check_interval 0.5
+ max_check_attempts 3
+}
+{% endif %}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/e884fe2e/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 fa68704..c835f6f 100644
--- a/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
+++ b/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
@@ -395,6 +395,7 @@ function hdp_mon_generate_response( $response_data )
$pieces[0] = "MAPREDUCE2";
break;
case "RESOURCEMANAGER":
+ case "APP_TIMELINE_SERVER":
case "NODEMANAGER":
$pieces[0] = "YARN";
break;