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 2015/09/01 14:13:38 UTC

ambari git commit: AMBARI-12956. Host Checks: should not warn on nagios, ganglia or puppet packages (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/trunk 4eb219b8a -> e6fb3934b


AMBARI-12956. Host Checks: should not warn on nagios, ganglia or puppet packages (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6fb3934
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6fb3934
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6fb3934

Branch: refs/heads/trunk
Commit: e6fb3934badaad9d3e93efbdff2bd77d0b025c1b
Parents: 4eb219b
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Sep 1 15:13:05 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Sep 1 15:13:05 2015 +0300

----------------------------------------------------------------------
 ambari-agent/src/main/python/ambari_agent/HostInfo.py           | 2 +-
 .../src/main/resources/custom_actions/scripts/check_host.py     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e6fb3934/ambari-agent/src/main/python/ambari_agent/HostInfo.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index b87b599..3d7125a 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -143,7 +143,7 @@ class HostInfoLinux(HostInfo):
   # Set of default users (need to be replaced with the configured user names)
   DEFAULT_USERS = [
     "hive", "ambari-qa", "oozie", "hbase", "hcat", "mapred",
-    "hdfs", "rrdcached", "zookeeper", "flume", "sqoop", "sqoop2",
+    "hdfs", "zookeeper", "flume", "sqoop", "sqoop2",
     "hue", "yarn", "tez", "storm", "falcon", "kafka", "knox", "ams",
     "hadoop", "spark", "accumulo", "atlas", "mahout", "ranger", "kms"
   ]

http://git-wip-us.apache.org/repos/asf/ambari/blob/e6fb3934/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index c235c87..a1c93b1 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -89,12 +89,13 @@ class CheckHost(Script):
 
   # ignore required packages
   IGNORE_PACKAGES = [
-    "epel-release", "ambari-server", "ambari-agent"
+    "epel-release", "ambari-server", "ambari-agent", "nagios",
+    # ganglia related:
+    "ganglia", "libganglia", "libconfuse", "perl", "rrdtool", "python-rrdtool", "gmetad", "librrd", "rrdcached"
   ]
   
   # Additional packages to look for (search packages that start with these)
   ADDITIONAL_PACKAGES = [
-    "rrdtool", "rrdtool-python", "ganglia", "gmond", "gweb", "libconfuse",
     "ambari-log4j"
   ]