Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 657E1116D9 for ; Mon, 22 Sep 2014 17:48:00 +0000 (UTC) Received: (qmail 47397 invoked by uid 500); 22 Sep 2014 17:48:00 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 47305 invoked by uid 500); 22 Sep 2014 17:48:00 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 47030 invoked by uid 99); 22 Sep 2014 17:48:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Sep 2014 17:48:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D49EB9D16AC; Mon, 22 Sep 2014 17:47:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Mon, 22 Sep 2014 17:48:10 -0000 Message-Id: <245c3baafe184fb8a809a5218a909a66@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/16] git commit: AMBARI-7423. ganglia host metrics not showing in non-HDFS cluster. (jaimin) AMBARI-7423. ganglia host metrics not showing in non-HDFS cluster. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97ff55ae Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97ff55ae Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97ff55ae Branch: refs/heads/branch-alerts-dev Commit: 97ff55ae272e4ea9d37584bd33e2c2f3b15499c8 Parents: 329b62f Author: Jaimin Jetly Authored: Mon Sep 22 09:34:53 2014 -0700 Committer: Jaimin Jetly Committed: Mon Sep 22 09:34:53 2014 -0700 ---------------------------------------------------------------------- .../HDP/1.3.2/services/GANGLIA/package/scripts/params.py | 5 ++--- .../HDP/2.0.6/services/GANGLIA/package/scripts/params.py | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/97ff55ae/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 0417980..8394082 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 @@ -72,12 +72,11 @@ 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)], + "slave_hosts" : [("HDPDataNode", 8659)], "namenode_host" : [("HDPNameNode", 8661)], "jtnode_host" : [("HDPJobTracker", 8662)], "hbase_master_hosts" : [("HDPHBaseMaster", 8663)], @@ -85,7 +84,7 @@ ganglia_cluster_names = { "hs_host" : [("HDPHistoryServer", 8666)], } -ganglia_clusters = [] +ganglia_clusters = [("HDPSlaves", 8660)] for key in ganglia_cluster_names: property_name = format("/clusterHostInfo/{key}") http://git-wip-us.apache.org/repos/asf/ambari/blob/97ff55ae/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 a00f7b1..43ce36f 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 @@ -109,12 +109,12 @@ 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)], + "jn_hosts": [("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)], + "slave_hosts": [("HDPDataNode", 8659)], "namenode_host": [("HDPNameNode", 8661)], "jtnode_host": [("HDPJobTracker", 8662)], "hbase_master_hosts": [("HDPHBaseMaster", 8663)], @@ -127,7 +127,7 @@ ganglia_cluster_names = { "ReservedPort3": [("ReservedPort3", 8669)] } -ganglia_clusters = [] +ganglia_clusters = [("HDPSlaves", 8660)] for key in ganglia_cluster_names: property_name = format("/clusterHostInfo/{key}")