Repository: ambari Updated Branches: refs/heads/branch-2.5 0fc586fb3 -> 329dcd09b
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/329dcd09 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/329dcd09 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/329dcd09 Branch: refs/heads/branch-2.5 Commit: 329dcd09bbd37407575ca492e7b6ec9d1cf42829 Parents: 0fc586f Author: Di Li <[email protected]> Authored: Fri Nov 11 11:08:13 2016 -0500 Committer: Di Li <[email protected]> Committed: Fri Nov 11 11:30:16 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/329dcd09/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 914e09a..0f89106 100644 --- a/ambari-agent/conf/unix/ambari-agent.ini +++ b/ambari-agent/conf/unix/ambari-agent.ini @@ -49,7 +49,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/329dcd09/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/329dcd09/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 1f8449e..c3d6c39 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',
