Rebase to pcp-7.1.5
Resolves: RHEL-173456
This commit is contained in:
William Cohen
parent
371d710728
commit
1bcc98ef29
@ -1,60 +0,0 @@
|
||||
commit 082ff6beb14420c04af74f37d2ae8c1628182ae2
|
||||
Author: William Cohen <wcohen@redhat.com>
|
||||
Date: Tue Feb 10 02:19:21 2026 +0000
|
||||
|
||||
selinux: AVC denial fix for rocestat pmda
|
||||
|
||||
Resolves: RHEL-132402
|
||||
|
||||
diff --git a/src/selinux/pcp.te b/src/selinux/pcp.te
|
||||
index 59cf1fb630..54f4e96877 100644
|
||||
--- a/src/selinux/pcp.te
|
||||
+++ b/src/selinux/pcp.te
|
||||
@@ -1036,6 +1036,16 @@ allow pcp_pmproxy_t pcp_log_t:lnk_file read;
|
||||
allow pcp_pmcd_t fsadm_exec_t:file { execute execute_no_trans getattr open read };
|
||||
allow pcp_pmcd_t fixed_disk_device_t:blk_file { open read ioctl };
|
||||
|
||||
+#============= pmda-rocestat ==============
|
||||
+optional_policy(`
|
||||
+ require {
|
||||
+ type ifconfig_exec_t;
|
||||
+ }
|
||||
+ # type=AVC msg=audit(N): avc: denied { execute_no_trans } for pid=PID comm="python3" path="/usr/sbin/ethtool" dev=DEV ino=INO scontext=system_u:system_r:pcp_pmcd_t:s0 tcontext=system_u:object_r:ifconfig_exec_t:s0 tclass=file permissive=0
|
||||
+ # RHEL-132402
|
||||
+ allow pcp_pmcd_t ifconfig_exec_t:file { execute execute_no_trans };
|
||||
+')
|
||||
+
|
||||
#============= pmda-nvidia ==============
|
||||
# type=AVC msg=audit(N): avc: denied { execute } for pid=PID comm="pmdanvidia" path="/usr/lib64/libnvidia-ml.so" dev="dm-2" ino=INO scontext=system_u:system_r:pcp_pmcd_t:s0 tcontext=unconfined_u:object_r:default_t:s0 tclass=file permissive=0
|
||||
# type=AVC msg=audit(N): avc: denied { read } for pid=PID comm="pmdanvidia" name="nvidia-cap2" dev="devtmpfs" ino=INO scontext=system_u:system_r:pcp_pmcd_t:s0 tcontext=unconfined_u:object_r:device_t:s0 tclass=chr_file permissive=0
|
||||
|
||||
commit e84ee24823548ce92c1e222d034e5600f4d3a10a
|
||||
Author: William Cohen <wcohen@redhat.com>
|
||||
Date: Tue Feb 10 04:00:26 2026 +0000
|
||||
|
||||
selinux: Update nvidia pmda policy
|
||||
|
||||
RHEL-133519
|
||||
|
||||
diff --git a/src/selinux/pcp.te b/src/selinux/pcp.te
|
||||
index 54f4e96877..69ee2b2957 100644
|
||||
--- a/src/selinux/pcp.te
|
||||
+++ b/src/selinux/pcp.te
|
||||
@@ -1051,7 +1051,7 @@ optional_policy(`
|
||||
# type=AVC msg=audit(N): avc: denied { read } for pid=PID comm="pmdanvidia" name="nvidia-cap2" dev="devtmpfs" ino=INO scontext=system_u:system_r:pcp_pmcd_t:s0 tcontext=unconfined_u:object_r:device_t:s0 tclass=chr_file permissive=0
|
||||
#RHEL-83594
|
||||
allow pcp_pmcd_t default_t:file { execute };
|
||||
-allow pcp_pmcd_t device_t:chr_file { create open read setattr write };
|
||||
+allow pcp_pmcd_t device_t:chr_file { create ioctl open read setattr write };
|
||||
allow pcp_pmcd_t device_t:dir { add_name remove_name write };
|
||||
allow pcp_pmcd_t device_t:lnk_file { create unlink };
|
||||
allow pcp_pmcd_t self:capability mknod;
|
||||
@@ -1059,7 +1059,7 @@ allow pcp_pmcd_t dri_device_t:chr_file { ioctl open read write };
|
||||
allow pcp_pmcd_t device_t:dir write;
|
||||
allow pcp_pmcd_t device_t:dir { create setattr };
|
||||
allow pcp_pmcd_t sysctl_vm_t:file read;
|
||||
-allow pcp_pmcd_t xserver_misc_device_t:chr_file { ioctl open read write };
|
||||
+allow pcp_pmcd_t xserver_misc_device_t:chr_file { ioctl map open read write };
|
||||
|
||||
# type=AVC msg=audit(N): avc: denied { sys_rawio } for pid=PID comm="pmdaX" name="/" dev="tracefs" ino=INO scontext=system_u:system_r:pcp_pmcd_t:s0 tcontext=system_u:object_r:pcp_pmcd_t:s0 tclass=capability permissive=0
|
||||
allow pcp_pmcd_t self:capability sys_rawio;
|
||||
144
pcp.spec
144
pcp.spec
@ -1,14 +1,11 @@
|
||||
Name: pcp
|
||||
Version: 7.0.3
|
||||
Release: 3%{?dist}
|
||||
Version: 7.1.5
|
||||
Release: 1%{?dist}
|
||||
Summary: System-level performance monitoring and performance management
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND CC-BY-3.0
|
||||
URL: https://pcp.io
|
||||
|
||||
Source0: https://github.com/performancecopilot/pcp/releases/pcp-%{version}.src.tar.gz
|
||||
Patch0: pcp2openmetrics-archive.patch
|
||||
Patch1: pcp-RHEL-132402.patch
|
||||
|
||||
Source0: https://github.com/performancecopilot/pcp/archive/%{version}/pcp-%{version}.tar.gz
|
||||
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
|
||||
ExcludeArch: %{ix86}
|
||||
%endif
|
||||
@ -85,18 +82,7 @@ ExcludeArch: %{ix86}
|
||||
%global perl_interpreter perl
|
||||
%endif
|
||||
|
||||
# support for pmdabcc, check bcc.spec for supported architectures of bcc
|
||||
%if 0%{?fedora} >= 25 || 0%{?rhel} > 6
|
||||
%ifarch x86_64 %{power64} aarch64 s390x riscv64
|
||||
%global disable_bcc 0
|
||||
%else
|
||||
%global disable_bcc 1
|
||||
%endif
|
||||
%else
|
||||
%global disable_bcc 1
|
||||
%endif
|
||||
|
||||
# support for pmdabpf, check bcc.spec for supported architectures of libbpf-tools
|
||||
# pmdabpf, check bcc.spec for supported architectures of libbpf-tools
|
||||
%if 0%{?fedora} >= 37 || 0%{?rhel} > 8
|
||||
%ifarch x86_64 %{power64} aarch64 s390x riscv64
|
||||
%global disable_bpf 0
|
||||
@ -107,7 +93,7 @@ ExcludeArch: %{ix86}
|
||||
%global disable_bpf 1
|
||||
%endif
|
||||
|
||||
# support for pmdabpftrace, check bpftrace.spec for supported architectures of bpftrace
|
||||
# pmdabpftrace, check bpftrace.spec for supported architectures of bpftrace
|
||||
%if 0%{?fedora} >= 30 || 0%{?rhel} > 7
|
||||
%ifarch x86_64 %{power64} aarch64 s390x riscv64
|
||||
%global disable_bpftrace 0
|
||||
@ -240,7 +226,6 @@ Obsoletes: pcp-pmda-nvidia < 3.10.5
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc gcc-c++
|
||||
BuildRequires: procps autoconf bison flex
|
||||
BuildRequires: avahi-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
%if !%{disable_python3}
|
||||
@ -370,12 +355,6 @@ Requires: pcp-selinux = %{version}-%{release}
|
||||
%global _with_statsd --with-pmdastatsd=yes
|
||||
%endif
|
||||
|
||||
%if %{disable_bcc}
|
||||
%global _with_bcc --with-pmdabcc=no
|
||||
%else
|
||||
%global _with_bcc --with-pmdabcc=yes
|
||||
%endif
|
||||
|
||||
%if %{disable_bpf}
|
||||
%global _with_bpf --with-pmdabpf=no
|
||||
%else
|
||||
@ -1443,23 +1422,6 @@ collecting metrics about the Device Mapper Cache and Thin Client.
|
||||
# end pcp-pmda-dm
|
||||
|
||||
|
||||
%if !%{disable_bcc}
|
||||
#
|
||||
# pcp-pmda-bcc
|
||||
#
|
||||
%package pmda-bcc
|
||||
License: Apache-2.0 AND GPL-2.0-or-later
|
||||
Summary: Performance Co-Pilot (PCP) metrics from eBPF/BCC modules
|
||||
URL: https://pcp.io
|
||||
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
|
||||
Requires: python3-bcc
|
||||
Requires: python3-pcp
|
||||
%description pmda-bcc
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
extracting performance metrics from eBPF/BCC Python modules.
|
||||
# end pcp-pmda-bcc
|
||||
%endif
|
||||
|
||||
%if !%{disable_bpf}
|
||||
#
|
||||
# pcp-pmda-bpf
|
||||
@ -1470,6 +1432,7 @@ Summary: Performance Co-Pilot (PCP) metrics from eBPF ELF modules
|
||||
URL: https://pcp.io
|
||||
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
|
||||
Requires: libbpf
|
||||
Obsoletes: pcp-pmda-bcc < 7.1.1
|
||||
BuildRequires: libbpf-devel clang llvm
|
||||
%description pmda-bpf
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
@ -1784,6 +1747,21 @@ collecting statistics for nVidia RDMA over Converged Ethernet (RoCE) devices.
|
||||
# end pcp-pmda-rocestat
|
||||
%endif
|
||||
|
||||
#
|
||||
# pcp-pmda-rds
|
||||
#
|
||||
%package pmda-rds
|
||||
License: GPL-2.0-or-later
|
||||
Summary: Performance Co-Pilot (PCP) metrics for Reliable Datagram Sockets (RDS) protocol
|
||||
URL: https://pcp.io
|
||||
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
|
||||
Requires: python3-pcp
|
||||
%description pmda-rds
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
collecting statistics for RDS connections.
|
||||
# end pcp-pmda-rds
|
||||
%endif
|
||||
|
||||
%if !%{disable_mongodb}
|
||||
#
|
||||
# pcp-pmda-mongodb
|
||||
@ -2272,7 +2250,7 @@ updated policy package.
|
||||
_build=`echo %{release} | sed -e 's/\..*$//'`
|
||||
sed -i "/PACKAGE_BUILD/s/=[0-9]*/=$_build/" VERSION.pcp
|
||||
|
||||
%configure %{?_with_multilib} %{?_with_nondebug} %{?_with_initd} %{?_with_doc} %{?_with_dstat} %{?_with_ib} %{?_with_gfs2} %{?_with_statsd} %{?_with_perfevent} %{?_with_bcc} %{?_with_bpf} %{?_with_bpftrace} %{?_with_mongodb} %{?_with_mysql} %{?_with_snmp} %{?_with_nutcracker}
|
||||
%configure %{?_with_multilib} %{?_with_nondebug} %{?_with_initd} %{?_with_doc} %{?_with_dstat} %{?_with_ib} %{?_with_gfs2} %{?_with_statsd} %{?_with_perfevent} %{?_with_bpf} %{?_with_bpftrace} %{?_with_mongodb} %{?_with_mysql} %{?_with_snmp} %{?_with_nutcracker}
|
||||
make %{?_smp_mflags} default_pcp
|
||||
|
||||
%install
|
||||
@ -2315,14 +2293,6 @@ rm -fr $RPM_BUILD_ROOT/%{_pmdasexecdir}/mssql
|
||||
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} || 0%{?fedora}
|
||||
# Fedora and RHEL default local only access for pmcd, pmproxy and pmlogger
|
||||
if [ "$1" -eq 1 ]
|
||||
then
|
||||
sed -i -e '/^# .*_LOCAL=1/s/^# //' $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/{pmcd,pmproxy,pmlogger}
|
||||
fi
|
||||
%endif
|
||||
|
||||
# default chkconfig off (all RPM platforms)
|
||||
for f in $RPM_BUILD_ROOT/%{_initddir}/{pcp,pmcd,pmlogger,pmie,pmproxy}; do
|
||||
test -f "$f" || continue
|
||||
@ -2336,9 +2306,44 @@ PCP_GUI='pmchart|pmconfirm|pmdumptext|pmmessage|pmquery|pmsnap|pmtime'
|
||||
PCP_CONF=$BACKDIR/src/include/pcp.conf
|
||||
export PCP_CONF
|
||||
. $BACKDIR/src/include/pcp.env
|
||||
CFGFILELIST=`ls -1 $BACKDIR/debian/pcp-conf.{install,dirs}`
|
||||
LIBFILELIST=`ls -1 $BACKDIR/debian/lib*.{install,dirs} | grep -F -v -- -dev.`
|
||||
DEVFILELIST=`ls -1 $BACKDIR/debian/lib*-dev.{install,dirs}`
|
||||
CFGFILELIST=''
|
||||
for f in `echo $BACKDIR/debian/pcp-conf.{install,dirs}`
|
||||
do
|
||||
[ -f "$f" ] && CFGFILELIST="$CFGFILELIST $f"
|
||||
done
|
||||
LIBFILELIST=''
|
||||
for f in `echo $BACKDIR/debian/lib*.{install,dirs}`
|
||||
do
|
||||
case "$f"
|
||||
in
|
||||
*-dev.*)
|
||||
# skip libpcp<foo>-dev.{install,dirs} ones, they'll
|
||||
# be collected in $DEVFILELIST
|
||||
;;
|
||||
*)
|
||||
if [ -f "$f" ]
|
||||
then
|
||||
# fix Debian Multiarch pathname
|
||||
# usr/lib/*/libpcp... => usr/lib/libpcp...
|
||||
fix_f=`basename "$f"`.fixed
|
||||
sed -e 's@usr/lib/[*]/@usr/lib/@' <"$f" >"$fix_f"
|
||||
LIBFILELIST="$LIBFILELIST $fix_f"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
DEVFILELIST=''
|
||||
for f in `echo $BACKDIR/debian/lib*-dev.{install,dirs}`
|
||||
do
|
||||
if [ -f "$f" ]
|
||||
then
|
||||
# fix Debian Multiarch pathname
|
||||
# usr/lib/*/libpcp... => usr/lib/libpcp...
|
||||
fix_f=`basename "$f"`.fixed
|
||||
sed -e 's@usr/lib/[*]/@usr/lib/@' <"$f" >"$fix_f"
|
||||
DEVFILELIST="$DEVFILELIST $fix_f"
|
||||
fi
|
||||
done
|
||||
|
||||
# Package split: pcp{-conf,-libs,-libs-devel,-testsuite,-import-*,-export-*}...
|
||||
# The above list is ordered by file selection; files for each package are
|
||||
@ -2444,7 +2449,6 @@ basic_manifest | keep '(etc/pcp|pmdas)/activemq(/|$)' >pcp-pmda-activemq-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/amdgpu(/|$)' >pcp-pmda-amdgpu-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/apache(/|$)' >pcp-pmda-apache-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/bash(/|$)' >pcp-pmda-bash-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/bcc(/|$)' >pcp-pmda-bcc-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/bind2(/|$)' >pcp-pmda-bind2-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/bonding(/|$)' >pcp-pmda-bonding-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/bpf(/|$)' >pcp-pmda-bpf-files
|
||||
@ -2498,6 +2502,7 @@ basic_manifest | keep '(etc/pcp|pmdas)/podman(/|$)' >pcp-pmda-podman-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/postfix(/|$)' >pcp-pmda-postfix-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/postgresql(/|$)' >pcp-pmda-postgresql-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/rabbitmq(/|$)' >pcp-pmda-rabbitmq-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/rds(/|$)' >pcp-pmda-rds-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/redis(/|$)' >pcp-pmda-redis-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/resctrl(/|$)|sys-fs-resctrl' >pcp-pmda-resctrl-files
|
||||
basic_manifest | keep '(etc/pcp|pmdas)/rocestat(/|$)' >pcp-pmda-rocestat-files
|
||||
@ -2524,7 +2529,7 @@ basic_manifest | keep '(etc/pcp|pmdas)/zswap(/|$)' >pcp-pmda-zswap-files
|
||||
rm -f packages.list
|
||||
for pmda_package in \
|
||||
activemq amdgpu apache \
|
||||
bash bcc bind2 bonding bpf bpftrace \
|
||||
bash bind2 bonding bpf bpftrace \
|
||||
cifs cisco \
|
||||
dbping denki docker dm ds389 ds389log \
|
||||
elasticsearch \
|
||||
@ -2538,7 +2543,7 @@ for pmda_package in \
|
||||
nutcracker nvidia \
|
||||
openmetrics opentelemetry openvswitch oracle \
|
||||
pdns perfevent podman postfix postgresql \
|
||||
rabbitmq redis resctrl rocestat roomtemp rpm rsyslog \
|
||||
rabbitmq rds redis resctrl rocestat roomtemp rpm rsyslog \
|
||||
samba sendmail shping slurm smart snmp \
|
||||
sockets statsd summary systemd \
|
||||
unbound uwsgi \
|
||||
@ -2699,7 +2704,7 @@ needinstall='sample simple'
|
||||
for PMDA in $needinstall ; do
|
||||
if ! grep -q "$PMDA/pmda$PMDA" "$PCP_PMCDCONF_PATH"
|
||||
then
|
||||
%{install_file "$PCP_PMDAS_DIR/$PMDA" .NeedInstall}
|
||||
%{install_file "$PCP_PMDAS_DIR/$PMDA" .NeedInstall}
|
||||
fi
|
||||
done
|
||||
%if 0%{?rhel}
|
||||
@ -2875,11 +2880,6 @@ exit 0
|
||||
%preun pmda-dm
|
||||
%{pmda_remove "$1" "dm"}
|
||||
|
||||
%if !%{disable_bcc}
|
||||
%preun pmda-bcc
|
||||
%{pmda_remove "$1" "bcc"}
|
||||
%endif
|
||||
|
||||
%if !%{disable_bpf}
|
||||
%preun pmda-bpf
|
||||
%{pmda_remove "$1" "bpf"}
|
||||
@ -2931,6 +2931,9 @@ exit 0
|
||||
%preun pmda-rocestat
|
||||
%{pmda_remove "$1" "rocestat"}
|
||||
|
||||
%preun pmda-rds
|
||||
%{pmda_remove "$1" "rds"}
|
||||
|
||||
%endif
|
||||
|
||||
%preun pmda-apache
|
||||
@ -3047,7 +3050,8 @@ done
|
||||
for s in pmcd pmlogger pmie; do
|
||||
systemctl --quiet is-enabled $s && systemctl --quiet restart $s || true
|
||||
done
|
||||
%else # old-school methods follow
|
||||
%else
|
||||
# old-school methods follow
|
||||
%if !%{disable_systemd}
|
||||
systemctl restart pmcd pmlogger pmie >/dev/null 2>&1
|
||||
systemctl enable pmcd pmlogger pmie >/dev/null 2>&1
|
||||
@ -3240,10 +3244,6 @@ fi
|
||||
|
||||
%files pmda-dm -f pcp-pmda-dm-files.rpm
|
||||
|
||||
%if !%{disable_bcc}
|
||||
%files pmda-bcc -f pcp-pmda-bcc-files.rpm
|
||||
%endif
|
||||
|
||||
%if !%{disable_bpf}
|
||||
%files pmda-bpf -f pcp-pmda-bpf-files.rpm
|
||||
%endif
|
||||
@ -3285,6 +3285,8 @@ fi
|
||||
|
||||
%files pmda-rocestat -f pcp-pmda-rocestat-files.rpm
|
||||
|
||||
%files pmda-rds -f pcp-pmda-rds-files.rpm
|
||||
|
||||
%files pmda-uwsgi -f pcp-pmda-uwsgi-files.rpm
|
||||
|
||||
%files export-pcp2graphite -f pcp-export-pcp2graphite-files.rpm
|
||||
@ -3328,7 +3330,6 @@ fi
|
||||
%files pmda-lio -f pcp-pmda-lio-files.rpm
|
||||
|
||||
%files pmda-openmetrics -f pcp-pmda-openmetrics-files.rpm
|
||||
%endif
|
||||
|
||||
%files pmda-opentelemetry -f pcp-pmda-opentelemetry-files.rpm
|
||||
%endif
|
||||
@ -3425,6 +3426,9 @@ fi
|
||||
%files zeroconf -f pcp-zeroconf-files.rpm
|
||||
|
||||
%changelog
|
||||
* Fri Jun 5 2026 William Cohen <wcohen@redhat.com> - 7.1.5-1
|
||||
- Latest upstream release
|
||||
|
||||
* Thu Feb 19 2026 William Cohen <wcohen@redhat.com> - 7.0.3-3
|
||||
- Update selinux polices for rocestat and nvidia pmdas (RHEL-132402, RHEL-134388, RHEL-133519)
|
||||
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
From 634789506f10c0156b13bfa6a3f07705ed40b5f1 Mon Sep 17 00:00:00 2001
|
||||
From: lmchilton <lauren.chilton26@gmail.com>
|
||||
Date: Tue, 13 Jan 2026 13:32:46 -0500
|
||||
Subject: [PATCH] pcp2openmetrics: resolves RHEL-138467
|
||||
|
||||
multi-instance metrics failing when queried with
|
||||
singular metrics from archive. Turning interpolation
|
||||
on resolves this issue. Additional code added to fix
|
||||
missing headers when 2+ metrics are queried together.
|
||||
---
|
||||
qa/1131 | 3 +++
|
||||
qa/1131.out | 12 ++++++++++++
|
||||
src/pcp2openmetrics/pcp2openmetrics.py | 8 ++++----
|
||||
3 files changed, 19 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/qa/1131 b/qa/1131
|
||||
index 118375d425..026a6ebd97 100755
|
||||
--- a/qa/1131
|
||||
+++ b/qa/1131
|
||||
@@ -31,6 +31,7 @@ signal=$PCP_BINADM_DIR/pmsignal
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
A="$here/archives/rep"
|
||||
+A1="$here/archives/20180606"
|
||||
hostname=`hostname`
|
||||
machineid=`_machine_id`
|
||||
domainid=`_domain_name`
|
||||
@@ -98,6 +99,8 @@ pcp2openmetrics -s1 -z hinv.ncpu | _filter_pcp2openmetrics
|
||||
echo "---"
|
||||
pcp2openmetrics -s2 -x hinv.ncpu | _filter_pcp2openmetrics
|
||||
echo "---"
|
||||
+pcp2openmetrics -s2 -a $A1 hinv.ncpu disk.partitions.write | _archive_filter
|
||||
+echo "---"
|
||||
pcp2opentelemetry -s1 -H -z hinv.ncpu | _filter_pcp2opentelemetry
|
||||
echo "---"
|
||||
|
||||
diff --git a/qa/1131.out b/qa/1131.out
|
||||
index a8fde64d5b..a6e98b0139 100644
|
||||
--- a/qa/1131.out
|
||||
+++ b/qa/1131.out
|
||||
@@ -2279,6 +2279,18 @@ hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MAC
|
||||
hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="AGENT"} NCPU
|
||||
hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="AGENT"} NCPU
|
||||
---
|
||||
+# PCP5 hinv_ncpu 60.0.32 u32 PM_INDOM_NULL discrete
|
||||
+# TYPE hinv_ncpu gauge
|
||||
+# HELP hinv_ncpu number of CPUs in the system
|
||||
+hinv_ncpu{domainname="localdomain",groupid="999",hostname="vm01",machineid="3a6b3d7f3b7559c538a5934a24866658",userid="999",agent="linux"} 1 1528207821.599573
|
||||
+# PCP5 disk_partitions_write 60.10.1 u32 60.10 counter count
|
||||
+# TYPE disk_partitions_write counter
|
||||
+# HELP disk_partitions_write write operations metric for storage partitions
|
||||
+disk_partitions_write_total{domainname="localdomain",groupid="999",hostname="vm01",machineid="3a6b3d7f3b7559c538a5934a24866658",userid="999",instname="sda1",instid="1",agent="linux",device_type="block",indom_name="per partition"} 88156 1528207821.599573
|
||||
+disk_partitions_write_total{domainname="localdomain",groupid="999",hostname="vm01",machineid="3a6b3d7f3b7559c538a5934a24866658",userid="999",instname="sda2",instid="2",agent="linux",device_type="block",indom_name="per partition"} 0 1528207821.599573
|
||||
+disk_partitions_write_total{domainname="localdomain",groupid="999",hostname="vm01",machineid="3a6b3d7f3b7559c538a5934a24866658",userid="999",instname="sda5",instid="3",agent="linux",device_type="block",indom_name="per partition"} 2293 1528207821.599573
|
||||
+# EOF
|
||||
+---
|
||||
{
|
||||
"resourceMetrics": [
|
||||
{
|
||||
diff --git a/src/pcp2openmetrics/pcp2openmetrics.py b/src/pcp2openmetrics/pcp2openmetrics.py
|
||||
index a228aaf340..bc935fab03 100755
|
||||
--- a/src/pcp2openmetrics/pcp2openmetrics.py
|
||||
+++ b/src/pcp2openmetrics/pcp2openmetrics.py
|
||||
@@ -104,7 +104,7 @@ class PCP2OPENMETRICS(object):
|
||||
self.precision = 3 # .3f
|
||||
self.precision_force = None
|
||||
self.timefmt = TIMEFMT
|
||||
- self.interpol = 0
|
||||
+ self.interpol = 1
|
||||
self.count_scale = None
|
||||
self.count_scale_force = None
|
||||
self.space_scale = None
|
||||
@@ -121,7 +121,7 @@ class PCP2OPENMETRICS(object):
|
||||
self.http_pass = None
|
||||
self.http_timeout = TIMEOUT
|
||||
self.no_comment = False
|
||||
- self.header_flag = True
|
||||
+ self.headers = []
|
||||
|
||||
# Internal
|
||||
self.runtime = -1
|
||||
@@ -476,12 +476,12 @@ class PCP2OPENMETRICS(object):
|
||||
help_dict = {}
|
||||
help_dict[metric] = context.pmLookupText(pmid[0])
|
||||
|
||||
- if self.header_flag is True:
|
||||
+ if metric not in self.headers:
|
||||
if self.no_comment is False:
|
||||
body += '# PCP5 %s %s %s %s %s %s\n' % (openmetrics_name(metric), pmIDStr, get_type_string(desc), pmIndomStr, semantics, units)
|
||||
body += '# TYPE %s %s\n' % (openmetrics_name(metric), openmetrics_type(desc))
|
||||
body += '# HELP %s %s\n' % (openmetrics_name(metric), help_dict[metric])
|
||||
- self.header_flag = False
|
||||
+ self.headers.append(metric)
|
||||
|
||||
for inst, name, value in results[metric]:
|
||||
if isinstance(value, float):
|
||||
--
|
||||
2.51.0
|
||||
|
||||
16
rpminspect.yaml
Normal file
16
rpminspect.yaml
Normal file
@ -0,0 +1,16 @@
|
||||
debuginfo:
|
||||
ignore:
|
||||
# Debug symbols are present in BPF modules as it is inherited
|
||||
# from the BPF it self
|
||||
- /usr/libexec/pcp/pmdas/bpf/modules/*.so
|
||||
# Ignore debug symbols related to testsuite on i686
|
||||
- /usr/lib/debug/var/lib/pcp/testsuite/{*,*/{*,*/{*,*/*}}}debug
|
||||
annocheck:
|
||||
ignore:
|
||||
# Ignore hardening of pcp testsuite files
|
||||
- /usr/lib*/libpcp_fault.so*
|
||||
- /var/lib/pcp/testsuite/{*,*/{*,*/{*,*/*}}}
|
||||
javabytecode:
|
||||
ignore:
|
||||
# Ignote java classes from the PCP testsuite - these are broken by a purpose
|
||||
- /var/lib/pcp/testsuite/java/*
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (pcp-7.0.3.src.tar.gz) = 335dc74c5afbb6a703d53c30b6ab871ce60f0bce4c2e10e0004b308acd8d30763b05714efcd2d49c7e7ee0e83fbf6c5389ca211270c5b6852a10fe2ce86c2d94
|
||||
SHA512 (pcp-7.1.5.tar.gz) = 91565258869e0f04c3d7a53926c857d6a476d9a04b8c2cff40c5665d15440f02799c4780d8e348e2e2622092427af8f406e51d8249e3d623d0cc3c07dd12ba21
|
||||
|
||||
Loading…
Reference in New Issue
Block a user