diff --git a/.gitignore b/.gitignore index bcb98d6..71e64d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pcp-5.2.3.src.tar.gz +SOURCES/pcp-5.2.5.src.tar.gz diff --git a/.pcp.metadata b/.pcp.metadata index ac73ffb..642e815 100644 --- a/.pcp.metadata +++ b/.pcp.metadata @@ -1 +1 @@ -c8addd52498f7dbd90a98f1fed7109a9a0191a8e SOURCES/pcp-5.2.3.src.tar.gz +d77455b09d679988fae82ead1fb3b4ec65726fa9 SOURCES/pcp-5.2.5.src.tar.gz diff --git a/SPECS/pcp.spec b/SPECS/pcp.spec index 4be3c59..654de60 100644 --- a/SPECS/pcp.spec +++ b/SPECS/pcp.spec @@ -1,6 +1,6 @@ Name: pcp -Version: 5.2.3 -Release: 1%{?dist} +Version: 5.2.5 +Release: 2%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2+ and CC-BY URL: https://pcp.io @@ -14,7 +14,8 @@ Source0: %{bintray}/pcp/source/pcp-%{version}.src.tar.gz %global __python2 python %endif -%if 0%{?rhel} >= 7 || 0%{?fedora} >= 17 +# UsrMerge was completed in EL 7, however the latest 'hostname' package in EL 7 contains "Provides: /bin/hostname" +%if 0%{?rhel} >= 8 || 0%{?fedora} >= 17 %global _hostname_executable /usr/bin/hostname %else %global _hostname_executable /bin/hostname @@ -206,6 +207,7 @@ Obsoletes: pcp-manager-debuginfo < 5.2.0 Obsoletes: pcp-manager < 5.2.0 # https://fedoraproject.org/wiki/Packaging "C and C++" +BuildRequires: make BuildRequires: gcc gcc-c++ BuildRequires: procps autoconf bison flex BuildRequires: nss-devel @@ -510,7 +512,8 @@ Requires: pcp-pmda-samba pcp-pmda-slurm pcp-pmda-vmware pcp-pmda-zimbra 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-lustrecomm pcp-pmda-logger pcp-pmda-docker pcp-pmda-bind2 +Requires: pcp-pmda-hacluster pcp-pmda-lustrecomm pcp-pmda-logger pcp-pmda-docker pcp-pmda-bind2 +Requires: pcp-pmda-sockets %if !%{disable_podman} Requires: pcp-pmda-podman %endif @@ -1777,7 +1780,7 @@ URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp -%if 0%{?rhel} == 0 +%if 0%{?rhel} == 0 || 0%{?rhel} > 7 Requires: python3-pyodbc %endif %else @@ -2006,6 +2009,33 @@ smartmontools package. #end pcp-pmda-smart # +# pcp-pmda-sockets +# +%package pmda-sockets +License: GPLv2+ +Summary: Performance Co-Pilot (PCP) per-socket metrics +URL: https://pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +Requires: iproute +%description pmda-sockets +This package contains the PCP Performance Metric Domain Agent (PMDA) for +collecting per-socket statistics, making use of utilities such as 'ss'. +#end pcp-pmda-sockets + +# +# pcp-pmda-hacluster +# +%package pmda-hacluster +License: GPLv2+ +Summary: Performance Co-Pilot (PCP) metrics for High Availability Clusters +URL: https://pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +%description pmda-hacluster +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about linux High Availability (HA) Clusters. +# end pcp-pmda-hacluster + +# # pcp-pmda-summary # %package pmda-summary @@ -2298,7 +2328,7 @@ for f in $RPM_BUILD_ROOT/%{_initddir}/{pcp,pmcd,pmlogger,pmie,pmproxy}; do done # list of PMDAs in the base pcp package -for pmda in jbd2 kvm linux mmv pipe pmcd proc root xfs; do +for pmda in jbd2 kvm linux mmv pipe pmcd proc root xfs zfs; do for alt in %{_pmdasdir} %{_pmdasexecdir} %{_confdir}; do [ -d $RPM_BUILD_ROOT/$alt/$pmda ] && echo $alt/$pmda >>base_pmdas.list done @@ -2397,11 +2427,6 @@ cat base_pmdas.list base_conf.list base_bin.list base_exec.list base_bashcomp.li grep -E -v 'pmdaib|pmsnap|2pcp|pmdas/systemd|zeroconf' |\ grep -E -v "$PCP_GUI|pixmaps|hicolor|pcp-doc|tutorials|selinux" |\ grep -E -v %{_logsdir} > base.list -%if !%{disable_systemd} -mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir} -mv $DIST_TMPFILES $RPM_BUILD_ROOT/%{_tmpfilesdir}/pcp.conf -echo %{_tmpfilesdir}/pcp.conf >> base.list -%endif # all devel pcp package files except those split out into sub packages ls -1 $RPM_BUILD_ROOT/%{_mandir}/man3 |\ @@ -2672,6 +2697,12 @@ exit 0 %preun pmda-smart %{pmda_remove "$1" "smart"} +%preun pmda-sockets +%{pmda_remove "$1" "sockets"} + +%preun pmda-hacluster +%{pmda_remove "$1" "hacluster"} + %preun pmda-summary %{pmda_remove "$1" "summary"} @@ -3378,6 +3409,14 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null %{_pmdasdir}/smart %{_pmdasexecdir}/smart +%files pmda-sockets +%{_pmdasdir}/sockets +%{_pmdasexecdir}/sockets + +%files pmda-hacluster +%{_pmdasdir}/hacluster +%{_pmdasexecdir}/hacluster + %files pmda-summary %{_pmdasdir}/summary %{_pmdasexecdir}/summary @@ -3446,11 +3485,26 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null %endif %changelog +* Mon Feb 08 2021 Andreas Gerstmayr - 5.2.5-2 +- fixed typo in specfile (pcp-testsuite requires pcp-pmda-hacluster + and pcp-pmda-sockets instead of pcp-pmdas-hacluster etc.) + +* Mon Feb 08 2021 Nathan Scott - 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) + * Fri Dec 18 2020 Nathan Scott - 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) * Wed Nov 11 2020 Nathan Scott - 5.2.2-1 - Add online help text for PCP derived metrics (BZ 1670029) @@ -3460,13 +3514,14 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null - 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 - 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) * Fri Sep 25 2020 Nathan Scott - 5.2.1-1 -- Iteractive mode in pcp-atop for time intervals (BZ 1806824) +- 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) @@ -3476,9 +3531,9 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null - 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) -- Rebase to a more recent upstream version of PCP (BZ 1854035) - 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) * Tue Jun 23 2020 Mark Goodwin - 5.1.1-3 - Fix for missing runtime deps on perl Net::SNMP (BZ 1790433)