diff -Naurp pcp-5.3.5.orig/qa/032 pcp-5.3.5/qa/032

--- pcp-5.3.5.orig/qa/032	2021-11-01 13:02:26.000000000 +1100

+++ pcp-5.3.5/qa/032	2022-01-21 10:55:30.286602172 +1100

@@ -34,13 +34,6 @@ trap "_cleanup" 0 1 2 3 15

 _stop_auto_restart pmcd

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 _service pcp stop | _filter_pcp_stop

 _wait_pmcd_end

 _writable_primary_logger

@@ -48,7 +41,7 @@ _writable_primary_logger

 _service pmcd start 2>&1 | _filter_pcp_start

 _wait_for_pmcd

 _service pmlogger start 2>&1 | _filter_pcp_start

-_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log

+_wait_for_pmlogger

 # real QA test starts here

 _echo "expect this to be off"

diff -Naurp pcp-5.3.5.orig/qa/041 pcp-5.3.5/qa/041

--- pcp-5.3.5.orig/qa/041	2021-09-01 08:58:41.000000000 +1000

+++ pcp-5.3.5/qa/041	2022-01-21 10:55:30.286602172 +1100

@@ -40,12 +40,11 @@ _expect()

     echo "" | tee -a $seq.full

 }

+status=1

 _needclean=true

 TAG=000666000magic

-status=1

-[ -z "$PCP_PMLOGGERCONTROL_PATH" ] && \

-	PCP_PMLOGGERCONTROL_PATH="$PCP_SYSCONF_DIR/pmlogger/control"

-

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

+rm -f $seq.full

 trap "_cleanup" 0 1 2 3 15

 _stop_auto_restart pmcd

@@ -68,15 +67,6 @@ _cleanup()

     exit $status

 }

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

-rm -f $seq.full

-

 # real QA test starts here

 # disable all pmloggers ...

diff -Naurp pcp-5.3.5.orig/qa/066 pcp-5.3.5/qa/066

--- pcp-5.3.5.orig/qa/066	2021-02-17 15:27:41.000000000 +1100

+++ pcp-5.3.5/qa/066	2022-01-21 10:55:30.286602172 +1100

@@ -42,6 +42,7 @@ signal=$PCP_BINADM_DIR/pmsignal

 log=$PCP_PMCDLOG_PATH

 _needclean=true

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _filter_log()

 {

@@ -80,13 +81,6 @@ interrupt()

     exit

 }

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 cleanup()

 {

     if [ $_needclean ]

diff -Naurp pcp-5.3.5.orig/qa/067 pcp-5.3.5/qa/067

--- pcp-5.3.5.orig/qa/067	2021-02-17 15:27:41.000000000 +1100

+++ pcp-5.3.5/qa/067	2022-01-21 10:55:30.287602155 +1100

@@ -31,6 +31,7 @@ trap "rm -f $tmp.*; exit" 0 1 2 3 15

 signal=$PCP_BINADM_DIR/pmsignal

 log=$PCP_PMCDLOG_PATH

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _filter_log()

 {

@@ -69,13 +70,6 @@ interrupt()

     exit

 }

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 cleanup()

 {

     _restore_config $PCP_PMCDCONF_PATH

diff -Naurp pcp-5.3.5.orig/qa/068 pcp-5.3.5/qa/068

--- pcp-5.3.5.orig/qa/068	2019-01-13 14:14:12.000000000 +1100

+++ pcp-5.3.5/qa/068	2022-01-21 10:55:30.287602155 +1100

@@ -19,22 +19,11 @@ echo "QA output created by $seq"

 _needclean=true

 LOCALHOST=`hostname`

-

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 trap "_cleanup" 0 1 2 3 15

-# don't need to regenerate config.default with pmlogconf

-#

-export PMLOGGER_CHECK_SKIP_LOGCONF=yes

-

 _stop_auto_restart pmcd

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 _cleanup()

 {

     echo >>$seq.full

diff -Naurp pcp-5.3.5.orig/qa/069 pcp-5.3.5/qa/069

--- pcp-5.3.5.orig/qa/069	2021-11-08 09:45:56.000000000 +1100

+++ pcp-5.3.5/qa/069	2022-01-21 10:55:30.287602155 +1100

@@ -45,6 +45,7 @@ nconfig=$tmp.pmcd.conf.new

 log=$PCP_PMCDLOG_PATH

 LOCALHOST=`hostname`

 LOCALHOST_FULL=`pmhostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _needclean=true

 rm -f $seq.full

@@ -104,13 +105,6 @@ skip > 0				{ skip--; next }

 }

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 cleanup()

 {

     if $_needclean

diff -Naurp pcp-5.3.5.orig/qa/1055 pcp-5.3.5/qa/1055

--- pcp-5.3.5.orig/qa/1055	2021-02-17 15:27:41.000000000 +1100

+++ pcp-5.3.5/qa/1055	2022-01-21 10:55:30.287602155 +1100

@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal

 status=1

 done_clean=false

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _cleanup()

 {

@@ -66,13 +67,7 @@ $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH

 _writable_primary_logger

 _service pcp restart 2>&1 | _filter_pcp_start

 _wait_for_pmcd

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log

+_wait_for_pmlogger

 # Reset pmlogger

 echo "log sample.dynamic.meta.metric"

diff -Naurp pcp-5.3.5.orig/qa/172 pcp-5.3.5/qa/172

--- pcp-5.3.5.orig/qa/172	2021-02-17 15:27:41.000000000 +1100

+++ pcp-5.3.5/qa/172	2022-01-21 10:55:30.287602155 +1100

@@ -39,6 +39,7 @@ else

     esac

 fi

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 LOCALHOST=`hostname`

 _needclean=true

 status=0

@@ -48,13 +49,6 @@ _interrupt()

     status=1

 }

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 _cleanup()

 {

     if $_needclean

diff -Naurp pcp-5.3.5.orig/qa/192 pcp-5.3.5/qa/192

--- pcp-5.3.5.orig/qa/192	2019-01-13 14:14:12.000000000 +1100

+++ pcp-5.3.5/qa/192	2022-01-21 10:55:30.287602155 +1100

@@ -13,6 +13,7 @@ echo "QA output created by $seq"

 . ./common.filter

 . ./common.check

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 LOCALHOST=`hostname`

 _needclean=true

 status=0

@@ -22,13 +23,6 @@ _interrupt()

     status=1

 }

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 _cleanup()

 {

     if $_needclean

diff -Naurp pcp-5.3.5.orig/qa/220 pcp-5.3.5/qa/220

--- pcp-5.3.5.orig/qa/220	2021-07-13 09:34:38.000000000 +1000

+++ pcp-5.3.5/qa/220	2022-01-21 10:55:30.287602155 +1100

@@ -18,13 +18,7 @@ which netstat >/dev/null 2>&1 || _notrun

 status=0

 clean=false

 LOCALHOST=`hostname`

-

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _cleanup()

 {

diff -Naurp pcp-5.3.5.orig/qa/258 pcp-5.3.5/qa/258

--- pcp-5.3.5.orig/qa/258	2019-01-30 14:22:38.000000000 +1100

+++ pcp-5.3.5/qa/258	2022-01-21 10:55:30.287602155 +1100

@@ -19,6 +19,7 @@ echo "QA output created by $seq"

 signal=$PCP_BINADM_DIR/pmsignal

 status=1

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _needclean=true

 _interrupt()

@@ -26,13 +27,6 @@ _interrupt()

     status=1

 }

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 _cleanup()

 {

     cd $here

diff -Naurp pcp-5.3.5.orig/qa/279 pcp-5.3.5/qa/279

--- pcp-5.3.5.orig/qa/279	2021-02-17 15:27:41.000000000 +1100

+++ pcp-5.3.5/qa/279	2022-01-21 10:55:30.287602155 +1100

@@ -17,6 +17,7 @@ echo "QA output created by $seq"

 status=1	# failure is the default!

 killer=`pwd`/src/killparent

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _needclean=true

 rm -f $seq.full

@@ -76,13 +77,6 @@ _filter_pmcd()

     # end

 }

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 _save_config $PCP_PMCDCONF_PATH

 _disable_loggers

 pmafm $LOGGING_DIR/$LOCALHOST/Latest remove >$tmp.cmd 2>&1 \

diff -Naurp pcp-5.3.5.orig/qa/280 pcp-5.3.5/qa/280

--- pcp-5.3.5.orig/qa/280	2021-08-16 14:12:25.000000000 +1000

+++ pcp-5.3.5/qa/280	2022-01-21 10:55:30.287602155 +1100

@@ -13,16 +13,6 @@ echo "QA output created by $seq"

 . ./common.filter

 . ./common.check

-if [ -d "$PCP_ARCHIVE_DIR" ]

-then

-    LOGGING_DIR=$PCP_ARCHIVE_DIR

-elif [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 _filter()

 {

     [ -z "$PCP_PMLOGGERCONTROL_PATH" ] && \

@@ -52,6 +42,7 @@ _filter()

 status=1	# failure is the default!

 signal=$PCP_BINADM_DIR/pmsignal

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 trap "_cleanup; $sudo rm -f $tmp.* $LOGGING_DIR/$LOCALHOST/lock; exit \$status" 0 1 2 3 15

 _stop_auto_restart pmcd

diff -Naurp pcp-5.3.5.orig/qa/282 pcp-5.3.5/qa/282

--- pcp-5.3.5.orig/qa/282	2021-02-17 15:27:41.000000000 +1100

+++ pcp-5.3.5/qa/282	2022-01-21 10:55:30.287602155 +1100

@@ -32,7 +32,7 @@ _needclean=true

 sleepy=false

 LOCALHOST=`hostname`

-LOGGING_DIR=$PCP_LOG_DIR/pmlogger

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 CHECK=`which pmlogger_check`

 [ -z "$CHECK" -o ! -x "$CHECK" ] && \

     _notrun "Cannot find an executable pmlogger_check: \"$CHECK\""

diff -Naurp pcp-5.3.5.orig/qa/336 pcp-5.3.5/qa/336

--- pcp-5.3.5.orig/qa/336	2018-10-23 07:37:45.000000000 +1100

+++ pcp-5.3.5/qa/336	2022-01-21 10:55:30.288602138 +1100

@@ -19,6 +19,7 @@ echo "QA output created by $seq"

 signal=$PCP_BINADM_DIR/pmsignal

 status=1	# failure is the default!

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _needclean=true

 if [ -n "$PCP_TRACE_HOST" ]

@@ -31,13 +32,6 @@ _interrupt()

     status=1

 }

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-

 _cleanup()

 {

     cd $here

diff -Naurp pcp-5.3.5.orig/qa/854 pcp-5.3.5/qa/854

--- pcp-5.3.5.orig/qa/854	2021-02-17 15:27:41.000000000 +1100

+++ pcp-5.3.5/qa/854	2022-01-21 10:55:30.288602138 +1100

@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal

 status=1

 done_clean=false

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _cleanup()

 {

@@ -59,20 +60,14 @@ cat <<End-of-File >$tmp.tmp

 # Installed by PCP QA test $seq on `date`

 pmcd	2	dso	pmcd_init	$PMDA_PMCD_PATH

 sample	29	pipe	binary 		$PCP_PMDAS_DIR/sample/pmdasample -d 29 

-simple	253	pipe	binary 		/var/lib/pcp/pmdas/simple/pmdasimple -d 253 

+simple	253	pipe	binary 		$PCP_PMDAS_DIR/simple/pmdasimple -d 253 

 End-of-File

 $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH

 _writable_primary_logger

 _service pcp restart 2>&1 | _filter_pcp_start

 _wait_for_pmcd

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log

+_wait_for_pmlogger

 # Reset pmlogger

 echo "log sample.dynamic.meta.metric"

diff -Naurp pcp-5.3.5.orig/qa/856 pcp-5.3.5/qa/856

--- pcp-5.3.5.orig/qa/856	2019-01-13 14:14:12.000000000 +1100

+++ pcp-5.3.5/qa/856	2022-01-21 10:55:30.288602138 +1100

@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal

 status=1

 done_clean=false

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _cleanup()

 {

@@ -69,13 +70,7 @@ $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH

 _writable_primary_logger

 _service pcp restart 2>&1 | _filter_pcp_start

 _wait_for_pmcd

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log

+_wait_for_pmlogger

 # Reset pmlogger

 echo "log sample.dynamic.meta.metric"

diff -Naurp pcp-5.3.5.orig/qa/882 pcp-5.3.5/qa/882

--- pcp-5.3.5.orig/qa/882	2019-01-13 14:14:12.000000000 +1100

+++ pcp-5.3.5/qa/882	2022-01-21 10:55:30.288602138 +1100

@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal

 status=1

 done_clean=false

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _cleanup()

 {

@@ -69,13 +70,7 @@ $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH

 _writable_primary_logger

 _service pcp restart 2>&1 | _filter_pcp_start

 _wait_for_pmcd

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log

+_wait_for_pmlogger

 # Reset pmlogger

 echo "log sample.dynamic.meta.metric"

diff -Naurp pcp-5.3.5.orig/qa/932 pcp-5.3.5/qa/932

--- pcp-5.3.5.orig/qa/932	2021-02-17 15:27:41.000000000 +1100

+++ pcp-5.3.5/qa/932	2022-01-21 10:55:30.288602138 +1100

@@ -17,6 +17,7 @@ signal=$PCP_BINADM_DIR/pmsignal

 status=1

 done_clean=false

 LOCALHOST=`hostname`

+LOGGING_DIR="$PCP_ARCHIVE_DIR"

 _cleanup()

 {

@@ -67,13 +68,7 @@ $sudo cp $tmp.tmp $PCP_PMCDCONF_PATH

 _writable_primary_logger

 _service pcp restart 2>&1 | _filter_pcp_start

 _wait_for_pmcd

-if [ -d $PCP_LOG_DIR/pmlogger ]

-then

-    LOGGING_DIR=$PCP_LOG_DIR/pmlogger

-else

-    LOGGING_DIR=$PCP_LOG_DIR

-fi

-_wait_for_pmlogger -P $LOGGING_DIR/$LOCALHOST/pmlogger.log

+_wait_for_pmlogger

 # Reset pmlogger

 echo "log sample.dynamic.meta.metric"

diff -Naurp pcp-5.3.5.orig/qa/common.check pcp-5.3.5/qa/common.check

--- pcp-5.3.5.orig/qa/common.check	2021-11-05 09:54:05.000000000 +1100

+++ pcp-5.3.5/qa/common.check	2022-01-21 10:55:30.288602138 +1100

@@ -262,7 +262,7 @@ _service()

 			# good reason for this)

 			# ditto for pmlogger_daily and pmlogger_daily-poll

 			#

-			for svc in pmlogger_check pmlogger_daily pmlogger_daily-poll

+			for svc in pmlogger_check pmlogger_daily pmlogger_farm_check pmlogger_daily-poll

 			do

 			    if systemctl show --property=ActiveState $svc.timer 2>&1 \

 			      | grep '=active$' >/dev/null

@@ -1940,9 +1940,11 @@ _remove_job_scheduler()

     $rc_sudo rm -f $rc_cron_backup $rc_systemd_state

     if systemctl cat pmie_daily.timer >/dev/null 2>&1; then

-	for i in pmie.service pmie_daily.timer pmie_check.timer pmlogger_daily.timer \

+	for i in pmie.service pmie_daily.timer \

+		pmie_check.timer pmie_farm_check.timer \

 		pmlogger_daily_report.timer pmlogger_daily_report-poll.timer \

-		pmlogger_daily-poll.timer pmlogger_check.timer ; do

+		pmlogger_daily-poll.timer pmlogger_daily.timer \

+		pmlogger_check.timer pmlogger_farm_check.timer ; do

 	    $rc_sudo systemctl is-active "$i" > /dev/null || continue

 	    $rc_sudo systemctl stop $i >/dev/null

 	    echo "$i" >> $rc_systemd_state

diff -Naurp pcp-5.3.5.orig/src/pmie/GNUmakefile pcp-5.3.5/src/pmie/GNUmakefile

--- pcp-5.3.5.orig/src/pmie/GNUmakefile	2021-11-09 10:50:58.000000000 +1100

+++ pcp-5.3.5/src/pmie/GNUmakefile	2022-01-21 10:55:54.918186303 +1100

@@ -1,5 +1,5 @@

 #

-# Copyright (c) 2013-2015,2020-2021 Red Hat.

+# Copyright (c) 2013-2015,2020-2022 Red Hat.

 # Copyright (c) 2000,2004 Silicon Graphics, Inc.  All Rights Reserved.

 # 

 # This program is free software; you can redistribute it and/or modify it

@@ -84,7 +84,6 @@ pmie.service : pmie.service.in

 pmie_farm.service : pmie_farm.service.in

 	$(SED) <$< >$@ \

-	    -e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \

 	    -e 's;@PCP_SYSCONFIG_DIR@;'$(PCP_SYSCONFIG_DIR)';' \

 	    -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \

 	    -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \

@@ -95,7 +94,10 @@ pmie_farm.service : pmie_farm.service.in

 pmie_farm_check.service : pmie_farm_check.service.in

 	$(SED) <$< >$@ \

+	    -e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \

 	    -e 's;@PCP_BIN_DIR@;'$(PCP_BIN_DIR)';' \

+	    -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \

+	    -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \

 	# END

 pmie_check.service : pmie_check.service.in

diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_check.service.in pcp-5.3.5/src/pmie/pmie_check.service.in

--- pcp-5.3.5.orig/src/pmie/pmie_check.service.in	2021-11-04 08:26:15.000000000 +1100

+++ pcp-5.3.5/src/pmie/pmie_check.service.in	2022-01-21 10:55:30.288602138 +1100

@@ -2,7 +2,6 @@

 Description=Check PMIE instances are running

 Documentation=man:pmie_check(1)

 ConditionPathExists=!@CRONTAB_PATH@

-PartOf=pmie.service

 [Service]

 Type=@SD_SERVICE_TYPE@

@@ -15,6 +14,3 @@ ExecStart=@PCP_BINADM_DIR@/pmie_check $P

 WorkingDirectory=@PCP_VAR_DIR@

 Group=@PCP_GROUP@

 User=@PCP_USER@

-

-[Install]

-RequiredBy=pmie.service

diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_check.timer pcp-5.3.5/src/pmie/pmie_check.timer

--- pcp-5.3.5.orig/src/pmie/pmie_check.timer	2021-02-17 15:27:41.000000000 +1100

+++ pcp-5.3.5/src/pmie/pmie_check.timer	2022-01-21 10:55:30.288602138 +1100

@@ -1,6 +1,5 @@

 [Unit]

 Description=Half-hourly check of PMIE instances

-PartOf=pmie.service

 [Timer]

 # if enabled, runs 1m after boot and every half hour

diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_daily.service.in pcp-5.3.5/src/pmie/pmie_daily.service.in

--- pcp-5.3.5.orig/src/pmie/pmie_daily.service.in	2021-10-07 14:28:56.000000000 +1100

+++ pcp-5.3.5/src/pmie/pmie_daily.service.in	2022-01-21 10:55:30.288602138 +1100

@@ -6,6 +6,7 @@ ConditionPathExists=!@CRONTAB_PATH@

 [Service]

 Type=@SD_SERVICE_TYPE@

 Restart=no

+TimeoutStartSec=1h

 Environment="PMIE_DAILY_PARAMS=-X xz -x 3"

 EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmie_timers

 ExecStart=@PCP_BINADM_DIR@/pmie_daily $PMIE_DAILY_PARAMS

diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_daily.timer pcp-5.3.5/src/pmie/pmie_daily.timer

--- pcp-5.3.5.orig/src/pmie/pmie_daily.timer	2019-02-20 18:03:00.000000000 +1100

+++ pcp-5.3.5/src/pmie/pmie_daily.timer	2022-01-21 10:55:30.288602138 +1100

@@ -2,6 +2,7 @@

 Description=Daily processing of PMIE logs

 [Timer]

+Persistent=true

 OnCalendar=*-*-* 00:08:00

 [Install]

diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_farm_check.service.in pcp-5.3.5/src/pmie/pmie_farm_check.service.in

--- pcp-5.3.5.orig/src/pmie/pmie_farm_check.service.in	2021-11-09 10:50:58.000000000 +1100

+++ pcp-5.3.5/src/pmie/pmie_farm_check.service.in	2022-01-21 10:55:54.918186303 +1100

@@ -1,19 +1,15 @@

 [Unit]

-Description=Check and migrate non-primary pmie instances to pmie_farm

-Documentation=man:pmie_check(1)

-# TODO non-systemd ConditionPathExists=!/etc/cron.d/pcp-pmie

+Description=Check and migrate non-primary pmie farm instances

+Documentation=man:pmiectl(1)

+ConditionPathExists=!@CRONTAB_PATH@

 [Service]

-Type=exec

+Type=@SD_SERVICE_TYPE@

 Restart=no

 TimeoutStartSec=4h

 TimeoutStopSec=120

 ExecStart=@PCP_BIN_DIR@/pmiectl -m check

-WorkingDirectory=/var/lib/pcp

-

+WorkingDirectory=@PCP_VAR_DIR@

 # root so pmiectl can migrate pmie processes to the pmie_farm service

 Group=root

 User=root

-

-[Install]

-RequiredBy=pmie_farm.service

diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_farm_check.timer pcp-5.3.5/src/pmie/pmie_farm_check.timer

--- pcp-5.3.5.orig/src/pmie/pmie_farm_check.timer	2021-11-04 08:26:15.000000000 +1100

+++ pcp-5.3.5/src/pmie/pmie_farm_check.timer	2022-01-21 10:49:07.985980678 +1100

@@ -1,10 +1,11 @@

 [Unit]

-Description=5 minute check of pmie farm instances

+Description=Half-hourly check of pmie farm instances

 [Timer]

-# if enabled, runs 1m after boot and every 5 mins

+# if enabled, runs 1m after boot and every half hour

 OnBootSec=1min

-OnCalendar=*:00/5

+OnCalendar=*-*-* *:28:10

+OnCalendar=*-*-* *:58:10

 [Install]

 WantedBy=timers.target

diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_farm.service.in pcp-5.3.5/src/pmie/pmie_farm.service.in

--- pcp-5.3.5.orig/src/pmie/pmie_farm.service.in	2021-11-04 08:26:15.000000000 +1100

+++ pcp-5.3.5/src/pmie/pmie_farm.service.in	2022-01-21 10:49:07.986980661 +1100

@@ -1,9 +1,9 @@

 [Unit]

 Description=pmie farm service

-Documentation=man:pmie(1)

-After=network-online.target pmcd.service

-Before=pmie_check.timer pmie_daily.timer

-BindsTo=pmie_farm_check.timer pmie_check.timer pmie_daily.timer

+Documentation=man:pmie_check(1)

+Before=pmie_farm_check.timer

+BindsTo=pmie_farm_check.timer

+PartOf=pmie.service

 [Service]

 Type=@SD_SERVICE_TYPE@

@@ -15,13 +15,9 @@ TimeoutStopSec=120

 Environment="PMIE_CHECK_PARAMS=--skip-primary"

 EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmie_timers

 ExecStart=@PCP_BINADM_DIR@/pmie_farm $PMIE_CHECK_PARAMS

-

 WorkingDirectory=@PCP_VAR_DIR@

 Group=@PCP_GROUP@

 User=@PCP_USER@

 [Install]

-WantedBy=multi-user.target

-

-# This dependency will be removed in PCPv6.

-WantedBy=pmie.service

+RequiredBy=pmie.service

diff -Naurp pcp-5.3.5.orig/src/pmie/pmie_farm.sh pcp-5.3.5/src/pmie/pmie_farm.sh

--- pcp-5.3.5.orig/src/pmie/pmie_farm.sh	2021-11-05 17:02:47.000000000 +1100

+++ pcp-5.3.5/src/pmie/pmie_farm.sh	2022-01-21 10:49:07.986980661 +1100

@@ -12,8 +12,8 @@

 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

 # for more details.

 #

-# Administrative script to start the pmlogger_farm service.

-# All arguments to pmlogger_check are passed from pmlogger_farm.service.

+# Administrative script to start the pmie_farm service.

+# All arguments to pmie_check are passed from pmie_farm.service.

 #

 . $PCP_DIR/etc/pcp.env

diff -Naurp pcp-5.3.5.orig/src/pmie/pmie.service.in pcp-5.3.5/src/pmie/pmie.service.in

--- pcp-5.3.5.orig/src/pmie/pmie.service.in	2021-02-22 11:32:05.000000000 +1100

+++ pcp-5.3.5/src/pmie/pmie.service.in	2022-01-21 10:49:07.986980661 +1100

@@ -2,8 +2,8 @@

 Description=Performance Metrics Inference Engine

 Documentation=man:pmie(1)

 After=network-online.target pmcd.service

-Before=pmie_check.timer pmie_daily.timer

-BindsTo=pmie_check.timer pmie_daily.timer

+Before=pmie_farm.service pmie_check.timer pmie_daily.timer

+BindsTo=pmie_farm.service pmie_check.timer pmie_daily.timer

 Wants=pmcd.service

 [Service]

diff -Naurp pcp-5.3.5.orig/src/pmlogger/GNUmakefile pcp-5.3.5/src/pmlogger/GNUmakefile

--- pcp-5.3.5.orig/src/pmlogger/GNUmakefile	2021-11-09 09:08:40.000000000 +1100

+++ pcp-5.3.5/src/pmlogger/GNUmakefile	2022-01-21 10:55:54.918186303 +1100

@@ -1,5 +1,5 @@

 #

-# Copyright (c) 2013-2021 Red Hat.

+# Copyright (c) 2013-2022 Red Hat.

 # Copyright (c) 2000,2004 Silicon Graphics, Inc.  All Rights Reserved.

 # 

 # This program is free software; you can redistribute it and/or modify it

@@ -99,7 +99,6 @@ pmlogger.service : pmlogger.service.in

 pmlogger_farm.service : pmlogger_farm.service.in

 	$(SED) <$< >$@ \

-	    -e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \

 	    -e 's;@PCP_SYSCONFIG_DIR@;'$(PCP_SYSCONFIG_DIR)';' \

 	    -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \

 	    -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \

@@ -110,7 +109,10 @@ pmlogger_farm.service : pmlogger_farm.se

 pmlogger_farm_check.service : pmlogger_farm_check.service.in

 	$(SED) <$< >$@ \

+	    -e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \

 	    -e 's;@PCP_BIN_DIR@;'$(PCP_BIN_DIR)';' \