Browse Source

AMBARI-6119. Some metrics on ganglia UI are empty on Ubuntu (aonishuk)

Andrew Onishuk 11 years ago
parent
commit
f0f6936f19

+ 7 - 7
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmondLib.sh

@@ -177,31 +177,31 @@ modules {
   }
   }
   module {
   module {
     name = "cpu_module"
     name = "cpu_module"
-    path = "modcpu.so"
+    path = "${MODULES_DIR}/modcpu.so"
   }
   }
   module {
   module {
     name = "disk_module"
     name = "disk_module"
-    path = "moddisk.so"
+    path = "${MODULES_DIR}/moddisk.so"
   }
   }
   module {
   module {
     name = "load_module"
     name = "load_module"
-    path = "modload.so"
+    path = "${MODULES_DIR}/modload.so"
   }
   }
   module {
   module {
     name = "mem_module"
     name = "mem_module"
-    path = "modmem.so"
+    path = "${MODULES_DIR}/modmem.so"
   }
   }
   module {
   module {
     name = "net_module"
     name = "net_module"
-    path = "modnet.so"
+    path = "${MODULES_DIR}/modnet.so"
   }
   }
   module {
   module {
     name = "proc_module"
     name = "proc_module"
-    path = "modproc.so"
+    path = "${MODULES_DIR}/modproc.so"
   }
   }
   module {
   module {
     name = "sys_module"
     name = "sys_module"
-    path = "modsys.so"
+    path = "${MODULES_DIR}/modsys.so"
   }
   }
 }
 }
 
 

+ 2 - 0
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":
 if System.get_instance().os_family == "debian":
   gmond_service_name = "ganglia-monitor"
   gmond_service_name = "ganglia-monitor"
+  modules_dir = "/usr/lib/ganglia"
 else:
 else:
   gmond_service_name = "gmond"
   gmond_service_name = "gmond"
+  modules_dir = "/usr/lib64/ganglia"
 
 
 webserver_group = "apache"
 webserver_group = "apache"
 rrdcached_base_dir = config['configurations']['global']["rrdcached_base_dir"]
 rrdcached_base_dir = config['configurations']['global']["rrdcached_base_dir"]

+ 1 - 0
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}};
 GMETAD_USER={{gmetad_user}};
 GMOND_USER={{gmond_user}};
 GMOND_USER={{gmond_user}};
 WEBSERVER_GROUP={{webserver_group}};
 WEBSERVER_GROUP={{webserver_group}};
+MODULES_DIR={{modules_dir}}