Merge branch 'master' into f22

This commit is contained in:
Mark Goodwin 2015-10-29 21:16:41 +10:00
commit 54b3a4e392
3 changed files with 115 additions and 81 deletions

6
.gitignore vendored
View File

@ -42,3 +42,9 @@ pcp-3.3.3-1.src.tar.gz
/pcp-3.10.6.src.tar.gz
/pcp-3.10.7.src.tar.gz
/vector.tar.gz
/pcp-3.10.8-0.20150921gita7c756e.tar.gz
/pcp-3.10.8-0.20150928gitf8ceed0.tar.gz
/pcp-3.10.8-0.20151013git2af7d51.tar.gz
/pcp-3.10.8-0.20151019git5f56d74.tar.gz
/pcp-3.10.8-0.20151026git5f56d74.tar.gz
/pcp-3.10.8.src.tar.gz

184
pcp.spec
View File

@ -1,6 +1,6 @@
Summary: System-level performance monitoring and performance management
Name: pcp
Version: 3.10.7
Version: 3.10.8
%global buildversion 1
Release: %{buildversion}%{?dist}
@ -617,6 +617,7 @@ Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for ActiveMQ
URL: http://www.pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
Requires: perl(LWP::UserAgent)
%description pmda-activemq
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@ -968,6 +969,21 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
collecting metrics about Samba.
#end pcp-pmda-samba
#
# pcp-pmda-slurm
#
%package pmda-slurm
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for NFS Clients
URL: http://www.pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
%description pmda-slurm
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
collecting metrics from the SLURM Workload Manager.
#end pcp-pmda-slurm
#
# pcp-pmda-snmp
#
@ -1437,7 +1453,7 @@ Requires: pcp-pmda-activemq pcp-pmda-bonding pcp-pmda-dbping pcp-pmda-ds389 pcp-
Requires: pcp-pmda-elasticsearch pcp-pmda-gpfs pcp-pmda-gpsd pcp-pmda-kvm pcp-pmda-lustre
Requires: pcp-pmda-memcache pcp-pmda-mysql pcp-pmda-named pcp-pmda-netfilter pcp-pmda-news
Requires: pcp-pmda-nginx pcp-pmda-nfsclient pcp-pmda-pdns pcp-pmda-postfix pcp-pmda-postgresql
Requires: pcp-pmda-samba pcp-pmda-snmp pcp-pmda-vmware pcp-pmda-zimbra
Requires: pcp-pmda-samba pcp-pmda-slurm pcp-pmda-snmp pcp-pmda-vmware pcp-pmda-zimbra
Requires: pcp-pmda-dm pcp-pmda-apache
Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-lmsensors pcp-pmda-mailq pcp-pmda-mounts
Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping
@ -1677,6 +1693,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
grep -E -v '^postgresql' |\
grep -E -v '^rsyslog' |\
grep -E -v '^samba' |\
grep -E -v '^slurm' |\
grep -E -v '^snmp' |\
grep -E -v '^vmware' |\
grep -E -v '^zimbra' |\
@ -1995,6 +2012,7 @@ cd
%{_datadir}/pcp/lib/bashproc.sh
%{_datadir}/pcp/lib/lockpmns
%{_datadir}/pcp/lib/pmdaproc.sh
%{_datadir}/pcp/lib/utilproc.sh
%{_datadir}/pcp/lib/rc-proc.sh
%{_datadir}/pcp/lib/rc-proc.sh.minimal
%{_datadir}/pcp/lib/unlockpmns
@ -2122,6 +2140,7 @@ cd
%{_datadir}/pcp/webapps/*.png
%{_datadir}/pcp/webapps/*.ico
%{_datadir}/pcp/webapps/*.html
%{_datadir}/pcp/webapps/*.txt
%{_datadir}/pcp/webapps/blinkenlights
%files webapp-grafana
@ -2202,75 +2221,78 @@ cd
%files pmda-gpfs
%{_pmdasdir}/gpfs
%files pmda-gpsd
%{_pmdasdir}/gpsd
%files pmda-gpsd
%{_pmdasdir}/gpsd
%files pmda-kvm
%{_pmdasdir}/kvm
%files pmda-kvm
%{_pmdasdir}/kvm
%files pmda-lustre
%files pmda-lustre
%{_pmdasdir}/lustre
%files pmda-lustrecomm
%{_pmdasdir}/lustrecomm
%files pmda-memcache
%{_pmdasdir}/memcache
%files pmda-memcache
%{_pmdasdir}/memcache
%files pmda-mysql
%{_pmdasdir}/mysql
%files pmda-mysql
%{_pmdasdir}/mysql
%files pmda-named
%{_pmdasdir}/named
%files pmda-named
%{_pmdasdir}/named
%files pmda-netfilter
%{_pmdasdir}/netfilter
%files pmda-netfilter
%{_pmdasdir}/netfilter
%files pmda-news
%{_pmdasdir}/news
%files pmda-news
%{_pmdasdir}/news
%files pmda-nginx
%{_pmdasdir}/nginx
%files pmda-nginx
%{_pmdasdir}/nginx
%files pmda-nfsclient
%{_pmdasdir}/nfsclient
%files pmda-nfsclient
%{_pmdasdir}/nfsclient
%files pmda-pdns
%{_pmdasdir}/pdns
%files pmda-pdns
%{_pmdasdir}/pdns
%files pmda-postfix
%{_pmdasdir}/postfix
%files pmda-postfix
%{_pmdasdir}/postfix
%files pmda-postgresql
%{_pmdasdir}/postgresql
%files pmda-postgresql
%{_pmdasdir}/postgresql
%files pmda-rsyslog
%{_pmdasdir}/rsyslog
%files pmda-rsyslog
%{_pmdasdir}/rsyslog
%files pmda-samba
%{_pmdasdir}/samba
%files pmda-snmp
%{_pmdasdir}/snmp
%files pmda-snmp
%{_pmdasdir}/snmp
%files pmda-vmware
%{_pmdasdir}/vmware
%files pmda-slurm
%{_pmdasdir}/slurm
%files pmda-zimbra
%{_pmdasdir}/zimbra
%files pmda-vmware
%{_pmdasdir}/vmware
%files pmda-dm
%{_pmdasdir}/dm
%files pmda-zimbra
%{_pmdasdir}/zimbra
%files pmda-dm
%{_pmdasdir}/dm
%if !%{disable_python2} || !%{disable_python3}
%files pmda-gluster
%{_pmdasdir}/gluster
%files pmda-gluster
%{_pmdasdir}/gluster
%files pmda-zswap
%{_pmdasdir}/zswap
%files pmda-zswap
%{_pmdasdir}/zswap
%files pmda-unbound
%{_pmdasdir}/unbound
%files pmda-unbound
%{_pmdasdir}/unbound
%files export-pcp2graphite
%{_bindir}/pcp2graphite
@ -2284,63 +2306,63 @@ cd
%{_pmdasdir}/json
%endif
%files pmda-apache
%{_pmdasdir}/apache
%files pmda-apache
%{_pmdasdir}/apache
%files pmda-bash
%{_pmdasdir}/bash
%files pmda-bash
%{_pmdasdir}/bash
%files pmda-cifs
%{_pmdasdir}/cifs
%files pmda-cifs
%{_pmdasdir}/cifs
%files pmda-cisco
%{_pmdasdir}/cisco
%files pmda-cisco
%{_pmdasdir}/cisco
%files pmda-gfs2
%{_pmdasdir}/gfs2
%files pmda-gfs2
%{_pmdasdir}/gfs2
%files pmda-lmsensors
%{_pmdasdir}/lmsensors
%files pmda-lmsensors
%{_pmdasdir}/lmsensors
%files pmda-logger
%{_pmdasdir}/logger
%files pmda-logger
%{_pmdasdir}/logger
%files pmda-mailq
%{_pmdasdir}/mailq
%files pmda-mailq
%{_pmdasdir}/mailq
%files pmda-mounts
%{_pmdasdir}/mounts
%files pmda-mounts
%{_pmdasdir}/mounts
%files pmda-nvidia-gpu
%files pmda-nvidia-gpu
%{_pmdasdir}/nvidia
%files pmda-roomtemp
%{_pmdasdir}/roomtemp
%files pmda-roomtemp
%{_pmdasdir}/roomtemp
%if !%{disable_rpm}
%files pmda-rpm
%{_pmdasdir}/rpm
%files pmda-rpm
%{_pmdasdir}/rpm
%endif
%files pmda-sendmail
%{_pmdasdir}/sendmail
%files pmda-sendmail
%{_pmdasdir}/sendmail
%files pmda-shping
%{_pmdasdir}/shping
%files pmda-shping
%{_pmdasdir}/shping
%files pmda-summary
%{_pmdasdir}/summary
%files pmda-summary
%{_pmdasdir}/summary
%if !%{disable_systemd}
%files pmda-systemd
%{_pmdasdir}/systemd
%files pmda-systemd
%{_pmdasdir}/systemd
%endif
%files pmda-trace
%{_pmdasdir}/trace
%files pmda-trace
%{_pmdasdir}/trace
%files pmda-weblog
%{_pmdasdir}/weblog
%files pmda-weblog
%{_pmdasdir}/weblog
%files -n perl-PCP-PMDA -f perl-pcp-pmda.list
@ -2376,6 +2398,12 @@ cd
%endif
%changelog
* Fri Oct 30 2015 Mark Goodwin <mgoodwin@redhat.com> - 3.10.8-1
- Update pmlogger to log an immediate sample first (BZ 1269921)
- Add pmOption host and archive setter python APIs (BZ 1270176)
- Replace old pmatop(1) man page with pcp-atop(1) (BZ 1270761)
- Update to latest PCP sources.
* 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)

View File

@ -1,3 +1,3 @@
9be3dd7657870d09888b84f981cdf84e pcp-3.10.7.src.tar.gz
628bb0764c2ee9647a79ed50136ed12f pcp-webjs.src.tar.gz
b4219506e0b6afd733885862b34d3f75 vector.tar.gz
678ab5515f322aa1a69765dd53ee12f5 pcp-3.10.8.src.tar.gz
035a120efbb02c051abe60a231d2fcb4 pcp-webjs.src.tar.gz
3d322cdf27548899ecb6367bb42c76ec vector.tar.gz