fix some net/cpu numbers

num_cpus was counted towards total
was returning kbit/m and displaying wrong units

api/server.py

@@ -153,15 +153,15 @@ def get_stats(split, query, environ):
 					stats[field][subfield][date] = array
 			elif field == 'net':
 				field_data = {}
-				for subfield in ['kbit/s_in', 'kbit/s_out', 'err_in', 'err_out', 'drop_in', 'drop_out']:
+				for subfield in ['bit/s_in', 'bit/s_out', 'err_in', 'err_out', 'drop_in', 'drop_out']:
 					field_data[subfield] = [None] * 1440
 				for i in xrange(1440):
 					lv_recv = last_val['net']['bytes_recv']
 					lv_sent = last_val['net']['bytes_sent']
 					if lv_recv > 0:
-						field_data['kbit/s_in'][i] = (subfields['bytes_recv'][i] - lv_recv) * 8.0 / 1024
+						field_data['bit/s_in'][i] = (subfields['bytes_recv'][i] - lv_recv) * 8.0 / 60
 					if lv_sent > 0:
-						field_data['kbit/s_out'][i] = (subfields['bytes_sent'][i] - lv_sent) * 8.0 / 1024
+						field_data['bit/s_out'][i] = (subfields['bytes_sent'][i] - lv_sent) * 8.0 / 60
 					last_val['net']['bytes_recv'] = subfields['bytes_recv'][i]
 					last_val['net']['bytes_sent'] = subfields['bytes_sent'][i]
 					for subfield in ['err_in', 'err_out', 'drop_in', 'drop_out']:

web/static/js/stats.js

@@ -28,13 +28,15 @@ window.addEvent('domready', function() {
 			'cached': '#33a',
 		},
 		'net': {
-			'kbit/s_in': '#33a',
-			'kbit/s_out': '#3a3',
+			'bit/s_in': '#33a',
+			'bit/s_out': '#3a3',
 		},
 	};
 	function graph_stat(field, subfields) {
 		var series = [];
 		Object.each(subfields, function(dates, subfield) {
+			if (subfield == 'num_cpus')
+				return;
 			var array = [];
 			Object.each(dates, function(day_array, k) {
 				if (day_array == null)