allow for gmetric compatible type

the "uint" type is not valid for gmetric, which requires the bit specific
width specified explicitally (8, 16 or 32).

transform the type into a 32bit unsigned int if using uint
and which is the equivalent used internally in modpython.

diskstat/python_modules/diskstat.py

@@ -340,7 +340,12 @@ def metric_cleanup():
 			print ' %s: %s %s [%s]' % (d['name'], v, d['units'], d['description'])
 
 		if options.gmetric:
+			if d['value_type'] == 'uint':
+				value_type = 'uint32'
+			else:
+				value_type = d['value_type']
+
 			cmd = "%s --conf=%s --value='%s' --units='%s' --type='%s' --name='%s' --slope='%s'" % \
-				(options.gmetric_bin, options.gmond_conf, v, d['units'], d['value_type'], d['name'], d['slope'])
+				(options.gmetric_bin, options.gmond_conf, v, d['units'], value_type, d['name'], d['slope'])
 			os.system(cmd)
 

ehcache/python_modules/ehcache.py

@@ -218,7 +218,12 @@ def metric_cleanup():
 			print ' %s: %s %s [%s]' % (d['name'], d['format'] % v, d['units'], d['description'])
 
 		if options.gmetric:
+			if d['value_type'] == 'uint':
+				value_type = 'uint32'
+			else:
+				value_type = d['value_type']
+
 			cmd = "%s --conf=%s --value='%s' --units='%s' --type='%s' --name='%s' --slope='%s'" % \
-				(options.gmetric_bin, options.gmond_conf, v, d['units'], d['value_type'], d['name'], d['slope'])
+				(options.gmetric_bin, options.gmond_conf, v, d['units'], value_type, d['name'], d['slope'])
 			os.system(cmd)
 

httpd/python_modules/httpd.py

@@ -441,7 +441,12 @@ def metric_cleanup():
 			print ' %s: %s %s [%s]' % (d['name'], v, d['units'], d['description'])
 
 		if options.gmetric:
+			if d['value_type'] == 'uint':
+				value_type = 'uint32'
+			else:
+				value_type = d['value_type']
+
 			cmd = "%s --conf=%s --value='%s' --units='%s' --type='%s' --name='%s' --slope='%s'" % \
-				(options.gmetric_bin, options.gmond_conf, v, d['units'], d['value_type'], d['name'], d['slope'])
+				(options.gmetric_bin, options.gmond_conf, v, d['units'], value_type, d['name'], d['slope'])
 			os.system(cmd)
 

jmxsh/python_modules/jmxsh.py

@@ -311,7 +311,12 @@ def metric_cleanup():
 			print ' %s: %s %s [%s]' % (d['name'], d['format'] % v, d['units'], d['description'])
 
 		if options.gmetric:
+			if d['value_type'] == 'uint':
+				value_type = 'uint32'
+			else:
+				value_type = d['value_type']
+
 			cmd = "%s --conf=%s --value='%s' --units='%s' --type='%s' --name='%s' --slope='%s'" % \
-				(options.gmetric_bin, options.gmond_conf, v, d['units'], d['value_type'], d['name'], d['slope'])
+				(options.gmetric_bin, options.gmond_conf, v, d['units'], value_type, d['name'], d['slope'])
 			os.system(cmd)
 

mysqld/python_modules/mysql.py

@@ -1062,7 +1062,12 @@ def metric_cleanup():
 			print ' %s: %s %s [%s]' % (d['name'], v, d['units'], d['description'])
 
 		if options.gmetric:
+			if d['value_type'] == 'uint':
+				value_type = 'uint32'
+			else:
+				value_type = d['value_type']
+
 			cmd = "%s --conf=%s --value='%s' --units='%s' --type='%s' --name='%s' --slope='%s'" % \
-				(options.gmetric_bin, options.gmond_conf, v, d['units'], d['value_type'], d['name'], d['slope'])
+				(options.gmetric_bin, options.gmond_conf, v, d['units'], value_type, d['name'], d['slope'])
 			os.system(cmd)
 

procstat/python_modules/procstat.py

@@ -496,8 +496,13 @@ def metric_cleanup():
 			print ' %s: %s %s [%s]' % (d['name'], d['format'] % v, d['units'], d['description'])
 
 		if options.gmetric:
+			if d['value_type'] == 'uint':
+				value_type = 'uint32'
+			else:
+				value_type = d['value_type']
+
 			cmd = "%s --conf=%s --value='%s' --units='%s' --type='%s' --name='%s' --slope='%s'" % \
-				(options.gmetric_bin, options.gmond_conf, v, d['units'], d['value_type'], d['name'], d['slope'])
+				(options.gmetric_bin, options.gmond_conf, v, d['units'], value_type, d['name'], d['slope'])
 			os.system(cmd)