Skip to content

Commit

Permalink
pmrep conf: fix cpu usage metrics in sar/vmstat metricset formulas
Browse files Browse the repository at this point in the history 
* use cpu.vnice instead of cpu.nice
* include cpu.intr in system time as the tools do
* include cpu.guest_nice in guest time as the tools do

Adjust QA 1428 output accordingly.
  • Loading branch information
@myllynen
myllynen committed Jul 23, 2024
1 parent 09fe393 commit 766a78e
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 72 deletions.
96 changes: 48 additions & 48 deletions qa/1428.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,29 +52,29 @@ STAMP cpu0 75.50 0.00 21.45 1.55 0.00 1.00
r b swpd free buff cache si so bi bo in cs us sy id wa st gu
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 5 0 127800 937948 1128 706128 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 3 0 127800 937948 1128 707096 0 0 440 738 1218 1246 73 22 0 2 0 0
STAMP 5 0 127800 937228 1128 708688 0 0 54 184 1084 1082 76 21 0 1 0 0
STAMP 4 0 127800 937228 1128 709472 0 0 144 2 1073 930 79 18 0 1 0 0
STAMP 3 0 127800 929176 1128 710592 0 0 328 2 1078 1020 76 20 0 2 0 0
STAMP 3 0 127800 928632 1128 711840 0 0 42 0 1099 1113 74 24 0 0 0 0
STAMP 3 0 127800 911936 1128 712448 0 0 132 0 1090 1010 76 20 0 1 0 0
STAMP 3 0 127800 911936 1128 713352 0 0 63 2 1065 1134 76 21 0 2 0 0
STAMP 3 0 127800 911936 1128 714188 0 0 163 28 1101 1114 75 21 0 2 0 0
STAMP 3 0 127800 937948 1128 707096 0 0 440 738 1218 1246 73 24 0 2 0 0
STAMP 5 0 127800 937228 1128 708688 0 0 54 184 1084 1082 76 22 0 1 0 0
STAMP 4 0 127800 937228 1128 709472 0 0 144 2 1073 930 79 19 0 1 0 0
STAMP 3 0 127800 929176 1128 710592 0 0 328 2 1078 1020 76 21 0 2 0 0
STAMP 3 0 127800 928632 1128 711840 0 0 42 0 1099 1113 74 25 0 0 0 0
STAMP 3 0 127800 911936 1128 712448 0 0 132 0 1090 1010 76 21 0 1 0 0
STAMP 3 0 127800 911936 1128 713352 0 0 63 2 1065 1134 76 22 0 2 0 0
STAMP 3 0 127800 911936 1128 714188 0 0 163 28 1101 1114 75 22 0 2 0 0


# DATE
# virtual memory active/inactive memory statistics
r b swpd free inact active si so bi bo in cs us sy id wa st gu
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 5 0 127800 937948 325704 333888 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 3 0 127800 937948 326580 334948 0 0 440 738 1218 1246 73 22 0 2 0 0
STAMP 5 0 127800 937228 327340 336028 0 0 54 184 1084 1082 76 21 0 1 0 0
STAMP 4 0 127800 937228 328104 348548 0 0 144 2 1073 930 79 18 0 1 0 0
STAMP 3 0 127800 929176 329236 336108 0 0 328 2 1078 1020 76 20 0 2 0 0
STAMP 3 0 127800 928632 330008 340132 0 0 42 0 1099 1113 74 24 0 0 0 0
STAMP 3 0 127800 911936 330600 342944 0 0 132 0 1090 1010 76 20 0 1 0 0
STAMP 3 0 127800 911936 331468 339924 0 0 63 2 1065 1134 76 21 0 2 0 0
STAMP 3 0 127800 911936 332256 343348 0 0 163 28 1101 1114 75 21 0 2 0 0
STAMP 3 0 127800 937948 326580 334948 0 0 440 738 1218 1246 73 24 0 2 0 0
STAMP 5 0 127800 937228 327340 336028 0 0 54 184 1084 1082 76 22 0 1 0 0
STAMP 4 0 127800 937228 328104 348548 0 0 144 2 1073 930 79 19 0 1 0 0
STAMP 3 0 127800 929176 329236 336108 0 0 328 2 1078 1020 76 21 0 2 0 0
STAMP 3 0 127800 928632 330008 340132 0 0 42 0 1099 1113 74 25 0 0 0 0
STAMP 3 0 127800 911936 330600 342944 0 0 132 0 1090 1010 76 21 0 1 0 0
STAMP 3 0 127800 911936 331468 339924 0 0 63 2 1065 1134 76 22 0 2 0 0
STAMP 3 0 127800 911936 332256 343348 0 0 163 28 1101 1114 75 22 0 2 0 0


# DATE
Expand Down Expand Up @@ -492,29 +492,29 @@ STAMP cpu0 75.50 0.00 21.45 1.55 0.00 1.00
r b swpd free buff cache si so bi bo in cs us sy id wa st gu
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 5 0 127800 937948 1128 706128 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 3 0 127800 937948 1128 707096 0 0 440 738 1218 1246 73 22 0 2 0 0
STAMP 5 0 127800 937228 1128 708688 0 0 54 184 1084 1082 76 21 0 1 0 0
STAMP 4 0 127800 937228 1128 709472 0 0 144 2 1073 930 79 18 0 1 0 0
STAMP 3 0 127800 929176 1128 710592 0 0 328 2 1078 1020 76 20 0 2 0 0
STAMP 3 0 127800 928632 1128 711840 0 0 42 0 1099 1113 74 24 0 0 0 0
STAMP 3 0 127800 911936 1128 712448 0 0 132 0 1090 1010 76 20 0 1 0 0
STAMP 3 0 127800 911936 1128 713352 0 0 63 2 1065 1134 76 21 0 2 0 0
STAMP 3 0 127800 911936 1128 714188 0 0 163 28 1101 1114 75 21 0 2 0 0
STAMP 3 0 127800 937948 1128 707096 0 0 440 738 1218 1246 73 24 0 2 0 0
STAMP 5 0 127800 937228 1128 708688 0 0 54 184 1084 1082 76 22 0 1 0 0
STAMP 4 0 127800 937228 1128 709472 0 0 144 2 1073 930 79 19 0 1 0 0
STAMP 3 0 127800 929176 1128 710592 0 0 328 2 1078 1020 76 21 0 2 0 0
STAMP 3 0 127800 928632 1128 711840 0 0 42 0 1099 1113 74 25 0 0 0 0
STAMP 3 0 127800 911936 1128 712448 0 0 132 0 1090 1010 76 21 0 1 0 0
STAMP 3 0 127800 911936 1128 713352 0 0 63 2 1065 1134 76 22 0 2 0 0
STAMP 3 0 127800 911936 1128 714188 0 0 163 28 1101 1114 75 22 0 2 0 0


# DATE
# virtual memory active/inactive memory statistics
r b swpd free inact active si so bi bo in cs us sy id wa st gu
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 5 0 127800 937948 325704 333888 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 3 0 127800 937948 326580 334948 0 0 440 738 1218 1246 73 22 0 2 0 0
STAMP 5 0 127800 937228 327340 336028 0 0 54 184 1084 1082 76 21 0 1 0 0
STAMP 4 0 127800 937228 328104 348548 0 0 144 2 1073 930 79 18 0 1 0 0
STAMP 3 0 127800 929176 329236 336108 0 0 328 2 1078 1020 76 20 0 2 0 0
STAMP 3 0 127800 928632 330008 340132 0 0 42 0 1099 1113 74 24 0 0 0 0
STAMP 3 0 127800 911936 330600 342944 0 0 132 0 1090 1010 76 20 0 1 0 0
STAMP 3 0 127800 911936 331468 339924 0 0 63 2 1065 1134 76 21 0 2 0 0
STAMP 3 0 127800 911936 332256 343348 0 0 163 28 1101 1114 75 21 0 2 0 0
STAMP 3 0 127800 937948 326580 334948 0 0 440 738 1218 1246 73 24 0 2 0 0
STAMP 5 0 127800 937228 327340 336028 0 0 54 184 1084 1082 76 22 0 1 0 0
STAMP 4 0 127800 937228 328104 348548 0 0 144 2 1073 930 79 19 0 1 0 0
STAMP 3 0 127800 929176 329236 336108 0 0 328 2 1078 1020 76 21 0 2 0 0
STAMP 3 0 127800 928632 330008 340132 0 0 42 0 1099 1113 74 25 0 0 0 0
STAMP 3 0 127800 911936 330600 342944 0 0 132 0 1090 1010 76 21 0 1 0 0
STAMP 3 0 127800 911936 331468 339924 0 0 63 2 1065 1134 76 22 0 2 0 0
STAMP 3 0 127800 911936 332256 343348 0 0 163 28 1101 1114 75 22 0 2 0 0


# DATE
Expand Down Expand Up @@ -932,29 +932,29 @@ STAMP cpu0 75.50 0.00 21.45 1.55 0.00 1.00
r b swpd free buff cache si so bi bo in cs us sy id wa st gu
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 5 0 127800 937948 1128 706128 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 3 0 127800 937948 1128 707096 0 0 440 738 1218 1246 73 22 0 2 0 0
STAMP 5 0 127800 937228 1128 708688 0 0 54 184 1084 1082 76 21 0 1 0 0
STAMP 4 0 127800 937228 1128 709472 0 0 144 2 1073 930 79 18 0 1 0 0
STAMP 3 0 127800 929176 1128 710592 0 0 328 2 1078 1020 76 20 0 2 0 0
STAMP 3 0 127800 928632 1128 711840 0 0 42 0 1099 1113 74 24 0 0 0 0
STAMP 3 0 127800 911936 1128 712448 0 0 132 0 1090 1010 76 20 0 1 0 0
STAMP 3 0 127800 911936 1128 713352 0 0 63 2 1065 1134 76 21 0 2 0 0
STAMP 3 0 127800 911936 1128 714188 0 0 163 28 1101 1114 75 21 0 2 0 0
STAMP 3 0 127800 937948 1128 707096 0 0 440 738 1218 1246 73 24 0 2 0 0
STAMP 5 0 127800 937228 1128 708688 0 0 54 184 1084 1082 76 22 0 1 0 0
STAMP 4 0 127800 937228 1128 709472 0 0 144 2 1073 930 79 19 0 1 0 0
STAMP 3 0 127800 929176 1128 710592 0 0 328 2 1078 1020 76 21 0 2 0 0
STAMP 3 0 127800 928632 1128 711840 0 0 42 0 1099 1113 74 25 0 0 0 0
STAMP 3 0 127800 911936 1128 712448 0 0 132 0 1090 1010 76 21 0 1 0 0
STAMP 3 0 127800 911936 1128 713352 0 0 63 2 1065 1134 76 22 0 2 0 0
STAMP 3 0 127800 911936 1128 714188 0 0 163 28 1101 1114 75 22 0 2 0 0


# DATE
# virtual memory active/inactive memory statistics
r b swpd free inact active si so bi bo in cs us sy id wa st gu
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 5 0 127800 937948 325704 333888 N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 3 0 127800 937948 326580 334948 0 0 440 738 1218 1246 73 22 0 2 0 0
STAMP 5 0 127800 937228 327340 336028 0 0 54 184 1084 1082 76 21 0 1 0 0
STAMP 4 0 127800 937228 328104 348548 0 0 144 2 1073 930 79 18 0 1 0 0
STAMP 3 0 127800 929176 329236 336108 0 0 328 2 1078 1020 76 20 0 2 0 0
STAMP 3 0 127800 928632 330008 340132 0 0 42 0 1099 1113 74 24 0 0 0 0
STAMP 3 0 127800 911936 330600 342944 0 0 132 0 1090 1010 76 20 0 1 0 0
STAMP 3 0 127800 911936 331468 339924 0 0 63 2 1065 1134 76 21 0 2 0 0
STAMP 3 0 127800 911936 332256 343348 0 0 163 28 1101 1114 75 21 0 2 0 0
STAMP 3 0 127800 937948 326580 334948 0 0 440 738 1218 1246 73 24 0 2 0 0
STAMP 5 0 127800 937228 327340 336028 0 0 54 184 1084 1082 76 22 0 1 0 0
STAMP 4 0 127800 937228 328104 348548 0 0 144 2 1073 930 79 19 0 1 0 0
STAMP 3 0 127800 929176 329236 336108 0 0 328 2 1078 1020 76 21 0 2 0 0
STAMP 3 0 127800 928632 330008 340132 0 0 42 0 1099 1113 74 25 0 0 0 0
STAMP 3 0 127800 911936 330600 342944 0 0 132 0 1090 1010 76 21 0 1 0 0
STAMP 3 0 127800 911936 331468 339924 0 0 63 2 1065 1134 76 22 0 2 0 0
STAMP 3 0 127800 911936 332256 343348 0 0 163 28 1101 1114 75 22 0 2 0 0


# DATE
Expand Down
2 changes: 1 addition & 1 deletion src/pmrep/conf/mpstat.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ aidle.formula = 100 * rate(kernel.all.cpu.idle) / hinv.ncpu
puser = %%usr,,,,7
puser.formula = 100 * rate(kernel.percpu.cpu.vuser)
pnice = %%nice,,,,7
pnice.formula = 100 * rate(kernel.percpu.cpu.nice)
pnice.formula = 100 * rate(kernel.percpu.cpu.vnice)
psys = %%sys,,,,7
psys.formula = 100 * rate(kernel.percpu.cpu.sys)
pwait = %%iowait,,,,7
Expand Down
2 changes: 1 addition & 1 deletion src/pmrep/conf/numa.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ colxrow = " NUMA n"
nusr = %%usr,,s,,
nusr.formula = 100 * kernel.pernode.cpu.vuser / (hinv.ncpu / hinv.nnode)
nnice = %%nice,,s,,
nnice.formula = 100 * kernel.pernode.cpu.nice / (hinv.ncpu / hinv.nnode)
nnice.formula = 100 * kernel.pernode.cpu.vnice / (hinv.ncpu / hinv.nnode)
nsys = %%sys,,s,,
nsys.formula = 100 * kernel.pernode.cpu.sys / (hinv.ncpu / hinv.nnode)
niowait = %%iowait,,s,,
Expand Down
6 changes: 3 additions & 3 deletions src/pmrep/conf/sar.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ colxrow = " CPU"
usr = %%usr,,s,,
usr.formula = 100 * kernel.all.cpu.vuser / hinv.ncpu
nice = %%nice,,s,,
nice.formula = 100 * kernel.all.cpu.nice / hinv.ncpu
nice.formula = 100 * kernel.all.cpu.vnice / hinv.ncpu
sys = %%sys,,s,,
sys.formula = 100 * kernel.all.cpu.sys / hinv.ncpu
iowait = %%iowait,,s,,
Expand Down Expand Up @@ -428,7 +428,7 @@ colxrow = " CPU"
usr = %%usr,,s,,
usr.formula = 100 * kernel.all.cpu.vuser / hinv.ncpu
nice = %%nice,,s,,
nice.formula = 100 * kernel.all.cpu.nice / hinv.ncpu
nice.formula = 100 * kernel.all.cpu.vnice / hinv.ncpu
sys = %%sys,,s,,
sys.formula = 100 * kernel.all.cpu.sys / hinv.ncpu
iowait = %%iowait,,s,,
Expand All @@ -448,7 +448,7 @@ idle.formula = 100 * kernel.all.cpu.idle / hinv.ncpu
pusr = %%usr,,s,,
pusr.formula = 100 * kernel.percpu.cpu.vuser
pnice = %%nice,,s,,
pnice.formula = 100 * kernel.percpu.cpu.nice
pnice.formula = 100 * kernel.percpu.cpu.vnice
psys = %%sys,,s,,
psys.formula = 100 * kernel.percpu.cpu.sys
piowait = %%iowait,,s,,
Expand Down
38 changes: 19 additions & 19 deletions src/pmrep/conf/vmstat.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ mem.vmstat.pgpgin = bi,,,,6
mem.vmstat.pgpgout = bo,,,,6
kernel.all.intr = in,,,,5
kernel.all.pswitch = cs,,,,6
alluser = kernel.all.cpu.alluserp
alluser.label = us
alluser.formula = 100 * (kernel.all.cpu.user + kernel.all.cpu.nice) / hinv.ncpu
alluser.unit = s
usr = kernel.all.cpu.usrp
usr.label = us
usr.formula = 100 * (kernel.all.cpu.vuser + kernel.all.cpu.vnice) / hinv.ncpu
usr.unit = s
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) / hinv.ncpu
sys.unit = s
idle = kernel.all.cpu.idlep
idle.label = id
Expand All @@ -56,7 +56,7 @@ steal.formula = 100 * kernel.all.cpu.steal / hinv.ncpu
steal.unit = s
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

[vmstat-a]
Expand All @@ -79,13 +79,13 @@ mem.vmstat.pgpgin = bi,,,,6
mem.vmstat.pgpgout = bo,,,,6
kernel.all.intr = in,,,,5
kernel.all.pswitch = cs,,,,6
alluser = kernel.all.cpu.alluserp
alluser.label = us
alluser.formula = 100 * (kernel.all.cpu.user + kernel.all.cpu.nice) / hinv.ncpu
alluser.unit = s
usr = kernel.all.cpu.usrp
usr.label = us
usr.formula = 100 * (kernel.all.cpu.vuser + kernel.all.cpu.vnice) / hinv.ncpu
usr.unit = s
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) / hinv.ncpu
sys.unit = s
idle = kernel.all.cpu.idlep
idle.label = id
Expand All @@ -101,7 +101,7 @@ steal.formula = 100 * kernel.all.cpu.steal / hinv.ncpu
steal.unit = s
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

[vmstat-d]
Expand Down Expand Up @@ -154,14 +154,14 @@ mem.vmstat.pgpgin = bi,,,,6
mem.vmstat.pgpgout = bo,,,,6
kernel.all.intr = in,,,,5
kernel.all.pswitch = cs,,,,6
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 = 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 = 4
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) / hinv.ncpu
sys.unit = s
sys.width = 4
idle = kernel.all.cpu.idlep
Expand All @@ -181,6 +181,6 @@ steal.unit = s
steal.width = 4
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 = 4

0 comments on commit 766a78e

Please sign in to comment.