pmrep conf: add support for pmstat -x like metricset

Also correct the previous formulas and scale the counts so that
they are reported in thousands so that they will fit on the output
under typical circumstances.

src/pmrep/conf/pmstat.conf

@@ -27,20 +27,59 @@ allcache.label     = cache
 allcache.formula   = mem.util.cached + mem.util.slab
 allcache.unit      = MB
 allcache.width     = 6
-swap.pagesin       = pi,,,,4
-swap.pagesout      = po,,,,4
-mem.vmstat.pgpgin  = bi,,,,4
-mem.vmstat.pgpgout = bo,,,,4
-kernel.all.intr    = in,,,,4
-kernel.all.pswitch = cs,,,,4
-alluser            = kernel.all.cpu.alluserp
-alluser.label      = us
-alluser.formula    = 100 * (kernel.all.cpu.user + kernel.all.cpu.nice) / hinv.ncpu
-alluser.unit       = s
-alluser.width      = 3
+swap.pagesin       = pi,,count x 10^3,,4
+swap.pagesout      = po,,count x 10^3,,4
+mem.vmstat.pgpgin  = bi,,count x 10^3,,4
+mem.vmstat.pgpgout = bo,,count x 10^3,,4
+kernel.all.intr    = in,,count x 10^3,,4
+kernel.all.pswitch = cs,,count x 10^3,,4
+usr                = kernel.all.cpu.usrp
+usr.label          = us
+usr.formula        = 100 * (kernel.all.cpu.user + kernel.all.cpu.nice) / hinv.ncpu
+usr.unit           = s
+usr.width          = 3
 sys                = kernel.all.cpu.sysp
 sys.label          = sy
-sys.formula        = 100 * kernel.all.cpu.sys / hinv.ncpu
+sys.formula        = 100 * (kernel.all.cpu.sys + kernel.all.cpu.intr + kernel.all.cpu.steal) / hinv.ncpu
+sys.unit           = s
+sys.width          = 3
+idle               = kernel.all.cpu.idlep
+idle.label         = id
+idle.formula       = 100 * (kernel.all.cpu.idle + kernel.all.cpu.wait.total) / hinv.ncpu
+idle.unit          = s
+idle.width         = 3
+
+[pmstat-x]
+header = yes
+unitinfo = no
+globals = no
+timestamp = no
+precision = 0
+delimiter = " "
+repeat_header = auto
+kernel.all.load    = load avg,1 minute,,,
+swap.used          = swpd,,MB,,6
+mem.util.free      = free,,MB,,6
+mem.util.bufmem    = buff,,MB,,6
+allcache           = mem.util.allcache
+allcache.label     = cache
+allcache.formula   = mem.util.cached + mem.util.slab
+allcache.unit      = MB
+allcache.width     = 6
+swap.pagesin       = pi,,count x 10^3,,4
+swap.pagesout      = po,,count x 10^3,,4
+mem.vmstat.pgpgin  = bi,,count x 10^3,,4
+mem.vmstat.pgpgout = bo,,count x 10^3,,4
+kernel.all.intr    = in,,count x 10^3,,4
+kernel.all.pswitch = cs,,count x 10^3,,4
+usr                = kernel.all.cpu.usrp
+usr.label          = us
+usr.formula        = 100 * (kernel.all.cpu.vuser + kernel.all.cpu.vnice) / hinv.ncpu
+usr.unit           = s
+usr.width          = 3
+sys                = kernel.all.cpu.sysp
+sys.label          = sy
+sys.formula        = 100 * (kernel.all.cpu.sys + kernel.all.cpu.intr) / hinv.ncpu
 sys.unit           = s
 sys.width          = 3
 idle               = kernel.all.cpu.idlep
@@ -60,6 +99,6 @@ steal.unit         = s
 steal.width        = 3
 guest              = kernel.all.cpu.guestp
 guest.label        = gu
-guest.formula      = 100 * kernel.all.cpu.guest / hinv.ncpu
+guest.formula      = 100 * (kernel.all.cpu.guest + kernel.all.cpu.guest_nice) / hinv.ncpu
 guest.unit         = s
 guest.width        = 3