Repository: ambari Updated Branches: refs/heads/trunk 8a9dddee0 -> f0f6936f1
AMBARI-6119. Some metrics on ganglia UI are empty on Ubuntu (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0f6936f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0f6936f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0f6936f Branch: refs/heads/trunk Commit: f0f6936f1979a8847d401acacc6bb35d2e8c143b Parents: 8a9ddde Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Mon Jun 16 17:53:28 2014 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon Jun 16 17:53:28 2014 +0300 ---------------------------------------------------------------------- .../2.0.6/services/GANGLIA/package/files/gmondLib.sh | 14 +++++++------- .../2.0.6/services/GANGLIA/package/scripts/params.py | 2 ++ .../GANGLIA/package/templates/gangliaEnv.sh.j2 | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f0f6936f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh index 53fe1bc..e7ea83f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh @@ -177,31 +177,31 @@ modules { } module { name = "cpu_module" - path = "modcpu.so" + path = "${MODULES_DIR}/modcpu.so" } module { name = "disk_module" - path = "moddisk.so" + path = "${MODULES_DIR}/moddisk.so" } module { name = "load_module" - path = "modload.so" + path = "${MODULES_DIR}/modload.so" } module { name = "mem_module" - path = "modmem.so" + path = "${MODULES_DIR}/modmem.so" } module { name = "net_module" - path = "modnet.so" + path = "${MODULES_DIR}/modnet.so" } module { name = "proc_module" - path = "modproc.so" + path = "${MODULES_DIR}/modproc.so" } module { name = "sys_module" - path = "modsys.so" + path = "${MODULES_DIR}/modsys.so" } } http://git-wip-us.apache.org/repos/asf/ambari/blob/f0f6936f/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 583c903..a4c3db1 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 @@ -38,8 +38,10 @@ gmond_apps = set(gmond_apps) & set(gmond_allowed_apps) if System.get_instance().os_family == "debian": gmond_service_name = "ganglia-monitor" + modules_dir = "/usr/lib/ganglia" else: gmond_service_name = "gmond" + modules_dir = "/usr/lib64/ganglia" webserver_group = "apache" rrdcached_base_dir = config['configurations']['global']["rrdcached_base_dir"] http://git-wip-us.apache.org/repos/asf/ambari/blob/f0f6936f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2 index 2a80234..3a14305 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2 +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2 @@ -42,3 +42,4 @@ RRD_ROOTDIR={{rrdcached_base_dir}} GMETAD_USER={{gmetad_user}}; GMOND_USER={{gmond_user}}; WEBSERVER_GROUP={{webserver_group}}; +MODULES_DIR={{modules_dir}}
