You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/05/23 17:08:00 UTC
git commit: AMBARI-5750. (Apache) AMBARI-5750 Ambari not configuring
Ganglia/gmetad correctly, leading to log spam (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 76be68182 -> 82a2b9bcb
AMBARI-5750. (Apache) AMBARI-5750 Ambari not configuring Ganglia/gmetad correctly, leading to log spam (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/82a2b9bc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/82a2b9bc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/82a2b9bc
Branch: refs/heads/trunk
Commit: 82a2b9bcbefe66303c4c2c9e68a6beb432f4db08
Parents: 76be681
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri May 23 18:07:52 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri May 23 18:07:52 2014 +0300
----------------------------------------------------------------------
.../services/GANGLIA/package/scripts/params.py | 24 +++++++++++++++++++
.../package/templates/gangliaClusters.conf.j2 | 15 +++---------
.../services/GANGLIA/package/scripts/params.py | 25 ++++++++++++++++++++
.../package/templates/gangliaClusters.conf.j2 | 18 +++-----------
4 files changed, 55 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/82a2b9bc/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
index de9f5be..ef13dc8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py
@@ -67,6 +67,30 @@ has_tasktracker = not len(tt_hosts) == 0
has_hbase_rs = not len(hbase_rs_hosts) == 0
has_flume = not len(flume_hosts) == 0
+ganglia_cluster_names = {
+ "jtnode_host" : [("HDPJournalNode", 8654)],
+ "flume_hosts" : [("HDPFlumeServer", 8655)],
+ "hbase_rs_hosts" : [("HDPHBaseRegionServer", 8656)],
+ "nm_hosts" : [("HDPNodeManager", 8657)],
+ "mapred_tt_hosts" : [("HDPTaskTracker", 8658)],
+ "slave_hosts" : [("HDPDataNode", 8659), ("HDPSlaves", 8660)],
+ "namenode_host" : [("HDPNameNode", 8661)],
+ "jtnode_host" : [("HDPJobTracker", 8662)],
+ "hbase_master_hosts" : [("HDPHBaseMaster", 8663)],
+ "rm_host" : [("HDPResourceManager", 8664)],
+ "hs_host" : [("HDPHistoryServer", 8666)],
+}
+
+ganglia_clusters = []
+
+for key in ganglia_cluster_names:
+ property_name = format("/clusterHostInfo/{key}")
+ hosts = set(default(property_name, []))
+ if not len(hosts) == 0:
+ for x in ganglia_cluster_names[key]:
+ ganglia_clusters.append(x)
+
+
if System.get_instance().os_family == "suse":
rrd_py_path = '/srv/www/cgi-bin'
else:
http://git-wip-us.apache.org/repos/asf/ambari/blob/82a2b9bc/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaClusters.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaClusters.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaClusters.conf.j2
index b60a15c..c41ade4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaClusters.conf.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaClusters.conf.j2
@@ -39,15 +39,6 @@
### ClusterName GmondMasterHost GmondPort ###
#########################################################
- HDPJournalNode {{ganglia_server_host}} 8654
- HDPFlumeServer {{ganglia_server_host}} 8655
- HDPHBaseRegionServer {{ganglia_server_host}} 8656
- HDPNodeManager {{ganglia_server_host}} 8657
- HDPTaskTracker {{ganglia_server_host}} 8658
- HDPDataNode {{ganglia_server_host}} 8659
- HDPSlaves {{ganglia_server_host}} 8660
- HDPNameNode {{ganglia_server_host}} 8661
- HDPJobTracker {{ganglia_server_host}} 8662
- HDPHBaseMaster {{ganglia_server_host}} 8663
- HDPResourceManager {{ganglia_server_host}} 8664
- HDPHistoryServer {{ganglia_server_host}} 8666
+{% for x in ganglia_clusters %}
+ {{ x[0] }} {{ganglia_server_host}} {{ x[1] }}
+{% endfor %}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/82a2b9bc/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
index cefe7fd..9bcf54b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
@@ -85,6 +85,31 @@ has_journalnode = not len(jn_hosts) == 0
has_nimbus_server = not len(nimbus_server_hosts) == 0
has_supervisor_server = not len(supervisor_server_hosts) == 0
+ganglia_cluster_names = {
+ "jtnode_host" : [("HDPJournalNode", 8654)],
+ "flume_hosts" : [("HDPFlumeServer", 8655)],
+ "hbase_rs_hosts" : [("HDPHBaseRegionServer", 8656)],
+ "nm_hosts" : [("HDPNodeManager", 8657)],
+ "mapred_tt_hosts" : [("HDPTaskTracker", 8658)],
+ "slave_hosts" : [("HDPDataNode", 8659), ("HDPSlaves", 8660)],
+ "namenode_host" : [("HDPNameNode", 8661)],
+ "jtnode_host" : [("HDPJobTracker", 8662)],
+ "hbase_master_hosts" : [("HDPHBaseMaster", 8663)],
+ "rm_host" : [("HDPResourceManager", 8664)],
+ "hs_host" : [("HDPHistoryServer", 8666)],
+ "nimbus_hosts" : [("HDPNimbus", 8649)],
+ "supervisor_hosts" : [("HDPSupervisor", 8650)]
+}
+
+ganglia_clusters = []
+
+for key in ganglia_cluster_names:
+ property_name = format("/clusterHostInfo/{key}")
+ hosts = set(default(property_name, []))
+ if not len(hosts) == 0:
+ for x in ganglia_cluster_names[key]:
+ ganglia_clusters.append(x)
+
if System.get_instance().os_family == "suse":
rrd_py_path = '/srv/www/cgi-bin'
else:
http://git-wip-us.apache.org/repos/asf/ambari/blob/82a2b9bc/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaClusters.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaClusters.conf.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaClusters.conf.j2
index 1672d92..ffb4e84 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaClusters.conf.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaClusters.conf.j2
@@ -38,18 +38,6 @@
### ClusterName GmondMasterHost GmondPort ###
#########################################################
- HDPJournalNode {{ganglia_server_host}} 8654
- HDPFlumeServer {{ganglia_server_host}} 8655
- HDPHBaseRegionServer {{ganglia_server_host}} 8656
- HDPNodeManager {{ganglia_server_host}} 8657
- HDPTaskTracker {{ganglia_server_host}} 8658
- HDPDataNode {{ganglia_server_host}} 8659
- HDPSlaves {{ganglia_server_host}} 8660
- HDPNameNode {{ganglia_server_host}} 8661
- HDPJobTracker {{ganglia_server_host}} 8662
- HDPHBaseMaster {{ganglia_server_host}} 8663
- HDPResourceManager {{ganglia_server_host}} 8664
- HDPHistoryServer {{ganglia_server_host}} 8666
- HDPNimbus {{ganglia_server_host}} 8649
- HDPSupervisor {{ganglia_server_host}} 8650
-
+{% for x in ganglia_clusters %}
+ {{ x[0] }} {{ganglia_server_host}} {{ x[1] }}
+{% endfor %}
\ No newline at end of file