Update to latest community sources
This commit is contained in:
Nathan Scott
parent
257c67c355
commit
2dc8c8fbdc
2
.gitignore
vendored
2
.gitignore
vendored
@ -40,3 +40,5 @@ pcp-3.3.3-1.src.tar.gz
|
||||
/pcp-3.10.4.src.tar.gz
|
||||
/pcp-3.10.5.src.tar.gz
|
||||
/pcp-3.10.6.src.tar.gz
|
||||
/pcp-3.10.7.src.tar.gz
|
||||
/vector.tar.gz
|
||||
|
||||
68
pcp.spec
68
pcp.spec
@ -1,14 +1,18 @@
|
||||
Summary: System-level performance monitoring and performance management
|
||||
Name: pcp
|
||||
Version: 3.10.6
|
||||
Version: 3.10.7
|
||||
%global buildversion 1
|
||||
|
||||
Release: %{buildversion}%{?dist}
|
||||
License: GPLv2+ and LGPLv2.1+ and CC-BY
|
||||
URL: http://www.pcp.io
|
||||
Group: Applications/System
|
||||
# https://bintray.com/artifact/download/pcp/source/pcp-%{version}.src.tar.gz
|
||||
Source0: pcp-%{version}.src.tar.gz
|
||||
# https://github.com/performancecopilot/pcp-webjs/archive/master.zip
|
||||
Source1: pcp-webjs.src.tar.gz
|
||||
# https://bintray.com/artifact/download/netflixoss/downloads/vector.tar.gz
|
||||
Source2: vector.tar.gz
|
||||
|
||||
# Compat check for distros that already have single install pmda's
|
||||
%if 0%{?fedora} > 22 || 0%{?rhel} > 7
|
||||
@ -87,13 +91,13 @@ Source1: pcp-webjs.src.tar.gz
|
||||
|
||||
# systemtap static probing, missing before el6 and on some architectures
|
||||
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
|
||||
%global disable_sdt 0
|
||||
%else
|
||||
%ifnarch ppc ppc64
|
||||
%global disable_sdt 0
|
||||
%else
|
||||
%global disable_sdt 1
|
||||
%endif
|
||||
%else
|
||||
%global disable_sdt 1
|
||||
%endif
|
||||
|
||||
# rpm producing "noarch" packages
|
||||
@ -186,6 +190,7 @@ Obsoletes: pcp-gui-debuginfo
|
||||
%global _initddir %{_datadir}/pcp/lib
|
||||
%else
|
||||
%global _initddir %{_sysconfdir}/rc.d/init.d
|
||||
%global _with_initd --with-rcdir=%{_initddir}
|
||||
%endif
|
||||
|
||||
# we never want Infiniband on s390 platforms
|
||||
@ -687,6 +692,7 @@ Group: Applications/System
|
||||
Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch
|
||||
URL: http://www.pcp.io
|
||||
Requires: perl-PCP-PMDA = %{version}-%{release}
|
||||
Requires: perl(LWP::UserAgent)
|
||||
|
||||
%description pmda-elasticsearch
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
@ -793,6 +799,8 @@ Group: Applications/System
|
||||
Summary: Performance Co-Pilot (PCP) metrics for MySQL
|
||||
URL: http://www.pcp.io
|
||||
Requires: perl-PCP-PMDA = %{version}-%{release}
|
||||
Requires: perl(DBI)
|
||||
Requires: perl(DBD::mysql)
|
||||
|
||||
%description pmda-mysql
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
@ -852,6 +860,7 @@ Group: Applications/System
|
||||
Summary: Performance Co-Pilot (PCP) metrics for the Nginx Webserver
|
||||
URL: http://www.pcp.io
|
||||
Requires: perl-PCP-PMDA = %{version}-%{release}
|
||||
Requires: perl(LWP::UserAgent)
|
||||
|
||||
%description pmda-nginx
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
@ -921,6 +930,8 @@ Group: Applications/System
|
||||
Summary: Performance Co-Pilot (PCP) metrics for PostgreSQL
|
||||
URL: http://www.pcp.io
|
||||
Requires: perl-PCP-PMDA = %{version}-%{release}
|
||||
Requires: perl(DBI)
|
||||
Requires: perl(DBD::Pg)
|
||||
|
||||
%description pmda-postgresql
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
@ -1072,6 +1083,24 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
collecting metrics about the Unbound DNS Resolver.
|
||||
# end pcp-pmda-unbound
|
||||
|
||||
#
|
||||
# pcp-pmda-mic
|
||||
#
|
||||
%package pmda-mic
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
Summary: Performance Co-Pilot (PCP) metrics for Intel MIC cards
|
||||
URL: http://www.pcp.io
|
||||
%if !%{disable_python3}
|
||||
Requires: python3-pcp
|
||||
%else
|
||||
Requires: python-pcp
|
||||
%endif
|
||||
%description pmda-mic
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
collecting metrics about Intel MIC cards.
|
||||
# end pcp-pmda-mic
|
||||
|
||||
%endif # !%{disable_python2} || !%{disable_python3}
|
||||
|
||||
%if !%{disable_json}
|
||||
@ -1381,7 +1410,7 @@ Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-lmsensors pcp-pmda
|
||||
Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping pcp-pmda-logger
|
||||
Requires: pcp-pmda-lustrecomm
|
||||
%if !%{disable_python2} || !%{disable_python3}
|
||||
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound
|
||||
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
|
||||
Requires: pcp-system-tools pcp-export-pcp2graphite
|
||||
%endif
|
||||
%if !%{disable_json}
|
||||
@ -1414,7 +1443,7 @@ Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-lmsensors pcp-pmda
|
||||
Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping
|
||||
Requires: pcp-pmda-lustrecomm pcp-pmda-logger
|
||||
%if !%{disable_python2} || !%{disable_python3}
|
||||
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound
|
||||
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
|
||||
%endif
|
||||
%if !%{disable_json}
|
||||
Requires: pcp-pmda-json
|
||||
@ -1552,6 +1581,7 @@ PCP utilities and daemons, and the PCP graphical tools.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -T -D -a 2 -c -n pcp-%{version}/vector
|
||||
%setup -q -T -D -a 1
|
||||
|
||||
%clean
|
||||
@ -1586,8 +1616,12 @@ rm -fr $RPM_BUILD_ROOT/%{_initddir}/pmwebd
|
||||
rm -fr $RPM_BUILD_ROOT/%{_unitdir}/pmwebd.service
|
||||
rm -f $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin/pmwebd
|
||||
%endif
|
||||
# prefer latest released Netflix version over pcp-webjs copy.
|
||||
rm -fr pcp-webjs/vector
|
||||
sed -i -e 's/vector [0-9]\.[0-9]*\.[0-9]*/vector/g' pcp-webjs/index.html
|
||||
mv pcp-webjs/* $RPM_BUILD_ROOT/%{_datadir}/pcp/webapps
|
||||
rmdir pcp-webjs
|
||||
mv vector $RPM_BUILD_ROOT/%{_datadir}/pcp/webapps
|
||||
|
||||
%if %{disable_infiniband}
|
||||
# remove pmdainfiniband on platforms lacking IB devel packages.
|
||||
@ -1665,6 +1699,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
|
||||
grep -E -v '^weblog' |\
|
||||
grep -E -v '^rpm' |\
|
||||
grep -E -v '^json' |\
|
||||
grep -E -v '^mic' |\
|
||||
grep -E -v '^gluster' |\
|
||||
grep -E -v '^zswap' |\
|
||||
grep -E -v '^unbound' |\
|
||||
@ -1754,7 +1789,7 @@ save_configs_script()
|
||||
[ "$_dir" = "$_new" ] && continue
|
||||
if [ -d "$_dir" ]
|
||||
then
|
||||
( cd "$_dir" ; find . -type f -print ) | sed -e 's/^\.\///' \
|
||||
( cd "$_dir" ; find . -maxdepth 1 -type f ) | sed -e 's/^\.\///' \
|
||||
| while read _file
|
||||
do
|
||||
[ "$_file" = "control" ] && continue
|
||||
@ -1782,7 +1817,7 @@ done
|
||||
for daemon in pmcd pmproxy
|
||||
do
|
||||
save_configs_script >> "$PCP_LOG_DIR/configs.sh" "$PCP_SYSCONF_DIR/$daemon"\
|
||||
"$PCP_CONFIG_DIR/$daemon" /etc/$daemon /etc/sysconfig/$daemon
|
||||
"$PCP_CONFIG_DIR/$daemon" /etc/$daemon
|
||||
done
|
||||
exit 0
|
||||
|
||||
@ -1984,6 +2019,9 @@ cd
|
||||
%config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf
|
||||
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger
|
||||
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pmproxy
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pmcd
|
||||
%config %{_sysconfdir}/bash_completion.d/pcp
|
||||
%config %{_sysconfdir}/pcp.env
|
||||
%config %{_sysconfdir}/pcp.sh
|
||||
@ -1994,9 +2032,13 @@ cd
|
||||
%dir %{_confdir}/pmproxy
|
||||
%config(noreplace) %{_confdir}/pmproxy/pmproxy.options
|
||||
%dir %{_confdir}/pmie
|
||||
%dir %{_confdir}/pmie/control.d
|
||||
%config(noreplace) %{_confdir}/pmie/control
|
||||
%config(noreplace) %{_confdir}/pmie/control.d/local
|
||||
%dir %{_confdir}/pmlogger
|
||||
%dir %{_confdir}/pmlogger/control.d
|
||||
%config(noreplace) %{_confdir}/pmlogger/control
|
||||
%config(noreplace) %{_confdir}/pmlogger/control.d/local
|
||||
|
||||
%{_localstatedir}/lib/pcp/config/pmafm
|
||||
%dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie
|
||||
@ -2232,6 +2274,9 @@ cd
|
||||
|
||||
%files export-pcp2graphite
|
||||
%{_bindir}/pcp2graphite
|
||||
|
||||
%files pmda-mic
|
||||
%{_pmdasdir}/mic
|
||||
%endif # !%{disable_python2} || !%{disable_python3}
|
||||
|
||||
%if !%{disable_json}
|
||||
@ -2331,6 +2376,15 @@ cd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Sep 16 2015 Nathan Scott <nathans@redhat.com> - 3.10.7-1
|
||||
- Resolved pmchart sigsegv opening view without context (BZ 1256708)
|
||||
- Fixed pmchart memory corruption restoring Saved Hosts (BZ 1257009)
|
||||
- Fix perl PMDA API double-free on socket error path (BZ 1258862)
|
||||
- Fix python API pmGetOption(3) alignment interface (BZ 1262722)
|
||||
- Added missing RPM dependencies to several PMDA sub-packages.
|
||||
- Update to latest stable Vector release for pcp-vector-webapp.
|
||||
- Update to latest PCP sources.
|
||||
|
||||
* Tue Aug 04 2015 Nathan Scott <nathans@redhat.com> - 3.10.6-1
|
||||
- Fix pcp2graphite write method invocation failure (BZ 1243123)
|
||||
- Reduce diagnostics in pmdaproc unknown state case (BZ 1224431)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user