pmrep conf: make metricset definitions consistent

No functional change, use the same style inside the files,
follow the style of the most of the existing code even though
it's not ideal as it's mixing compact and verbose forms.

src/pmrep/conf/collectl.conf

@@ -45,12 +45,9 @@ globals = no
 timestamp = yes
 precision = 2
 delimiter = " "
-cpu                = %%cpu,,,,5
-cpu.label          = cpu
-cpu.formula        = 100 * (kernel.all.cpu.user + kernel.all.cpu.nice) / hinv.ncpu
-cpu.unit           = s
-sys                = %%sys,,,,5
-sys.label          = sys
+cpu                = cpu,,,,5
+cpu.formula        = 100 * (rate(kernel.all.cpu.user) + rate(kernel.all.cpu.nice)) / hinv.ncpu
+sys                = sys,,,,5
 sys.formula        = 100 * rate(kernel.all.cpu.sys) / hinv.ncpu
 kernel.all.intr    = intr/s,,,,7
 kernel.all.pswitch = cswch/s,,,,8

src/pmrep/conf/mpstat.conf

@@ -37,11 +37,8 @@ guest              = %%guest,,,,7
 guest.formula      = 100 * rate(kernel.all.cpu.guest) / hinv.ncpu
 guest_nice         = %%gnice,,,,7
 guest_nice.formula = 100 * rate(kernel.all.cpu.guest_nice) / hinv.ncpu
-aidle              = kernel.all.cpu.idlep
-aidle.label        = %%idle
-aidle.formula      = 100 * kernel.all.cpu.idle / hinv.ncpu
-aidle.unit         = s
-aidle.width        = 7
+idle               = %%idle,,,,7
+idle.formula       = 100 * rate(kernel.all.cpu.idle) / hinv.ncpu
 
 [mpstat-I-SUM]
 header = yes
@@ -81,48 +78,25 @@ guest              = %%guest,,,,7
 guest.formula      = 100 * rate(kernel.all.cpu.guest) / hinv.ncpu
 guest_nice         = %%gnice,,,,7
 guest_nice.formula = 100 * rate(kernel.all.cpu.guest_nice) / hinv.ncpu
-aidle              = kernel.all.cpu.idlep
-aidle.label        = %%idle
-aidle.formula      = 100 * kernel.all.cpu.idle / hinv.ncpu
-aidle.unit         = s
-aidle.width        = 7
-puser              = kernel.percpu.util.vuser
-puser.label        = %%usr
+aidle              = %%idle,,,,7
+aidle.formula      = 100 * rate(kernel.all.cpu.idle) / hinv.ncpu
+puser              = %%usr,,,,7
 puser.formula      = 100 * rate(kernel.percpu.cpu.vuser)
-puser.width        = 7
-pnice              = kernel.percpu.util.nice
-pnice.label        = %%nice
+pnice              = %%nice,,,,7
 pnice.formula      = 100 * rate(kernel.percpu.cpu.nice)
-pnice.width        = 7
-psys               = kernel.percpu.util.sys
-psys.label         = %%sys
+psys               = %%sys,,,,7
 psys.formula       = 100 * rate(kernel.percpu.cpu.sys)
-psys.width         = 7
-pwait              = kernel.percpu.util.wait
-pwait.label        = %%iowait
+pwait              = %%iowait,,,,7
 pwait.formula      = 100 * rate(kernel.percpu.cpu.wait.total)
-pwait.width        = 7
-pintr              = kernel.percpu.util.hard
-pintr.label        = %%irq
+pintr              = %%irq,,,,7
 pintr.formula      = 100 * rate(kernel.percpu.cpu.irq.hard)
-pintr.width        = 7
-psoft              = kernel.percpu.util.soft
-psoft.label        = %%soft
+psoft              = %%soft,,,,7
 psoft.formula      = 100 * rate(kernel.percpu.cpu.irq.soft)
-psoft.width        = 7
-psteal             = kernel.percpu.util.steal
-psteal.label       = %%steal
+psteal             = %%steal,,,,7
 psteal.formula     = 100 * rate(kernel.percpu.cpu.steal)
-psteal.width       = 7
-pguest             = kernel.percpu.util.guest
-pguest.label       = %%guest
+pguest             = %%guest,,,,7
 pguest.formula     = 100 * rate(kernel.percpu.cpu.guest)
-pguest.width       = 7
-pgnice             = kernel.percpu.util.guest_nice
-pgnice.label       = %%gnice
+pgnice             = %%gnice,,,,7
 pgnice.formula     = 100 * rate(kernel.percpu.cpu.guest_nice)
-pgnice.width       = 7
-pidle              = kernel.percpu.percpu.idlep
-pidle.label        = %%idle
+pidle              = %%idle,,,,7
 pidle.formula      = 100 * rate(kernel.percpu.cpu.idle)
-pidle.width        = 7