Merge branch 'gpu_util' into 'master'

Remove unused fan_speed monitoring, add monitoring of memory and gpu utilization

See merge request !139

Former-commit-id: 48b9a2f8

roles/collectd/templates/cuda_collectd.py.j2

@@ -14,11 +14,6 @@ def read(data=None):
         for gpu in root.iter('gpu'):
                 vl.plugin_instance = 'cuda-%s' % (gpu.attrib['id'])
 
-                try:
-                    vl.dispatch(type='fanspeed',
-                            values=[float(gpu.find('fan_speed').text.split()[0])])
-                except:
-                    pass
                 try:
                     vl.dispatch(type='temperature',
                             values=[float(gpu.find('temperature/gpu_temp').text.split()[0])])
@@ -26,8 +21,13 @@ def read(data=None):
                     pass
 
                 try:
-                    vl.dispatch(type='memory', type_instance='used',
-                            values=[1e6 * float(gpu.find('memory_usage/used').text.split()[0])])
+                    vl.dispatch(type='utilization', type_instance='memory',
+                            values=[1e6 * float(gpu.find('utilization/memory_util').text.split()[0])])
+                except:
+                    pass
+                try:
+                    vl.dispatch(type='utilization', type_instance='gpu',
+                            values=[1e6 * float(gpu.find('utilization/gpu_util').text.split()[0])])
                 except:
                     pass