diff --git a/_service b/_service
index df99293..787df1f 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
git
https://github.com/performancecopilot/pcp.git
pcp
- 4.3.1
+ 4.3.4
@PARENT_TAG@
disable
diff --git a/pcp-4.3.1.tar.bz2 b/pcp-4.3.1.tar.bz2
deleted file mode 100644
index 3bfef17..0000000
--- a/pcp-4.3.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b5d132e053fe1ed9c1596111c868fc5c8e2d535a332cf9c612440be586c559ff
-size 32269284
diff --git a/pcp-4.3.4.tar.bz2 b/pcp-4.3.4.tar.bz2
new file mode 100644
index 0000000..a100e71
--- /dev/null
+++ b/pcp-4.3.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0cfff498a4af680055350a40d5cdfa776107921397ac4934ab5f8a9e7d5659e
+size 32893034
diff --git a/pcp.changes b/pcp.changes
index c09421f..f8f7d9a 100644
--- a/pcp.changes
+++ b/pcp.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Aug 21 14:30:44 UTC 2019 - David Disseldorp
+
+- Upgrade to 4.3.4
+ + pmchart, pmseries, pcp-dstat, pmrep and pcp-atop UI fixes and
+ improvements
+ + pmdalinux, pmdaproc and pmdabcc fixes
+ + pmproxy REST API changes and TLS support
+ + libpcp_pmda and libpcp_web fixes and support for Redis clustering
+ + various build and documentation changes
+ + libpcp_web: refactoring and support for Redis cluster protocol
+ + deprecate pmdapapi, upgrade to perfevent
+
-------------------------------------------------------------------
Wed Apr 24 17:29:39 UTC 2019 - Martin Liška
diff --git a/pcp.spec b/pcp.spec
index 098e232..cbbc1bb 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -73,7 +73,7 @@ Summary: System-level performance monitoring and performance management
License: %{license_gplv2plus} AND %{license_lgplv2plus} AND %{license_cc_by}
Group: %{pcp_gr}
Name: pcp
-Version: 4.3.1
+Version: 4.3.4
Release: 0
%global buildversion 1
@@ -102,16 +102,10 @@ Patch6: 0006-pmsnap-control-var-www-srv-www.patch
%global disable_snmp 0
-# There are no papi/libpfm devel packages for s390 nor for some rhels, disable
-%ifarch s390 s390x
-%global disable_papi 1
+# No libpfm devel packages for s390, armv7hl nor for some rhels, disable
+%ifarch s390 s390x armv7hl
%global disable_perfevent 1
%else
-%if 0%{?rhel} == 0 || 0%{?rhel} > 5 || 0%{?suse_version}
-%global disable_papi 0
-%else
-%global disable_papi 1
-%endif
%if 0%{?fedora} >= 20 || 0%{?rhel} > 6 || 0%{?suse_version}
%global disable_perfevent 0
%else
@@ -266,9 +260,6 @@ BuildRequires: python3-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: ncurses-devel
BuildRequires: readline-devel
-%if !%{disable_papi}
-BuildRequires: papi-devel
-%endif
%if !%{disable_perfevent}
BuildRequires: libpfm-devel >= 4.4
%endif
@@ -281,6 +272,7 @@ BuildRequires: cairo-devel
%if !%{disable_sdt}
BuildRequires: systemtap-sdt-devel
%endif
+BuildRequires: openssl-devel >= 1.1.1
BuildRequires: perl-ExtUtils-MakeMaker
%if 0%{?suse_version}
BuildRequires: update-desktop-files
@@ -395,10 +387,6 @@ Obsoletes: pcp-pmda-nvidia < %{version}
%global _with_ib --with-infiniband=no
%endif
-%if !%{disable_papi}
-%global _with_papi --with-papi=yes
-%endif
-
%if !%{disable_perfevent}
%global _with_perfevent --with-perfevent=yes
%endif
@@ -975,25 +963,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
-Summary: Performance Co-Pilot (PCP) metrics for Performance API and hardware counters
-License: %{license_gplv2plus}
-Group: %{pcp_gr}
-Url: https://pcp.io
-%if !0%{?suse_version}
-Requires: %{lib_pkg} = %{version}-%{release}
-%endif
-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_perfevent}
#
# pcp-pmda-perfevent
@@ -1008,6 +977,8 @@ Requires: %{lib_pkg} = %{version}-%{release}
Requires: libpfm >= 4.4
%endif
BuildRequires: libpfm-devel >= 4.4
+Obsoletes: pcp-pmda-papi
+Obsoletes: pcp-pmda-papi-debuginfo
%description pmda-perfevent
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -1125,7 +1096,7 @@ collecting metrics about bonded network interfaces.
# pcp-pmda-dbping
#
%package pmda-dbping
-Summary: Performance Co-Pilot (PCP) metrics for Database response times and Availablility
+Summary: Performance Co-Pilot (PCP) metrics for Database responsiveness
License: %{license_gplv2plus}
Group: %{pcp_gr}
Url: https://pcp.io
@@ -2336,7 +2307,6 @@ PCP_CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" CXX
%{?_with_initd} \
%{?_with_doc} \
%{?_with_ib} \
- %{?_with_papi} \
%{?_with_perfevent} \
%{?_with_json} \
%{?_with_snmp} \
@@ -2443,12 +2413,10 @@ ln -sf /sbin/service $RPM_BUILD_ROOT/%{_sbindir}/rcpmwebd
# SUSE requires use of %fillup_and_insserv
mkdir -p $RPM_BUILD_ROOT/%{_fillupdir}
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmlogger \
- $RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.pmlogger
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmproxy \
- $RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.pmproxy
-mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/pmcd \
- $RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.pmcd
+for f in pmlogger pmproxy pmcd pmie_timers pmlogger_timers; do
+ mv $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/${f} \
+ $RPM_BUILD_ROOT/%{_fillupdir}/sysconfig.${f}
+done
%else
# default chkconfig off for Fedora and RHEL
@@ -2485,7 +2453,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 '^postfix' |\
grep -E -v '^postgresql' |\
@@ -2571,8 +2538,6 @@ ls -1 $RPM_BUILD_ROOT/%{_mandir}/man5 |\
mv $RPM_BUILD_ROOT/%{_datadir}/pcp/demos $RPM_BUILD_ROOT/%{_docdir}/pcp
ls -1 $RPM_BUILD_ROOT/%{_docdir}/pcp/demos/tutorials |\
sed -e 's#^#'%{_docdir}/pcp/demos/tutorials'\/#' >>pcp-doc.list
-find $RPM_BUILD_ROOT/%{_datadir}/doc/pcp-doc |\
- sed -e "s#^$RPM_BUILD_ROOT#/#" >>pcp-doc.list
%else
ls -1 $RPM_BUILD_ROOT/%{_datadir}/pcp/demos/tutorials |\
sed -e 's#^#'%{_datadir}/pcp/demos/tutorials'\/#' >>pcp-doc.list
@@ -2899,6 +2864,8 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
%{fillup_and_insserv pmlogger}
%{fillup_and_insserv pmie}
%{fillup_and_insserv pmproxy}
+%{fillup_and_insserv pmie_timers}
+%{fillup_and_insserv pmlogger_timers}
%endif
%else
%if !%{disable_systemd}
@@ -3075,10 +3042,14 @@ fi
%{_fillupdir}/sysconfig.pmlogger
%{_fillupdir}/sysconfig.pmproxy
%{_fillupdir}/sysconfig.pmcd
+%{_fillupdir}/sysconfig.pmie_timers
+%{_fillupdir}/sysconfig.pmlogger_timers
%else
%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger
%config(noreplace) %{_sysconfdir}/sysconfig/pmproxy
%config(noreplace) %{_sysconfdir}/sysconfig/pmcd
+%config(noreplace) %{_sysconfdir}/sysconfig/pmie_timers
+%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger_timers
%endif
%config %{_sysconfdir}/pcp.env
%dir %{_confdir}/pmcd
@@ -3087,6 +3058,7 @@ fi
%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
@@ -3252,12 +3224,6 @@ fi
%defattr(-,root,root)
%{_bindir}/collectl2pcp
-%if !%{disable_papi}
-%files pmda-papi
-%defattr(-,root,root)
-%{_pmdasdir}/papi
-%endif
-
%if !%{disable_perfevent}
%files pmda-perfevent
%defattr(-,root,root)
@@ -3570,6 +3536,10 @@ fi
%exclude %{_docdir}/pcp/pcp.lsm
%dir %{_docdir}/pcp/demos
%dir %{_docdir}/pcp/demos/tutorials
+%dir %{_datadir}/doc/pcp-doc
+%{_datadir}/doc/pcp-doc/html
+%{_datadir}/doc/pcp-doc/pcp-programmers-guide.pdf
+%{_datadir}/doc/pcp-doc/pcp-users-and-administrators-guide.pdf
%endif
%if !%{disable_python2} || !%{disable_python3}