Merge branch 'master' into f28

pcp.spec

@@ -1,6 +1,6 @@
 Name:    pcp
-Version: 4.3.1
+Version: 4.3.2
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
 URL:     https://pcp.io
@@ -14,7 +14,6 @@ Source2: %{github}/pcp-webapp-grafana/archive/1.9.1-2/pcp-webapp-grafana-1.9.1-2
 Source3: %{github}/pcp-webapp-graphite/archive/0.9.10/pcp-webapp-graphite-0.9.10.tar.gz
 Source4: %{github}/pcp-webapp-blinkenlights/archive/1.0.1/pcp-webapp-blinkenlights-1.0.1.tar.gz
 Patch0: pmcd-pmlogger-local-context.patch
-Patch1: selinux-policy-updates.patch
 
 %if 0%{?fedora} >= 26 || 0%{?rhel} > 7
 %global __python2 python2
@@ -30,16 +29,10 @@ Patch1: selinux-policy-updates.patch
 
 %global disable_snmp 0
 
-# There are no papi/libpfm devel packages for s390, armv7hl nor for some rhels, disable
+# No libpfm devel packages for s390, armv7hl nor for some rhels, disable
 %ifarch s390 s390x armv7hl
-%global disable_papi 1
 %global disable_perfevent 1
 %else
-%if 0%{?rhel} == 0 || 0%{?rhel} > 5
-%global disable_papi 0
-%else
-%global disable_papi 1
-%endif
 %if 0%{?fedora} >= 20 || 0%{?rhel} > 6
 %global disable_perfevent 0
 %else
@@ -205,9 +198,6 @@ BuildRequires: python3-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
 BuildRequires: cyrus-sasl-devel
-%if !%{disable_papi}
-BuildRequires: papi-devel
-%endif
 %if !%{disable_podman}
 BuildRequires: libvarlink-devel
 %endif
@@ -316,10 +306,6 @@ Requires: pcp-libs = %{version}-%{release}
 %global _with_ib --with-infiniband=yes
 %endif
 
-%if !%{disable_papi}
-%global _with_papi --with-papi=yes
-%endif
-
 %if %{disable_perfevent}
 %global _with_perfevent --with-perfevent=no
 %else
@@ -925,22 +911,6 @@ Performance Co-Pilot (PCP) front-end tools for exporting metric values
 to the Zabbix (https://www.zabbix.org/) monitoring software.
 %endif
 
-%if !%{disable_papi}
-#
-# pcp-pmda-papi
-#
-%package pmda-papi
-License: GPLv2+
-Summary: Performance Co-Pilot (PCP) metrics for Performance API and hardware counters
-URL: https://pcp.io
-Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
-BuildRequires: papi-devel
-
-%description pmda-papi
-This package contains the PCP Performance Metrics Domain Agent (PMDA) for
-collecting hardware counters statistics through PAPI (Performance API).
-%endif
-
 %if !%{disable_podman}
 #
 # pcp-pmda-podman
@@ -969,6 +939,7 @@ URL: https://pcp.io
 Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
 Requires: libpfm >= 4
 BuildRequires: libpfm-devel >= 4
+Obsoletes: pcp-pmda-papi pcp-pmda-papi-debuginfo
 
 %description pmda-perfevent
 This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -2039,7 +2010,7 @@ Requires: pcp-libs = %{version}-%{release}
 # https://fedoraproject.org/wiki/Packaging:Guidelines "Renaming/Replacing Existing Packages"
 Provides: dstat = %{version}-%{release}
 Provides: /usr/bin/dstat
-Obsoletes: dstat <= 0.7.3-5
+Obsoletes: dstat <= 0.8
 %endif
 
 %description system-tools
@@ -2122,13 +2093,12 @@ updated policy package.
 %setup -q -T -D -a 4 -c -n blinkenlights
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %if !%{disable_python2} && 0%{?default_python} != 3
 export PYTHON=python%{?default_python}
 %endif
-%configure %{?_with_initd} %{?_with_doc} %{?_with_dstat} %{?_with_ib} %{?_with_papi} %{?_with_podman} %{?_with_perfevent} %{?_with_bcc} %{?_with_json} %{?_with_snmp} %{?_with_nutcracker} %{?_with_webapps} %{?_with_python2}
+%configure %{?_with_initd} %{?_with_doc} %{?_with_dstat} %{?_with_ib} %{?_with_podman} %{?_with_perfevent} %{?_with_bcc} %{?_with_json} %{?_with_snmp} %{?_with_nutcracker} %{?_with_webapps} %{?_with_python2}
 make %{?_smp_mflags} default_pcp
 
 %install
@@ -2219,7 +2189,6 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
   grep -E -v '^nginx' |\
   grep -E -v '^nutcracker' |\
   grep -E -v '^oracle' |\
-  grep -E -v '^papi' |\
   grep -E -v '^pdns' |\
   grep -E -v '^podman' |\
   grep -E -v '^postfix' |\
@@ -2441,11 +2410,6 @@ fi
 %{pmda_remove "$1" "rpm"}
 %endif #preun pmda-rpm
 
-%if !%{disable_papi}
-%preun pmda-papi
-%{pmda_remove "$1" "papi"}
-%endif #preun pmda-papi
-
 %if !%{disable_systemd}
 %preun pmda-systemd
 %{pmda_remove "$1" "systemd"}
@@ -2862,6 +2826,8 @@ cd
 %{_unitdir}/pmie_check.timer
 %{_unitdir}/pmie_daily.service
 %{_unitdir}/pmie_daily.timer
+%config(noreplace) %{_sysconfdir}/sysconfig/pmie_timers
+%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger_timers
 %else
 # cron scripts
 %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger
@@ -2879,6 +2845,7 @@ cd
 %config(noreplace) %{_confdir}/pmcd/rc.local
 %dir %{_confdir}/pmproxy
 %config(noreplace) %{_confdir}/pmproxy/pmproxy.options
+%config(noreplace) %{_confdir}/pmproxy/pmproxy.conf
 %dir %{_confdir}/pmie
 %dir %{_confdir}/pmie/control.d
 %config(noreplace) %{_confdir}/pmie/control
@@ -3039,11 +3006,6 @@ cd
 %files import-collectl2pcp
 %{_bindir}/collectl2pcp
 
-%if !%{disable_papi}
-%files pmda-papi
-%{_pmdasdir}/papi
-%endif
-
 %if !%{disable_podman}
 %files pmda-podman
 %{_pmdasdir}/podman
@@ -3332,10 +3294,11 @@ cd
 %endif
 
 %changelog
-* Thu Mar 07 2019 Nathan Scott <nathans@redhat.com> - 4.3.1-2
+* Fri Apr 26 2019 Mark Goodwin <mgoodwin@redhat.com> 4.3.2-1
-- Remove Group: spec settings, use %ldconfig_scriptlets once more
+- Resolve selinux policy issues for pmie daemon mode (BZ 1702589)
-- Revert removal of pmcd/pmlogger-local-mode patch
+- Resolve selinux policy issues for BPF permissions (BZ 1693332)
-- Update selinux policy.
+- Further improvements to daily archive processing (BZ 1647390)
+- Update to latest PCP sources.
 
 * Wed Feb 27 2019 Mark Goodwin <mgoodwin@redhat.com> - 4.3.1-1
 - Fixes pcp-dstat in --full (all instances) mode (BZ 1661912)

sources

@@ -1,7 +1,6 @@
-SHA512 (pcp-4.3.1.src.tar.gz) = 8e5bcaf7e4cff88009041b5eb8fe1f4f89b0a873a4ad88f011efe8357e7c052efc800153b8805747e25fbdc1383c19396f4291e06f08d3d756c018a346acbf7a
+SHA512 (pcp-4.3.2.src.tar.gz) = bcca070564f2766022a0c780a92d3156d5d28f7f9a0e093e73cd892b1d043d43816d83204ec4611707b67319a5fa33233ce965b207f8cb0f893c00c23afe7248
 SHA512 (pcp-webapp-blinkenlights-1.0.1.tar.gz) = dadf0bc0742a3344a75f8f304851762572ddc9a5c7c66fd085adcabb70f9e7a9b2c9b6095a8fb358f6a6c64dbf41cf245e2da74a60b8120880f314b6ed3d271c
 SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa
 SHA512 (pcp-webapp-vector-1.3.1-1.tar.gz) = b1463d4da3727f130752699dd433e997212c19241ac440df389c1153e468ace840b7d5f43a37b2173e4eee4f4a807338a3c40cc9635801e626c1530baf46e289
 SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21
 SHA512 (pmcd-pmlogger-local-context.patch) = 8f4b6b49494781d0a711ac27738a75b1adead72cb1baef9a78754686c48ae2d278d691108233e9cf9ad33fede5ba7b7a43f4674205b9bf448f267c844ddc1a01
-SHA512 (selinux-policy-updates.patch) = 1d765d1fc11ec7576231f53048ceb315d9168613526aff60b972b297b8ad4ec08a00911858ee8989533e27b17c686590fea0d859acab2482f6c260cf41b21178