readme fixup & test output fixup

internal/models/running_input.go

@@ -75,7 +75,7 @@ func (r *RunningInput) MakeMetric(
 	)
 
 	if r.trace && m != nil {
-		fmt.Println("> " + m.String())
+		fmt.Print("> " + m.String())
 	}
 
 	r.MetricsGathered.Incr(1)

plugins/inputs/system/SYSTEM_README.md

@@ -19,6 +19,7 @@ to the unix `uptime` command.
     - load15 (float)
     - load5 (float)
     - n_users (integer)
+    - n_cpus (integer)
     - uptime (integer, seconds)
     - uptime_format (string)
 
@@ -31,5 +32,7 @@ None
 ```
 $ telegraf -config ~/ws/telegraf.conf -input-filter system -test
 * Plugin: system, Collection 1
-> system load1=2.05,load15=2.38,load5=2.03,n_users=4i,uptime=239043i,uptime_format="2 days, 18:24" 1457546165399253452
+* Plugin: inputs.system, Collection 1
+> system,host=tyrion load1=3.72,load5=2.4,load15=2.1,n_users=3i,n_cpus=4i 1483964144000000000
+> system,host=tyrion uptime=1249632i,uptime_format="14 days, 11:07" 1483964144000000000
 ```