Merge branch 'main' of https://github.com/kmcdonell/pcp

performancecopilot · Apr 2, 2024 · 6f50573 · 6f50573
2 parents e26be2f + 503a703
commit 6f50573
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 16 deletions.
diff --git a/build/rpm/pcp.spec.in b/build/rpm/pcp.spec.in
@@ -2394,7 +2394,7 @@ basic_manifest() {
 # to isolate the (somewhat exotic) dependencies for these tools.
 # Likewise, for the pcp-pmda and pcp-testsuite subpackages.
 #
-total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault.h' >pcp-testsuite-files
+total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault.h|pmcheck/pmda-sample' >pcp-testsuite-files
 total_manifest | keep 'tutorials|/html/|pcp-doc|man.*\.[1-9].*' | cull 'out' >pcp-doc-files
 basic_manifest | keep "$PCP_GUI|pcp-gui|applications|pixmaps|hicolor" | cull 'pmtime.h' >pcp-gui-files
 basic_manifest | keep 'selinux' | cull 'tmp|testsuite' >pcp-selinux-files

diff --git a/build/rpm/redhat.spec b/build/rpm/redhat.spec
@@ -2566,7 +2566,7 @@ basic_manifest() {
 # Likewise, for the pcp-pmda and pcp-testsuite subpackages.
 #
 total_manifest | keep 'tutorials|/html/|pcp-doc|man.*\.[1-9].*' | cull 'out' >pcp-doc-files
-total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault.h' >pcp-testsuite-files
+total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault.h|pmcheck/pmda-sample' >pcp-testsuite-files
 
 basic_manifest | keep "$PCP_GUI|pcp-gui|applications|pixmaps|hicolor" | cull 'pmtime.h' >pcp-gui-files
 basic_manifest | keep 'selinux' | cull 'tmp|testsuite' >pcp-selinux-files

diff --git a/debian/pcp-testsuite.install b/debian/pcp-testsuite.install
@@ -3,3 +3,4 @@ usr/lib/libpcp_fault.a
 usr/lib/libpcp_fault.so
 usr/lib/libpcp_fault.so.3
 usr/lib/sysusers.d/pcp-testsuite.conf
+usr/share/pcp/lib/pmcheck/pmda-sample
diff --git a/qa/1491.out b/qa/1491.out
@@ -18,12 +18,12 @@ pmproxy
 zeroconf       
 -- -lv --
 pmcd            Performance Metrics Collection Daemon - local source of performance data
-pmda-overhead   PCP overhead PMDA - ...
-pmda-sample     PCP sample PMDA
-pmie            PCP Inference Engine - rule-based monitoring
-pmlogger        PCP Archive logger - record performance data for subsequent replay
-pmproxy         PCP Proxy Agent - proxy, web and redis integration
-zeroconf        PCP Zeroconf Package ...
+pmda-overhead   overhead PMDA - ...
+pmda-sample     sample PMDA
+pmie            Inference Engine - rule-based monitoring
+pmlogger        Archive logger - record performance data for subsequent replay
+pmproxy         Proxy Daemon - proxy, web and redis integration
+zeroconf        Zeroconf Package ...
 -- -s --
 pmcd            OK
 pmda-overhead   OK

diff --git a/src/pmcheck/pmda.na.template b/src/pmcheck/pmda.na.template
@@ -17,7 +17,7 @@ na="not currently available for `uname -s`"
 
 if $lflag
 then
-    [ "$verbose" -gt 0 ] && echo "PCP $iam PMDA - $na"
+    [ "$verbose" -gt 0 ] && echo "$iam PMDA - $na"
 elif $sflag
 then
     status=2

diff --git a/src/pmcheck/pmda.template b/src/pmcheck/pmda.template
@@ -14,7 +14,7 @@ iam=`echo "$component" | sed -e 's/pmda-//'`
 
 if $lflag
 then
-    [ "$verbose" -gt 0 ] && echo "PCP $iam PMDA"
+    [ "$verbose" -gt 0 ] && echo "$iam PMDA"
 elif $sflag
 then
     _ctl_pmda state $iam

diff --git a/src/pmdas/overhead/overhead.pmcheck b/src/pmdas/overhead/overhead.pmcheck
@@ -10,7 +10,7 @@ _do_args "$@"
 
 if $lflag
 then
-    [ "$verbose" -gt 0 ] && echo "PCP overhead PMDA - measure overhead of PCP components"
+    [ "$verbose" -gt 0 ] && echo "overhead PMDA - measure overhead of PCP components"
 elif $sflag
 then
     _ctl_pmda state overhead

diff --git a/src/pmie/pmie.pmcheck b/src/pmie/pmie.pmcheck
@@ -37,7 +37,7 @@ then
     fi
 elif $lflag
 then
-    [ "$verbose" -gt 0 ] && echo "PCP Inference Engine - rule-based monitoring"
+    [ "$verbose" -gt 0 ] && echo "Inference Engine - rule-based monitoring"
 elif $aflag
 then
     _ctl_svc activate pmie || status=1

diff --git a/src/pmlogconf/no.zeroconf.pmcheck b/src/pmlogconf/no.zeroconf.pmcheck
@@ -14,7 +14,7 @@ na="not currently available for `uname -s`"
 
 if $lflag
 then
-    [ "$verbose" -gt 0 ] && echo "PCP Zeroconf Package - $na"
+    [ "$verbose" -gt 0 ] && echo "Zeroconf Package - $na"
 elif $sflag
 then
     status=2

diff --git a/src/pmlogconf/zeroconf.pmcheck b/src/pmlogconf/zeroconf.pmcheck
@@ -17,7 +17,7 @@ then
     [ "$verbose" -gt 0 ] && echo "need to install the pcp-zeroconf package"
 elif $lflag
 then
-    [ "$verbose" -gt 0 ] && echo "PCP Zeroconf Package"
+    [ "$verbose" -gt 0 ] && echo "Zeroconf Package"
 elif $aflag
 then
     if [ ! -d "$PCP_VAR_DIR/config/pmlogconf/zeroconf" ]

diff --git a/src/pmlogger/pmlogger.pmcheck b/src/pmlogger/pmlogger.pmcheck
@@ -37,7 +37,7 @@ then
     fi
 elif $lflag
 then
-    [ "$verbose" -gt 0 ] && echo "PCP Archive logger - record performance data for subsequent replay"
+    [ "$verbose" -gt 0 ] && echo "Archive logger - record performance data for subsequent replay"
 elif $aflag
 then
     _ctl_svc activate pmlogger || status=1

diff --git a/src/pmproxy/pmproxy.pmcheck b/src/pmproxy/pmproxy.pmcheck
@@ -37,7 +37,7 @@ then
     fi
 elif $lflag
 then
-    [ "$verbose" -gt 0 ] && echo "PCP Proxy Agent - proxy, web and redis integration"
+    [ "$verbose" -gt 0 ] && echo "Proxy Daemon - proxy, web and redis integration"
 elif $aflag
 then
     _ctl_svc activate pmproxy || status=1