From 096a03ffd0d53e513268437eff59d5a67c991f69 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 09 2020 20:03:43 +0000 Subject: import pcp-5.1.1-1.el8 --- diff --git a/.gitignore b/.gitignore index b7d88db..036f7d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pcp-5.1.0.src.tar.gz +SOURCES/pcp-5.1.1.src.tar.gz diff --git a/.pcp.metadata b/.pcp.metadata index f32fd71..d432933 100644 --- a/.pcp.metadata +++ b/.pcp.metadata @@ -1 +1 @@ -82eb0cd3b6c29bdcc41e2a89fc8c570c5b1c107f SOURCES/pcp-5.1.0.src.tar.gz +ecc3f3a9163a2295816ca5eb8d918125670a727e SOURCES/pcp-5.1.1.src.tar.gz diff --git a/SPECS/pcp.spec b/SPECS/pcp.spec index a40eb94..f4065bd 100644 --- a/SPECS/pcp.spec +++ b/SPECS/pcp.spec @@ -1,6 +1,6 @@ Name: pcp -Version: 5.1.0 -Release: 2%{?dist} +Version: 5.1.1 +Release: 1%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2+ and CC-BY URL: https://pcp.io @@ -47,7 +47,7 @@ Source0: %{bintray}/pcp/source/pcp-%{version}.src.tar.gz %endif # libchan, libhdr_histogram and pmdastatsd -%if 0%{?fedora} >= 29 || 0%{?rhel} > 8 +%if 0%{?fedora} >= 29 || 0%{?rhel} > 7 %global disable_statsd 0 %else %global disable_statsd 1 @@ -226,7 +226,11 @@ BuildRequires: cyrus-sasl-devel BuildRequires: libvarlink-devel %endif %if !%{disable_statsd} -BuildRequires: ragel chan-devel HdrHistogram_c-devel +# ragel unavailable on RHEL8 +%if 0%{?rhel} == 0 +BuildRequires: ragel +%endif +BuildRequires: chan-devel HdrHistogram_c-devel %endif %if !%{disable_perfevent} BuildRequires: libpfm-devel >= 4 @@ -341,9 +345,9 @@ Requires: pcp-libs = %{version}-%{release} %endif %if %{disable_statsd} -%global _with_statsd --with-statsd=no +%global _with_statsd --with-pmdastatsd=no %else -%global _with_statsd --with-statsd=yes +%global _with_statsd --with-pmdastatsd=yes %endif %if %{disable_bcc} @@ -518,6 +522,7 @@ 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 %endif %if !%{disable_mssql} Requires: pcp-pmda-mssql @@ -540,6 +545,15 @@ Requires: pcp-gui %endif Requires: bc gcc gzip bzip2 Requires: redhat-rpm-config +%if !%{disable_selinux} +Requires: selinux-policy-devel +Requires: selinux-policy-targeted +%if 0%{?rhel} == 5 +Requires: setools +%else +Requires: setools-console +%endif +%endif %description testsuite Quality assurance test suite for Performance Co-Pilot (PCP). @@ -1635,6 +1649,24 @@ collecting metrics about Elasticsearch. #end pcp-pmda-elasticsearch # +# pcp-pmda-openvswitch +# +%package pmda-openvswitch +License: GPLv2+ +Summary: Performance Co-Pilot (PCP) metrics for Open vSwitch +URL: https://pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +%if !%{disable_python3} +Requires: python3-pcp +%else +Requires: %{__python2}-pcp +%endif +%description pmda-openvswitch +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics from Open vSwitch. +#end pcp-pmda-openvswitch + +# # pcp-pmda-rabbitmq # %package pmda-rabbitmq @@ -2036,13 +2068,14 @@ License: GPLv2+ Summary: Performance Co-Pilot (PCP) Zeroconf Package URL: https://pcp.io Requires: pcp pcp-doc pcp-system-tools -Requires: pcp-pmda-dm pcp-pmda-nfsclient +Requires: pcp-pmda-dm +%if !%{disable_python2} || !%{disable_python3} +Requires: pcp-pmda-nfsclient pcp-pmda-openmetrics +%endif %description zeroconf This package contains configuration tweaks and files to increase metrics gathering frequency, several extended pmlogger configurations, as well as automated pmie diagnosis, alerting and self-healing for the localhost. -A cron script also writes daily performance summary reports similar to -those written by sysstat. %if !%{disable_python2} # @@ -2304,6 +2337,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ grep -E -v '^mssql' |\ grep -E -v '^netcheck' |\ grep -E -v '^nvidia' |\ + grep -E -v '^openvswitch' |\ grep -E -v '^rabbitmq' |\ grep -E -v '^roomtemp' |\ grep -E -v '^sendmail' |\ @@ -2494,6 +2528,9 @@ fi %preun pmda-elasticsearch %{pmda_remove "$1" "elasticsearch"} +%preun pmda-openvswitch +%{pmda_remove "$1" "openvswitch"} + %preun pmda-rabbitmq %{pmda_remove "$1" "rabbitmq"} @@ -2730,7 +2767,7 @@ PCP_PMDAS_DIR=%{_pmdasdir} PCP_SYSCONFIG_DIR=%{_sysconfdir}/sysconfig PCP_PMCDCONF_PATH=%{_confdir}/pmcd/pmcd.conf # auto-install important PMDAs for RH Support (if not present already) -for PMDA in dm nfsclient ; do +for PMDA in dm nfsclient openmetrics ; do if ! grep -q "$PMDA/pmda$PMDA" "$PCP_PMCDCONF_PATH" then %{install_file "$PCP_PMDAS_DIR/$PMDA" .NeedInstall} @@ -2862,34 +2899,44 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null %{_initddir}/pmproxy %if !%{disable_systemd} %{_unitdir}/pmcd.service +%{_unitdir}/pmproxy.service %{_unitdir}/pmlogger.service +%{_unitdir}/pmfind.service %{_unitdir}/pmie.service -%{_unitdir}/pmproxy.service # services and timers replacing the old cron scripts %{_unitdir}/pmlogger_check.service %{_unitdir}/pmlogger_check.timer +%{_unitdir}/pmlogger_check.path %{_unitdir}/pmlogger_daily.service %{_unitdir}/pmlogger_daily.timer %{_unitdir}/pmlogger_daily-poll.service %{_unitdir}/pmlogger_daily-poll.timer +%{_unitdir}/pmie_check.timer +%{_unitdir}/pmie_check.path %{_unitdir}/pmie_check.service %{_unitdir}/pmie_check.timer +%{_unitdir}/pmie_check.path %{_unitdir}/pmie_daily.service %{_unitdir}/pmie_daily.timer +%{_unitdir}/pmfind.timer +%{_unitdir}/pmfind.path %config(noreplace) %{_sysconfdir}/sysconfig/pmie_timers %config(noreplace) %{_sysconfdir}/sysconfig/pmlogger_timers %else # cron scripts %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger +%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmfind %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie %endif %config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf %config(noreplace) %{_sysconfdir}/sysconfig/pmlogger %config(noreplace) %{_sysconfdir}/sysconfig/pmproxy +%config(noreplace) %{_sysconfdir}/sysconfig/pmfind %config(noreplace) %{_sysconfdir}/sysconfig/pmcd %config %{_sysconfdir}/pcp.env -%dir %{_confdir}/pipe.conf.d %dir %{_confdir}/labels +%dir %{_confdir}/labels/optional +%dir %{_confdir}/pipe.conf.d %dir %{_confdir}/pmcd %config(noreplace) %{_confdir}/pmcd/pmcd.conf %config(noreplace) %{_confdir}/pmcd/pmcd.options @@ -3057,6 +3104,9 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null %files pmda-elasticsearch %{_pmdasdir}/elasticsearch +%files pmda-openvswitch +%{_pmdasdir}/openvswitch + %files pmda-rabbitmq %{_pmdasdir}/rabbitmq @@ -3335,6 +3385,19 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null %endif %changelog +* Fri May 29 2020 Mark Goodwin - 5.1.1-1 +- 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 - 5.1.0-2 - replace pmdads389log dep on 389-ds-base with a softdep - fix install deps for pcp-testsuite on pcp-pmda-mssql @@ -3364,6 +3427,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null - pmdakvm: debugfs access is restricted (BZ 1824297) - error starting pmlogger; pid file not owned by root (BZ 1761962) - Update to latest PCP 5.1.0-1 upstream sources. +- Update to latest PCP sources. * Wed Mar 11 2020 Mark Goodwin - 5.0.3-3 - Resolve pcp-selinux issues causing services failures - (BZ 1810458) @@ -3378,9 +3442,6 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null - Fix dstat sub-sample averaging (BZ 1780039) - Update to latest PCP sources. -* Wed Jan 29 2020 Fedora Release Engineering - 5.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Wed Dec 11 2019 Nathan Scott - 5.0.2-1 - Resolve fresh install pmlogger timeout bug (BZ 1721223) - Fix dstat exception writing to a closed fd (BZ 1768619) @@ -3469,7 +3530,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null - Updated versions of Vector (1.3.1) and Blinkenlights (1.0.1) webapps * Fri Aug 03 2018 Dave Brolley - 4.1.1-2 -- pcp.spec: Fix the _with_dstat reference in the %configure command +- pcp.spec: Fix the _with_dstat reference in the %%configure command * Fri Aug 03 2018 Dave Brolley - 4.1.1-1 - SELinux is preventing pmdalinux from 'unix_read' accesses on the shared memory Unknown