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