Merge branch 'master' into f25
This commit is contained in:
Lukas Berk
commit
39a3b8b750
65
pcp.spec
65
pcp.spec
@ -1,6 +1,6 @@
|
||||
Name: pcp
|
||||
Version: 3.11.10
|
||||
Release: 2%{?dist}
|
||||
Version: 3.12.0
|
||||
Release: 1%{?dist}
|
||||
Summary: System-level performance monitoring and performance management
|
||||
License: GPLv2+ and LGPLv2.1+ and CC-BY
|
||||
URL: http://www.pcp.io
|
||||
@ -227,15 +227,17 @@ Obsoletes: pcp-gui-debuginfo
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{disable_infiniband}
|
||||
%global _with_ib --with-infiniband=no
|
||||
%if !%{disable_infiniband}
|
||||
%global _with_ib --with-infiniband=yes
|
||||
%endif
|
||||
|
||||
%if !%{disable_papi}
|
||||
%global _with_papi --with-papi=yes
|
||||
%endif
|
||||
|
||||
%if !%{disable_perfevent}
|
||||
%if %{disable_perfevent}
|
||||
%global _with_perfevent --with-perfevent=no
|
||||
%else
|
||||
%global _with_perfevent --with-perfevent=yes
|
||||
%endif
|
||||
|
||||
@ -1360,12 +1362,12 @@ URL: http://www.pcp.io
|
||||
%if !%{disable_python3}
|
||||
Requires: python3-pcp
|
||||
Requires: libvirt-python3 python3-lxml
|
||||
BuildRequires: libvirt-python3
|
||||
BuildRequires: libvirt-python3 python3-lxml
|
||||
%else
|
||||
Requires: python-pcp
|
||||
Requires: libvirt-python python-lxml
|
||||
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
|
||||
BuildRequires: libvirt-python
|
||||
BuildRequires: libvirt-python python-lxml
|
||||
%endif
|
||||
%endif
|
||||
%description pmda-libvirt
|
||||
@ -1385,9 +1387,11 @@ URL: http://www.pcp.io
|
||||
%if !%{disable_python3}
|
||||
Requires: python3-pcp
|
||||
Requires: python3-rtslib
|
||||
BuildRequires: python3-rtslib
|
||||
%else
|
||||
Requires: python-pcp
|
||||
Requires: python-rtslib
|
||||
BuildRequires: python-rtslib
|
||||
%endif
|
||||
%description pmda-lio
|
||||
This package provides a PMDA to gather performance metrics from the kernels
|
||||
@ -1397,6 +1401,30 @@ summary instance per iSCSI target, which aggregates all LUN metrics within the
|
||||
target.
|
||||
#end pcp-pmda-lio
|
||||
|
||||
#
|
||||
# pcp-pmda-prometheus
|
||||
#
|
||||
%package pmda-prometheus
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
Summary: Performance Co-Pilot (PCP) metrics from Prometheus endpoints
|
||||
URL: http://www.pcp.io
|
||||
Requires: pcp-libs = %{version}-%{release}
|
||||
%if !%{disable_python3}
|
||||
Requires: python3-pcp
|
||||
Requires: python3-requests
|
||||
BuildRequires: python3-requests
|
||||
%else
|
||||
Requires: python-pcp
|
||||
Requires: python-requests
|
||||
BuildRequires: python-requests
|
||||
%endif
|
||||
|
||||
%description pmda-prometheus
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
extracting statistics from programs instrumented as Prometheus endpoints.
|
||||
#end pcp-pmda-prometheus
|
||||
|
||||
%endif # !%{disable_python2} || !%{disable_python3}
|
||||
|
||||
%if !%{disable_json}
|
||||
@ -1708,7 +1736,8 @@ Requires: pcp-pmda-lustrecomm pcp-pmda-logger pcp-pmda-docker pcp-pmda-bind2
|
||||
Requires: pcp-pmda-nutcracker
|
||||
%endif
|
||||
%if !%{disable_python2} || !%{disable_python3}
|
||||
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic pcp-pmda-libvirt pcp-pmda-lio
|
||||
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
|
||||
Requires: pcp-pmda-libvirt pcp-pmda-lio pcp-pmda-prometheus
|
||||
%endif
|
||||
%if !%{disable_snmp}
|
||||
Requires: pcp-pmda-snmp
|
||||
@ -1876,6 +1905,7 @@ Group: Applications/System
|
||||
Summary: Selinux policy package
|
||||
URL: http://www.pcp.io
|
||||
BuildRequires: selinux-policy-devel
|
||||
BuildRequires: selinux-policy-targeted
|
||||
%if 0%{?rhel} == 5
|
||||
BuildRequires: setools
|
||||
%else
|
||||
@ -2076,7 +2106,7 @@ cat base_bin.list base_exec.list |\
|
||||
ls -1 $RPM_BUILD_ROOT/%{_logconfdir}/ |\
|
||||
sed -e 's#^#'%{_logconfdir}'\/#' |\
|
||||
grep -E -v 'zeroconf' >pcp-logconf.list
|
||||
cat base_pmdas.list base_bin.list base_exec.list pcp-logconf.list|\
|
||||
cat base_pmdas.list base_bin.list base_exec.list pcp-logconf.list |\
|
||||
grep -E -v 'pmdaib|pmmgr|pmweb|pmsnap|2pcp|pmdas/systemd' |\
|
||||
grep -E -v "$PCP_GUI|pixmaps|pcp-doc|tutorials|selinux" |\
|
||||
grep -E -v %{_confdir} | grep -E -v %{_logsdir} > base.list
|
||||
@ -2270,6 +2300,9 @@ fi
|
||||
%preun pmda-lio
|
||||
%{pmda_remove "$1" "lio"}
|
||||
|
||||
%preun pmda-prometheus
|
||||
%{pmda_remove "$1" "prometheus"}
|
||||
|
||||
%preun pmda-lustre
|
||||
%{pmda_remove "$1" "lustre"}
|
||||
|
||||
@ -2679,6 +2712,8 @@ cd
|
||||
%{_libdir}/libpcp_trace.so
|
||||
%{_libdir}/libpcp_import.so
|
||||
%{_libdir}/libpcp_web.so
|
||||
%{_libdir}/pkgconfig/libpcp.pc
|
||||
%{_libdir}/pkgconfig/libpcp_pmda.pc
|
||||
%{_includedir}/pcp/*.h
|
||||
|
||||
%files devel -f devel.list
|
||||
@ -2816,6 +2851,9 @@ cd
|
||||
%files pmda-lio
|
||||
%{_pmdasdir}/lio
|
||||
|
||||
%files pmda-prometheus
|
||||
%{_pmdasdir}/prometheus
|
||||
|
||||
%files pmda-lustre
|
||||
%{_pmdasdir}/lustre
|
||||
|
||||
@ -3015,6 +3053,15 @@ cd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jun 30 2017 Lukas Berk <lberk@redhat.com> - 3.12.0-1
|
||||
- Fix pcp-atop failure in open-ended write mode (BZ 1431292)
|
||||
- Resolve additional selinux policy issues (BZ 1317515)
|
||||
- Improve poor pmlogconf performance (BZ1376857)
|
||||
- Update to latest PCP Sources.
|
||||
|
||||
* Mon Jun 05 2017 Jitka Plesnikova <jplesnik@redhat.com> - 3.11.10-3
|
||||
- Perl 5.26 rebuild
|
||||
|
||||
* Fri Jun 2 2017 Lukas Berk <lberk@redhat.com> - 3.11.10-2
|
||||
- Correct subrpm inclusion of zeroconf config files (BZ 1456262)
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1,4 +1,4 @@
|
||||
SHA512 (pcp-3.11.10.src.tar.gz) = f91bfae176ae4ed189e11c0cc86db215b4343752400cef9026168fc2c39f5e7caff440078b7a4c459c1d620cd532a8bc60746f0ae820a81fa2a058361825a8c9
|
||||
SHA512 (pcp-3.12.0.src.tar.gz) = 5633e6b35aa1223d9a74e6dd2b6b42a6eeccd9738f04b343b5dfb03ff6597a968d1ca6b453ba4c8e80b543cbdc4f34e2d645bac78571e7a639a0b2e2018e442a
|
||||
SHA512 (pcp-webapp-blinkenlights-1.0.0.tar.gz) = 505eafd4b8eb2ab97ec6b0fea3b5510ab0b976fa07559f1d163d240c62a8d7419f062eecc180b28b6b240207b45daed6fcc39d8e2930c6d038790d5ac0c695ab
|
||||
SHA512 (pcp-webapp-grafana-1.9.1.tar.gz) = 844c04b7155d19a294eacfab98e3950e5fefbf423b98a1195b86cb024e5dc6ab98ecb8785fd7ceff7fbcd947dd5c5ce07a2f059a4c432fda984c26a79ab641f3
|
||||
SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa
|
||||
|
||||
Loading…
Reference in New Issue
Block a user