Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/performancecopilot/pcp
Browse files Browse the repository at this point in the history
  • Loading branch information
@kmcdonell
kmcdonell committed Apr 8, 2024
2 parents 051b69b + 9f44fb5 commit 67bce52
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 57 deletions.
66 changes: 33 additions & 33 deletions qa/1428.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ STAMP 2 0 832000 73320 759792 517220 0 0 0 28 13

# DATE
# paging statistics
pgpgin/s pgpgout/s fault/s majflt/s pgfree/s pgscank/s pgscand/s pgsteal/s %vmeff
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 13595.00 8.00 58285.50 97.50 55081.50 6491.00 0.00 6323.00 97.41
STAMP 1348.50 43.50 52690.00 7.00 50274.00 210.00 0.00 206.50 98.33
STAMP 925.50 1173.00 57476.00 1.00 54506.50 1988.00 0.00 1899.50 95.55
STAMP 603.50 13.50 59673.50 0.00 54784.50 23.00 0.00 22.00 95.65
STAMP 2876.00 1925.50 123662.00 20.00 85713.50 0.00 0.00 0.00 0.00
STAMP 33.00 219.50 143626.00 0.00 93646.50 0.00 0.00 0.00 0.00
STAMP 6.00 2.50 27754.50 0.50 18219.50 0.00 0.00 0.00 0.00
STAMP 0.00 27.50 372.50 0.00 260.50 0.00 0.00 0.00 0.00
pgpgin/s pgpgout/s fault/s majflt/s pgfree/s pgscank/s pgscand/s pgsteal/s
STAMP N/A N/A N/A N/A N/A N/A N/A N/A
STAMP N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 13595.00 8.00 58285.50 97.50 55081.50 6491.00 0.00 6323.00
STAMP 1348.50 43.50 52690.00 7.00 50274.00 210.00 0.00 206.50
STAMP 925.50 1173.00 57476.00 1.00 54506.50 1988.00 0.00 1899.50
STAMP 603.50 13.50 59673.50 0.00 54784.50 23.00 0.00 22.00
STAMP 2876.00 1925.50 123662.00 20.00 85713.50 0.00 0.00 0.00
STAMP 33.00 219.50 143626.00 0.00 93646.50 0.00 0.00 0.00
STAMP 6.00 2.50 27754.50 0.50 18219.50 0.00 0.00 0.00
STAMP 0.00 27.50 372.50 0.00 260.50 0.00 0.00 0.00


# DATE
Expand Down Expand Up @@ -500,17 +500,17 @@ STAMP 2 0 832000 73320 759792 517220 0 0 0 28 13

# DATE
# paging statistics
pgpgin/s pgpgout/s fault/s majflt/s pgfree/s pgscank/s pgscand/s pgsteal/s %vmeff
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 13595.00 8.00 58285.50 97.50 55081.50 6491.00 0.00 6323.00 97.41
STAMP 1348.50 43.50 52690.00 7.00 50274.00 210.00 0.00 206.50 98.33
STAMP 925.50 1173.00 57476.00 1.00 54506.50 1988.00 0.00 1899.50 95.55
STAMP 603.50 13.50 59673.50 0.00 54784.50 23.00 0.00 22.00 95.65
STAMP 2876.00 1925.50 123662.00 20.00 85713.50 0.00 0.00 0.00 0.00
STAMP 33.00 219.50 143626.00 0.00 93646.50 0.00 0.00 0.00 0.00
STAMP 6.00 2.50 27754.50 0.50 18219.50 0.00 0.00 0.00 0.00
STAMP 0.00 27.50 372.50 0.00 260.50 0.00 0.00 0.00 0.00
pgpgin/s pgpgout/s fault/s majflt/s pgfree/s pgscank/s pgscand/s pgsteal/s
STAMP N/A N/A N/A N/A N/A N/A N/A N/A
STAMP N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 13595.00 8.00 58285.50 97.50 55081.50 6491.00 0.00 6323.00
STAMP 1348.50 43.50 52690.00 7.00 50274.00 210.00 0.00 206.50
STAMP 925.50 1173.00 57476.00 1.00 54506.50 1988.00 0.00 1899.50
STAMP 603.50 13.50 59673.50 0.00 54784.50 23.00 0.00 22.00
STAMP 2876.00 1925.50 123662.00 20.00 85713.50 0.00 0.00 0.00
STAMP 33.00 219.50 143626.00 0.00 93646.50 0.00 0.00 0.00
STAMP 6.00 2.50 27754.50 0.50 18219.50 0.00 0.00 0.00
STAMP 0.00 27.50 372.50 0.00 260.50 0.00 0.00 0.00


# DATE
Expand Down Expand Up @@ -921,17 +921,17 @@ STAMP 2 0 832000 73320 759792 517220 0 0 0 28 13

# DATE
# paging statistics
pgpgin/s pgpgout/s fault/s majflt/s pgfree/s pgscank/s pgscand/s pgsteal/s %vmeff
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP N/A N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 13595.00 8.00 58285.50 97.50 55081.50 6491.00 0.00 6323.00 97.41
STAMP 1348.50 43.50 52690.00 7.00 50274.00 210.00 0.00 206.50 98.33
STAMP 925.50 1173.00 57476.00 1.00 54506.50 1988.00 0.00 1899.50 95.55
STAMP 603.50 13.50 59673.50 0.00 54784.50 23.00 0.00 22.00 95.65
STAMP 2876.00 1925.50 123662.00 20.00 85713.50 0.00 0.00 0.00 0.00
STAMP 33.00 219.50 143626.00 0.00 93646.50 0.00 0.00 0.00 0.00
STAMP 6.00 2.50 27754.50 0.50 18219.50 0.00 0.00 0.00 0.00
STAMP 0.00 27.50 372.50 0.00 260.50 0.00 0.00 0.00 0.00
pgpgin/s pgpgout/s fault/s majflt/s pgfree/s pgscank/s pgscand/s pgsteal/s
STAMP N/A N/A N/A N/A N/A N/A N/A N/A
STAMP N/A N/A N/A N/A N/A N/A N/A N/A
STAMP 13595.00 8.00 58285.50 97.50 55081.50 6491.00 0.00 6323.00
STAMP 1348.50 43.50 52690.00 7.00 50274.00 210.00 0.00 206.50
STAMP 925.50 1173.00 57476.00 1.00 54506.50 1988.00 0.00 1899.50
STAMP 603.50 13.50 59673.50 0.00 54784.50 23.00 0.00 22.00
STAMP 2876.00 1925.50 123662.00 20.00 85713.50 0.00 0.00 0.00
STAMP 33.00 219.50 143626.00 0.00 93646.50 0.00 0.00 0.00
STAMP 6.00 2.50 27754.50 0.50 18219.50 0.00 0.00 0.00
STAMP 0.00 27.50 372.50 0.00 260.50 0.00 0.00 0.00


# DATE
Expand Down
1 change: 1 addition & 0 deletions qa/1491
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ s/not currently available for .*/.../
s/inactive/OK/
s/could be activated/OK/
s/cannot be activated/OK/
s/ No systemd unit file installed//
}' \
-e '/^pmda-redis /{
s/inactive/OK/
Expand Down
13 changes: 11 additions & 2 deletions qa/1992
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ status=1 # failure is the default!
$sudo rm -rf $tmp $tmp.* $seq.full
trap "_cleanup" 0 1 2 3 15

_filter_pmcheck()
{
sed \
-e 's/cannot be activated/checked/g' \
-e 's/could be activated/checked/g' \
-e 's/active/checked/g' \
#end
}

pmdauwsgi_remove()
{
echo
Expand All @@ -44,7 +53,7 @@ pmdauwsgi_install()

echo
echo "=== $iam check post-install ==="
pmcheck pmda-$iam
pmcheck pmda-$iam | _filter_pmcheck

echo
echo "=== $iam agent installation ==="
Expand All @@ -65,7 +74,7 @@ pmdauwsgi_install()
{ print }' | tr -s ' '
echo
echo "=== $iam check post-install ==="
pmcheck pmda-$iam
pmcheck pmda-$iam | _filter_pmcheck
}

# real QA test starts here
Expand Down
6 changes: 6 additions & 0 deletions qa/1992.out
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
QA output created by 1992

=== uwsgi check post-install ===
pmda-uwsgi checked

=== uwsgi agent installation ===
Updating the Performance Metrics Name Space (PMNS) ...
Terminate PMDA if already installed ...
[...install files, make output...]
Updating the PMCD control file, and notifying PMCD ...
Check uwsgi metrics have appeared ... X metrics and Y values

=== uwsgi check post-install ===
pmda-uwsgi checked

=== remove uwsgi agent ===
Culling the Performance Metrics Name Space ...
uwsgi ... done
Expand Down
22 changes: 0 additions & 22 deletions src/pmrep/conf/sar.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,6 @@ pgscand.formula = mem.vmstat.pgscan_direct + mem.vmstat.pgscan_direct_t
pgsteal = mem.vmstat.pgsteal_all
pgsteal.label = pgsteal/s
pgsteal.formula = mem.vmstat.pgsteal_kswapd + mem.vmstat.pgsteal_direct
vmeff = mem.vmstat.vmeff
vmeff.label = %%vmeff
vmeff.formula =
(
delta(mem.vmstat.pgscan_kswapd) +
delta(mem.vmstat.pgscan_direct) +
delta(mem.vmstat.pgscan_direct_throttle)
) == 0
?
mkconst(0, type=double, semantics=instant)
:
100 *
(
delta(mem.vmstat.pgsteal_kswapd) +
delta(mem.vmstat.pgsteal_direct)
)
/
(
delta(mem.vmstat.pgscan_kswapd) +
delta(mem.vmstat.pgscan_direct) +
delta(mem.vmstat.pgscan_direct_throttle)
)

[sar-b]
header = yes
Expand Down

0 comments on commit 67bce52

Please sign in to comment.