Containerized PCP Integration

agent/Makefile

@@ -161,7 +161,6 @@ tool-datalogs = \
 	numastat-datalog \
 	oc-datalog \
 	openvswitch-datalog \
-	pcp-datalog \
 	perf-datalog \
 	pidstat-convert \
 	pidstat-datalog \
@@ -197,7 +196,6 @@ tool-postprocess = \
 	mpstat-stop-postprocess \
 	numastat-postprocess \
 	openvswitch-postprocess \
-	pcp-postprocess \
 	perf-stop-postprocess \
 	pidstat-postprocess \
 	pidstat-postprocess-cdm \

agent/base

@@ -126,6 +126,30 @@ if [[ -z "$scp_opts" ]]; then
     export scp_opts
 fi
 
+if [[ -z "$prom_reg" ]]; then
+    prom_reg=$(pbench-config prometheus container-registry)
+    if [[ -z "$prom_reg" ]]; then
+        prom_reg='quay.io/prometheus/prometheus'
+    fi
+    export prom_reg
+fi
+
+if [[ -z "$pmlogger_reg" ]]; then
+    pmlogger_reg=$(pbench-config pcp_pmlogger container-registry)
+    if [[ -z "$pmlogger_reg" ]]; then
+        pmlogger_reg='quay.io/pbench/pcp-pmlogger'
+    fi
+    export pmlogger_reg
+fi
+
+if [[ -z "$pmcd_reg" ]]; then
+    pmcd_reg=$(pbench-config pcp_pmcd container-registry)
+    if [[ -z "$pmcd_reg" ]]; then
+        pmcd_reg='quay.io/pbench/pcp-pmcd'
+    fi
+    export pmcd_reg
+fi
+
 function is_redhat() {
     grep -q 'Red Hat' /etc/redhat-release
     return $?

agent/config/pbench-agent-default.cfg

@@ -65,3 +65,8 @@ host_remote_user = root
 stockpile_path =
 stockpile_log =
 stockpile_output_path =
+
+[container-registry]
+pcp_pmlogger = quay.io/pbench/pcp-pmlogger
+pcp_pmcd = quay.io/pbench/pcp-pmcd
+prometheus = quay.io/prometheus/prometheus

agent/containers/images/pcp-images/pcp-pmcd/Dockerfile

@@ -0,0 +1,16 @@
+FROM fedora:33
+
+ENV SUMMARY="Performance Co-Pilot" \
+    DESCRIPTION="Performance Co-Pilot is a system performance analysis toolkit." \
+    VERSION=5
+
+RUN dnf install -y --setopt=tsflags=nodocs procps-ng gettext pcp pcp-zeroconf && \
+    dnf install -y pcp-doc pcp-gui pcp-system-tools && \
+    dnf clean all
+RUN systemctl enable pmcd && systemctl disable pmlogger
+
+COPY config /etc/sysconfig/pmcd
+
+EXPOSE 44321
+CMD ["/usr/sbin/init"]
+

agent/containers/images/pcp-images/pcp-pmcd/config

@@ -0,0 +1,30 @@
+# Environment variables for the pmcd daemon.  Refer also to the
+# pmcd.options and pmcd.conf files for additional configuration.
+
+# Behaviour regarding listening on external-facing interfaces;
+# unset PMCD_LOCAL to allow connections from remote hosts.
+# A value of 0 permits remote connections, 1 permits local only.
+PMCD_LOCAL=0
+
+# Max length to which the queue of pending connections may grow
+# A value of 5 is the default.
+# PMCD_MAXPENDING=5
+
+# Default behaviour regarding pmcd's approach to starting PMDAs;
+# In cases where pmdaroot is available, setting this variable to
+# 1, offloads starting and stopping of agents to pmdaroot.  This
+# allows pmcd to not require a restart when starting a new PMDA.
+PMCD_ROOT_AGENT=1
+
+# Default behaviour regarding pmcd's approach to re-starting any
+# unresponsive PMDAs; this should only be used with pmdaroot and
+# PMCD_ROOT_AGENT=1 as it allows pmcd to attempt to automatically
+# restart any exited PMDA that it detects (which usually requires
+# privileges not available to pmcd itself).
+PMCD_RESTART_AGENTS=1
+
+# Default timeout for waiting on pmcd to accept connections; any
+# longer than this value and the rc scripts report it as failed.
+# The value is a PCPIntro(1) interval in units of seconds and it
+# will be passed directly to the pmcd_wait(1) utility.
+# PMCD_WAIT_TIMEOUT=60

agent/containers/images/pcp-images/pcp-pmlogger/Dockerfile

@@ -0,0 +1,14 @@
+FROM fedora:33
+
+ENV SUMMARY="Performance Co-Pilot" \
+    DESCRIPTION="Performance Co-Pilot is a system performance analysis toolkit." \
+    VERSION=5
+
+RUN dnf install -y --setopt=tsflags=nodocs procps-ng gettext pcp pcp-zeroconf && \
+    dnf install -y pcp-doc pcp-gui pcp-system-tools && \
+    dnf clean all && \
+    rm -rf /etc/pcp/pmlogger/control.d/local
+RUN systemctl enable pmlogger && systemctl disable pmcd
+
+VOLUME ["/var/log/pcp/pmlogger"]
+CMD ["/usr/sbin/init"]

agent/tool-scripts/base-tool

@@ -91,9 +91,6 @@ oc)
 	longoptions="${longoptions},components:"
 	tool_package_name="atomic-openshift-clients"
 	;;
-pcp)
-	tool_package_name="pcp-system-tools"
-	;;
 perf)
 	def_record_opts="-a --freq=100"
 	record_opts="${def_record_opts}"
@@ -595,7 +592,7 @@ install)
 		return ${rc}
 	}
 	case "${tool}" in
-	bpftrace|haproxy-ocp|iostat|kvmtrace|mpstat|oc|pcp|perf|pidstat|pprof|prometheus-metrics|sar|turbostat)
+	bpftrace|haproxy-ocp|iostat|kvmtrace|mpstat|oc|perf|pidstat|pprof|prometheus-metrics|sar|turbostat)
 		require_rpm ${tool_package_name} ${tool_package_ver}
 		rc=${?}
 		;;
@@ -651,7 +648,7 @@ start)
 	oc)
 		tool_cmd="${datalog_path}/${tool}-datalog ${tool_output_dir} ${components}"
 		;;
-	openvswitch|pcp)
+	openvswitch)
 		tool_cmd="${datalog_path}/${tool}-datalog ${tool_output_dir} ${interval}"
 		;;
 	perf)
@@ -811,7 +808,7 @@ stop)
 				fi
 				rc=${?}
 				;;
-			blktrace|bpftrace|iostat|mpstat|pcp|sar|systemtap|tcpdump|turbostat|vmstat)
+			blktrace|bpftrace|iostat|mpstat|sar|systemtap|tcpdump|vmstat)
 				safe_kill "${tool_name}" "${pid}"
 				rc=${?}
 				;;

agent/tool-scripts/meta.json

@@ -20,7 +20,6 @@
 		"numastat": null,
 		"oc": null,
 		"openvswitch": null,
-		"pcp": null,
 		"perf": null,
 		"pidstat": null,
 		"pprof": null,
@@ -43,6 +42,7 @@
 
 	"persistent":{
 		"node-exporter": {"collector": "prometheus", "port": "9100"},
-		"dcgm": {"collector": "prometheus", "port": "8000"}
+		"dcgm": {"collector": "prometheus", "port": "8000"},
+		"pcp": {"collector": "pcp", "port": "44321"}
 	}
 }

agent/tool-scripts/pcp

@@ -0,0 +1,17 @@
+#!/usr/bin/python3
+# -*- mode: python -*-
+
+import sys
+import os
+
+PROG = os.path.basename(sys.argv[0])
+
+if len(sys.argv) != 2 or sys.argv[1] != "--help":
+    print(f"{PROG}: This script is deprecated, please run it with --help for info on registering the tool.", file=sys.stderr)
+    print(f"{PROG}: Run /opt/pbench-agent/tool-scripts/pcp --help for more info.", file=sys.stderr)
+    sys.exit(1)
+
+if sys.argv[1] == "--help":
+    print(f"{PROG}: Options:", file=sys.stdout)
+    print(f"{PROG}: No tool-specific options currently", file=sys.stdout)
+

agent/tool-scripts/postprocess/gold/index.html

@@ -104,18 +104,6 @@ <h3 align="center">mpstat-postprocess</h3>
     <p><a href="mpstat-0/cpu7.html">mpstat-0/cpu7</a></p>
     <p><a href="mpstat-0/cpuall.html">mpstat-0/cpuall</a></p>
 
-    <h3 align="center">pcp-postprocess</h3>
-    <p><a href="pcp-0/disk.html">pcp-0/disk</a></p>
-    <p><a href="pcp-0/event.html">pcp-0/event</a></p>
-    <p><a href="pcp-0/filesys.html">pcp-0/filesys</a></p>
-    <p><a href="pcp-0/hinv.html">pcp-0/hinv</a></p>
-    <p><a href="pcp-0/kernel.html">pcp-0/kernel</a></p>
-    <p><a href="pcp-0/mem.html">pcp-0/mem</a></p>
-    <p><a href="pcp-0/network.html">pcp-0/network</a></p>
-    <p><a href="pcp-0/pmcd.html">pcp-0/pmcd</a></p>
-    <p><a href="pcp-0/pmda.html">pcp-0/pmda</a></p>
-    <p><a href="pcp-0/swap.html">pcp-0/swap</a></p>
-
     <h3 align="center">pidstat-postprocess</h3>
     <p><a href="pidstat/context_switches.html">pidstat/context_switches</a></p>
     <p><a href="pidstat/cpu_usage.html">pidstat/cpu_usage</a></p>