You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/02/14 19:45:15 UTC
git commit: AMBARI-4472. Alerts for Ganglia monitor is shown only on
the host with Ganglia server (Dmytro Shkvyra via dlysnichenko)
Updated Branches:
refs/heads/trunk 5d69aaaf2 -> cec62b2e4
AMBARI-4472. Alerts for Ganglia monitor is shown only on the host with Ganglia server (Dmytro Shkvyra via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cec62b2e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cec62b2e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cec62b2e
Branch: refs/heads/trunk
Commit: cec62b2e487860d5088475722299ef3ab4b37a29
Parents: 5d69aaa
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Feb 14 20:44:14 2014 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Feb 14 20:44:14 2014 +0200
----------------------------------------------------------------------
.../services/GANGLIA/package/files/gmondLib.sh | 12 +++------
.../package/templates/hadoop-services.cfg.j2 | 26 ++++++++++++++------
.../services/GANGLIA/package/files/gmondLib.sh | 12 +++------
.../package/templates/hadoop-services.cfg.j2 | 24 +++++++++++++-----
4 files changed, 42 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cec62b2e/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/gmondLib.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/gmondLib.sh b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/gmondLib.sh
index 87da4dd..75a18a8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/gmondLib.sh
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/gmondLib.sh
@@ -160,9 +160,10 @@ host {
*
* At the very least, every gmond must expose its XML state to
* queriers from localhost.
+ * Also we use this port for Nagios monitoring
*/
tcp_accept_channel {
- bind = localhost
+ bind = 0.0.0.0
port = ${gmondPort}
}
@@ -492,13 +493,6 @@ udp_recv_channel {
port = ${gmondPort}
}
-/* The gmond cluster master must additionally provide an XML
- * description of the cluster to the gmetad that will query it.
- */
-tcp_accept_channel {
- bind = ${gmondMasterIP}
- port = ${gmondPort}
-}
END_OF_GMOND_MASTER_CONF
else
return 2;
@@ -542,4 +536,4 @@ END_OF_GMOND_SLAVE_CONF
else
return 1;
fi
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/cec62b2e/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 5c34234..631ff40 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
@@ -112,8 +112,6 @@ define service {
{% endif %}
{% endif %}
-
-
# GANGLIA SERVER Checks
{% if hostgroup_defs['ganglia-server'] %}
define service {
@@ -126,9 +124,12 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endif %}
+{% if hostgroup_defs['namenode'] %}
+{% for hostname in hostgroup_defs['namenode'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for NameNode
servicegroups GANGLIA
@@ -137,10 +138,13 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
+{% endif %}
{% if hostgroup_defs['jobtracker'] %}
+{% for hostname in hostgroup_defs['jobtracker'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for JobTracker
servicegroups GANGLIA
@@ -149,11 +153,13 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
{% endif %}
{% if hostgroup_defs['hbasemasters'] %}
+{% for hostname in hostgroup_defs['hbasemasters'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for HBase Master
servicegroups GANGLIA
@@ -162,11 +168,13 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
{% endif %}
{% if hostgroup_defs['resourcemanager'] %}
+{% for hostname in hostgroup_defs['resourcemanager'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for ResourceManager
servicegroups GANGLIA
@@ -175,11 +183,13 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
{% endif %}
{% if hostgroup_defs['historyserver2'] %}
+{% for hostname in hostgroup_defs['historyserver2'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for HistoryServer
servicegroups GANGLIA
@@ -188,9 +198,9 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
{% endif %}
-{% endif %}
{% if hostgroup_defs['snamenode'] %}
# Secondary namenode checks
http://git-wip-us.apache.org/repos/asf/ambari/blob/cec62b2e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh
index 87da4dd..75a18a8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh
@@ -160,9 +160,10 @@ host {
*
* At the very least, every gmond must expose its XML state to
* queriers from localhost.
+ * Also we use this port for Nagios monitoring
*/
tcp_accept_channel {
- bind = localhost
+ bind = 0.0.0.0
port = ${gmondPort}
}
@@ -492,13 +493,6 @@ udp_recv_channel {
port = ${gmondPort}
}
-/* The gmond cluster master must additionally provide an XML
- * description of the cluster to the gmetad that will query it.
- */
-tcp_accept_channel {
- bind = ${gmondMasterIP}
- port = ${gmondPort}
-}
END_OF_GMOND_MASTER_CONF
else
return 2;
@@ -542,4 +536,4 @@ END_OF_GMOND_SLAVE_CONF
else
return 1;
fi
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/cec62b2e/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 2be5322..3b41d56 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
@@ -139,9 +139,12 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endif %}
+{% if hostgroup_defs['namenode'] %}
+{% for hostname in hostgroup_defs['namenode'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for NameNode
servicegroups GANGLIA
@@ -150,10 +153,13 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
+{% endif %}
{% if hostgroup_defs['jobtracker'] %}
+{% for hostname in hostgroup_defs['jobtracker'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for JobTracker
servicegroups GANGLIA
@@ -162,11 +168,13 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
{% endif %}
{% if hostgroup_defs['hbasemasters'] %}
+{% for hostname in hostgroup_defs['hbasemasters'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for HBase Master
servicegroups GANGLIA
@@ -175,11 +183,13 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
{% endif %}
{% if hostgroup_defs['resourcemanager'] %}
+{% for hostname in hostgroup_defs['resourcemanager'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for ResourceManager
servicegroups GANGLIA
@@ -188,11 +198,13 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
{% endif %}
{% if hostgroup_defs['historyserver2'] %}
+{% for hostname in hostgroup_defs['historyserver2'] %}
define service {
- hostgroup_name ganglia-server
+ host_name {{ hostname }}
use hadoop-service
service_description GANGLIA::Ganglia Monitor process for HistoryServer
servicegroups GANGLIA
@@ -201,9 +213,9 @@ define service {
retry_check_interval 0.25
max_check_attempts 4
}
+{% endfor %}
{% endif %}
-{% endif %}
{% if hostgroup_defs['snamenode'] %}
# Secondary namenode checks