Compare commits
No commits in common. "c8" and "c9" have entirely different histories.
|
|
@ -1 +1 @@
|
|||
SOURCES/pcp-5.3.7.src.tar.gz
|
||||
SOURCES/pcp-6.0.1.src.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
a0a05bf501b016cb859fb211ae60ce18be2bbd99 SOURCES/pcp-5.3.7.src.tar.gz
|
||||
4f405e26a6c651b2f094134e0648cd5fd201d310 SOURCES/pcp-6.0.1.src.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,374 +0,0 @@
|
|||
diff --git a/qa/1927 b/qa/1927
|
||||
new file mode 100755
|
||||
index 000000000..46afa9509
|
||||
--- /dev/null
|
||||
+++ b/qa/1927
|
||||
@@ -0,0 +1,88 @@
|
||||
+#!/bin/sh
|
||||
+# PCP QA Test No. 1927
|
||||
+# Exercise the sockets PMDA Install/Remove and string metric bug.
|
||||
+#
|
||||
+# Copyright (c) 2022 Red Hat. All Rights Reserved.
|
||||
+#
|
||||
+
|
||||
+seq=`basename $0`
|
||||
+echo "QA output created by $seq"
|
||||
+
|
||||
+# get standard environment, filters and checks
|
||||
+. ./common.product
|
||||
+. ./common.filter
|
||||
+. ./common.check
|
||||
+
|
||||
+[ -f $PCP_PMDAS_DIR/sockets/pmdasockets ] || _notrun "sockets pmda not installed"
|
||||
+
|
||||
+_cleanup()
|
||||
+{
|
||||
+ cd $here
|
||||
+ $sudo rm -rf $tmp $tmp.*
|
||||
+}
|
||||
+
|
||||
+status=0 # success is the default!
|
||||
+$sudo rm -rf $tmp $tmp.* $seq.full
|
||||
+
|
||||
+_filter_sockets()
|
||||
+{
|
||||
+ grep -v 'No value(s) available'
|
||||
+}
|
||||
+
|
||||
+pmdasockets_remove()
|
||||
+{
|
||||
+ echo
|
||||
+ echo "=== remove sockets agent ==="
|
||||
+ $sudo ./Remove >$tmp.out 2>&1
|
||||
+ _filter_pmda_remove <$tmp.out
|
||||
+}
|
||||
+
|
||||
+pmdasockets_install()
|
||||
+{
|
||||
+ # start from known starting points
|
||||
+ cd $PCP_PMDAS_DIR/sockets
|
||||
+ $sudo ./Remove >/dev/null 2>&1
|
||||
+
|
||||
+ echo
|
||||
+ echo "=== sockets agent installation ==="
|
||||
+ $sudo ./Install </dev/null >$tmp.out 2>&1
|
||||
+ cat $tmp.out >>$here/$seq.full
|
||||
+ # Check sockets metrics have appeared ... X metrics and Y values
|
||||
+ _filter_pmda_install <$tmp.out \
|
||||
+ | sed \
|
||||
+ -e 's/[0-9][0-9]* warnings, //' \
|
||||
+ | $PCP_AWK_PROG '
|
||||
+/Check network.persocket metrics have appeared/ {
|
||||
+ if ($7 >= 50 && $7 <= 99) $7 = "X"
|
||||
+ if ($10 >= 0) $10 = "Y"
|
||||
+ }
|
||||
+ { print }'
|
||||
+}
|
||||
+
|
||||
+_prepare_pmda sockets
|
||||
+# note: _restore_auto_restart pmcd done in _cleanup_pmda()
|
||||
+trap "_cleanup_pmda sockets; exit \$status" 0 1 2 3 15
|
||||
+
|
||||
+_stop_auto_restart pmcd
|
||||
+
|
||||
+# real QA test starts here
|
||||
+pmdasockets_install
|
||||
+
|
||||
+# pmcd should have been started by the Install process - check
|
||||
+if pminfo -v network.persocket > $tmp.info 2> $tmp.err
|
||||
+then
|
||||
+ :
|
||||
+else
|
||||
+ echo "... failed! ... here is the Install log ..."
|
||||
+ cat $tmp.out
|
||||
+fi
|
||||
+cat $tmp.info $tmp.err | _filter_sockets
|
||||
+
|
||||
+echo "Check the values for v6only metric are 0 or 1 ..."
|
||||
+pminfo -f network.persocket.v6only | egrep -v 'value [01]$' | sed -e '/^$/d'
|
||||
+
|
||||
+pmdasockets_remove
|
||||
+status=0
|
||||
+
|
||||
+# success, all done
|
||||
+exit
|
||||
diff --git a/qa/1927.out b/qa/1927.out
|
||||
new file mode 100644
|
||||
index 000000000..2ae4385fd
|
||||
--- /dev/null
|
||||
+++ b/qa/1927.out
|
||||
@@ -0,0 +1,17 @@
|
||||
+QA output created by 1927
|
||||
+
|
||||
+=== sockets agent installation ===
|
||||
+Updating the Performance Metrics Name Space (PMNS) ...
|
||||
+Terminate PMDA if already installed ...
|
||||
+[...install files, make output...]
|
||||
+Updating the PMCD control file, and notifying PMCD ...
|
||||
+Check network.persocket metrics have appeared ... X metrics and Y values
|
||||
+Check the values for v6only metric are 0 or 1 ...
|
||||
+network.persocket.v6only
|
||||
+
|
||||
+=== remove sockets agent ===
|
||||
+Culling the Performance Metrics Name Space ...
|
||||
+network.persocket ... done
|
||||
+Updating the PMCD control file, and notifying PMCD ...
|
||||
+[...removing files...]
|
||||
+Check network.persocket metrics have gone away ... OK
|
||||
diff --git a/qa/group b/qa/group
|
||||
index acfc5d208..846c0c4bd 100644
|
||||
--- a/qa/group
|
||||
+++ b/qa/group
|
||||
@@ -1967,6 +1967,7 @@ x11
|
||||
1901 pmlogger local
|
||||
1902 help local
|
||||
1914 atop local
|
||||
+1927 pmda.sockets local
|
||||
1937 pmlogrewrite pmda.xfs local
|
||||
1955 libpcp pmda pmda.pmcd local
|
||||
1956 pmda.linux pmcd local
|
||||
diff --git a/src/pmdas/linux_sockets/pmda.c b/src/pmdas/linux_sockets/pmda.c
|
||||
index d10eacf29..5a3018d8a 100644
|
||||
--- a/src/pmdas/linux_sockets/pmda.c
|
||||
+++ b/src/pmdas/linux_sockets/pmda.c
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Sockets PMDA
|
||||
*
|
||||
- * Copyright (c) 2021 Red Hat.
|
||||
+ * Copyright (c) 2021-2022 Red Hat.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
@@ -14,6 +14,7 @@
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
+#include <ctype.h>
|
||||
#include "pmapi.h"
|
||||
#include "pmda.h"
|
||||
|
||||
@@ -147,6 +148,31 @@ sockets_fetchCallBack(pmdaMetric *metric, unsigned int inst, pmAtomValue *atom)
|
||||
return PMDA_FETCH_STATIC;
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * Restrict the allowed filter strings to only limited special
|
||||
+ * characters (open and close brackets - everthing else can be
|
||||
+ * done with alphanumerics) to limit any attack surface here.
|
||||
+ * The ss filtering language is more complex than we ever want
|
||||
+ * to be attempting to parse ourself, so we leave that side of
|
||||
+ * things to the ss command itself.
|
||||
+ */
|
||||
+int
|
||||
+sockets_check_filter(const char *string)
|
||||
+{
|
||||
+ const char *p;
|
||||
+
|
||||
+ for (p = string; *p; p++) {
|
||||
+ if (isspace(*p))
|
||||
+ continue;
|
||||
+ if (isalnum(*p))
|
||||
+ continue;
|
||||
+ if (*p == '(' || *p == ')')
|
||||
+ continue;
|
||||
+ return 0; /* disallow */
|
||||
+ }
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
static int
|
||||
sockets_store(pmResult *result, pmdaExt *pmda)
|
||||
{
|
||||
@@ -165,9 +191,14 @@ sockets_store(pmResult *result, pmdaExt *pmda)
|
||||
case 0: /* network.persocket.filter */
|
||||
if ((sts = pmExtractValue(vsp->valfmt, &vsp->vlist[0],
|
||||
PM_TYPE_STRING, &av, PM_TYPE_STRING)) >= 0) {
|
||||
+ if (sockets_check_filter(av.cp)) {
|
||||
+ sts = PM_ERR_BADSTORE;
|
||||
+ free(av.cp);
|
||||
+ break;
|
||||
+ }
|
||||
if (ss_filter)
|
||||
free(ss_filter);
|
||||
- ss_filter = av.cp; /* TODO filter syntax check */
|
||||
+ ss_filter = av.cp;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
diff --git a/src/pmdas/linux_sockets/ss_parse.c b/src/pmdas/linux_sockets/ss_parse.c
|
||||
index 94c5e16e9..9f3afc691 100644
|
||||
--- a/src/pmdas/linux_sockets/ss_parse.c
|
||||
+++ b/src/pmdas/linux_sockets/ss_parse.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2021 Red Hat.
|
||||
+ * Copyright (c) 2021-2022 Red Hat.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
@@ -21,65 +21,70 @@ static ss_stats_t ss_p;
|
||||
/* boolean value with no separate value, default 0 */
|
||||
#define PM_TYPE_BOOL (PM_TYPE_UNKNOWN-1)
|
||||
|
||||
+/* helper macros to extract field address and size */
|
||||
+#define SSFIELD(str,type,f) {(str), (sizeof(str)-1), type, (&(f)), (sizeof(f))}
|
||||
+#define SSNULLFIELD(str) {(str), (sizeof(str)-1), PM_TYPE_UNKNOWN, NULL}
|
||||
+
|
||||
static struct {
|
||||
char *field;
|
||||
int len;
|
||||
int type;
|
||||
void *addr;
|
||||
+ int size;
|
||||
int found;
|
||||
} parse_table[] = {
|
||||
- { "timer:", 6, PM_TYPE_STRING, &ss_p.timer_str },
|
||||
- { "uid:", 4, PM_TYPE_U32, &ss_p.uid },
|
||||
- { "ino:", 4, PM_TYPE_64, &ss_p.inode },
|
||||
- { "sk:", 3, PM_TYPE_U64, &ss_p.sk },
|
||||
- { "cgroup:", 7, PM_TYPE_STRING, &ss_p.cgroup },
|
||||
- { "v6only:", 7, PM_TYPE_32, &ss_p.v6only },
|
||||
- { "--- ", 4, PM_TYPE_UNKNOWN, NULL },
|
||||
- { "<-> ", 4, PM_TYPE_UNKNOWN, NULL },
|
||||
- { "--> ", 4, PM_TYPE_UNKNOWN, NULL },
|
||||
- { "skmem:", 6, PM_TYPE_STRING, &ss_p.skmem_str, },
|
||||
- { "ts ", 3, PM_TYPE_BOOL, &ss_p.ts },
|
||||
- { "sack ", 5, PM_TYPE_BOOL, &ss_p.sack },
|
||||
- { "cubic ", 6, PM_TYPE_BOOL, &ss_p.cubic },
|
||||
- { "wscale:", 7, PM_TYPE_STRING, &ss_p.wscale_str },
|
||||
- { "rto:", 4, PM_TYPE_DOUBLE, &ss_p.rto },
|
||||
- { "rtt:", 4, PM_TYPE_STRING, &ss_p.round_trip_str },
|
||||
- { "ato:", 4, PM_TYPE_DOUBLE, &ss_p.ato },
|
||||
- { "backoff:", 8, PM_TYPE_32, &ss_p.backoff },
|
||||
- { "mss:", 4, PM_TYPE_U32, &ss_p.mss },
|
||||
- { "pmtu:", 5, PM_TYPE_U32, &ss_p.pmtu },
|
||||
- { "rcvmss:", 7, PM_TYPE_U32, &ss_p.rcvmss },
|
||||
- { "advmss:", 7, PM_TYPE_U32, &ss_p.advmss },
|
||||
- { "cwnd:", 5, PM_TYPE_U32, &ss_p.cwnd },
|
||||
- { "lost:", 5, PM_TYPE_32, &ss_p.lost },
|
||||
- { "ssthresh:", 9, PM_TYPE_U32, &ss_p.ssthresh },
|
||||
- { "bytes_sent:", 11, PM_TYPE_U64, &ss_p.bytes_sent },
|
||||
- { "bytes_retrans:", 14, PM_TYPE_U64, &ss_p.bytes_retrans },
|
||||
- { "bytes_acked:", 12, PM_TYPE_U64, &ss_p.bytes_acked },
|
||||
- { "bytes_received:", 15, PM_TYPE_U64, &ss_p.bytes_received },
|
||||
- { "segs_out:", 9, PM_TYPE_U32, &ss_p.segs_out },
|
||||
- { "segs_in:", 8, PM_TYPE_U32, &ss_p.segs_in },
|
||||
- { "data_segs_out:", 14, PM_TYPE_U32, &ss_p.data_segs_out },
|
||||
- { "data_segs_in:", 13, PM_TYPE_U32, &ss_p.data_segs_in },
|
||||
- { "send ", 5, PM_TYPE_DOUBLE, &ss_p.send }, /* no ':' */
|
||||
- { "lastsnd:", 8, PM_TYPE_U32, &ss_p.lastsnd },
|
||||
- { "lastrcv:", 8, PM_TYPE_U32, &ss_p.lastrcv },
|
||||
- { "lastack:", 8, PM_TYPE_U32, &ss_p.lastack },
|
||||
- { "pacing_rate ", 12, PM_TYPE_DOUBLE, &ss_p.pacing_rate }, /* no ':' */
|
||||
- { "delivery_rate ", 14, PM_TYPE_DOUBLE, &ss_p.delivery_rate }, /* no ':' */
|
||||
- { "delivered:", 10, PM_TYPE_U32, &ss_p.delivered },
|
||||
- { "app_limited ", 12, PM_TYPE_BOOL, &ss_p.app_limited },
|
||||
- { "reord_seen:", 11, PM_TYPE_32, &ss_p.reord_seen },
|
||||
- { "busy:", 5, PM_TYPE_U64, &ss_p.busy },
|
||||
- { "unacked:", 8, PM_TYPE_32, &ss_p.unacked },
|
||||
- { "rwnd_limited:", 13, PM_TYPE_U64, &ss_p.rwnd_limited },
|
||||
- { "retrans:", 8, PM_TYPE_STRING, &ss_p.retrans_str },
|
||||
- { "dsack_dups:", 11, PM_TYPE_U32, &ss_p.dsack_dups },
|
||||
- { "rcv_rtt:", 8, PM_TYPE_DOUBLE, &ss_p.rcv_rtt },
|
||||
- { "rcv_space:", 10, PM_TYPE_32, &ss_p.rcv_space },
|
||||
- { "rcv_ssthresh:", 13, PM_TYPE_32, &ss_p.rcv_ssthresh },
|
||||
- { "minrtt:", 7, PM_TYPE_DOUBLE, &ss_p.minrtt },
|
||||
- { "notsent:", 8, PM_TYPE_U32, &ss_p.notsent },
|
||||
+ SSFIELD("timer:", PM_TYPE_STRING, ss_p.timer_str),
|
||||
+ SSFIELD("uid:", PM_TYPE_U32, ss_p.uid),
|
||||
+ SSFIELD("ino:", PM_TYPE_64, ss_p.inode),
|
||||
+ SSFIELD("sk:", PM_TYPE_U64, ss_p.sk),
|
||||
+ SSFIELD("cgroup:", PM_TYPE_STRING, ss_p.cgroup),
|
||||
+ SSFIELD("v6only:", PM_TYPE_32, ss_p.v6only),
|
||||
+ SSNULLFIELD("--- "),
|
||||
+ SSNULLFIELD("<-> "),
|
||||
+ SSNULLFIELD("--> "),
|
||||
+ SSFIELD("skmem:", PM_TYPE_STRING, ss_p.skmem_str),
|
||||
+ SSFIELD("ts ", PM_TYPE_BOOL, ss_p.ts),
|
||||
+ SSFIELD("sack ", PM_TYPE_BOOL, ss_p.sack),
|
||||
+ SSFIELD("cubic ", PM_TYPE_BOOL, ss_p.cubic),
|
||||
+ SSFIELD("wscale:", PM_TYPE_STRING, ss_p.wscale_str),
|
||||
+ SSFIELD("rto:", PM_TYPE_DOUBLE, ss_p.rto),
|
||||
+ SSFIELD("rtt:", PM_TYPE_STRING, ss_p.round_trip_str),
|
||||
+ SSFIELD("ato:", PM_TYPE_DOUBLE, ss_p.ato),
|
||||
+ SSFIELD("backoff:", PM_TYPE_32, ss_p.backoff),
|
||||
+ SSFIELD("mss:", PM_TYPE_U32, ss_p.mss),
|
||||
+ SSFIELD("pmtu:", PM_TYPE_U32, ss_p.pmtu),
|
||||
+ SSFIELD("rcvmss:", PM_TYPE_U32, ss_p.rcvmss),
|
||||
+ SSFIELD("advmss:", PM_TYPE_U32, ss_p.advmss),
|
||||
+ SSFIELD("cwnd:", PM_TYPE_U32, ss_p.cwnd),
|
||||
+ SSFIELD("lost:", PM_TYPE_32, ss_p.lost),
|
||||
+ SSFIELD("ssthresh:", PM_TYPE_U32, ss_p.ssthresh),
|
||||
+ SSFIELD("bytes_sent:", PM_TYPE_U64, ss_p.bytes_sent),
|
||||
+ SSFIELD("bytes_retrans:", PM_TYPE_U64, ss_p.bytes_retrans),
|
||||
+ SSFIELD("bytes_acked:", PM_TYPE_U64, ss_p.bytes_acked),
|
||||
+ SSFIELD("bytes_received:", PM_TYPE_U64, ss_p.bytes_received),
|
||||
+ SSFIELD("segs_out:", PM_TYPE_U32, ss_p.segs_out),
|
||||
+ SSFIELD("segs_in:", PM_TYPE_U32, ss_p.segs_in),
|
||||
+ SSFIELD("data_segs_out:", PM_TYPE_U32, ss_p.data_segs_out),
|
||||
+ SSFIELD("data_segs_in:", PM_TYPE_U32, ss_p.data_segs_in),
|
||||
+ SSFIELD("send ", PM_TYPE_DOUBLE, ss_p.send), /* no ':' */
|
||||
+ SSFIELD("lastsnd:", PM_TYPE_U32, ss_p.lastsnd),
|
||||
+ SSFIELD("lastrcv:", PM_TYPE_U32, ss_p.lastrcv),
|
||||
+ SSFIELD("lastack:", PM_TYPE_U32, ss_p.lastack),
|
||||
+ SSFIELD("pacing_rate ", PM_TYPE_DOUBLE, ss_p.pacing_rate), /* no ':' */
|
||||
+ SSFIELD("delivery_rate ", PM_TYPE_DOUBLE, ss_p.delivery_rate), /* no ':' */
|
||||
+ SSFIELD("delivered:", PM_TYPE_U32, ss_p.delivered),
|
||||
+ SSFIELD("app_limited ", PM_TYPE_BOOL, ss_p.app_limited),
|
||||
+ SSFIELD("reord_seen:", PM_TYPE_32, ss_p.reord_seen),
|
||||
+ SSFIELD("busy:", PM_TYPE_U64, ss_p.busy),
|
||||
+ SSFIELD("unacked:", PM_TYPE_32, ss_p.unacked),
|
||||
+ SSFIELD("rwnd_limited:", PM_TYPE_U64, ss_p.rwnd_limited),
|
||||
+ SSFIELD("retrans:", PM_TYPE_STRING, ss_p.retrans_str),
|
||||
+ SSFIELD("dsack_dups:", PM_TYPE_U32, ss_p.dsack_dups),
|
||||
+ SSFIELD("rcv_rtt:", PM_TYPE_DOUBLE, ss_p.rcv_rtt),
|
||||
+ SSFIELD("rcv_space:", PM_TYPE_32, ss_p.rcv_space),
|
||||
+ SSFIELD("rcv_ssthresh:", PM_TYPE_32, ss_p.rcv_ssthresh),
|
||||
+ SSFIELD("minrtt:", PM_TYPE_DOUBLE, ss_p.minrtt),
|
||||
+ SSFIELD("notsent:", PM_TYPE_U32, ss_p.notsent),
|
||||
|
||||
{ NULL }
|
||||
};
|
||||
@@ -225,8 +230,11 @@ ss_parse(char *line, int has_state_field, ss_stats_t *ss)
|
||||
if (*p == '(')
|
||||
p++;
|
||||
r = (char *)parse_table[i].addr;
|
||||
- for (s=p; *s && *s != ' ' && *s != '\n' && *s != ')'; s++)
|
||||
- *r++ = *s; /* TODO check r len */
|
||||
+ for (s=p; *s && *s != ' ' && *s != '\n' && *s != ')'; s++) {
|
||||
+ *r++ = *s;
|
||||
+ if (r - (char *)parse_table[i].addr >= parse_table[i].size - 1)
|
||||
+ break;
|
||||
+ }
|
||||
*r = '\0';
|
||||
break;
|
||||
case PM_TYPE_32:
|
||||
diff --git a/src/pmdas/linux_sockets/ss_stats.h b/src/pmdas/linux_sockets/ss_stats.h
|
||||
index 183db5afa..009a00cd9 100644
|
||||
--- a/src/pmdas/linux_sockets/ss_stats.h
|
||||
+++ b/src/pmdas/linux_sockets/ss_stats.h
|
||||
@@ -1,11 +1,11 @@
|
||||
/*
|
||||
- * Copyright (c) 2021 Red Hat.
|
||||
- *
|
||||
+ * Copyright (c) 2021-2022 Red Hat.
|
||||
+ *
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
- *
|
||||
+ *
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
@@ -26,7 +26,7 @@ typedef struct ss_stats {
|
||||
__int32_t timer_retrans;
|
||||
__uint32_t uid;
|
||||
__uint64_t sk;
|
||||
- char cgroup[64];
|
||||
+ char cgroup[128];
|
||||
__int32_t v6only;
|
||||
char skmem_str[64];
|
||||
__int32_t skmem_rmem_alloc;
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
bcc included in RHEL 8.6 doesn't support the kernel_struct_has_field function.
|
||||
The 4.18.x kernel in RHEL 8.6 did backport the `state` to `__state` rename (upstream:
|
||||
change was in kernel v5.14+), and now we're in a situation where we can't test for
|
||||
the existence of this kernel struct member and also can't rely on a kernel version check.
|
||||
|
||||
Therefore, let's patch it here for RHEL 8.x only:
|
||||
|
||||
diff --git a/src/pmdas/bcc/modules/runqlat.python b/src/pmdas/bcc/modules/runqlat.python
|
||||
index 1c6c6b4b0..efc30e958 100644
|
||||
--- a/src/pmdas/bcc/modules/runqlat.python
|
||||
+++ b/src/pmdas/bcc/modules/runqlat.python
|
||||
@@ -100,7 +100,7 @@ class PCPBCCModule(PCPBCCBase):
|
||||
if (
|
||||
hasattr(BPF, "kernel_struct_has_field")
|
||||
and BPF.kernel_struct_has_field(b"task_struct", b"__state") == 1
|
||||
- ) or self.kernel_version() >= (5, 14, 0):
|
||||
+ ) or self.kernel_version() >= (4, 18, 0):
|
||||
self.bpf_text = self.bpf_text.replace('STATE_FIELD', '__state')
|
||||
else:
|
||||
self.bpf_text = self.bpf_text.replace('STATE_FIELD', 'state')
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -Naurp pcp-5.3.7.orig/src/pmie/GNUmakefile pcp-5.3.7/src/pmie/GNUmakefile
|
||||
--- pcp-5.3.7.orig/src/pmie/GNUmakefile 2022-02-02 11:53:05.000000000 +1100
|
||||
+++ pcp-5.3.7/src/pmie/GNUmakefile 2022-05-03 11:45:12.108743480 +1000
|
||||
@@ -80,6 +80,7 @@ pmie.service : pmie.service.in
|
||||
$(SED) <$< >$@ \
|
||||
-e 's;@PCP_RC_DIR@;'$(PCP_RC_DIR)';' \
|
||||
-e 's;@PCP_RUN_DIR@;'$(PCP_RUN_DIR)';' \
|
||||
+ -e 's;@PCP_SYSCONFIG_DIR@;'$(PCP_SYSCONFIG_DIR)';' \
|
||||
# END
|
||||
|
||||
pmie_farm.service : pmie_farm.service.in
|
||||
|
|
@ -1,146 +0,0 @@
|
|||
commit f54eddf494e474531e5af609bcc376037a918977
|
||||
Author: Nathan Scott <nathans@redhat.com>
|
||||
Date: Tue Apr 26 14:32:59 2022 +1000
|
||||
|
||||
pmdapostfix: harden against a not-yet-running postfix
|
||||
|
||||
Ensure the postfix PMDA can start and service requests even
|
||||
if postfix is not yet started.
|
||||
|
||||
diff --git a/src/perl/PMDA/local.c b/src/perl/PMDA/local.c
|
||||
index e223bde7a..33130bc5d 100644
|
||||
--- a/src/perl/PMDA/local.c
|
||||
+++ b/src/perl/PMDA/local.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2012-2017 Red Hat.
|
||||
+ * Copyright (c) 2012-2017,2022 Red Hat.
|
||||
* Copyright (c) 2008-2011 Aconex. All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
@@ -139,18 +139,15 @@ int
|
||||
local_tail(char *file, scalar_t *callback, int cookie)
|
||||
{
|
||||
int fd = open(file, O_RDONLY | O_NDELAY);
|
||||
- struct stat stats;
|
||||
+ struct stat stats = {0};
|
||||
int me;
|
||||
|
||||
- if (fd < 0) {
|
||||
- pmNotifyErr(LOG_ERR, "open failed (%s): %s", file, osstrerror());
|
||||
- exit(1);
|
||||
- }
|
||||
- if (fstat(fd, &stats) < 0) {
|
||||
- pmNotifyErr(LOG_ERR, "fstat failed (%s): %s", file, osstrerror());
|
||||
- exit(1);
|
||||
- }
|
||||
- lseek(fd, 0L, SEEK_END);
|
||||
+ if (fd < 0)
|
||||
+ pmNotifyErr(LOG_INFO, "open failed (%s): %s", file, osstrerror());
|
||||
+ else if (fstat(fd, &stats) < 0)
|
||||
+ pmNotifyErr(LOG_INFO, "fstat failed (%s): %s", file, osstrerror());
|
||||
+ else
|
||||
+ lseek(fd, 0L, SEEK_END);
|
||||
me = local_file(FILE_TAIL, fd, callback, cookie);
|
||||
files[me].me.tail.path = strdup(file);
|
||||
files[me].me.tail.dev = stats.st_dev;
|
||||
@@ -416,10 +413,11 @@ local_pmdaMain(pmdaInterface *self)
|
||||
}
|
||||
|
||||
for (i = 0; i < nfiles; i++) {
|
||||
- fd = files[i].fd;
|
||||
/* check for log rotation or host reconnection needed */
|
||||
if ((count % 10) == 0) /* but only once every 10 */
|
||||
local_connection(&files[i]);
|
||||
+ if ((fd = files[i].fd) < 0)
|
||||
+ continue;
|
||||
if (files[i].type != FILE_TAIL && !(__pmFD_ISSET(fd, &readyfds)))
|
||||
continue;
|
||||
offset = 0;
|
||||
@@ -431,21 +429,16 @@ multiread:
|
||||
(oserror() == EAGAIN) ||
|
||||
(oserror() == EWOULDBLOCK)))
|
||||
continue;
|
||||
- if (files[i].type == FILE_SOCK) {
|
||||
- close(files[i].fd);
|
||||
- files[i].fd = -1;
|
||||
- continue;
|
||||
- }
|
||||
- pmNotifyErr(LOG_ERR, "Data read error on %s: %s\n",
|
||||
- local_filetype(files[i].type), osstrerror());
|
||||
- exit(1);
|
||||
+ close(files[i].fd);
|
||||
+ files[i].fd = -1;
|
||||
+ continue;
|
||||
}
|
||||
if (bytes == 0) {
|
||||
if (files[i].type == FILE_TAIL)
|
||||
continue;
|
||||
- pmNotifyErr(LOG_ERR, "No data to read - %s may be closed\n",
|
||||
- local_filetype(files[i].type));
|
||||
- exit(1);
|
||||
+ close(files[i].fd);
|
||||
+ files[i].fd = -1;
|
||||
+ continue;
|
||||
}
|
||||
/*
|
||||
* good read ... data up to buffer + offset + bytes is all OK
|
||||
diff --git a/src/pmdas/postfix/pmdapostfix.pl b/src/pmdas/postfix/pmdapostfix.pl
|
||||
index ac46816bc..d6d3f4d3a 100644
|
||||
--- a/src/pmdas/postfix/pmdapostfix.pl
|
||||
+++ b/src/pmdas/postfix/pmdapostfix.pl
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
-# Copyright (c) 2012-2015 Red Hat.
|
||||
+# Copyright (c) 2012-2015,2022 Red Hat.
|
||||
# Copyright (c) 2009-2010 Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify it
|
||||
@@ -56,8 +56,6 @@ my @postfix_received_dom = (
|
||||
1 => 'smtp',
|
||||
);
|
||||
|
||||
-my $setup = defined($ENV{'PCP_PERL_PMNS'}) || defined($ENV{'PCP_PERL_DOMAIN'});
|
||||
-
|
||||
sub postfix_do_refresh
|
||||
{
|
||||
QUEUE:
|
||||
@@ -212,7 +210,7 @@ $logstats{"received"}{1} = 0;
|
||||
|
||||
# Note:
|
||||
# Environment variables.
|
||||
-# $PMDA_POSTFIX_QSHAPE: alternative executable qshape scrpipt (for QA)
|
||||
+# $PMDA_POSTFIX_QSHAPE: alternative executable qshape script (for QA)
|
||||
# ... over-rides default and command line argument.
|
||||
# ... over-rides default arguments -b 10 -t $refresh
|
||||
# $PMDA_POSTFIX_REFRESH: alternative refresh rate (for QA)
|
||||
@@ -228,7 +226,7 @@ if (defined($ENV{'PMDA_POSTFIX_QSHAPE'})) {
|
||||
$qshape = $ENV{'PMDA_POSTFIX_QSHAPE'};
|
||||
$qshape_args = '';
|
||||
}
|
||||
-if (!$setup) { $pmda->log("qshape cmd: $qshape $qshape_args <qname>"); }
|
||||
+unless (pmda_install()) { $pmda->log("qshape cmd: $qshape $qshape_args <qname>"); }
|
||||
|
||||
if (defined($ENV{'PMDA_POSTFIX_REFRESH'})) { $refresh = $ENV{'PMDA_POSTFIX_REFRESH'}; }
|
||||
|
||||
@@ -238,12 +236,15 @@ foreach my $file ( @logfiles ) {
|
||||
}
|
||||
}
|
||||
if (defined($ENV{'PMDA_POSTFIX_LOG'})) { $logfile = $ENV{'PMDA_POSTFIX_LOG'}; }
|
||||
-unless(defined($logfile))
|
||||
-{
|
||||
- $pmda->log("Fatal: No Postfix log file found in: @logfiles");
|
||||
- die 'No Postfix log file found';
|
||||
+unless (pmda_install()) {
|
||||
+ if (defined($logfile)) {
|
||||
+ $pmda->log("logfile: $logfile");
|
||||
+ } else {
|
||||
+ $pmda->log("Warning: assuming logfile: $logfiles[0] as no Postfix log found yet from: @logfiles");
|
||||
+ }
|
||||
}
|
||||
-if (!$setup) { $pmda->log("logfile: $logfile"); }
|
||||
+# set a good default if none found, before continuing
|
||||
+unless (defined($logfile)) { $logfile = $logfiles[0]; }
|
||||
|
||||
$pmda->add_indom($postfix_queues_indom, \@postfix_queues_dom, '', '');
|
||||
$pmda->add_indom($postfix_sent_indom, \@postfix_sent_dom, '', '');
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
commit d874d2e486c8a64fa9945ed7aa0048cccbd46f77
|
||||
Author: Nathan Scott <nathans@redhat.com>
|
||||
Date: Wed May 4 17:11:19 2022 +1000
|
||||
|
||||
pmdaproc: fix cgroup cpu metrics refresh structures
|
||||
|
||||
Jan Kurik encountered this issue when running the regression
|
||||
testsuite (especially qa/359) on non-x86_64 architectures.
|
||||
|
||||
Something must've changed in the toolchain recently on these
|
||||
platforms since we've not seen this before, but this bug has
|
||||
been in our code for some time. It works everywhere else by
|
||||
good fortune, when there just happen to be NULLs after these
|
||||
cgroups CPU parsing data structures.
|
||||
|
||||
Resolves Red Hat BZ #2081262.
|
||||
|
||||
diff --git a/src/pmdas/linux_proc/cgroups.c b/src/pmdas/linux_proc/cgroups.c
|
||||
index 413a72343..26d59863a 100644
|
||||
--- a/src/pmdas/linux_proc/cgroups.c
|
||||
+++ b/src/pmdas/linux_proc/cgroups.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2012-2019 Red Hat.
|
||||
+ * Copyright (c) 2012-2019,2022 Red Hat.
|
||||
* Copyright (c) 2010 Aconex. All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
@@ -863,6 +863,7 @@ read_cpu_time(const char *file, cgroup_cputime_t *ccp)
|
||||
{ "usage_usec", &cputime.usage },
|
||||
{ "user_usec", &cputime.user },
|
||||
{ "system_usec", &cputime.system },
|
||||
+ { NULL, NULL }
|
||||
};
|
||||
char buffer[4096], name[64];
|
||||
unsigned long long value;
|
||||
@@ -903,6 +904,7 @@ read_cpu_stats(const char *file, cgroup_cpustat_t *ccp)
|
||||
{ "nr_periods", &cpustat.nr_periods },
|
||||
{ "nr_throttled", &cpustat.nr_throttled },
|
||||
{ "throttled_time", &cpustat.throttled_time },
|
||||
+ { NULL, NULL }
|
||||
};
|
||||
char buffer[4096], name[64];
|
||||
unsigned long long value;
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
diff -Naurp pcp-5.3.7.orig/src/pcp/dstat/pcp-dstat.1 pcp-5.3.7/src/pcp/dstat/pcp-dstat.1
|
||||
--- pcp-5.3.7.orig/src/pcp/dstat/pcp-dstat.1 2021-05-26 17:43:26.000000000 +1000
|
||||
+++ pcp-5.3.7/src/pcp/dstat/pcp-dstat.1 2022-10-20 08:57:02.176922290 +1100
|
||||
@@ -1,6 +1,6 @@
|
||||
'\"macro stdmacro
|
||||
.\"
|
||||
-.\" Copyright (c) 2018-2020 Red Hat.
|
||||
+.\" Copyright (c) 2018-2022 Red Hat.
|
||||
.\"
|
||||
.\" This program is free software; you can redistribute it and/or modify it
|
||||
.\" under the terms of the GNU General Public License as published by the
|
||||
@@ -34,6 +34,7 @@
|
||||
[\f3\-\-integer\f1]
|
||||
[\f3\-\-nocolor\f1]
|
||||
[\f3\-\-noheaders\f1]
|
||||
+[\f3\-\-nomissed\f1]
|
||||
[\f3\-\-noupdate\f1]
|
||||
[\f3\-\-list\f1]
|
||||
[\f3\-\-pidfile\f1 \f2pid-file\f1]
|
||||
@@ -404,6 +405,9 @@ disable colors
|
||||
\fB\-\-noheaders\fR
|
||||
disable repetitive headers
|
||||
.TP
|
||||
+\fB\-\-nomissed\fR
|
||||
+disable missed ticks warnings for intermediate samples.
|
||||
+.TP
|
||||
\fB\-\-noupdate\fR
|
||||
disable intermediate updates when \fIdelay\fR greater than 1.
|
||||
.TP
|
||||
diff -Naurp pcp-5.3.7.orig/src/pcp/dstat/pcp-dstat.py pcp-5.3.7/src/pcp/dstat/pcp-dstat.py
|
||||
--- pcp-5.3.7.orig/src/pcp/dstat/pcp-dstat.py 2022-04-05 09:05:43.000000000 +1000
|
||||
+++ pcp-5.3.7/src/pcp/dstat/pcp-dstat.py 2022-10-20 08:57:02.176922290 +1100
|
||||
@@ -455,6 +455,7 @@ class DstatTool(object):
|
||||
|
||||
# Internal
|
||||
self.missed = 0
|
||||
+ self.nomissed = False # report missed ticks by default
|
||||
self.runtime = -1
|
||||
self.plugins = [] # list of requested plugin names
|
||||
self.allplugins = [] # list of all known plugin names
|
||||
@@ -783,7 +784,8 @@ class DstatTool(object):
|
||||
opts.pmSetLongOption('color', 0, '', '', 'force colors')
|
||||
opts.pmSetLongOption('nocolor', 0, '', '', 'disable colors')
|
||||
opts.pmSetLongOption('noheaders', 0, '', '', 'disable repetitive headers')
|
||||
- opts.pmSetLongOption('noupdate', 0, '', '', 'disable intermediate headers')
|
||||
+ opts.pmSetLongOption('noupdate', 0, '', '', 'disable intermediate updates')
|
||||
+ opts.pmSetLongOption('nomissed', 0, '', '', 'disable missed ticks warnings')
|
||||
opts.pmSetLongOption('output', 1, 'o', 'file', 'write CSV output to file')
|
||||
opts.pmSetLongOption('version', 0, 'V', '', '')
|
||||
opts.pmSetLongOption('debug', 1, None, '', '')
|
||||
@@ -920,6 +922,8 @@ class DstatTool(object):
|
||||
self.header = False
|
||||
elif opt in ['noupdate']:
|
||||
self.update = False
|
||||
+ elif opt in ['nomissed']:
|
||||
+ self.nomissed = True
|
||||
elif opt in ['o', 'output']:
|
||||
self.output = arg
|
||||
elif opt in ['pidfile']:
|
||||
@@ -1773,12 +1777,12 @@ class DstatTool(object):
|
||||
outputfile = open(self.output, omode)
|
||||
outputfile.write(oline)
|
||||
|
||||
- if self.missed > 0:
|
||||
+ if self.missed > 0 and self.nomissed is False:
|
||||
line = 'missed ' + str(self.missed + 1) + ' ticks'
|
||||
sys.stdout.write(' ' + THEME['error'] + line + THEME['input'])
|
||||
if self.output and step == self.delay:
|
||||
outputfile.write(',"' + line + '"')
|
||||
- self.missed = 0
|
||||
+ self.missed = 0
|
||||
# Finish the line
|
||||
if not op.update and self.novalues is False:
|
||||
sys.stdout.write('\n')
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
commit 55e8c83ee5920ab30644f54f7a525255b1de4b84
|
||||
Author: Nathan Scott <nathans@redhat.com>
|
||||
Date: Mon Aug 29 14:25:03 2022 +1000
|
||||
|
||||
docs: describe working sudoers configuration with requiretty
|
||||
|
||||
When /etc/sudoers is configured with 'Defaults requiretty',
|
||||
pmlogctl cannot invoke pmlogger_check in the normal fashion.
|
||||
Symptoms of the problem are the following system log message:
|
||||
|
||||
pmlogctl[PID]: sudo: sorry, you must have a tty to run sudo
|
||||
|
||||
pmiectl and pmie_check are similarly affected. The simplest
|
||||
solution is to add an additional configuration line excluding
|
||||
these commands from requiring a tty; this is the approach now
|
||||
documented.
|
||||
|
||||
Note these PCP commands are not interactive (require no tty)
|
||||
and the unprivileged 'pcp' account uses nologin(8) as a shell
|
||||
anyway, so requiretty offers no advantages here. Note also
|
||||
there's debate about whether requiretty is a useful security
|
||||
measure in general as it can be trivially bypassed; further
|
||||
details: https://bugzilla.redhat.com/show_bug.cgi?id=1020147
|
||||
|
||||
Resolves Red Hat BZ #2093751
|
||||
|
||||
diff -Naurp pcp-5.3.7.orig/man/man1/pmie_check.1 pcp-5.3.7/man/man1/pmie_check.1
|
||||
--- pcp-5.3.7.orig/man/man1/pmie_check.1 2021-11-04 08:26:15.000000000 +1100
|
||||
+++ pcp-5.3.7/man/man1/pmie_check.1 2022-08-31 11:17:52.362276530 +1000
|
||||
@@ -406,6 +406,42 @@ no
|
||||
entries are needed as the timer mechanism provided by
|
||||
.B systemd
|
||||
is used instead.
|
||||
+.PP
|
||||
+The
|
||||
+.BR pmiectl (1)
|
||||
+utility may invoke
|
||||
+.B pmie_check
|
||||
+using the
|
||||
+.BR sudo (1)
|
||||
+command to run it under the $PCP_USER ``pcp'' account.
|
||||
+If
|
||||
+.B sudo
|
||||
+is configured with the non-default
|
||||
+.I requiretty
|
||||
+option (see below),
|
||||
+.B pmie_check
|
||||
+may fail to run due to not having a tty configured.
|
||||
+This issue can be resolved by adding a second line
|
||||
+(expand $PCP_BINADM_DIR according to your platform)
|
||||
+to the
|
||||
+.I /etc/sudoers
|
||||
+configuration file as follows:
|
||||
+.P
|
||||
+.ft CW
|
||||
+.nf
|
||||
+.in +0.5i
|
||||
+Defaults requiretty
|
||||
+Defaults!$PCP_BINADM_DIR/pmie_check !requiretty
|
||||
+.in
|
||||
+.fi
|
||||
+.ft 1
|
||||
+.P
|
||||
+Note that the unprivileged PCP account under which these
|
||||
+commands run uses
|
||||
+.I /sbin/nologin
|
||||
+as the shell, so the
|
||||
+.I requiretty
|
||||
+option is ineffective here and safe to disable in this way.
|
||||
.SH FILES
|
||||
.TP 5
|
||||
.I $PCP_PMIECONTROL_PATH
|
||||
diff -Naurp pcp-5.3.7.orig/man/man1/pmlogger_check.1 pcp-5.3.7/man/man1/pmlogger_check.1
|
||||
--- pcp-5.3.7.orig/man/man1/pmlogger_check.1 2022-04-05 09:05:43.000000000 +1000
|
||||
+++ pcp-5.3.7/man/man1/pmlogger_check.1 2022-08-31 11:20:52.470086724 +1000
|
||||
@@ -830,6 +830,42 @@ no
|
||||
entries are needed as the timer mechanism provided by
|
||||
.B systemd
|
||||
is used instead.
|
||||
+.PP
|
||||
+The
|
||||
+.BR pmlogctl (1)
|
||||
+utility may invoke
|
||||
+.B pmlogger_check
|
||||
+using the
|
||||
+.BR sudo (1)
|
||||
+command to run it under the $PCP_USER ``pcp'' account.
|
||||
+If
|
||||
+.B sudo
|
||||
+is configured with the non-default
|
||||
+.I requiretty
|
||||
+option (see below),
|
||||
+.B pmlogger_check
|
||||
+may fail to run due to not having a tty configured.
|
||||
+This issue can be resolved by adding a second line
|
||||
+(expand $PCP_BINADM_DIR according to your platform)
|
||||
+to the
|
||||
+.I /etc/sudoers
|
||||
+configuration file as follows:
|
||||
+.P
|
||||
+.ft CW
|
||||
+.nf
|
||||
+.in +0.5i
|
||||
+Defaults requiretty
|
||||
+Defaults!$PCP_BINADM_DIR/pmlogger_check !requiretty
|
||||
+.in
|
||||
+.fi
|
||||
+.ft 1
|
||||
+.P
|
||||
+Note that the unprivileged PCP account under which these
|
||||
+commands run uses
|
||||
+.I /sbin/nologin
|
||||
+as the shell, so the
|
||||
+.I requiretty
|
||||
+option is ineffective here and safe to disable in this way.
|
||||
.SH FILES
|
||||
.TP 5
|
||||
.I $PCP_PMLOGGERCONTROL_PATH
|
||||
@@ -926,7 +962,7 @@ instances for
|
||||
.I hostname
|
||||
have been launched in the interim.
|
||||
Because the cron-driven PCP archive management scripts run under
|
||||
-the uid of the user ``pcp'',
|
||||
+the $PCP_USER account ``pcp'',
|
||||
.BI $PCP_ARCHIVE_DIR/ hostname /SaveLogs
|
||||
typically needs to be owned by the user ``pcp''.
|
||||
.TP
|
||||
@@ -994,6 +1030,7 @@ platforms.
|
||||
.BR pmlogmv (1),
|
||||
.BR pmlogrewrite (1),
|
||||
.BR pmsocks (1),
|
||||
+.BR sudo (1),
|
||||
.BR systemd (1),
|
||||
.BR xz (1)
|
||||
and
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
From 73c024c64f7db68fdcd224c27c1711fa6dd1d254 Mon Sep 17 00:00:00 2001
|
||||
From: Nathan Scott <nathans@redhat.com>
|
||||
Date: Tue, 28 Jun 2022 10:06:06 +1000
|
||||
Subject: [PATCH] pmlogger_farm: add default configuration file for farm
|
||||
loggers
|
||||
|
||||
Provide a mechanism whereby the farm loggers can be configured.
|
||||
There has been reluctance in the past to sharing configuration
|
||||
of the local primary logger, so these are now done separately.
|
||||
Makes sense to me as the primary pmlogger may need to use more
|
||||
frequent sampling, may not want to allow remote pmlc, etc.
|
||||
|
||||
Resolves Red Hat BZ #2101574
|
||||
---
|
||||
src/pmlogger/GNUmakefile | 1 +
|
||||
src/pmlogger/pmlogger.defaults | 2 ++
|
||||
src/pmlogger/pmlogger_check.sh | 5 +++--
|
||||
src/pmlogger/pmlogger_farm.defaults | 27 +++++++++++++++++++++++++++
|
||||
4 files changed, 33 insertions(+), 2 deletions(-)
|
||||
create mode 100644 src/pmlogger/pmlogger_farm.defaults
|
||||
|
||||
diff -Naurp pcp-5.3.7.orig/src/pmlogger/GNUmakefile pcp-5.3.7/src/pmlogger/GNUmakefile
|
||||
--- pcp-5.3.7.orig/src/pmlogger/GNUmakefile 2022-02-02 11:53:05.000000000 +1100
|
||||
+++ pcp-5.3.7/src/pmlogger/GNUmakefile 2022-08-31 11:23:08.758672970 +1000
|
||||
@@ -45,6 +45,7 @@ install:: $(SUBDIRS)
|
||||
|
||||
install:: default
|
||||
$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_VAR_DIR)/config/pmlogger
|
||||
+ $(INSTALL) -m 644 pmlogger_farm.defaults $(PCP_SYSCONFIG_DIR)/pmlogger_farm
|
||||
$(INSTALL) -m 644 pmlogger.defaults $(PCP_SYSCONFIG_DIR)/pmlogger
|
||||
$(INSTALL) -m 755 -d $(PCP_SHARE_DIR)/zeroconf
|
||||
$(INSTALL) -m 644 pmlogger.zeroconf $(PCP_SHARE_DIR)/zeroconf/pmlogger
|
||||
diff -Naurp pcp-5.3.7.orig/src/pmlogger/pmlogger_check.sh pcp-5.3.7/src/pmlogger/pmlogger_check.sh
|
||||
--- pcp-5.3.7.orig/src/pmlogger/pmlogger_check.sh 2022-04-05 09:05:43.000000000 +1000
|
||||
+++ pcp-5.3.7/src/pmlogger/pmlogger_check.sh 2022-08-31 11:23:08.758672970 +1000
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
#
|
||||
-# Copyright (c) 2013-2016,2018,2020-2021 Red Hat.
|
||||
+# Copyright (c) 2013-2016,2018,2020-2022 Red Hat.
|
||||
# Copyright (c) 1995-2000,2003 Silicon Graphics, Inc. All Rights Reserved.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify it
|
||||
@@ -24,6 +24,7 @@
|
||||
PMLOGGER="$PCP_BINADM_DIR/pmlogger"
|
||||
PMLOGCONF="$PCP_BINADM_DIR/pmlogconf"
|
||||
PMLOGGERENVS="$PCP_SYSCONFIG_DIR/pmlogger"
|
||||
+PMLOGGERFARMENVS="$PCP_SYSCONFIG_DIR/pmlogger_farm"
|
||||
PMLOGGERZEROCONFENVS="$PCP_SHARE_DIR/zeroconf/pmlogger"
|
||||
|
||||
# error messages should go to stderr, not the GUI notifiers
|
||||
@@ -972,8 +973,8 @@ END { print m }'`
|
||||
continue
|
||||
fi
|
||||
else
|
||||
+ envs=`grep -h ^PMLOGGER "$PMLOGGERFARMENVS" 2>/dev/null`
|
||||
args="-h $host $args"
|
||||
- envs=""
|
||||
iam=""
|
||||
fi
|
||||
|
||||
diff -Naurp pcp-5.3.7.orig/src/pmlogger/pmlogger.defaults pcp-5.3.7/src/pmlogger/pmlogger.defaults
|
||||
--- pcp-5.3.7.orig/src/pmlogger/pmlogger.defaults 2022-02-03 16:11:40.000000000 +1100
|
||||
+++ pcp-5.3.7/src/pmlogger/pmlogger.defaults 2022-08-31 11:23:08.758672970 +1000
|
||||
@@ -1,5 +1,7 @@
|
||||
# Environment variables for the primary pmlogger daemon. See also
|
||||
# the pmlogger control file and pmlogconf(1) for additional details.
|
||||
+# Also see separate pmlogger_farm configuration for the non-primary
|
||||
+# logger configuration settings, separate to this file.
|
||||
# Settings defined in this file will override any settings in the
|
||||
# pmlogger zeroconf file (if present).
|
||||
|
||||
diff -Naurp pcp-5.3.7.orig/src/pmlogger/pmlogger_farm.defaults pcp-5.3.7/src/pmlogger/pmlogger_farm.defaults
|
||||
--- pcp-5.3.7.orig/src/pmlogger/pmlogger_farm.defaults 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ pcp-5.3.7/src/pmlogger/pmlogger_farm.defaults 2022-08-31 11:23:08.758672970 +1000
|
||||
@@ -0,0 +1,27 @@
|
||||
+# Environment variables for the pmlogger farm daemons. See also
|
||||
+# pmlogger control file(s) and pmlogconf(1) for additional details.
|
||||
+# Also see separate pmlogger configuration for the primary logger
|
||||
+# configuration settings, separate to this file.
|
||||
+
|
||||
+# Behaviour regarding listening on external-facing interfaces;
|
||||
+# unset PMLOGGER_LOCAL to allow connections from remote hosts.
|
||||
+# A value of 0 permits remote connections, 1 permits local only.
|
||||
+# PMLOGGER_LOCAL=1
|
||||
+
|
||||
+# Max length to which the queue of pending connections may grow
|
||||
+# A value of 5 is the default.
|
||||
+# PMLOGGER_MAXPENDING=5
|
||||
+
|
||||
+# Default sampling interval pmlogger uses when no more specific
|
||||
+# interval is requested. A value of 60 seconds is the default.
|
||||
+# Both pmlogger command line (via control file) and also pmlogger
|
||||
+# configuration file directives will override this value.
|
||||
+# PMLOGGER_INTERVAL=60
|
||||
+
|
||||
+# The default behaviour, when pmlogger configuration comes from
|
||||
+# pmlogconf(1), is to regenerate the configuration file and check for
|
||||
+# changes whenever pmlogger is started from pmlogger_check(1).
|
||||
+# If the PMDA configuration is stable, this is not necessary, and
|
||||
+# setting PMLOGGER_CHECK_SKIP_LOGCONF to yes disables the regeneration
|
||||
+# and checking.
|
||||
+# PMLOGGER_CHECK_SKIP_LOGCONF=yes
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,88 @@
|
|||
diff --git a/vendor/github.com/iovisor/bcc/libbpf-tools/arm64/vmlinux_510.h b/vendor/github.com/iovisor/bcc/libbpf-tools/arm64/vmlinux_510.h
|
||||
index f84b1347bf..3c032f5230 100644
|
||||
--- a/vendor/github.com/iovisor/bcc/libbpf-tools/arm64/vmlinux_510.h
|
||||
+++ b/vendor/github.com/iovisor/bcc/libbpf-tools/arm64/vmlinux_510.h
|
||||
@@ -1678,6 +1678,7 @@ struct perf_event {
|
||||
int pending_wakeup;
|
||||
int pending_kill;
|
||||
int pending_disable;
|
||||
+ long unsigned int pending_addr;
|
||||
struct irq_work pending;
|
||||
atomic_t event_limit;
|
||||
struct perf_addr_filters_head addr_filters;
|
||||
@@ -1693,6 +1694,7 @@ struct perf_event {
|
||||
void *overflow_handler_context;
|
||||
perf_overflow_handler_t orig_overflow_handler;
|
||||
struct bpf_prog *prog;
|
||||
+ u64 bpf_cookie;
|
||||
struct trace_event_call *tp_event;
|
||||
struct event_filter *filter;
|
||||
struct ftrace_ops ftrace_ops;
|
||||
@@ -26070,7 +26072,10 @@ enum bpf_link_type {
|
||||
BPF_LINK_TYPE_ITER = 4,
|
||||
BPF_LINK_TYPE_NETNS = 5,
|
||||
BPF_LINK_TYPE_XDP = 6,
|
||||
- MAX_BPF_LINK_TYPE = 7,
|
||||
+ BPF_LINK_TYPE_PERF_EVENT = 7,
|
||||
+ BPF_LINK_TYPE_KPROBE_MULTI = 8,
|
||||
+ BPF_LINK_TYPE_STRUCT_OPS = 9,
|
||||
+ MAX_BPF_LINK_TYPE = 10,
|
||||
};
|
||||
|
||||
struct bpf_link_info {
|
||||
@@ -30363,6 +30368,11 @@ struct bpf_raw_tp_link {
|
||||
struct bpf_raw_event_map *btp;
|
||||
};
|
||||
|
||||
+struct bpf_perf_link {
|
||||
+ struct bpf_link link;
|
||||
+ struct file *perf_file;
|
||||
+};
|
||||
+
|
||||
struct btf_member {
|
||||
__u32 name_off;
|
||||
__u32 type;
|
||||
diff --git a/vendor/github.com/iovisor/bcc/libbpf-tools/powerpc/vmlinux_510.h b/vendor/github.com/iovisor/bcc/libbpf-tools/powerpc/vmlinux_510.h
|
||||
index 3b1b0127d1..052db391d4 100644
|
||||
--- a/vendor/github.com/iovisor/bcc/libbpf-tools/powerpc/vmlinux_510.h
|
||||
+++ b/vendor/github.com/iovisor/bcc/libbpf-tools/powerpc/vmlinux_510.h
|
||||
@@ -4345,6 +4345,7 @@ struct perf_event {
|
||||
int pending_wakeup;
|
||||
int pending_kill;
|
||||
int pending_disable;
|
||||
+ long unsigned int pending_addr;
|
||||
struct irq_work pending;
|
||||
atomic_t event_limit;
|
||||
struct perf_addr_filters_head addr_filters;
|
||||
@@ -4360,6 +4361,7 @@ struct perf_event {
|
||||
void *overflow_handler_context;
|
||||
perf_overflow_handler_t orig_overflow_handler;
|
||||
struct bpf_prog *prog;
|
||||
+ u64 bpf_cookie;
|
||||
struct trace_event_call *tp_event;
|
||||
struct event_filter *filter;
|
||||
struct ftrace_ops ftrace_ops;
|
||||
@@ -36449,7 +36451,10 @@ enum bpf_link_type {
|
||||
BPF_LINK_TYPE_ITER = 4,
|
||||
BPF_LINK_TYPE_NETNS = 5,
|
||||
BPF_LINK_TYPE_XDP = 6,
|
||||
- MAX_BPF_LINK_TYPE = 7,
|
||||
+ BPF_LINK_TYPE_PERF_EVENT = 7,
|
||||
+ BPF_LINK_TYPE_KPROBE_MULTI = 8,
|
||||
+ BPF_LINK_TYPE_STRUCT_OPS = 9,
|
||||
+ MAX_BPF_LINK_TYPE = 10,
|
||||
};
|
||||
|
||||
struct bpf_link_info {
|
||||
@@ -40756,6 +40761,11 @@ struct bpf_raw_tp_link {
|
||||
struct bpf_raw_event_map *btp;
|
||||
};
|
||||
|
||||
+struct bpf_perf_link {
|
||||
+ struct bpf_link link;
|
||||
+ struct file *perf_file;
|
||||
+};
|
||||
+
|
||||
struct btf_member {
|
||||
__u32 name_off;
|
||||
__u32 type;
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
commit 23bfdcbac0b0fb7bd33f092c6f2ad56889480335
|
||||
Author: Andreas Gerstmayr <agerstmayr@redhat.com>
|
||||
Date: Thu Oct 27 14:22:37 2022 +0200
|
||||
|
||||
build: use vendored vmlinux.h when compiling bpftool
|
||||
|
||||
diff --git a/vendor/GNUmakefile b/vendor/GNUmakefile
|
||||
index a0c29d4b45..57151e4671 100644
|
||||
--- a/vendor/GNUmakefile
|
||||
+++ b/vendor/GNUmakefile
|
||||
@@ -3,7 +3,7 @@ include $(TOPDIR)/src/include/builddefs
|
||||
|
||||
default_pcp default:
|
||||
ifeq "$(PMDA_BPF)" "true"
|
||||
- $(MAKE) -C github.com/libbpf/bpftool/src
|
||||
+ $(MAKE) -C github.com/libbpf/bpftool/src VMLINUX_H=$(PMDABPF_VMLINUXH)
|
||||
endif
|
||||
|
||||
install_pcp install:
|
||||
|
|
@ -1,534 +0,0 @@
|
|||
diff -Naurp pcp-5.3.7.orig/qa/1985 pcp-5.3.7/qa/1985
|
||||
--- pcp-5.3.7.orig/qa/1985 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ pcp-5.3.7/qa/1985 2022-10-19 21:32:03.971832371 +1100
|
||||
@@ -0,0 +1,38 @@
|
||||
+#!/bin/sh
|
||||
+# PCP QA Test No. 1985
|
||||
+# Exercise a pmfind fix - valgrind-enabled variant.
|
||||
+#
|
||||
+# Copyright (c) 2022 Red Hat. All Rights Reserved.
|
||||
+#
|
||||
+
|
||||
+seq=`basename $0`
|
||||
+echo "QA output created by $seq"
|
||||
+
|
||||
+# get standard environment, filters and checks
|
||||
+. ./common.product
|
||||
+. ./common.filter
|
||||
+. ./common.check
|
||||
+
|
||||
+_check_valgrind
|
||||
+
|
||||
+_cleanup()
|
||||
+{
|
||||
+ cd $here
|
||||
+ $sudo rm -rf $tmp $tmp.*
|
||||
+}
|
||||
+
|
||||
+status=0 # success is the default!
|
||||
+$sudo rm -rf $tmp $tmp.* $seq.full
|
||||
+trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
+
|
||||
+# real QA test starts here
|
||||
+export seq
|
||||
+./1986 --valgrind \
|
||||
+| $PCP_AWK_PROG '
|
||||
+skip == 1 && $1 == "===" { skip = 0 }
|
||||
+/^=== std err ===/ { skip = 1 }
|
||||
+skip == 0 { print }
|
||||
+skip == 1 { print >>"'$here/$seq.full'" }'
|
||||
+
|
||||
+# success, all done
|
||||
+exit
|
||||
diff -Naurp pcp-5.3.7.orig/qa/1985.out pcp-5.3.7/qa/1985.out
|
||||
--- pcp-5.3.7.orig/qa/1985.out 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ pcp-5.3.7/qa/1985.out 2022-10-19 21:32:03.971832371 +1100
|
||||
@@ -0,0 +1,11 @@
|
||||
+QA output created by 1985
|
||||
+QA output created by 1986 --valgrind
|
||||
+=== std out ===
|
||||
+SOURCE HOSTNAME
|
||||
+=== filtered valgrind report ===
|
||||
+Memcheck, a memory error detector
|
||||
+Command: pmfind -S -m probe=127.0.0.1/32
|
||||
+LEAK SUMMARY:
|
||||
+definitely lost: 0 bytes in 0 blocks
|
||||
+indirectly lost: 0 bytes in 0 blocks
|
||||
+ERROR SUMMARY: 0 errors from 0 contexts ...
|
||||
diff -Naurp pcp-5.3.7.orig/qa/1986 pcp-5.3.7/qa/1986
|
||||
--- pcp-5.3.7.orig/qa/1986 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ pcp-5.3.7/qa/1986 2022-10-19 21:32:03.971832371 +1100
|
||||
@@ -0,0 +1,62 @@
|
||||
+#!/bin/sh
|
||||
+# PCP QA Test No. 1986
|
||||
+# Exercise libpcp_web timers pmfind regression fix.
|
||||
+#
|
||||
+# Copyright (c) 2022 Red Hat. All Rights Reserved.
|
||||
+#
|
||||
+
|
||||
+if [ $# -eq 0 ]
|
||||
+then
|
||||
+ seq=`basename $0`
|
||||
+ echo "QA output created by $seq"
|
||||
+else
|
||||
+ # use $seq from caller, unless not set
|
||||
+ [ -n "$seq" ] || seq=`basename $0`
|
||||
+ echo "QA output created by `basename $0` $*"
|
||||
+fi
|
||||
+
|
||||
+# get standard environment, filters and checks
|
||||
+. ./common.product
|
||||
+. ./common.filter
|
||||
+. ./common.check
|
||||
+
|
||||
+do_valgrind=false
|
||||
+if [ "$1" = "--valgrind" ]
|
||||
+then
|
||||
+ _check_valgrind
|
||||
+ do_valgrind=true
|
||||
+fi
|
||||
+
|
||||
+test -x $PCP_BIN_DIR/pmfind || _notrun No support for pmfind
|
||||
+
|
||||
+_cleanup()
|
||||
+{
|
||||
+ cd $here
|
||||
+ $sudo rm -rf $tmp $tmp.*
|
||||
+}
|
||||
+
|
||||
+status=0 # success is the default!
|
||||
+hostname=`hostname || echo localhost`
|
||||
+$sudo rm -rf $tmp $tmp.* $seq.full
|
||||
+trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
+
|
||||
+_filter()
|
||||
+{
|
||||
+ sed \
|
||||
+ -e "s@$tmp@TMP@g" \
|
||||
+ -e "s/ $hostname/ HOSTNAME/" \
|
||||
+ -e 's/^[a-f0-9][a-f0-9]* /SOURCE /' \
|
||||
+ # end
|
||||
+}
|
||||
+
|
||||
+# real QA test starts here
|
||||
+if $do_valgrind
|
||||
+then
|
||||
+ _run_valgrind pmfind -S -m probe=127.0.0.1/32
|
||||
+else
|
||||
+ pmfind -S -m probe=127.0.0.1/32
|
||||
+fi \
|
||||
+| _filter
|
||||
+
|
||||
+# success, all done
|
||||
+exit
|
||||
diff -Naurp pcp-5.3.7.orig/qa/1986.out pcp-5.3.7/qa/1986.out
|
||||
--- pcp-5.3.7.orig/qa/1986.out 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ pcp-5.3.7/qa/1986.out 2022-10-19 21:32:03.971832371 +1100
|
||||
@@ -0,0 +1,2 @@
|
||||
+QA output created by 1986
|
||||
+SOURCE HOSTNAME
|
||||
diff -Naurp pcp-5.3.7.orig/qa/group pcp-5.3.7/qa/group
|
||||
--- pcp-5.3.7.orig/qa/group 2022-10-19 20:49:42.638708707 +1100
|
||||
+++ pcp-5.3.7/qa/group 2022-10-19 21:32:03.972832359 +1100
|
||||
@@ -1974,4 +1974,6 @@ x11
|
||||
1957 libpcp local valgrind
|
||||
1978 atop local
|
||||
1984 pmlogconf pmda.redis local
|
||||
+1985 pmfind local valgrind
|
||||
+1986 pmfind local
|
||||
4751 libpcp threads valgrind local pcp helgrind
|
||||
diff -Naurp pcp-5.3.7.orig/src/libpcp_web/src/webgroup.c pcp-5.3.7/src/libpcp_web/src/webgroup.c
|
||||
--- pcp-5.3.7.orig/src/libpcp_web/src/webgroup.c 2021-11-01 13:02:26.000000000 +1100
|
||||
+++ pcp-5.3.7/src/libpcp_web/src/webgroup.c 2022-10-19 21:32:03.973832346 +1100
|
||||
@@ -287,11 +287,24 @@ webgroup_new_context(pmWebGroupSettings
|
||||
}
|
||||
|
||||
static void
|
||||
+webgroup_timers_stop(struct webgroups *groups)
|
||||
+{
|
||||
+ if (groups->active) {
|
||||
+ uv_timer_stop(&groups->timer);
|
||||
+ uv_close((uv_handle_t *)&groups->timer, NULL);
|
||||
+ pmWebTimerRelease(groups->timerid);
|
||||
+ groups->timerid = -1;
|
||||
+ groups->active = 0;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
webgroup_garbage_collect(struct webgroups *groups)
|
||||
{
|
||||
dictIterator *iterator;
|
||||
dictEntry *entry;
|
||||
context_t *cp;
|
||||
+ unsigned int count = 0, drops = 0;
|
||||
|
||||
if (pmDebugOptions.http || pmDebugOptions.libweb)
|
||||
fprintf(stderr, "%s: started\n", "webgroup_garbage_collect");
|
||||
@@ -308,33 +321,40 @@ webgroup_garbage_collect(struct webgroup
|
||||
uv_mutex_unlock(&groups->mutex);
|
||||
webgroup_drop_context(cp, groups);
|
||||
uv_mutex_lock(&groups->mutex);
|
||||
+ drops++;
|
||||
}
|
||||
+ count++;
|
||||
}
|
||||
dictReleaseIterator(iterator);
|
||||
+
|
||||
+ /* if dropping the last remaining context, do cleanup */
|
||||
+ if (groups->active && drops == count) {
|
||||
+ if (pmDebugOptions.http || pmDebugOptions.libweb)
|
||||
+ fprintf(stderr, "%s: freezing\n", "webgroup_garbage_collect");
|
||||
+ webgroup_timers_stop(groups);
|
||||
+ }
|
||||
uv_mutex_unlock(&groups->mutex);
|
||||
}
|
||||
|
||||
if (pmDebugOptions.http || pmDebugOptions.libweb)
|
||||
- fprintf(stderr, "%s: finished\n", "webgroup_garbage_collect");
|
||||
+ fprintf(stderr, "%s: finished [%u drops from %u entries]\n",
|
||||
+ "webgroup_garbage_collect", drops, count);
|
||||
}
|
||||
|
||||
static void
|
||||
refresh_maps_metrics(void *data)
|
||||
{
|
||||
struct webgroups *groups = (struct webgroups *)data;
|
||||
+ unsigned int value;
|
||||
|
||||
- if (groups->metrics) {
|
||||
- unsigned int value;
|
||||
-
|
||||
- value = dictSize(contextmap);
|
||||
- mmv_set(groups->map, groups->metrics[CONTEXT_MAP_SIZE], &value);
|
||||
- value = dictSize(namesmap);
|
||||
- mmv_set(groups->map, groups->metrics[NAMES_MAP_SIZE], &value);
|
||||
- value = dictSize(labelsmap);
|
||||
- mmv_set(groups->map, groups->metrics[LABELS_MAP_SIZE], &value);
|
||||
- value = dictSize(instmap);
|
||||
- mmv_set(groups->map, groups->metrics[INST_MAP_SIZE], &value);
|
||||
- }
|
||||
+ value = contextmap? dictSize(contextmap) : 0;
|
||||
+ mmv_set(groups->map, groups->metrics[CONTEXT_MAP_SIZE], &value);
|
||||
+ value = namesmap? dictSize(namesmap) : 0;
|
||||
+ mmv_set(groups->map, groups->metrics[NAMES_MAP_SIZE], &value);
|
||||
+ value = labelsmap? dictSize(labelsmap) : 0;
|
||||
+ mmv_set(groups->map, groups->metrics[LABELS_MAP_SIZE], &value);
|
||||
+ value = instmap? dictSize(instmap) : 0;
|
||||
+ mmv_set(groups->map, groups->metrics[INST_MAP_SIZE], &value);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -487,6 +507,7 @@ pmWebGroupDestroy(pmWebGroupSettings *se
|
||||
if (pmDebugOptions.libweb)
|
||||
fprintf(stderr, "%s: destroy context %p gp=%p\n", "pmWebGroupDestroy", cp, gp);
|
||||
|
||||
+ webgroup_deref_context(cp);
|
||||
webgroup_drop_context(cp, gp);
|
||||
}
|
||||
sdsfree(msg);
|
||||
@@ -2394,17 +2415,12 @@ pmWebGroupClose(pmWebGroupModule *module
|
||||
|
||||
if (groups) {
|
||||
/* walk the contexts, stop timers and free resources */
|
||||
- if (groups->active) {
|
||||
- groups->active = 0;
|
||||
- uv_timer_stop(&groups->timer);
|
||||
- pmWebTimerRelease(groups->timerid);
|
||||
- groups->timerid = -1;
|
||||
- }
|
||||
iterator = dictGetIterator(groups->contexts);
|
||||
while ((entry = dictNext(iterator)) != NULL)
|
||||
webgroup_drop_context((context_t *)dictGetVal(entry), NULL);
|
||||
dictReleaseIterator(iterator);
|
||||
dictRelease(groups->contexts);
|
||||
+ webgroup_timers_stop(groups);
|
||||
memset(groups, 0, sizeof(struct webgroups));
|
||||
free(groups);
|
||||
}
|
||||
diff -Naurp pcp-5.3.7.orig/src/pmfind/source.c pcp-5.3.7/src/pmfind/source.c
|
||||
--- pcp-5.3.7.orig/src/pmfind/source.c 2021-02-17 15:27:41.000000000 +1100
|
||||
+++ pcp-5.3.7/src/pmfind/source.c 2022-10-19 21:32:03.973832346 +1100
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2020 Red Hat.
|
||||
+ * Copyright (c) 2020,2022 Red Hat.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
@@ -25,6 +25,7 @@ static pmWebGroupSettings settings;
|
||||
typedef struct {
|
||||
sds source;
|
||||
sds hostspec;
|
||||
+ unsigned int refcount;
|
||||
} context_t;
|
||||
|
||||
typedef struct {
|
||||
@@ -38,22 +39,34 @@ typedef struct {
|
||||
} sources_t;
|
||||
|
||||
static void
|
||||
+source_release(sources_t *sp, context_t *cp, sds ctx)
|
||||
+{
|
||||
+ pmWebGroupDestroy(&settings, ctx, sp);
|
||||
+ sdsfree(cp->hostspec);
|
||||
+ sdsfree(cp->source);
|
||||
+ free(cp);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
sources_release(void *arg, const struct dictEntry *entry)
|
||||
{
|
||||
sources_t *sp = (sources_t *)arg;
|
||||
context_t *cp = (context_t *)dictGetVal(entry);
|
||||
sds ctx = (sds)entry->key;
|
||||
|
||||
- pmWebGroupDestroy(&settings, ctx, sp);
|
||||
- sdsfree(cp->hostspec);
|
||||
- sdsfree(cp->source);
|
||||
+ if (pmDebugOptions.discovery)
|
||||
+ fprintf(stderr, "releasing context %s\n", ctx);
|
||||
+
|
||||
+ source_release(sp, cp, ctx);
|
||||
}
|
||||
|
||||
static void
|
||||
-sources_containers(sources_t *sp, sds id, dictEntry *uniq)
|
||||
+sources_containers(sources_t *sp, context_t *cp, sds id, dictEntry *uniq)
|
||||
{
|
||||
uv_mutex_lock(&sp->mutex);
|
||||
- sp->count++; /* issuing another PMWEBAPI request */
|
||||
+ /* issuing another PMWEBAPI request */
|
||||
+ sp->count++;
|
||||
+ cp->refcount++;
|
||||
uv_mutex_unlock(&sp->mutex);
|
||||
|
||||
pmWebGroupScrape(&settings, id, sp->params, sp);
|
||||
@@ -75,6 +88,7 @@ on_source_context(sds id, pmWebSource *s
|
||||
|
||||
cp->source = sdsdup(src->source);
|
||||
cp->hostspec = sdsdup(src->hostspec);
|
||||
+ cp->refcount = 1;
|
||||
|
||||
uv_mutex_lock(&sp->mutex);
|
||||
dictAdd(sp->contexts, id, cp);
|
||||
@@ -84,7 +98,7 @@ on_source_context(sds id, pmWebSource *s
|
||||
if (entry) { /* source just discovered */
|
||||
printf("%s %s\n", src->source, src->hostspec);
|
||||
if (containers)
|
||||
- sources_containers(sp, id, entry);
|
||||
+ sources_containers(sp, cp, id, entry);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,7 +130,9 @@ static void
|
||||
on_source_done(sds context, int status, sds message, void *arg)
|
||||
{
|
||||
sources_t *sp = (sources_t *)arg;
|
||||
- int count = 0, release = 0;
|
||||
+ context_t *cp;
|
||||
+ dictEntry *he;
|
||||
+ int remove = 0, count = 0, release = 0;
|
||||
|
||||
if (pmDebugOptions.discovery)
|
||||
fprintf(stderr, "done on context %s (sts=%d)\n", context, status);
|
||||
@@ -127,19 +143,26 @@ on_source_done(sds context, int status,
|
||||
uv_mutex_lock(&sp->mutex);
|
||||
if ((count = --sp->count) <= 0)
|
||||
release = 1;
|
||||
+ if ((he = dictFind(sp->contexts, context)) != NULL &&
|
||||
+ (cp = (context_t *)dictGetVal(he)) != NULL &&
|
||||
+ (--cp->refcount <= 0))
|
||||
+ remove = 1;
|
||||
uv_mutex_unlock(&sp->mutex);
|
||||
|
||||
+ if (remove) {
|
||||
+ if (pmDebugOptions.discovery)
|
||||
+ fprintf(stderr, "remove context %s\n", context);
|
||||
+ source_release(sp, cp, context);
|
||||
+ dictDelete(sp->contexts, context);
|
||||
+ }
|
||||
+
|
||||
if (release) {
|
||||
unsigned long cursor = 0;
|
||||
-
|
||||
- if (pmDebugOptions.discovery)
|
||||
- fprintf(stderr, "release context %s (sts=%d)\n", context, status);
|
||||
do {
|
||||
cursor = dictScan(sp->contexts, cursor, sources_release, NULL, sp);
|
||||
} while (cursor);
|
||||
- } else {
|
||||
- if (pmDebugOptions.discovery)
|
||||
- fprintf(stderr, "not yet releasing (count=%d)\n", count);
|
||||
+ } else if (pmDebugOptions.discovery) {
|
||||
+ fprintf(stderr, "not yet releasing (count=%d)\n", count);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,6 +213,7 @@ sources_discovery_start(uv_timer_t *arg)
|
||||
}
|
||||
|
||||
dictRelease(dp);
|
||||
+ pmWebTimerClose();
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -214,8 +238,8 @@ source_discovery(int count, char **urls)
|
||||
uv_mutex_init(&find.mutex);
|
||||
find.urls = urls;
|
||||
find.count = count; /* at least one PMWEBAPI request for each url */
|
||||
- find.uniq = dictCreate(&sdsDictCallBacks, NULL);
|
||||
- find.params = dictCreate(&sdsDictCallBacks, NULL);
|
||||
+ find.uniq = dictCreate(&sdsKeyDictCallBacks, NULL);
|
||||
+ find.params = dictCreate(&sdsOwnDictCallBacks, NULL);
|
||||
dictAdd(find.params, sdsnew("name"), sdsnew("containers.state.running"));
|
||||
find.contexts = dictCreate(&sdsKeyDictCallBacks, NULL);
|
||||
|
||||
@@ -230,6 +254,7 @@ source_discovery(int count, char **urls)
|
||||
|
||||
pmWebGroupSetup(&settings.module);
|
||||
pmWebGroupSetEventLoop(&settings.module, loop);
|
||||
+ pmWebTimerSetEventLoop(loop);
|
||||
|
||||
/*
|
||||
* Start a one-shot timer to add a start function into the loop
|
||||
@@ -244,7 +269,9 @@ source_discovery(int count, char **urls)
|
||||
/*
|
||||
* Finished, release all resources acquired so far
|
||||
*/
|
||||
+ pmWebGroupClose(&settings.module);
|
||||
uv_mutex_destroy(&find.mutex);
|
||||
+ dictRelease(find.uniq);
|
||||
dictRelease(find.params);
|
||||
dictRelease(find.contexts);
|
||||
return find.status;
|
||||
diff -Naurp pcp-5.3.7.orig/src/pmproxy/src/server.c pcp-5.3.7/src/pmproxy/src/server.c
|
||||
--- pcp-5.3.7.orig/src/pmproxy/src/server.c 2022-04-05 09:05:43.000000000 +1000
|
||||
+++ pcp-5.3.7/src/pmproxy/src/server.c 2022-10-19 21:31:43.831093354 +1100
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2018-2019,2021 Red Hat.
|
||||
+ * Copyright (c) 2018-2019,2021-2022 Red Hat.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published
|
||||
@@ -310,17 +310,21 @@ on_write_callback(uv_callback_t *handle,
|
||||
struct client *client = (struct client *)request->writer.data;
|
||||
int sts;
|
||||
|
||||
+ (void)handle;
|
||||
if (pmDebugOptions.af)
|
||||
fprintf(stderr, "%s: client=%p\n", "on_write_callback", client);
|
||||
|
||||
if (client->stream.secure == 0) {
|
||||
sts = uv_write(&request->writer, (uv_stream_t *)&client->stream,
|
||||
&request->buffer[0], request->nbuffers, request->callback);
|
||||
- if (sts != 0)
|
||||
- fprintf(stderr, "%s: ERROR uv_write failed\n", "on_write_callback");
|
||||
+ if (sts != 0) {
|
||||
+ pmNotifyErr(LOG_ERR, "%s: %s - uv_write failed [%s]: %s\n",
|
||||
+ pmGetProgname(), "on_write_callback",
|
||||
+ uv_err_name(sts), uv_strerror(sts));
|
||||
+ client_close(client);
|
||||
+ }
|
||||
} else
|
||||
secure_client_write(client, request);
|
||||
- (void)handle;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -455,14 +459,16 @@ on_client_connection(uv_stream_t *stream
|
||||
uv_handle_t *handle;
|
||||
|
||||
if (status != 0) {
|
||||
- fprintf(stderr, "%s: client connection failed: %s\n",
|
||||
- pmGetProgname(), uv_strerror(status));
|
||||
+ pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
|
||||
+ pmGetProgname(), "on_client_connection", "connection",
|
||||
+ uv_err_name(status), uv_strerror(status));
|
||||
return;
|
||||
}
|
||||
|
||||
if ((client = calloc(1, sizeof(*client))) == NULL) {
|
||||
- fprintf(stderr, "%s: out-of-memory for new client\n",
|
||||
- pmGetProgname());
|
||||
+ pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
|
||||
+ pmGetProgname(), "on_client_connection", "calloc",
|
||||
+ "ENOMEM", strerror(ENOMEM));
|
||||
return;
|
||||
}
|
||||
if (pmDebugOptions.context | pmDebugOptions.af)
|
||||
@@ -476,16 +482,18 @@ on_client_connection(uv_stream_t *stream
|
||||
|
||||
status = uv_tcp_init(proxy->events, &client->stream.u.tcp);
|
||||
if (status != 0) {
|
||||
- fprintf(stderr, "%s: client tcp init failed: %s\n",
|
||||
- pmGetProgname(), uv_strerror(status));
|
||||
+ pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
|
||||
+ pmGetProgname(), "on_client_connection", "uv_tcp_init",
|
||||
+ uv_err_name(status), uv_strerror(status));
|
||||
client_put(client);
|
||||
return;
|
||||
}
|
||||
|
||||
status = uv_accept(stream, (uv_stream_t *)&client->stream.u.tcp);
|
||||
if (status != 0) {
|
||||
- fprintf(stderr, "%s: client tcp init failed: %s\n",
|
||||
- pmGetProgname(), uv_strerror(status));
|
||||
+ pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
|
||||
+ pmGetProgname(), "on_client_connection", "uv_accept",
|
||||
+ uv_err_name(status), uv_strerror(status));
|
||||
client_put(client);
|
||||
return;
|
||||
}
|
||||
@@ -496,8 +504,9 @@ on_client_connection(uv_stream_t *stream
|
||||
status = uv_read_start((uv_stream_t *)&client->stream.u.tcp,
|
||||
on_buffer_alloc, on_client_read);
|
||||
if (status != 0) {
|
||||
- fprintf(stderr, "%s: client read start failed: %s\n",
|
||||
- pmGetProgname(), uv_strerror(status));
|
||||
+ pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
|
||||
+ pmGetProgname(), "on_client_connection", "uv_read_start",
|
||||
+ uv_err_name(status), uv_strerror(status));
|
||||
client_close(client);
|
||||
}
|
||||
}
|
||||
@@ -530,8 +539,9 @@ open_request_port(struct proxy *proxy, s
|
||||
|
||||
sts = uv_listen((uv_stream_t *)&stream->u.tcp, maxpending, on_client_connection);
|
||||
if (sts != 0) {
|
||||
- fprintf(stderr, "%s: socket listen error %s\n",
|
||||
- pmGetProgname(), uv_strerror(sts));
|
||||
+ pmNotifyErr(LOG_ERR, "%s: %s - uv_listen failed [%s]: %s\n",
|
||||
+ pmGetProgname(), "open_request_port",
|
||||
+ uv_err_name(sts), uv_strerror(sts));
|
||||
uv_close(handle, NULL);
|
||||
return -ENOTCONN;
|
||||
}
|
||||
@@ -554,15 +564,23 @@ open_request_local(struct proxy *proxy,
|
||||
uv_pipe_init(proxy->events, &stream->u.local, 0);
|
||||
handle = (uv_handle_t *)&stream->u.local;
|
||||
handle->data = (void *)proxy;
|
||||
- uv_pipe_bind(&stream->u.local, name);
|
||||
+ sts = uv_pipe_bind(&stream->u.local, name);
|
||||
+ if (sts != 0) {
|
||||
+ pmNotifyErr(LOG_ERR, "%s: %s - uv_pipe_bind %s failed [%s]: %s\n",
|
||||
+ pmGetProgname(), "open_request_local", name,
|
||||
+ uv_err_name(sts), uv_strerror(sts));
|
||||
+ uv_close(handle, NULL);
|
||||
+ return -ENOTCONN;
|
||||
+ }
|
||||
#ifdef HAVE_UV_PIPE_CHMOD
|
||||
uv_pipe_chmod(&stream->u.local, UV_READABLE | UV_WRITABLE);
|
||||
#endif
|
||||
|
||||
sts = uv_listen((uv_stream_t *)&stream->u.local, maxpending, on_client_connection);
|
||||
if (sts != 0) {
|
||||
- fprintf(stderr, "%s: local listen error %s\n",
|
||||
- pmGetProgname(), uv_strerror(sts));
|
||||
+ pmNotifyErr(LOG_ERR, "%s: %s - %s failed [%s]: %s\n",
|
||||
+ pmGetProgname(), "open_request_local", "uv_listen",
|
||||
+ uv_err_name(sts), uv_strerror(sts));
|
||||
uv_close(handle, NULL);
|
||||
return -ENOTCONN;
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
commit 4014e295f7b5f541439774bd3c88924d3c061325
|
||||
Author: Masatake YAMATO <yamato@redhat.com>
|
||||
Date: Thu Oct 20 13:55:43 2022 +0900
|
||||
|
||||
pmdas/snmp: install the agent specific configuration file to PMDATMPDIR
|
||||
|
||||
When running ./Install of the agent, the following line is printed in
|
||||
/var/log/pcp/pmcd/snmp.log.
|
||||
|
||||
Log for pmdasnmp on pcp-netsnmp started Tue Oct 18 22:45:23 2022
|
||||
|
||||
opening /var/lib/pcp/pmdas/snmp/snmp.conf No such file or directory at /var/lib/pcp/pmdas/snmp/pmdasnmp.pl line 90.
|
||||
|
||||
As a result, pmdasnmp.pl cannot read its configuration file though it
|
||||
is "./Install"ed.
|
||||
|
||||
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
|
||||
|
||||
diff --git a/src/pmdas/snmp/GNUmakefile b/src/pmdas/snmp/GNUmakefile
|
||||
index ce0e3e8036..7bf5471a76 100644
|
||||
--- a/src/pmdas/snmp/GNUmakefile
|
||||
+++ b/src/pmdas/snmp/GNUmakefile
|
||||
@@ -44,7 +44,7 @@ install_pcp install: default
|
||||
$(INSTALL) -m 755 -t $(PMDATMPDIR) Install Remove $(PMDAADMDIR)
|
||||
$(INSTALL) -m 644 -t $(PMDATMPDIR)/pmda$(IAM).pl pmda$(IAM).pl $(PMDAADMDIR)/pmda$(IAM).pl
|
||||
$(INSTALL) -m 755 -d $(PMDACONFIG)
|
||||
- $(INSTALL) -m 644 snmp.conf $(PMDACONFIG)/snmp.conf
|
||||
+ $(INSTALL) -m 644 -t $(PMDATMPDIR)/$(IAM).conf $(IAM).conf $(PMDACONFIG)/$(IAM).conf
|
||||
@$(INSTALL_MAN)
|
||||
else
|
||||
build-me:
|
||||
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
diff --git a/src/pmdas/podman/.gitignore b/src/pmdas/podman/.gitignore
|
||||
index a4f35e0f43..aea2c4052e 100644
|
||||
--- a/src/pmdas/podman/.gitignore
|
||||
+++ b/src/pmdas/podman/.gitignore
|
||||
@@ -2,8 +2,6 @@ deps/
|
||||
domain.h
|
||||
pmdapodman
|
||||
pmda_podman.so
|
||||
-jsonsl.c
|
||||
-jsonsl.h
|
||||
help.dir
|
||||
help.pag
|
||||
exports
|
||||
diff --git a/src/pmdas/podman/GNUmakefile b/src/pmdas/podman/GNUmakefile
|
||||
index d6e58cfca5..1117a7a4e4 100644
|
||||
--- a/src/pmdas/podman/GNUmakefile
|
||||
+++ b/src/pmdas/podman/GNUmakefile
|
||||
@@ -83,6 +83,7 @@ domain.h: ../../pmns/stdpmid
|
||||
$(OBJECTS): domain.h
|
||||
pmda.o: $(VERSION_SCRIPT)
|
||||
pmda.o: $(TOPDIR)/src/include/pcp/libpcp.h
|
||||
+podman.o: $(JSONSL_HFILES)
|
||||
|
||||
check:: $(CFILES) $(HFILES)
|
||||
$(CLINT) $^
|
||||
diff --git a/src/pmdas/root/.gitignore b/src/pmdas/root/.gitignore
|
||||
index 21f507f0dd..b78b1fd28a 100644
|
||||
--- a/src/pmdas/root/.gitignore
|
||||
+++ b/src/pmdas/root/.gitignore
|
||||
@@ -1,8 +1,6 @@
|
||||
deps/
|
||||
domain.h
|
||||
pmdaroot
|
||||
-jsonsl.c
|
||||
-jsonsl.h
|
||||
help.dir
|
||||
help.pag
|
||||
pmns
|
||||
diff --git a/src/pmdas/root/GNUmakefile b/src/pmdas/root/GNUmakefile
|
||||
index ed01a18fb8..b02d4ea834 100644
|
||||
--- a/src/pmdas/root/GNUmakefile
|
||||
+++ b/src/pmdas/root/GNUmakefile
|
||||
@@ -83,6 +83,7 @@ pmns :
|
||||
$(LN_S) -f root_root pmns
|
||||
|
||||
lxc.o root.o: $(TOPDIR)/src/include/pcp/libpcp.h
|
||||
+podman.o: $(JSONSL_HFILES)
|
||||
|
||||
check:: $(CFILES) $(HFILES)
|
||||
$(CLINT) $^
|
||||
390
SPECS/pcp.spec
390
SPECS/pcp.spec
|
|
@ -1,28 +1,19 @@
|
|||
Name: pcp
|
||||
Version: 5.3.7
|
||||
Release: 16%{?dist}
|
||||
Version: 6.0.1
|
||||
Release: 4%{?dist}
|
||||
Summary: System-level performance monitoring and performance management
|
||||
License: GPLv2+ and LGPLv2+ and CC-BY
|
||||
URL: https://pcp.io
|
||||
|
||||
%global artifactory https://performancecopilot.jfrog.io/artifactory
|
||||
Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz
|
||||
Patch0: redhat-bugzilla-2003956-pmdabcc-update-kernel-version-check-due-to-backporting.patch
|
||||
Patch1: redhat-bugzilla-1981886-pmdasockets-backporting.patch
|
||||
Patch2: redhat-bugzilla-2059461-pmie-systemd-fixup.patch
|
||||
Patch3: redhat-bugzilla-2081262-pmdaproc-cgroups-fix.patch
|
||||
Patch4: redhat-bugzilla-2059463-pmdapostfix-harden.patch
|
||||
Patch5: redhat-bugzilla-2083897-dstat-missed-ticks.patch
|
||||
Patch6: redhat-bugzilla-2111742-selinux-policy.patch
|
||||
Patch7: redhat-bugzilla-2093751-sudoers-docs.patch
|
||||
Patch8: redhat-bugzilla-2101574-farm-config.patch
|
||||
Patch9: redhat-bugzilla-2135314-pmfind-fix.patch
|
||||
Patch10: redhat-bugzilla-2139012-pmdasnmp-config.patch
|
||||
Patch11: redhat-build-jsonsl.patch
|
||||
|
||||
Patch0: redhat-bugzilla-2117074-vendored_vmlinux.h.patch
|
||||
Patch1: redhat-bugzilla-2117074-ppc_arm_vmlinux.h.patch
|
||||
|
||||
# The additional linker flags break out-of-tree PMDAs.
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2043092
|
||||
%undefine _package_note_flags
|
||||
%undefine _package_note_flags
|
||||
|
||||
%if 0%{?fedora} >= 26 || 0%{?rhel} > 7
|
||||
%global __python2 python2
|
||||
|
|
@ -58,8 +49,6 @@ Patch11: redhat-build-jsonsl.patch
|
|||
%endif
|
||||
%endif
|
||||
|
||||
%global disable_podman 0
|
||||
|
||||
# libchan, libhdr_histogram and pmdastatsd
|
||||
%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
|
||||
%global disable_statsd 0
|
||||
|
|
@ -106,9 +95,9 @@ Patch11: redhat-build-jsonsl.patch
|
|||
%global disable_bcc 1
|
||||
%endif
|
||||
|
||||
# support for pmdabpf, check bpf.spec for supported architectures of bpf
|
||||
# support for pmdabpf, check bcc.spec for supported architectures of libbpf-tools
|
||||
%if 0%{?fedora} >= 33 || 0%{?rhel} > 8
|
||||
%ifarch x86_64 %{power64} aarch64 s390x
|
||||
%ifarch x86_64 ppc64 ppc64le aarch64
|
||||
%global disable_bpf 0
|
||||
%else
|
||||
%global disable_bpf 1
|
||||
|
|
@ -139,6 +128,13 @@ Patch11: redhat-build-jsonsl.patch
|
|||
%global disable_json 1
|
||||
%endif
|
||||
|
||||
# support for pmdamongodb
|
||||
%if !%{disable_python2} || !%{disable_python3}
|
||||
%global disable_mongodb 0
|
||||
%else
|
||||
%global disable_mongodb 1
|
||||
%endif
|
||||
|
||||
# No mssql ODBC driver on non-x86 platforms
|
||||
%ifarch x86_64
|
||||
%if !%{disable_python2} || !%{disable_python3}
|
||||
|
|
@ -241,7 +237,6 @@ Obsoletes: pcp-pmda-nvidia < 3.10.5
|
|||
BuildRequires: make
|
||||
BuildRequires: gcc gcc-c++
|
||||
BuildRequires: procps autoconf bison flex
|
||||
BuildRequires: nss-devel
|
||||
BuildRequires: avahi-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
|
|
@ -287,7 +282,7 @@ BuildRequires: perl(Time::HiRes) perl(Digest::MD5)
|
|||
BuildRequires: perl(XML::LibXML) perl(File::Slurp)
|
||||
BuildRequires: man %{_hostname_executable}
|
||||
%if !%{disable_systemd}
|
||||
BuildRequires: systemd-devel systemd-rpm-macros
|
||||
BuildRequires: systemd-devel
|
||||
%endif
|
||||
%if !%{disable_qt}
|
||||
BuildRequires: desktop-file-utils
|
||||
|
|
@ -364,12 +359,6 @@ Requires: pcp-selinux = %{version}-%{release}
|
|||
%global _with_perfevent --with-perfevent=yes
|
||||
%endif
|
||||
|
||||
%if %{disable_podman}
|
||||
%global _with_podman --with-podman=no
|
||||
%else
|
||||
%global _with_podman --with-podman=yes
|
||||
%endif
|
||||
|
||||
%if %{disable_statsd}
|
||||
%global _with_statsd --with-pmdastatsd=no
|
||||
%else
|
||||
|
|
@ -400,6 +389,12 @@ Requires: pcp-selinux = %{version}-%{release}
|
|||
%global _with_json --with-pmdajson=yes
|
||||
%endif
|
||||
|
||||
%if %{disable_mongodb}
|
||||
%global _with_mongodb --with-pmdamongodb=no
|
||||
%else
|
||||
%global _with_mongodb --with-pmdamongodb=yes
|
||||
%endif
|
||||
|
||||
%if %{disable_nutcracker}
|
||||
%global _with_nutcracker --with-pmdanutcracker=no
|
||||
%else
|
||||
|
|
@ -448,7 +443,7 @@ then
|
|||
pmieconf -c enable "%2"
|
||||
else
|
||||
echo "WARNING: Cannot write to %1, skipping pmieconf enable of %2." >&2
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
%description
|
||||
|
|
@ -482,6 +477,9 @@ Summary: Performance Co-Pilot run-time libraries
|
|||
URL: https://pcp.io
|
||||
Requires: pcp-conf = %{version}-%{release}
|
||||
|
||||
# prevent conflicting library (libpcp.so.N) installation
|
||||
Conflicts: postgresql-pgpool-II
|
||||
|
||||
%description libs
|
||||
Performance Co-Pilot (PCP) run-time libraries
|
||||
|
||||
|
|
@ -494,6 +492,9 @@ Summary: Performance Co-Pilot (PCP) development headers
|
|||
URL: https://pcp.io
|
||||
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
|
||||
|
||||
# prevent conflicting library (libpcp.so) installation
|
||||
Conflicts: postgresql-pgpool-II-devel
|
||||
|
||||
%description libs-devel
|
||||
Performance Co-Pilot (PCP) headers for development.
|
||||
|
||||
|
|
@ -534,10 +535,7 @@ Requires: pcp-pmda-dm pcp-pmda-apache
|
|||
Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-mailq pcp-pmda-mounts
|
||||
Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping pcp-pmda-smart
|
||||
Requires: pcp-pmda-hacluster pcp-pmda-lustrecomm pcp-pmda-logger pcp-pmda-denki pcp-pmda-docker pcp-pmda-bind2
|
||||
Requires: pcp-pmda-sockets
|
||||
%if !%{disable_podman}
|
||||
Requires: pcp-pmda-podman
|
||||
%endif
|
||||
Requires: pcp-pmda-sockets pcp-pmda-podman
|
||||
%if !%{disable_statsd}
|
||||
Requires: pcp-pmda-statsd
|
||||
%endif
|
||||
|
|
@ -557,7 +555,10 @@ Requires: pcp-pmda-bpftrace
|
|||
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
|
||||
Requires: pcp-pmda-libvirt pcp-pmda-lio pcp-pmda-openmetrics pcp-pmda-haproxy
|
||||
Requires: pcp-pmda-lmsensors pcp-pmda-netcheck pcp-pmda-rabbitmq
|
||||
Requires: pcp-pmda-openvswitch pcp-pmda-mongodb
|
||||
Requires: pcp-pmda-openvswitch
|
||||
%endif
|
||||
%if !%{disable_mongodb}
|
||||
Requires: pcp-pmda-mongodb
|
||||
%endif
|
||||
%if !%{disable_mssql}
|
||||
Requires: pcp-pmda-mssql
|
||||
|
|
@ -898,7 +899,6 @@ Performance Co-Pilot (PCP) front-end tools for exporting metric values
|
|||
to the Zabbix (https://www.zabbix.org/) monitoring software.
|
||||
%endif
|
||||
|
||||
%if !%{disable_podman}
|
||||
#
|
||||
# pcp-pmda-podman
|
||||
#
|
||||
|
|
@ -911,7 +911,6 @@ Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
|
|||
%description pmda-podman
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
collecting podman container and pod statistics via the podman REST API.
|
||||
%endif
|
||||
|
||||
%if !%{disable_statsd}
|
||||
#
|
||||
|
|
@ -1800,7 +1799,9 @@ Requires: %{__python2}-pcp
|
|||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
collecting metrics from simple network checks.
|
||||
# end pcp-pmda-netcheck
|
||||
%endif
|
||||
|
||||
%if !%{disable_mongodb}
|
||||
#
|
||||
# pcp-pmda-mongodb
|
||||
#
|
||||
|
|
@ -1813,11 +1814,13 @@ Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
|
|||
Requires: python3-pcp
|
||||
%if 0%{?rhel} == 0
|
||||
Requires: python3-pymongo
|
||||
BuildRequires: python3-pymongo
|
||||
%endif
|
||||
%else
|
||||
Requires: %{__python2}-pcp
|
||||
%if 0%{?rhel} == 0
|
||||
Requires: %{__python2}-pymongo
|
||||
BuildRequires: %{__python2}-pymongo
|
||||
%endif
|
||||
%endif
|
||||
%description pmda-mongodb
|
||||
|
|
@ -2289,19 +2292,9 @@ updated policy package.
|
|||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
|
||||
%build
|
||||
# the buildsubdir macro gets defined in %setup and is apparently only available in the next step (i.e. the %build step)
|
||||
# the buildsubdir macro gets defined in %%setup and is apparently only available in the next step (i.e. the %%build step)
|
||||
%global __strip %{_builddir}/%{?buildsubdir}/build/rpm/custom-strip
|
||||
|
||||
# fix up build version
|
||||
|
|
@ -2311,7 +2304,7 @@ sed -i "/PACKAGE_BUILD/s/=[0-9]*/=$_build/" VERSION.pcp
|
|||
%if !%{disable_python2} && 0%{?default_python} != 3
|
||||
export PYTHON=python%{?default_python}
|
||||
%endif
|
||||
%configure %{?_with_initd} %{?_with_doc} %{?_with_dstat} %{?_with_ib} %{?_with_podman} %{?_with_statsd} %{?_with_perfevent} %{?_with_bcc} %{?_with_bpf} %{?_with_bpftrace} %{?_with_json} %{?_with_snmp} %{?_with_nutcracker} %{?_with_python2}
|
||||
%configure %{?_with_initd} %{?_with_doc} %{?_with_dstat} %{?_with_ib} %{?_with_statsd} %{?_with_perfevent} %{?_with_bcc} %{?_with_bpf} %{?_with_bpftrace} %{?_with_json} %{?_with_mongodb} %{?_with_snmp} %{?_with_nutcracker} %{?_with_python2}
|
||||
make %{?_smp_mflags} default_pcp
|
||||
|
||||
%install
|
||||
|
|
@ -2434,7 +2427,7 @@ total_manifest() {
|
|||
awk '{print $NF}' $DIST_MANIFEST
|
||||
}
|
||||
basic_manifest() {
|
||||
total_manifest | cull '/pcp-doc/|/testsuite/|/man/|/examples/'
|
||||
total_manifest | cull '/pcp-doc/|/testsuite/|/man/|pcp/examples/'
|
||||
}
|
||||
|
||||
#
|
||||
|
|
@ -2443,7 +2436,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|etc/systemd/system|libpcp_fault|pcp/fault.h' >pcp-testsuite-files
|
||||
total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault.h' >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
|
||||
|
|
@ -2452,7 +2445,7 @@ basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|htop|pcp2csv' \
|
|||
-e 'pcp-atop|pcp-dmcache|pcp-dstat|pcp-free|pcp-htop' \
|
||||
-e 'pcp-ipcs|pcp-iostat|pcp-lvmcache|pcp-mpstat' \
|
||||
-e 'pcp-numastat|pcp-pidstat|pcp-shping|pcp-tapestat' \
|
||||
-e 'pcp-uptime|pcp-verify|pcp-ss' | \
|
||||
-e 'pcp-uptime|pcp-verify|pcp-ss|pcp-ps' | \
|
||||
cull 'selinux|pmlogconf|pmieconf|pmrepconf' >pcp-system-tools-files
|
||||
|
||||
basic_manifest | keep 'sar2pcp' >pcp-import-sar2pcp-files
|
||||
|
|
@ -2517,7 +2510,7 @@ basic_manifest | keep '(etc/pcp|pmdas)/nginx(/|$)' >pcp-pmda-nginx-files
|
|||
basic_manifest | keep '(etc/pcp|pmdas)/nutcracker(/|$)' >pcp-pmda-nutcracker-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/nvidia(/|$)' >pcp-pmda-nvidia-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/openmetrics(/|$)' >pcp-pmda-openmetrics-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/openvswitch(/|$)' >pcp-pmda-openvswitch-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas|pmieconf)/openvswitch(/|$)' >pcp-pmda-openvswitch-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/oracle(/|$)' >pcp-pmda-oracle-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/pdns(/|$)' >pcp-pmda-pdns-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/perfevent(/|$)' >pcp-pmda-perfevent-files
|
||||
|
|
@ -2693,17 +2686,23 @@ done
|
|||
%if !%{disable_selinux}
|
||||
%selinux_relabel_pre -s targeted
|
||||
%endif
|
||||
test -d %{_testsdir} || mkdir -p -m 755 %{_testsdir}
|
||||
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
|
||||
echo u pcpqa - \"PCP Quality Assurance\" %{_testsdir} /bin/bash | \
|
||||
systemd-sysusers --replace=/usr/lib/sysusers.d/pcp-testsuite.conf -
|
||||
%else
|
||||
getent group pcpqa >/dev/null || groupadd -r pcpqa
|
||||
getent passwd pcpqa >/dev/null || \
|
||||
useradd -c "PCP Quality Assurance" -g pcpqa -d %{_testsdir} -M -r -s /bin/bash pcpqa 2>/dev/null
|
||||
%endif
|
||||
test -d %{_testsdir} || mkdir -p -m 755 %{_testsdir}
|
||||
chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null
|
||||
exit 0
|
||||
|
||||
%post testsuite
|
||||
%if !%{disable_selinux}
|
||||
PCP_SELINUX_DIR=%{_selinuxdir}
|
||||
semodule -r pcpqa >/dev/null 2>&1 || true
|
||||
%selinux_modules_install -s targeted %{_selinuxdir}/pcp-testsuite.pp.bz2
|
||||
%selinux_modules_install -s targeted "$PCP_SELINUX_DIR/pcp-testsuite.pp.bz2"
|
||||
%selinux_relabel_post -s targeted
|
||||
%endif
|
||||
chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null
|
||||
|
|
@ -2729,9 +2728,14 @@ fi
|
|||
%endif
|
||||
|
||||
%pre
|
||||
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
|
||||
echo u pcp - \"Performance Co-Pilot\" %{_localstatedir}/lib/pcp | \
|
||||
systemd-sysusers --replace=/usr/lib/sysusers.d/pcp.conf -
|
||||
%else
|
||||
getent group pcp >/dev/null || groupadd -r pcp
|
||||
getent passwd pcp >/dev/null || \
|
||||
useradd -c "Performance Co-Pilot" -g pcp -d %{_localstatedir}/lib/pcp -M -r -s /sbin/nologin pcp
|
||||
%endif
|
||||
exit 0
|
||||
|
||||
%if !%{disable_systemd}
|
||||
|
|
@ -2749,10 +2753,8 @@ exit 0
|
|||
%{pmda_remove "$1" "perfevent"}
|
||||
%endif
|
||||
|
||||
%if !%{disable_podman}
|
||||
%preun pmda-podman
|
||||
%{pmda_remove "$1" "podman"}
|
||||
%endif
|
||||
|
||||
%if !%{disable_statsd}
|
||||
%preun pmda-statsd
|
||||
|
|
@ -2910,8 +2912,10 @@ exit 0
|
|||
%preun pmda-lmsensors
|
||||
%{pmda_remove "$1" "lmsensors"}
|
||||
|
||||
%if !%{disable_mongodb}
|
||||
%preun pmda-mongodb
|
||||
%{pmda_remove "$1" "mongodb"}
|
||||
%endif
|
||||
|
||||
%if !%{disable_mssql}
|
||||
%preun pmda-mssql
|
||||
|
|
@ -2977,14 +2981,6 @@ exit 0
|
|||
%preun pmda-weblog
|
||||
%{pmda_remove "$1" "weblog"}
|
||||
|
||||
%if !%{disable_systemd}
|
||||
%preun zeroconf
|
||||
if [ "$1" -eq 0 ]
|
||||
then
|
||||
%systemd_preun pmlogger_daily_report.timer pmlogger_daily_report.service
|
||||
fi
|
||||
%endif
|
||||
|
||||
%preun
|
||||
if [ "$1" -eq 0 ]
|
||||
then
|
||||
|
|
@ -3080,10 +3076,11 @@ PCP_LOG_DIR=%{_logsdir}
|
|||
%selinux_relabel_pre -s targeted
|
||||
|
||||
%post selinux
|
||||
PCP_SELINUX_DIR=%{_selinuxdir}
|
||||
semodule -r pcpupstream-container >/dev/null 2>&1 || true
|
||||
semodule -r pcpupstream-docker >/dev/null 2>&1 || true
|
||||
semodule -r pcpupstream >/dev/null 2>&1 || true
|
||||
%selinux_modules_install -s targeted %{_selinuxdir}/pcp.pp.bz2
|
||||
%selinux_modules_install -s targeted "$PCP_SELINUX_DIR/pcp.pp.bz2"
|
||||
%selinux_relabel_post -s targeted
|
||||
|
||||
%postun selinux
|
||||
|
|
@ -3122,9 +3119,7 @@ fi
|
|||
%files pmda-infiniband -f pcp-pmda-infiniband-files.rpm
|
||||
%endif
|
||||
|
||||
%if !%{disable_podman}
|
||||
%files pmda-podman -f pcp-pmda-podman-files.rpm
|
||||
%endif
|
||||
|
||||
%if !%{disable_statsd}
|
||||
%files pmda-statsd -f pcp-pmda-statsd-files.rpm
|
||||
|
|
@ -3241,7 +3236,9 @@ fi
|
|||
|
||||
%files pmda-lmsensors -f pcp-pmda-lmsensors-files.rpm
|
||||
|
||||
%if !%{disable_mongodb}
|
||||
%files pmda-mongodb -f pcp-pmda-mongodb-files.rpm
|
||||
%endif
|
||||
|
||||
%if !%{disable_mssql}
|
||||
%files pmda-mssql -f pcp-pmda-mssql-files.rpm
|
||||
|
|
@ -3370,18 +3367,25 @@ fi
|
|||
%files zeroconf -f pcp-zeroconf-files.rpm
|
||||
|
||||
%changelog
|
||||
* Thu Nov 17 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-16
|
||||
- Ensure SNMP metrics config symlink installed (BZ 2139012)
|
||||
* Tue Jan 17 2023 Nathan Scott <nathans@redhat.com> - 6.0.1-4
|
||||
- Rebuild for dependency on new version of libbpf (BZ 2159276)
|
||||
|
||||
* Thu Oct 27 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-15
|
||||
- Backport independent selinux policy rework (BZ 2111742)
|
||||
- Fix invalid memory access in pmfind utility (BZ 2135314)
|
||||
- Allow pcp-dstat(1) missed ticks suppression (BZ 2083897)
|
||||
* Thu Nov 17 2022 Nathan Scott <nathans@redhat.com> - 6.0.1-3
|
||||
- Remove pmlogger_daily_report systemd leftovers (BZ 2142713)
|
||||
|
||||
* Mon Sep 05 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-9
|
||||
- Additional selinux policy rules for pmdabcc (BZ 2050094)
|
||||
- Describe working sudoers requiretty configuration (BZ 2093751)
|
||||
- Separate pmlogger_farm configuration mechanism (BZ 2101574)
|
||||
* Fri Nov 11 2022 Nathan Scott <nathans@redhat.com> - 6.0.1-2
|
||||
- Resolve an issue with installing sysusers entries (BZ 2138758)
|
||||
|
||||
* Fri Oct 28 2022 Nathan Scott <nathans@redhat.com> - 6.0.1-1
|
||||
- Convert to independent selinux policy (BZs 1941873, 2127037)
|
||||
- Improve pmproxy REST API timeout handling (BZ 2130208)
|
||||
- Rebase to latest stable version of PCP (BZ 2117074)
|
||||
|
||||
* Mon Sep 26 2022 Nathan Scott <nathans@redhat.com> - 6.0.0-1
|
||||
- Support --top* options in the pcp-dstat(1) utility (BZ 2020988)
|
||||
- Performance improvements, fixes in pmseries --load (BZ 2027430)
|
||||
- Switch from static pcp useradd to systemd-sysusers (BZ 2095445)
|
||||
- Rebase to latest stable version of PCP (BZ 2117074)
|
||||
|
||||
* Mon May 09 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-7
|
||||
- Additional selinux policy rules for pmdasockets (BZ 1981886)
|
||||
|
|
@ -3392,106 +3396,88 @@ fi
|
|||
|
||||
* Tue May 03 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-3
|
||||
- Fix remaining issues in the pcp-ss(1) utility (BZ 1981886)
|
||||
- Remove benign warning message from pmie systemd unit file.
|
||||
- Remove benign pmie systemd unit file warning (BZ 2072971)
|
||||
|
||||
* Tue Apr 05 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-1
|
||||
- Fix several issues in the pcp-ss(1) utility (BZ 1981886)
|
||||
- Document pmproxy archive discovery further (BZ 2026726)
|
||||
- Improve SQL Server PMDA secure settings (BZ 2057615)
|
||||
- Rebase to latest stable version of PCP (BZ 2059461)
|
||||
* Tue Apr 05 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-2
|
||||
- Rebase to latest stable version of PCP (BZ 2059462)
|
||||
|
||||
* Wed Feb 02 2022 Nathan Scott <nathans@redhat.com> - 5.3.5-8
|
||||
- Fix pcp-zeroconf logger interval override regression (BZ 1991763)
|
||||
- Fix pcp-zeroconf logger interval override regression (BZ 1991764)
|
||||
- Remove warnings from spec setup of PCP systemd units (BZ 2048024)
|
||||
|
||||
* Thu Dec 16 2021 Andreas Gerstmayr <agerstmayr@redhat.com> - 5.3.5-6
|
||||
- pmdabcc: update qa/1118 testcase to match new output (BZ 2003956)
|
||||
* Fri Jan 21 2022 Nathan Scott <nathans@redhat.com> - 5.3.5-5
|
||||
- Further improve pmlogger and pmie farm services (BZ 2030138)
|
||||
- Resolve a further KVM selinux issue with KVM (BZ 2006430)
|
||||
- Rebuild to use latest selinux-policy for el9 (BZ 2041503)
|
||||
|
||||
* Wed Dec 15 2021 Nathan Scott <nathans@redhat.com> - 5.3.5-4
|
||||
* Fri Dec 17 2021 Nathan Scott <nathans@redhat.com> - 5.3.5-4
|
||||
- pmdabcc: resolve compilation issues of some bcc PMDA modules on
|
||||
aarch64, ppc64le and s390x (BZ 2003956)
|
||||
aarch64, ppc64le and s390x (BZ 2024982)
|
||||
- pmdabpf: support arm and powerpc architectures (BZ 2024980)
|
||||
- Further improve pmlogger service startup latency (BZ 1973833)
|
||||
- Additional improvements to farm systemd services (BZ 2027753)
|
||||
- Additional improvements to farm systemd services (BZ 2030138)
|
||||
|
||||
* Thu Dec 09 2021 Nathan Scott <nathans@redhat.com> - 5.3.5-3
|
||||
- Resolve failure in the Nvidia metrics agent (BZ 2029301)
|
||||
- PMDA indom cache loading performance improvements (BZ 2030121)
|
||||
- Consistent user experience for new farm services (BZ 2027753)
|
||||
- Resilience improvements for the pmproxy service (BZ 2030140)
|
||||
- Resolve failure in the Nvidia metrics agent (BZ 2030123)
|
||||
- PMDA indom cache loading performance improvements (BZ 2030122)
|
||||
- Consistent user experience for new farm services (BZ 2030138)
|
||||
- Resilience improvements for the pmproxy service (BZ 2030141)
|
||||
|
||||
* Fri Nov 26 2021 Nathan Scott <nathans@redhat.com> - 5.3.5-2
|
||||
- Updates to pmlogconf persistence changes (BZ 2017632)
|
||||
- Updates to pmlogconf persistance changes (BZ 2017632)
|
||||
|
||||
* Wed Nov 10 2021 Nathan Scott <nathans@redhat.com> - 5.3.5-1
|
||||
- Extend pmlogger(1) man page --interval option (BZ 2018083)
|
||||
- Disable Avahi service advertisement by default (BZ 1899625)
|
||||
- Use separate localhost and farm service cgroups (BZ 1991896)
|
||||
- Update and extend the Nvidia GPU metric coverage (BZ 1690590)
|
||||
- Assessment API and pmdamssql(1) share credentials (BZ 1951342)
|
||||
- Improve remote pmlogger over slow network connections (BZ 1973833)
|
||||
- Implement pcp-atop(1) support for Nvidia GPU reports (BZ 1984273)
|
||||
- Drop DMA[32] zones when the zone is not in node 0 (BZ 1985519)
|
||||
- Support kernel changes to /proc/zoneinfo metrics (BZ 1985523)
|
||||
- Ensure pmlogconf persists configuration changes (BZ 2017632)
|
||||
- Auto-reconnect lost redis connection in pmproxy (BZ 1989287)
|
||||
- Rebase to a more recent upstream version of PCP (BZ 1991763)
|
||||
- Update to latest PCP sources (BZ 1991764)
|
||||
|
||||
* Fri Oct 15 2021 Mark Goodwin <mgoodwin@redhat.com> - 5.3.4-2
|
||||
- Fix pmlogger manual start with service disabled (BZ 2018011)
|
||||
- Fix pmlogger manual start with service disabled (BZ 2013937)
|
||||
|
||||
* Fri Oct 08 2021 Nathan Scott <nathans@redhat.com> - 5.3.4-1
|
||||
- Add pcp-atop(1) support for 'curscal' values (BZ 1984271)
|
||||
- Fix pcp-atop(1) reporting perfevent 'ipc' values (BZ 1986264)
|
||||
- Fix pmlogger(1) exiting on receipt of SIGALRM (BZ 2004771)
|
||||
- Fix values of some hacluster metrics on s390x (BZ 2008298)
|
||||
- Add new pmdads389(1) metrics for replication (BZ 1966122)
|
||||
- Rebase to a more recent upstream version of PCP (BZ 1991763)
|
||||
- Update to latest PCP sources (BZ 1991764)
|
||||
|
||||
* Wed Sep 15 2021 Nathan Scott <nathans@redhat.com> - 5.3.3-1
|
||||
- Add new pmdads389(1) metrics for replication (BZ 1966122)
|
||||
- Add label support to pmdahacluster(1) metrics (BZ 1972277)
|
||||
- Improve pmieconf rules for saturated processors (BZ 1994680)
|
||||
- Auto-upgrade pmcd.conf for python2 to python3 (BZ 1988403)
|
||||
- Document unloading pmdakvm(1) for kernel module (BZ 1977740)
|
||||
- Add option to pmdalinux(1) for slabinfo metrics (BZ 1962902)
|
||||
- Fix for OpenMetrics scripting generating AVCs (BZ 1985818)
|
||||
- Resolve some pcp-testsuite failures (BZ 1980459, 1981686)
|
||||
- Rebase to a more recent upstream version of PCP (BZ 1991763)
|
||||
* Tue Oct 05 2021 Nathan Scott <nathans@redhat.com> - 5.3.3-1
|
||||
- Resolve pmdakvm(1) selinux AVC denials (BZ 2006430)
|
||||
- Related: rhbz#1991764
|
||||
|
||||
* Sat Aug 28 2021 Nathan Scott <nathans@redhat.com> - 5.3.1-5
|
||||
- Fix pmdapodman initialization and selinux policy (BZ 1962019)
|
||||
* Mon Aug 30 2021 Nathan Scott <nathans@redhat.com> - 5.3.1-6
|
||||
- Fix pmdapodman initialization and selinux policy
|
||||
- Related: rhbz#1957575
|
||||
|
||||
* Fri Jul 09 2021 Mark Goodwin <mgoodwin@redhat.com> - 5.3.1-3
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.3.1-5
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Mon Jul 12 2021 Mark Goodwin <mgoodwin@redhat.com> - 5.3.1-4
|
||||
- Improve pmproxy and libpcp_web scalability (BZ 1975069)
|
||||
- Provide a pcp-ss(1) tool in pcp-system-tools (BZ 1879350)
|
||||
|
||||
* Thu Jun 24 2021 Nathan Scott <nathans@redhat.com> - 5.3.1-2
|
||||
* Fri Jun 25 2021 Nathan Scott <nathans@redhat.com> - 5.3.1-3
|
||||
- Fix pmproxy parallel TLS requests bug (BZ 1947989)
|
||||
- Backport pmrep archive creation fix (BZ 1974266)
|
||||
- Related: rhbz#1957575
|
||||
|
||||
* Fri Jun 04 2021 Nathan Scott <nathans@redhat.com> - 5.3.1-1
|
||||
- Improved diagnostics from pmie service scripts (BZ 1954576)
|
||||
- Drop option configuration file env var setting (BZ 1967174)
|
||||
- Add pmie support for thermal throttle detection (BZ 1908212)
|
||||
- Annotate a couple of obscure config files in rpm (BZ 1964253)
|
||||
- Rebase to a more recent upstream version of PCP (BZ 1922040)
|
||||
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.3.1-2
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
||||
* Fri May 14 2021 Nathan Scott <nathans@redhat.com> - 5.3.0-4
|
||||
* Wed Jun 09 2021 Nathan Scott <nathans@redhat.com> - 5.3.1-1
|
||||
- Add selinux rules for pmdabcc bpf access (BZ 1952374)
|
||||
- Update to latest PCP sources (BZ 1957575)
|
||||
|
||||
* Tue May 18 2021 Nathan Scott <nathans@redhat.com> - 5.3.0-2
|
||||
- Improve pmchart duplicate archive diagnostics (BZ 1615718)
|
||||
- Save pmchart users prefered archive locations (BZ 1615742)
|
||||
- Remove libvarlink dependency from podman PMDA (BZ 1956608)
|
||||
|
||||
* Thu Apr 22 2021 Nathan Scott <nathans@redhat.com> - 5.3.0-3
|
||||
- Correct pcp-testsuite file permissions (BZ 1922040)
|
||||
|
||||
* Tue Apr 20 2021 Nathan Scott <nathans@redhat.com> - 5.3.0-2
|
||||
- Resolve pcp-testsuite linkage problems (BZ 1950263)
|
||||
|
||||
* Fri Apr 16 2021 Nathan Scott <nathans@redhat.com> - 5.3.0-1
|
||||
- Allow pcp-atop to filter processes on state (BZ 1807046)
|
||||
- Dynamically adjust the pmproxy open file limit (BZ 1954711)
|
||||
- Rebase to a more recent upstream version of PCP (BZ 1922040)
|
||||
- PCP scalability and memory footprint improvements (BZ 1942292)
|
||||
* Thu May 06 2021 Nathan Scott <nathans@redhat.com> - 5.3.0-1
|
||||
- Added conditional lockdown policy access by pmdakvm (BZ 1940971)
|
||||
- Added spec file dependency on cyrus-sasl-scram (BZ 1942879)
|
||||
- Update to latest PCP sources (BZ 1957575)
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.5-5
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Fri Feb 19 2021 Nathan Scott <nathans@redhat.com> - 5.2.5-4
|
||||
- Revert removal of pmcd unit dependencies (BZs 1929556, 1930284)
|
||||
|
|
@ -3500,116 +3486,44 @@ fi
|
|||
- Specify pmns_name in sockets PMDA Install and Remove scripts
|
||||
- Add selinux rules for pmcd to use netlink tcpdiag sockets (BZ 1926756)
|
||||
|
||||
* Mon Feb 08 2021 Andreas Gerstmayr <agerstmayr@redhat.com> - 5.2.5-2
|
||||
- Fixed typo in specfile (pcp-testsuite requires pcp-pmda-hacluster
|
||||
and pcp-pmda-sockets instead of pcp-pmdas-hacluster etc.)
|
||||
* Wed Feb 10 2021 Nathan Scott <nathans@redhat.com> - 5.2.5-2
|
||||
- Update to latest PCP sources.
|
||||
- Fix pcp-dstat(1) sample count being off-by-one (BZ 1922768)
|
||||
- Add dstat(1) symlink to pcp-dstat(1) in pcp-doc (BZ 1922771)
|
||||
|
||||
* Mon Feb 08 2021 Nathan Scott <nathans@redhat.com> - 5.2.5-1
|
||||
- Extended socket statistic metrics (BZ 1491892)
|
||||
- Add explicit umask to startup scripts (BZ 1833647)
|
||||
- Fix pmlogger scripts fore remote loggers (BZ 1919950)
|
||||
- Enhance selinux policy for netcheck metrics (BZ 1897719)
|
||||
- Resolve packaging issue related to tmpfiles (BZ 1919974)
|
||||
- Ensure online help text exists for all metrics (BZ 1670029)
|
||||
- Adds HA cluster metrics (Pacemaker, Corosync, DRBD and SBD)
|
||||
- Rebase to a more recent upstream version of PCP (BZ 1854035)
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Dec 18 2020 Nathan Scott <nathans@redhat.com> - 5.2.3-1
|
||||
- Adds a new pcp-htop(1) utility (BZ 1716242)
|
||||
- Adds per-process network metrics to pcp-atop(1) (BZ 1733901)
|
||||
- Rebase to latest upstream stable release of PCP (BZ 1854035)
|
||||
- Resolves an selinux issue in the netcheck agent (BZ 1897719)
|
||||
- Rebase to a more recent upstream version of PCP (BZ 1854035)
|
||||
- Update to latest PCP sources.
|
||||
|
||||
* Wed Nov 11 2020 Nathan Scott <nathans@redhat.com> - 5.2.2-1
|
||||
- Add online help text for PCP derived metrics (BZ 1670029)
|
||||
- Add process accounting metrics and pcp-atop support (BZ 1814526)
|
||||
- Fix pmchart recorded archive folio host names (BZ 1824403)
|
||||
- Fix selinux issue with secure pmcd connections (BZ 1857396)
|
||||
- Extend pmlogger_daily script compression docs (BZ 1880392)
|
||||
- perfevent support for hv_24x7/hv_gpci dynamic events (BZ 1889613)
|
||||
- Improve pmlogger multiple remote node setups (BZ 1892326)
|
||||
- Rebase to a more recent upstream version of PCP (BZ 1854035)
|
||||
|
||||
* Tue Sep 29 2020 Nathan Scott <nathans@redhat.com> - 5.2.1-2
|
||||
- Fix rpm spec permissions for pmie and sa directories (BZ 1882615)
|
||||
- Add versioned rpm spec dependencies for pcp-zeroconf (BZ 1882664)
|
||||
- Update to latest PCP sources.
|
||||
|
||||
* Fri Sep 25 2020 Nathan Scott <nathans@redhat.com> - 5.2.1-1
|
||||
- Interactive mode in pcp-atop for time intervals (BZ 1806824)
|
||||
- Add branch-to-specific-time feature in pcp-atop (BZ 1806927)
|
||||
- Fix hostname written to archive folio by pmchart (BZ 1824403)
|
||||
- Allow pmafm to function with compressed archives (BZ 1839666)
|
||||
- Fix folio handling of archive files outside /tmp (BZ 1839698)
|
||||
- pcp-pmda-lio deals with a missing kernel module (BZ 1843792)
|
||||
- Windows authentication mode for SQL Server PMDA (BZ 1847808)
|
||||
- Fix previous sample selection within pcp-atop (BZ 1847925)
|
||||
- Make pcp-atopsar honour the -e (end time) option (BZ 1851838)
|
||||
- Fix pcp-pmda-zswap crashing with namespace error (BZ 1851887)
|
||||
- Fix pcp-atopsar handling of -H (header) option (BZ 1857121)
|
||||
- Update pcp-free(1) to show 'shared' memory usage (BZ 1878768)
|
||||
- Rebase to a more recent upstream version of PCP (BZ 1854035)
|
||||
- Update to latest PCP sources.
|
||||
|
||||
* Tue Jun 23 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.1.1-3
|
||||
- Fix for missing runtime deps on perl Net::SNMP (BZ 1790433)
|
||||
- Resolve covscan and other issues from upstream QA (BZ 1849511)
|
||||
- Possible memory leak detected in pcp-atop (BZ 1846705)
|
||||
- Installation of pcp-pmda-samba causes SELinux issues (BZ 1790452)
|
||||
- Fix Intermittent pminfo crashes (BZ 1848995)
|
||||
- Silence openmetrics PMDA warnings, add status metrics (BZ 1846711)
|
||||
- Set PACKAGE_BUILD in VERSION.pcp so pmcd.build metric is correct
|
||||
* Sat Aug 08 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.2.0-1
|
||||
- FHS compliance in installed /var file locations (BZ 1827441)
|
||||
- pmproxy intermittently crashes at uv_timer_stop (BZ 1789312)
|
||||
- Update to latest PCP sources.
|
||||
- Re-enabled LTO.
|
||||
|
||||
* Thu Jun 11 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.1.1-2
|
||||
- Activate pmlogger_rewrite on upgrades (BZ 1541406)
|
||||
- Fix Coverity issues in pmdastatsd and pmlogconf (BZ 1792971)
|
||||
- libpcp_web: ensure context is freed only after timer is fully closed
|
||||
- Services: pmlogger and pmie services Want pmcd on boot
|
||||
- Fix intermittent pmlogconf core dumps (BZ 1845241)
|
||||
- pcp-atop: resolve potential null task pointer dereference
|
||||
- pmproxy: improve diagnostics, particularly relating to http requests
|
||||
- pmproxy: cleanup, remove unused flags and dead code in http encoding
|
||||
- pmproxy: support the OPTIONS protocol in HTTP 1.1
|
||||
- libpcp_web: add resilience to descriptor lookup paths (BZ 1837153)
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 5.1.1-3
|
||||
- Disable LTO
|
||||
|
||||
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 5.1.1-2
|
||||
- Perl 5.32 rebuild
|
||||
|
||||
* Fri May 29 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.1.1-1
|
||||
- Update to latest PCP sources.
|
||||
- Rebuild to pick up changed HdrHistogram_c version (BZ 1831502)
|
||||
- pmdakvm: handle kernel lockdown in integrity mode (BZ 1824297)
|
||||
- PCP_NSSDB_DIR should not be mentioned in /etc/pcp.conf (BZ 1826020)
|
||||
- pmie_daily.service runs as pcp but tries to do root things (BZ 1832262)
|
||||
- pcp-testsuite-5.1.0-2.el8 package is missing pcpqa.pp file (BZ 1835422)
|
||||
- GFS2 kernel trace points turning on by themselves (BZ 1825386)
|
||||
- pcp-atop various fixes (BZ 1818710)
|
||||
- SELinux prevents pmlogger from secure connection to remote pmcd (BZ 1826047)
|
||||
- pmda-lustre fails to start since lustre 2.12 (BZ 1788937)
|
||||
- Added labels support for pmrep and various pcp2xxx tools
|
||||
- Update to latest pcp-5.1.1 PCP sources.
|
||||
|
||||
* Fri May 08 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.1.0-2
|
||||
- Replace pmdads389log dep on 389-ds-base with a softdep
|
||||
- Fix install deps for pcp-testsuite on pcp-pmda-mssql
|
||||
- Improve pmlogger and pmie system log messages (BZ 1806428)
|
||||
- Missing dep of pcp-pmda-dbping on perl-DBI (BZ 1790421)
|
||||
- Missing dep of pcp-pmda-ds389log on 389-ds-base (BZ 1790422)
|
||||
- Missing dep of pcp-pmda-gpsd on perl-JSON and perl-Time-HiRes (BZ 1790426)
|
||||
- Missing dep of pcp-pmda-lmsensors on lm_sensors (BZ 1790427)
|
||||
- Missing dep of pcp-pmda-redis on perl-autodie (BZ 1790431)
|
||||
- Missing dep of pcp-pmda-smart on smartmontools (BZ 1790432)
|
||||
- Missing dep of pcp-pmda-snmp on net-snmp-perl (BZ 1790433)
|
||||
- SELinux issues with pcp-pmda-zimbra (BZ 1790437)
|
||||
- Missing dep of pcp-pmda-pdns on perl-Time-HiRes (BZ 1790441)
|
||||
- Installation of pcp-pmda-netcheck causes SELinux issue (BZ 1790450)
|
||||
- Installation of pcp-pmda-samba causes SELinux issues (BZ 1790452)
|
||||
- Some PMDAs are missing dependency on PCP (BZ 1790526)
|
||||
- pmieconf randomly fails (BZ 1800545)
|
||||
- collectl2pcp does not handle large collectl archives well (BZ 1785101)
|
||||
- Missing dep of pcp-pmda-redis on perl-autodie and perl-Time-HiRes (BZ 1788519)
|
||||
- Cannot install pcp-pmda-activemq, wrong location of RESTClient (BZ 1788878)
|
||||
- Missing dep of pcp-pmda-bind2 on various perl packages (BZ 1790415)
|
||||
- pmlogger_daily_report causing PCP upstream testsuite to fail (BZ 1805146)
|
||||
- Missing selinux rules preventing pcp-pmda-named runing rndc(BZ 1825663)
|
||||
- SELinux is preventing PostgreSQL PMDA to collect metrics (BZ 1825957)
|
||||
- pmnewlog generates inaccessible config file (BZ 1810110)
|
||||
- pmnewlog is causing PCP testsuite to hang (BZ 1810118)
|
||||
* Fri Apr 24 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.1.0-1
|
||||
- pmdakvm: debugfs access is restricted (BZ 1824297)
|
||||
- Error starting pmlogger; pid file not owned by root (BZ 1761962)
|
||||
- Update to latest PCP sources.
|
||||
|
|
|
|||
Loading…
Reference in New Issue