diff -Naurp pcp-4.3.2.wip/build/rpm/fedora.spec pcp-4.3.2/build/rpm/fedora.spec
--- pcp-4.3.2.wip/build/rpm/fedora.spec 2019-04-26 11:54:27.000000000 +1000
+++ pcp-4.3.2/build/rpm/fedora.spec 2020-02-17 17:46:27.631805233 +1100
@@ -2888,6 +2888,7 @@ cd
%else
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger-daily-report
%endif
+%{_localstatedir}/lib/pcp/config/pmieconf/zeroconf
%{_localstatedir}/lib/pcp/config/pmlogconf/zeroconf
#additional pmlogger config files
diff -Naurp pcp-4.3.2.wip/man/man1/pmieconf.1 pcp-4.3.2/man/man1/pmieconf.1
--- pcp-4.3.2.wip/man/man1/pmieconf.1 2017-11-30 12:48:48.000000000 +1100
+++ pcp-4.3.2/man/man1/pmieconf.1 2020-02-17 17:46:53.461502780 +1100
@@ -61,7 +61,7 @@ Any rule modifications resulting from
manipulation of variable values will be written to \f2file\f1.
The default value of \f2file\f1 is dependent on the user ID \- for the root
user, the file
-.I $PCP_VAR_DIR/config/pmieconf/config.pmie
+.I $PCP_SYSCONF_DIR/pmie/config.pmie
is used, for other users the default is
.IR $HOME/.pcp/pmie/config.pmie .
.TP 8
@@ -309,7 +309,7 @@ option is presented.
.IR $PCP_VAR_DIR/config/pmieconf/ */*
generalized system resource monitoring rules
.TP 10
-.I $PCP_VAR_DIR/config/pmieconf/config.pmie
+.I $PCP_SYSCONF_DIR/pmie/config.pmie
default super-user settings for system resource monitoring rules
.TP 10
.I $HOME/.pcp/pmie/config.pmie
diff -Naurp pcp-4.3.2.wip/src/pmieconf/.gitignore pcp-4.3.2/src/pmieconf/.gitignore
--- pcp-4.3.2.wip/src/pmieconf/.gitignore 2017-11-30 12:48:48.000000000 +1100
+++ pcp-4.3.2/src/pmieconf/.gitignore 2020-02-17 17:46:27.632805221 +1100
@@ -2,14 +2,15 @@ cpu/GNUmakefile
entropy/GNUmakefile
filesys/GNUmakefile
global/GNUmakefile
-local
memory/GNUmakefile
percpu/GNUmakefile
pernetif/GNUmakefile
primary/GNUmakefile
+zeroconf/GNUmakefile
pmieconf
pmieconf.static
pmlogconf
pmlogconf.tmp
rate-syscalls
rules
+local
diff -Naurp pcp-4.3.2.wip/src/pmieconf/GNUmakefile pcp-4.3.2/src/pmieconf/GNUmakefile
--- pcp-4.3.2.wip/src/pmieconf/GNUmakefile 2018-07-10 11:42:44.000000000 +1000
+++ pcp-4.3.2/src/pmieconf/GNUmakefile 2020-02-17 17:46:27.632805221 +1100
@@ -17,7 +17,8 @@ TOPDIR = ../..
include $(TOPDIR)/src/include/builddefs
include $(TOPDIR)/src/libpcp/src/GNUlibrarydefs
-MKFILE_SUBDIRS = cpu entropy filesys memory percpu pernetif global primary
+MKFILE_SUBDIRS = cpu entropy filesys memory percpu pernetif \
+ global primary zeroconf
SUBDIRS = $(MKFILE_SUBDIRS)
CMDTARGET = pmieconf$(EXECSUFFIX)
diff -Naurp pcp-4.3.2.wip/src/pmieconf/zeroconf/all_threads pcp-4.3.2/src/pmieconf/zeroconf/all_threads
--- pcp-4.3.2.wip/src/pmieconf/zeroconf/all_threads 1970-01-01 10:00:00.000000000 +1000
+++ pcp-4.3.2/src/pmieconf/zeroconf/all_threads 2020-02-17 17:46:27.633805209 +1100
@@ -0,0 +1,37 @@
+#pmieconf-rules 1
+# --- DO NOT MODIFY THIS FILE --- see pmieconf(5)
+#
+
+rule zeroconf.all_threads
+ default = "$rule$"
+ predicate = "some_host ( proc.control.all.threads == 0 )"
+ enabled = no
+ version = 1
+ help =
+"Ensure per-thread metrics are exported by the pmdaproc(1)
+Performance Metric Domain Agent (PMDA).";
+
+string rule
+ default = "Enable per-thread proc metrics"
+ modify = no
+ display = no;
+
+string action_expand
+ default = "threads[%v]@%h"
+ display = no
+ modify = no;
+
+string email_expand
+ default = "host: %h threads=%v"
+ display = no
+ modify = no;
+
+shell all_threads_action
+ enabled = yes
+ default = "pmstore proc.control.all.threads 1"
+ help =
+"The pmdaproc(1) Performance Metrics Domain Agent will receive a
+metric store to via pmstore(1) to export threads values as well.";
+
+#
+# --- DO NOT MODIFY THIS FILE --- see pmieconf(5)
diff -Naurp pcp-4.3.2.wip/src/pmieconf/zeroconf/localdefs pcp-4.3.2/src/pmieconf/zeroconf/localdefs
--- pcp-4.3.2.wip/src/pmieconf/zeroconf/localdefs 1970-01-01 10:00:00.000000000 +1000
+++ pcp-4.3.2/src/pmieconf/zeroconf/localdefs 2020-02-17 17:46:27.633805209 +1100
@@ -0,0 +1,2 @@
+ALL_RULES = all_threads
+LOCAL_RULES = $(ALL_RULES)