Update to latest community sources

This commit is contained in:
Nathan Scott 2017-08-16 16:17:29 +10:00
parent b5d333cfbd
commit 261bb9390e
2 changed files with 65 additions and 34 deletions

View File

@ -1,6 +1,6 @@
Name: pcp Name: pcp
Version: 3.12.0 Version: 3.12.1
Release: 7%{?dist} Release: 1%{?dist}
Summary: System-level performance monitoring and performance management Summary: System-level performance monitoring and performance management
License: GPLv2+ and LGPLv2.1+ and CC-BY License: GPLv2+ and LGPLv2.1+ and CC-BY
URL: http://www.pcp.io URL: http://www.pcp.io
@ -59,6 +59,12 @@ Source4: %{github}/pcp-webapp-blinkenlights/archive/1.0.0/pcp-webapp-blinkenligh
%global disable_python3 1 %global disable_python3 1
%endif %endif
%if 0%{?fedora} >= 24 || 0%{?rhel} > 7
%global perl_interpreter perl-interpreter
%else
%global perl_interpreter perl
%endif
# support for pmdajson # support for pmdajson
%if 0%{?rhel} == 0 || 0%{?rhel} > 6 %if 0%{?rhel} == 0 || 0%{?rhel} > 6
%if !%{disable_python2} || !%{disable_python3} %if !%{disable_python2} || !%{disable_python3}
@ -500,7 +506,7 @@ Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Perl bindings and documentation Summary: Performance Co-Pilot (PCP) Perl bindings and documentation
URL: http://www.pcp.io URL: http://www.pcp.io
Requires: pcp-libs = %{version}-%{release} Requires: pcp-libs = %{version}-%{release}
Requires: perl-interpreter Requires: %{perl_interpreter}
%description -n perl-PCP-PMDA %description -n perl-PCP-PMDA
The PCP::PMDA Perl module contains the language bindings for The PCP::PMDA Perl module contains the language bindings for
@ -518,6 +524,7 @@ Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values
URL: http://www.pcp.io URL: http://www.pcp.io
Requires: pcp-libs = %{version}-%{release} Requires: pcp-libs = %{version}-%{release}
Requires: %{perl_interpreter}
%description -n perl-PCP-MMV %description -n perl-PCP-MMV
The PCP::MMV module contains the Perl language bindings for The PCP::MMV module contains the Perl language bindings for
@ -536,6 +543,7 @@ Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Perl bindings for importing external data into PCP archives Summary: Performance Co-Pilot (PCP) Perl bindings for importing external data into PCP archives
URL: http://www.pcp.io URL: http://www.pcp.io
Requires: pcp-libs = %{version}-%{release} Requires: pcp-libs = %{version}-%{release}
Requires: %{perl_interpreter}
%description -n perl-PCP-LogImport %description -n perl-PCP-LogImport
The PCP::LogImport module contains the Perl language bindings for The PCP::LogImport module contains the Perl language bindings for
@ -551,6 +559,7 @@ Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Perl bindings for post-processing output of pmlogsummary Summary: Performance Co-Pilot (PCP) Perl bindings for post-processing output of pmlogsummary
URL: http://www.pcp.io URL: http://www.pcp.io
Requires: pcp-libs = %{version}-%{release} Requires: pcp-libs = %{version}-%{release}
Requires: %{perl_interpreter}
%description -n perl-PCP-LogSummary %description -n perl-PCP-LogSummary
The PCP::LogSummary module provides a Perl module for using the The PCP::LogSummary module provides a Perl module for using the
@ -1351,6 +1360,24 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
collecting metrics about Intel MIC cards. collecting metrics about Intel MIC cards.
# end pcp-pmda-mic # end pcp-pmda-mic
#
# pcp-pmda-haproxy
#
%package pmda-haproxy
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for HAProxy
URL: http://www.pcp.io
%if !%{disable_python3}
Requires: python3-pcp
%else
Requires: python-pcp
%endif
%description pmda-haproxy
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
extracting performance metrics from HAProxy over the HAProxy stats socket.
# end pcp-pmda-haproxy
# #
# pcp-pmda-libvirt # pcp-pmda-libvirt
# #
@ -1737,7 +1764,7 @@ Requires: pcp-pmda-nutcracker
%endif %endif
%if !%{disable_python2} || !%{disable_python3} %if !%{disable_python2} || !%{disable_python3}
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
Requires: pcp-pmda-libvirt pcp-pmda-lio pcp-pmda-prometheus Requires: pcp-pmda-libvirt pcp-pmda-lio pcp-pmda-prometheus pcp-pmda-haproxy
%endif %endif
%if !%{disable_snmp} %if !%{disable_snmp}
Requires: pcp-pmda-snmp Requires: pcp-pmda-snmp
@ -1995,6 +2022,12 @@ for f in $RPM_BUILD_ROOT/%{_initddir}/{pcp,pmcd,pmlogger,pmie,pmwebd,pmmgr,pmpro
sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f
done done
%if 0%{?fedora} > 26
PCP_SYSCONFIG_DIR=%{_sysconfdir}/sysconfig
sed -i 's/^\#\ PMLOGGER_LOCAL.*/PMLOGGER_LOCAL=1/g' "$RPM_BUILD_ROOT/$PCP_SYSCONFIG_DIR/pmlogger"
sed -i 's/^\#\ PMCD_LOCAL.*/PMCD_LOCAL=1/g' "$RPM_BUILD_ROOT/$PCP_SYSCONFIG_DIR/pmcd"
%endif
# list of PMDAs in the base pkg # list of PMDAs in the base pkg
ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
grep -E -v '^simple|sample|trivial|txmon' |\ grep -E -v '^simple|sample|trivial|txmon' |\
@ -2058,6 +2091,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
grep -E -v '^gluster' |\ grep -E -v '^gluster' |\
grep -E -v '^zswap' |\ grep -E -v '^zswap' |\
grep -E -v '^unbound' |\ grep -E -v '^unbound' |\
grep -E -v '^haproxy' |\
sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list
# all base pcp package files except those split out into sub packages # all base pcp package files except those split out into sub packages
@ -2363,6 +2397,9 @@ fi
%preun pmda-mic %preun pmda-mic
%{pmda_remove "$1" "mic"} %{pmda_remove "$1" "mic"}
%preun pmda-haproxy
%{pmda_remove "$1" "haproxy"}
%preun pmda-libvirt %preun pmda-libvirt
%{pmda_remove "$1" "libvirt"} %{pmda_remove "$1" "libvirt"}
%endif # !%{disable_python[2,3]} %endif # !%{disable_python[2,3]}
@ -2420,11 +2457,10 @@ if [ "$1" -eq 0 ]
then then
# stop daemons before erasing the package # stop daemons before erasing the package
%if !%{disable_systemd} %if !%{disable_systemd}
systemctl --no-reload disable pmlogger.service >/dev/null 2>&1 %systemd_preun pmlogger.service
systemctl --no-reload disable pmie.service >/dev/null 2>&1 %systemd_preun pmie.service
systemctl --no-reload disable pmproxy.service >/dev/null 2>&1 %systemd_preun pmproxy.service
systemctl --no-reload disable pmcd.service >/dev/null 2>&1 %systemd_preun pmcd.service
systemctl stop pmlogger.service >/dev/null 2>&1 systemctl stop pmlogger.service >/dev/null 2>&1
systemctl stop pmie.service >/dev/null 2>&1 systemctl stop pmie.service >/dev/null 2>&1
systemctl stop pmproxy.service >/dev/null 2>&1 systemctl stop pmproxy.service >/dev/null 2>&1
@ -2559,9 +2595,12 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
touch "$PCP_PMNS_DIR/.NeedRebuild" touch "$PCP_PMNS_DIR/.NeedRebuild"
chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
%if !%{disable_systemd} %if !%{disable_systemd}
systemctl condrestart pmcd.service >/dev/null 2>&1 %systemd_postun_with_restart pmcd.service
systemctl condrestart pmlogger.service >/dev/null 2>&1 %systemd_post pmcd.service
systemctl condrestart pmie.service >/dev/null 2>&1 %systemd_postun_with_restart pmlogger.service
%systemd_post pmlogger.service
%systemd_postun_with_restart pmie.service
%systemd_post pmie.service
systemctl condrestart pmproxy.service >/dev/null 2>&1 systemctl condrestart pmproxy.service >/dev/null 2>&1
%else %else
/sbin/chkconfig --add pmcd >/dev/null 2>&1 /sbin/chkconfig --add pmcd >/dev/null 2>&1
@ -2714,6 +2753,7 @@ cd
%{_libdir}/libpcp_web.so %{_libdir}/libpcp_web.so
%{_libdir}/pkgconfig/libpcp.pc %{_libdir}/pkgconfig/libpcp.pc
%{_libdir}/pkgconfig/libpcp_pmda.pc %{_libdir}/pkgconfig/libpcp_pmda.pc
%{_libdir}/pkgconfig/libpcp_import.pc
%{_includedir}/pcp/*.h %{_includedir}/pcp/*.h
%files devel -f devel.list %files devel -f devel.list
@ -2937,6 +2977,9 @@ cd
%files pmda-mic %files pmda-mic
%{_pmdasdir}/mic %{_pmdasdir}/mic
%files pmda-haproxy
%{_pmdasdir}/haproxy
%files pmda-libvirt %files pmda-libvirt
%{_pmdasdir}/libvirt %{_pmdasdir}/libvirt
@ -3053,20 +3096,8 @@ cd
%endif %endif
%changelog %changelog
* Fri Aug 11 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.12.0-7 * Wed Aug 16 2017 Nathan Scott <nathans@redhat.com> - 3.12.1-1
- Rebuilt after RPM update (№ 3) - Update to latest PCP sources.
* Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.12.0-6
- Rebuilt for RPM soname bump
* Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.12.0-5
- Rebuilt for RPM soname bump
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 3.12.0-2 * Thu Jul 13 2017 Petr Pisar <ppisar@redhat.com> - 3.12.0-2
- perl dependency renamed to perl-interpreter - perl dependency renamed to perl-interpreter
@ -3076,7 +3107,7 @@ cd
- Fix pcp-atop failure in open-ended write mode (BZ 1431292) - Fix pcp-atop failure in open-ended write mode (BZ 1431292)
- Resolve additional selinux policy issues (BZ 1317515) - Resolve additional selinux policy issues (BZ 1317515)
- Improve poor pmlogconf performance (BZ1376857) - Improve poor pmlogconf performance (BZ1376857)
- Update to latest PCP Sources. - Update to latest PCP sources.
* Mon Jun 05 2017 Jitka Plesnikova <jplesnik@redhat.com> - 3.11.10-3 * Mon Jun 05 2017 Jitka Plesnikova <jplesnik@redhat.com> - 3.11.10-3
- Perl 5.26 rebuild - Perl 5.26 rebuild
@ -3088,13 +3119,13 @@ cd
- python api: handle non-POSIXLY_CORRECT getopt cases (BZ 1289912) - python api: handle non-POSIXLY_CORRECT getopt cases (BZ 1289912)
- Fix pmchart reaction to timezone changes from pmtime (BZ 968823) - Fix pmchart reaction to timezone changes from pmtime (BZ 968823)
- Require Qt5 for Fedora. - Require Qt5 for Fedora.
- Update to latest PCP Sources. - Update to latest PCP sources.
* Fri Mar 31 2017 Nathan Scott <nathans@redhat.com> - 3.11.9-1 * Fri Mar 31 2017 Nathan Scott <nathans@redhat.com> - 3.11.9-1
- Fix pmchart chart legends toggling behaviour (BZ 1359961) - Fix pmchart chart legends toggling behaviour (BZ 1359961)
- Improve multiple local context attr handling (BZ 1430248) - Improve multiple local context attr handling (BZ 1430248)
- Fix error during installation of pcp-selinux (BZ 1433271) - Fix error during installation of pcp-selinux (BZ 1433271)
- Update to latest PCP Sources. - Update to latest PCP sources.
* Fri Feb 17 2017 Lukas Berk <lberk@redhat.com> - 3.11.8-1 * Fri Feb 17 2017 Lukas Berk <lberk@redhat.com> - 3.11.8-1
- Support newer kernels /proc/vmstat file contents (BZ 1396148) - Support newer kernels /proc/vmstat file contents (BZ 1396148)
@ -3114,7 +3145,7 @@ cd
- Ensure pmieconf and pmlogconf handle empty files (BZ 1249123) - Ensure pmieconf and pmlogconf handle empty files (BZ 1249123)
- Ignore rpmsave and rpmnew suffixed control files (BZ 1375415) - Ignore rpmsave and rpmnew suffixed control files (BZ 1375415)
- Add new pcp-pmda-libvirt package for virtual machine metrics - Add new pcp-pmda-libvirt package for virtual machine metrics
- Update to latest PCP Sources. - Update to latest PCP sources.
* Fri Aug 05 2016 Nathan Scott <nathans@redhat.com> - 3.11.4-1 * Fri Aug 05 2016 Nathan Scott <nathans@redhat.com> - 3.11.4-1
- Support inside-container metric values in python (BZ 1333702) - Support inside-container metric values in python (BZ 1333702)
@ -3124,7 +3155,7 @@ cd
- Use "dirsrv" as default pmdads389log user account (BZ 1357607) - Use "dirsrv" as default pmdads389log user account (BZ 1357607)
- Make pmie(1) honour SIGINT while parsing rules (BZ 1327226) - Make pmie(1) honour SIGINT while parsing rules (BZ 1327226)
- Add pmlogconf support for pcp-pidstat and pcp-mpstat (BZ 1361943) - Add pmlogconf support for pcp-pidstat and pcp-mpstat (BZ 1361943)
- Update to latest PCP Sources. - Update to latest PCP sources.
* Fri Jun 17 2016 Nathan Scott <nathans@redhat.com> - 3.11.3-1 * Fri Jun 17 2016 Nathan Scott <nathans@redhat.com> - 3.11.3-1
- Fix memory leak in derived metrics error handling (BZ 1331973) - Fix memory leak in derived metrics error handling (BZ 1331973)
@ -3132,7 +3163,7 @@ cd
- Disallow stopping pmie/pmlogger daemons from cron (BZ 1336792) - Disallow stopping pmie/pmlogger daemons from cron (BZ 1336792)
- Fail fast for easily detected bad pmcd configuration (BZ 1336210) - Fail fast for easily detected bad pmcd configuration (BZ 1336210)
- Implement primary (local) pmie concept in rc pmie (BZ 1323851) - Implement primary (local) pmie concept in rc pmie (BZ 1323851)
- Update to latest PCP Sources. - Update to latest PCP sources.
* Mon May 16 2016 Jitka Plesnikova <jplesnik@redhat.com> - 3.11.2-2.1 * Mon May 16 2016 Jitka Plesnikova <jplesnik@redhat.com> - 3.11.2-2.1
- Perl 5.24 rebuild - Perl 5.24 rebuild
@ -3142,7 +3173,7 @@ cd
- Multithreaded clients with concurrent pmNewContext improvements (BZ 1325363) - Multithreaded clients with concurrent pmNewContext improvements (BZ 1325363)
- PMCD agent auto-restart (BZ 1323521) - PMCD agent auto-restart (BZ 1323521)
- Segv in libpcp during discovery error processing (BZ 1319288) - Segv in libpcp during discovery error processing (BZ 1319288)
- Update to latest PCP Sources. - Update to latest PCP sources.
* Fri Mar 18 2016 Dave Brolley <brolley@redhat.com> - 3.11.1-1 * Fri Mar 18 2016 Dave Brolley <brolley@redhat.com> - 3.11.1-1
- Call Remove script when uninstalling individual PMDAs (BZ 1304722) - Call Remove script when uninstalling individual PMDAs (BZ 1304722)

View File

@ -1,4 +1,4 @@
SHA512 (pcp-3.12.0.src.tar.gz) = 5633e6b35aa1223d9a74e6dd2b6b42a6eeccd9738f04b343b5dfb03ff6597a968d1ca6b453ba4c8e80b543cbdc4f34e2d645bac78571e7a639a0b2e2018e442a SHA512 (pcp-3.12.1.src.tar.gz) = ff2a7fd14ed720f9340dab956d0b4b0d17be66f1882a5452d443b4bb97a442b77b5fd647233b1fe6379ec197f1c29a194ea575de926a842926b7fa978b3d5f87
SHA512 (pcp-webapp-blinkenlights-1.0.0.tar.gz) = 505eafd4b8eb2ab97ec6b0fea3b5510ab0b976fa07559f1d163d240c62a8d7419f062eecc180b28b6b240207b45daed6fcc39d8e2930c6d038790d5ac0c695ab SHA512 (pcp-webapp-blinkenlights-1.0.0.tar.gz) = 505eafd4b8eb2ab97ec6b0fea3b5510ab0b976fa07559f1d163d240c62a8d7419f062eecc180b28b6b240207b45daed6fcc39d8e2930c6d038790d5ac0c695ab
SHA512 (pcp-webapp-grafana-1.9.1.tar.gz) = 844c04b7155d19a294eacfab98e3950e5fefbf423b98a1195b86cb024e5dc6ab98ecb8785fd7ceff7fbcd947dd5c5ce07a2f059a4c432fda984c26a79ab641f3 SHA512 (pcp-webapp-grafana-1.9.1.tar.gz) = 844c04b7155d19a294eacfab98e3950e5fefbf423b98a1195b86cb024e5dc6ab98ecb8785fd7ceff7fbcd947dd5c5ce07a2f059a4c432fda984c26a79ab641f3
SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa