Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C6C6D200BBF for ; Mon, 14 Nov 2016 19:24:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C5AAC160AF4; Mon, 14 Nov 2016 18:24:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 755C6160B06 for ; Mon, 14 Nov 2016 19:24:04 +0100 (CET) Received: (qmail 6177 invoked by uid 500); 14 Nov 2016 18:24:03 -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 4820 invoked by uid 99); 14 Nov 2016 18:24:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Nov 2016 18:24:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8984CEEE2B; Mon, 14 Nov 2016 18:24:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Mon, 14 Nov 2016 18:24:12 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/25] ambari git commit: AMBARI-18838: Remove references to ganglias and nagios in Ambari agent source code (dili) archived-at: Mon, 14 Nov 2016 18:24:05 -0000 AMBARI-18838: Remove references to ganglias and nagios in Ambari agent source code (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bed231b9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bed231b9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bed231b9 Branch: refs/heads/branch-feature-AMBARI-18634 Commit: bed231b9668ba7d71720ee3f4abae0a93f3a4991 Parents: 9e82fd1 Author: Di Li Authored: Fri Nov 11 11:08:13 2016 -0500 Committer: Di Li Committed: Fri Nov 11 11:08:13 2016 -0500 ---------------------------------------------------------------------- ambari-agent/conf/unix/ambari-agent.ini | 2 +- ambari-agent/conf/windows/ambari-agent.ini | 5 ++--- ambari-agent/src/main/python/ambari_agent/AmbariConfig.py | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bed231b9/ambari-agent/conf/unix/ambari-agent.ini ---------------------------------------------------------------------- diff --git a/ambari-agent/conf/unix/ambari-agent.ini b/ambari-agent/conf/unix/ambari-agent.ini index 9a0b537..b0b64c9 100644 --- a/ambari-agent/conf/unix/ambari-agent.ini +++ b/ambari-agent/conf/unix/ambari-agent.ini @@ -50,7 +50,7 @@ pidLookupPath=/var/run/ [heartbeat] state_interval_seconds=60 dirs=/etc/hadoop,/etc/hadoop/conf,/etc/hbase,/etc/hcatalog,/etc/hive,/etc/oozie, - /etc/sqoop,/etc/ganglia, + /etc/sqoop, /var/run/hadoop,/var/run/zookeeper,/var/run/hbase,/var/run/templeton,/var/run/oozie, /var/log/hadoop,/var/log/zookeeper,/var/log/hbase,/var/run/templeton,/var/log/hive ; 0 - unlimited http://git-wip-us.apache.org/repos/asf/ambari/blob/bed231b9/ambari-agent/conf/windows/ambari-agent.ini ---------------------------------------------------------------------- diff --git a/ambari-agent/conf/windows/ambari-agent.ini b/ambari-agent/conf/windows/ambari-agent.ini index b7a0a4d..3612414 100644 --- a/ambari-agent/conf/windows/ambari-agent.ini +++ b/ambari-agent/conf/windows/ambari-agent.ini @@ -44,12 +44,11 @@ pidLookupPath=\\var\\run\\ambari-agent [heartbeat] state_interval_seconds=60 dirs=/etc/hadoop,/etc/hadoop/conf,/etc/hbase,/etc/hcatalog,/etc/hive,/etc/oozie, - /etc/sqoop,/etc/ganglia,/etc/nagios, + /etc/sqoop, /var/run/hadoop,/var/run/zookeeper,/var/run/hbase,/var/run/templeton,/var/run/oozie, /var/log/hadoop,/var/log/zookeeper,/var/log/hbase,/var/run/templeton,/var/log/hive, /var/log/nagios -rpms=nagios,ganglia, - hadoop,hadoop-lzo,hbase,oozie,sqoop,pig,zookeeper,hive,libconfuse,ambari-log4j +rpms=hadoop,hadoop-lzo,hbase,oozie,sqoop,pig,zookeeper,hive,libconfuse,ambari-log4j ; 0 - unlimited log_lines_count=300 idle_interval_min=1 http://git-wip-us.apache.org/repos/asf/ambari/blob/bed231b9/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py index 6e4d74a..a097f37 100644 --- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py +++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py @@ -88,8 +88,6 @@ servicesToPidNames = { 'ZOOKEEPER_SERVER': 'zookeeper_server.pid', 'FLUME_SERVER': 'flume-node.pid', 'TEMPLETON_SERVER': 'templeton.pid', - 'GANGLIA_SERVER': 'gmetad.pid', - 'GANGLIA_MONITOR': 'gmond.pid', 'HBASE_MASTER': 'hbase-{USER}-master.pid', 'HBASE_REGIONSERVER': 'hbase-{USER}-regionserver.pid', 'HCATALOG_SERVER': 'webhcat.pid', @@ -125,8 +123,6 @@ pidPathVars = [ 'defaultValue' : '/var/run/hadoop'}, {'var' : 'hadoop_pid_dir_prefix', 'defaultValue' : '/var/run/hadoop'}, - {'var' : 'ganglia_runtime_dir', - 'defaultValue' : '/var/run/ganglia/hdp'}, {'var' : 'hbase_pid_dir', 'defaultValue' : '/var/run/hbase'}, {'var' : 'zk_pid_dir',