From 3dab6724928fa65a593cfe57c7304ca4f69585ff Mon Sep 17 00:00:00 2001 From: Mark Goodwin Date: Jun 15 2015 12:05:49 +0000 Subject: Merge branch 'master' into f21 --- diff --git a/.gitignore b/.gitignore index 859ff3b..5ec706c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ pcp-3.3.3-1.src.tar.gz /pcp-3.10.3.src.tar.gz /pcp-3.10.3.src.tar.gz /pcp-3.10.4.src.tar.gz +/pcp-3.10.5-0.20150601git9478ca0.tar.gz +/pcp-3.10.5.src.tar.gz diff --git a/pcp.spec b/pcp.spec index de30cb7..11d3bdd 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,6 +1,6 @@ Summary: System-level performance monitoring and performance management Name: pcp -Version: 3.10.4 +Version: 3.10.5 %global buildversion 1 Release: %{buildversion}%{?dist} @@ -11,6 +11,13 @@ Source0: ftp://ftp.pcp.io/projects/pcp/download/%{name}-%{version}.src.tar.gz # From: git://sourceware.org/git/pcpfans.git --branch=webjs Source1: pcp-webjs.src.tar.gz +# Compat check for distros that already have single install pmda's +%if 0%{?fedora} > 22 || 0%{?rhel} > 7 +%global with_compat 0 +%else +%global with_compat 1 +%endif + # There are no papi/libpfm devel packages for s390 nor for some rhels, disable %ifarch s390 s390x %global disable_papi 1 @@ -37,10 +44,10 @@ Source1: pcp-webjs.src.tar.gz %global default_python 26 %endif # No python3 development environment before el7 -%if 0%{?rhel} == 0 || 0%{?rhel} > 6 +%if 0%{?rhel} == 0 || 0%{?rhel} > 7 %global disable_python3 0 # Do we wish to mandate python3 use in pcp? (f22+ and el8+) -%if 0%{?fedora} >= 22 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 22 || 0%{?rhel} > 7 %global default_python 3 %endif %else @@ -54,6 +61,9 @@ Source1: pcp-webjs.src.tar.gz %global disable_qt 1 %endif +# prevent conflicting binary and man page install for pcp(1) +Conflicts: librapi + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: procps autoconf bison flex BuildRequires: nss-devel @@ -101,7 +111,7 @@ BuildRequires: desktop-file-utils BuildRequires: qt4-devel >= 4.4 %endif -Requires: bash gawk sed grep fileutils findutils initscripts perl which +Requires: bash gawk sed grep fileutils findutils initscripts which Requires: python%{?default_python} Requires: pcp-libs = %{version}-%{release} %if 0%{?default_python} == 3 @@ -110,7 +120,6 @@ Requires: python3-pcp = %{version}-%{release} %if !%{disable_python2} && 0%{?default_python} != 3 Requires: python-pcp = %{version}-%{release} %endif -Requires: perl-PCP-PMDA = %{version}-%{release} Obsoletes: pcp-gui-debuginfo Obsoletes: pcp-pmda-nvidia @@ -161,14 +170,19 @@ Obsoletes: pcp-pmda-nvidia %global _with_perfevent --with-perfevent=yes %endif - %description Performance Co-Pilot (PCP) provides a framework and services to support system-level performance monitoring and performance management. The PCP open source release provides a unifying abstraction for all of the interesting performance data in a system, and allows client -applications to easily retrieve and process any subset of that data. +applications to easily retrieve and process any subset of that data. + +%if %{with_compat} +Requires: pcp-compat +%endif +Requires: pcp-libs = @package_version@ +Obsoletes: pcp-gui-debuginfo # # pcp-conf @@ -329,202 +343,1106 @@ as the data repository, and Graphites web interface renders it. The Carbon and Whisper subsystems of Graphite are not included nor used. # -# perl-PCP-PMDA. This is the PCP agent perl binding. +# perl-PCP-PMDA. This is the PCP agent perl binding. +# +%package -n perl-PCP-PMDA +License: GPLv2+ +Group: Development/Libraries +Summary: Performance Co-Pilot (PCP) Perl bindings and documentation +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +Requires: perl + +%description -n perl-PCP-PMDA +The PCP::PMDA Perl module contains the language bindings for +building Performance Metric Domain Agents (PMDAs) using Perl. +Each PMDA exports performance data for one specific domain, for +example the operating system kernel, Cisco routers, a database, +an application, etc. + +# +# perl-PCP-MMV +# +%package -n perl-PCP-MMV +License: GPLv2+ +Group: Development/Libraries +Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} + +%description -n perl-PCP-MMV +The PCP::MMV module contains the Perl language bindings for +building scripts instrumented with the Performance Co-Pilot +(PCP) Memory Mapped Value (MMV) mechanism. +This mechanism allows arbitrary values to be exported from an +instrumented script into the PCP infrastructure for monitoring +and analysis with pmchart, pmie, pmlogger and other PCP tools. + +# +# perl-PCP-LogImport +# +%package -n perl-PCP-LogImport +License: GPLv2+ +Group: Development/Libraries +Summary: Performance Co-Pilot (PCP) Perl bindings for importing external data into PCP archives +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} + +%description -n perl-PCP-LogImport +The PCP::LogImport module contains the Perl language bindings for +importing data in various 3rd party formats into PCP archives so +they can be replayed with standard PCP monitoring tools. + +# +# perl-PCP-LogSummary +# +%package -n perl-PCP-LogSummary +License: GPLv2+ +Group: Development/Libraries +Summary: Performance Co-Pilot (PCP) Perl bindings for post-processing output of pmlogsummary +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} + +%description -n perl-PCP-LogSummary +The PCP::LogSummary module provides a Perl module for using the +statistical summary data produced by the Performance Co-Pilot +pmlogsummary utility. This utility produces various averages, +minima, maxima, and other calculations based on the performance +data stored in a PCP archive. The Perl interface is ideal for +exporting this data into third-party tools (e.g. spreadsheets). + +# +# pcp-import-sar2pcp +# +%package import-sar2pcp +License: LGPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot tools for importing sar data into PCP archive logs +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +Requires: perl-PCP-LogImport = %{version}-%{release} +Requires: sysstat + +%description import-sar2pcp +Performance Co-Pilot (PCP) front-end tools for importing sar data +into standard PCP archive logs for replay with any PCP monitoring tool. + +# +# pcp-import-iostat2pcp +# +%package import-iostat2pcp +License: LGPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot tools for importing iostat data into PCP archive logs +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +Requires: perl-PCP-LogImport = %{version}-%{release} +Requires: sysstat + +%description import-iostat2pcp +Performance Co-Pilot (PCP) front-end tools for importing iostat data +into standard PCP archive logs for replay with any PCP monitoring tool. + +# +# pcp-import-mrtg2pcp +# +%package import-mrtg2pcp +License: LGPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot tools for importing MTRG data into PCP archive logs +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +Requires: perl-PCP-LogImport = %{version}-%{release} + +%description import-mrtg2pcp +Performance Co-Pilot (PCP) front-end tools for importing MTRG data +into standard PCP archive logs for replay with any PCP monitoring tool. + +# +# pcp-import-ganglia2pcp +# +%package import-ganglia2pcp +License: LGPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot tools for importing ganglia data into PCP archive logs +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +Requires: perl-PCP-LogImport = %{version}-%{release} + +%description import-ganglia2pcp +Performance Co-Pilot (PCP) front-end tools for importing ganglia data +into standard PCP archive logs for replay with any PCP monitoring tool. + +%if !%{disable_python2} || !%{disable_python3} +# +# pcp-export-pcp2graphite +# +%package export-pcp2graphite +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot tools for exporting PCP metrics to Graphite +URL: http://www.pcp.io +Requires: pcp-libs >= %{version}-%{release} +%if !%{disable_python3} +Requires: python3-pcp = %{version}-%{release} +%else +Requires: python-pcp = %{version}-%{release} +%endif + +%description export-pcp2graphite +Performance Co-Pilot (PCP) front-end tools for exporting metric values +to graphite (http://graphite.readthedocs.org). +%endif + +# +# pcp-import-collectl2pcp +# +%package import-collectl2pcp +License: LGPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot tools for importing collectl log files into PCP archive logs +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} + +%description import-collectl2pcp +Performance Co-Pilot (PCP) front-end tools for importing collectl data +into standard PCP archive logs for replay with any PCP monitoring tool. + +%if !%{disable_papi} +# +# pcp-pmda-papi +# +%package pmda-papi +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Performance API and hardware counters +URL: http://www.pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +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 +# +%package pmda-perfevent +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for hardware counters +URL: http://www.pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +Requires: libpfm >= 4 +BuildRequires: libpfm-devel >= 4 + +%description pmda-perfevent +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting hardware counters statistics through libpfm. +%endif + +%if !%{disable_infiniband} +# +# pcp-pmda-infiniband +# +%package pmda-infiniband +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Infiniband HCAs and switches +URL: http://www.pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +Requires: libibmad >= 1.3.7 libibumad >= 1.3.7 +BuildRequires: libibmad-devel >= 1.3.7 libibumad-devel >= 1.3.7 + +%description pmda-infiniband +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting Infiniband statistics. By default, it monitors the local HCAs +but can also be configured to monitor remote GUIDs such as IB switches. +%endif +# +# pcp-pmda-activemq +# +%package pmda-activemq +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for ActiveMQ +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-activemq +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the ActiveMQ message broker. The PMDA is written +in Perl. +#end pcp-pmda-activemq + +# +# pcp-pmda-bonding +# +%package pmda-bonding +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Bonded network interfaces +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-bonding +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about bonded network interfaces. The PMDA is written +in Perl. + +#end pcp-pmda-bonding + +# +# pcp-pmda-dbping +# +%package pmda-dbping +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Database response times and Availablility +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-dbping +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Database response times and Availablility. +The PMDA is written in Perl. + +#end pcp-pmda-dbping + +# +# pcp-pmda-ds389 +# +%package pmda-ds389 +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Servers +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-ds389 +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about a 389 Directory Server. The PMDA is written +in Perl. + +#end pcp-pmda-ds389 + +# +# pcp-pmda-ds389log +# +%package pmda-ds389log +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Server Loggers +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-ds389log +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about a 389 Directory Server Logger. The PMDA is written +in Perl. + +#end pcp-pmda-ds389log + +# +# pcp-pmda-elasticsearch +# +%package pmda-elasticsearch +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-elasticsearch +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about Elasticsearch. The PMDA is written +in Perl. + +#end pcp-pmda-elasticsearch + +# +# pcp-pmda-gpfs +# +%package pmda-gpfs +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for GPFS Filesystem +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-gpfs +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the GPFS filesystem. The PMDA is written +in Perl. + +#end pcp-pmda-gpfs + +# +# pcp-pmda-gpsd +# +%package pmda-gpsd +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for a GPS Daemon +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-gpsd +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about a GPS Daemon. The PMDA is written +in Perl. + +#end pcp-pmda-gpsd + +# +# pcp-pmda-kvm +# +%package pmda-kvm +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for KVM +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-kvm +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Kernel based Virtual Machine. The PMDA is written +in Perl. + +#end pcp-pmda-kvm + +# +# pcp-pmda-lustre +# +%package pmda-lustre +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-lustre +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Lustre Filesystem. The PMDA is written +in Perl. + +#end pcp-pmda-lustre + +# +# pcp-pmda-lustrecomm +# +%package pmda-lustrecomm +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem Comms +URL: http://www.pcp.io + +%description pmda-lustrecomm +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Lustre Filesystem Comms. The PMDA is written +in C. + +#end pcp-pmda-lustrecomm + +# +# pcp-pmda-memcache +# +%package pmda-memcache +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Memcached +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-memcache +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about Memcached. The PMDA is written +in Perl. + +#end pcp-pmda-memcache + +# +# pcp-pmda-mysql +# +%package pmda-mysql +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for MySQL +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-mysql +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the MySQL database. The PMDA is written +in Perl. + +#end pcp-pmda-mysql + +# +# pcp-pmda-named +# +%package pmda-named +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Named +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-named +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Named nameserver. The PMDA is written +in Perl. + +#end pcp-pmda-named + +# pcp-pmda-netfilter +# +%package pmda-netfilter +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Netfilter framework +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-netfilter +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Netfilter packet filtering framework. The +PMDA is written in Perl. + +#end pcp-pmda-netfilter + +# +# pcp-pmda-news +# +%package pmda-news +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Usenet News +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-news +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about Usenet News. The PMDA is written +in Perl. + +#end pcp-pmda-news + +# +# pcp-pmda-nginx +# +%package pmda-nginx +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Nginx Webserver +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-nginx +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Nginx Webserver. The PMDA is written +in Perl. + +#end pcp-pmda-nginx + +# +# pcp-pmda-nfsclient +# +%package pmda-nfsclient +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-nfsclient +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics for NFS Clients. The PMDA is written in Perl. + +#end pcp-pmda-nfsclient + +# +# pcp-pmda-pdns +# +%package pmda-pdns +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for PowerDNS +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-pdns +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the PowerDNS. The PMDA is written in Perl. + +#end pcp-pmda-pdns + +# +# pcp-pmda-postfix +# +%package pmda-postfix +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Postfix (MTA) +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} +%if 0%{?fedora} > 16 || 0%{?rhel} > 5 +Requires: postfix-perl-scripts +%endif +%if 0%{?rhel} <= 5 +Requires: postfix +%endif +%if "%{_vendor}" == "suse" +Requires: postfix-doc +%endif + +%description pmda-postfix +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Postfix (MTA). The PMDA is written +in Perl. + +#end pcp-pmda-postfix + +# +# pcp-pmda-postgresql +# +%package pmda-postgresql +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for PostgreSQL +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-postgresql +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the PostgreSQL database. The PMDA is written +in Perl. + +#end pcp-pmda-postgresql + +# +# pcp-pmda-rsyslog +# +%package pmda-rsyslog +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Rsyslog +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-rsyslog +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about Rsyslog. The PMDA is written +in Perl. + +#end pcp-pmda-rsyslog + +# +# pcp-pmda-samba +# +%package pmda-samba +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Samba +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-samba +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about Samba. The PMDA is written in Perl. + +#end pcp-pmda-samba + +# +# pcp-pmda-snmp +# +%package pmda-snmp +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Simple Network Management Protocol +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-snmp +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about SNMP. The PMDA is written in Perl. + +#end pcp-pmda-snmp + +# +# pcp-pmda-vmware +# +%package pmda-vmware +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for VMware +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-vmware +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics for VMware. The PMDA is written +in Perl. + +#end pcp-pmda-vmware + +# +# pcp-pmda-zimbra +# +%package pmda-zimbra +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for Zimbra +URL: http://www.pcp.io +Requires: perl-PCP-PMDA = %{version}-%{release} + +%description pmda-zimbra +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about Zimra. The PMDA is written +in Perl. +#end pcp-pmda-zimbra + +# +# pcp-pmda-dm +# +%package pmda-dm +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Device Mapper Cache and Thin Client +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +%description pmda-dm +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Device Mapper Cache and Thin Client. The PMDA +is written in Python. +# end pcp-pmda-dm + + +%if !%{disable_python2} || !%{disable_python3} +# +# pcp-pmda-gluster +# +%package pmda-gluster +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Gluster filesystem +URL: http://www.pcp.io +%if !%{disable_python3} +Requires: python3-pcp +%else +Requires: python-pcp +%endif +%description pmda-gluster +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the gluster filesystem. The PMDA is written +in Python. +# end pcp-pmda-gluster + +# +# pcp-pmda-zswap +# +%package pmda-zswap +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for compressed swap +URL: http://www.pcp.io +%if !%{disable_python3} +Requires: python3-pcp +%else +Requires: python-pcp +%endif +%description pmda-zswap +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about compressed swap. The PMDA is written +in Python. +# end pcp-pmda-zswap + +# +# pcp-pmda-unbound +# +%package pmda-unbound +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Unbound DNS Resolver +URL: http://www.pcp.io +%if !%{disable_python3} +Requires: python3-pcp +%else +Requires: python-pcp +%endif +%description pmda-unbound +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Unbound DNS Resolver. The PMDA is written +in Python. +# end pcp-pmda-unbound + +# +# pcp-pmda-json +# +%package pmda-json +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for JSON data +URL: http://www.pcp.io +%if !%{disable_python3} +Requires: python3-pcp +Requires: python3-jsonpointer +Requires: python3-six +BuildRequires: python3-jsonpointer +BuildRequires: python3-six +%else +Requires: python-pcp +Requires: python-jsonpointer +Requires: python-six +BuildRequires: python-jsonpointer +BuildRequires: python-six +%endif +%description pmda-json +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics output in JSON. The PMDA is written in Python. +# end pcp-pmda-json + +%endif # !%{disable_python2} || !%{disable_python3} + +# +# C pmdas +# pcp-pmda-apache +# +%package pmda-apache +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Apache webserver +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +%description pmda-apache +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Apache webserver. The PMDA is written +in C. +# end pcp-pmda-apache + +# +# pcp-pmda-bash +# +%package pmda-bash +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Bash shell +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +%description pmda-bash +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Bash shell. The PMDA is written in C. +# end pcp-pmda-bash + +# +# pcp-pmda-cifs +# +%package pmda-cifs +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Cifs shell +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +%description pmda-cifs +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Common Internet Filesytem. The PMDA is written in C. +# end pcp-pmda-cifs + +# +# pcp-pmda-cisco +# +%package pmda-cisco +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Cisco shell +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +%description pmda-cisco +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about Cisco routers. The PMDA is written in C. +# end pcp-pmda-cisco + +# +# pcp-pmda-gfs2 +# +%package pmda-gfs2 +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Gfs2 shell +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +%description pmda-gfs2 +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Global Filesystem v2. The PMDA is written in C. +# end pcp-pmda-gfs2 + +# +# pcp-pmda-lmsensors # -%package -n perl-PCP-PMDA +%package pmda-lmsensors License: GPLv2+ -Group: Development/Libraries -Summary: Performance Co-Pilot (PCP) Perl bindings and documentation +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Lmsensors shell URL: http://www.pcp.io Requires: pcp-libs = %{version}-%{release} - -%description -n perl-PCP-PMDA -The PCP::PMDA Perl module contains the language bindings for -building Performance Metric Domain Agents (PMDAs) using Perl. -Each PMDA exports performance data for one specific domain, for -example the operating system kernel, Cisco routers, a database, -an application, etc. +%description pmda-lmsensors +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Linux hardware monitoring sensors. The PMDA +is written in C. +# end pcp-pmda-lmsensors # -# perl-PCP-MMV +# pcp-pmda-logger # -%package -n perl-PCP-MMV +%package pmda-logger License: GPLv2+ -Group: Development/Libraries -Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics from arbitrary log files URL: http://www.pcp.io Requires: pcp-libs = %{version}-%{release} - -%description -n perl-PCP-MMV -The PCP::MMV module contains the Perl language bindings for -building scripts instrumented with the Performance Co-Pilot -(PCP) Memory Mapped Value (MMV) mechanism. -This mechanism allows arbitrary values to be exported from an -instrumented script into the PCP infrastructure for monitoring -and analysis with pmchart, pmie, pmlogger and other PCP tools. +%description pmda-logger +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics from a specified set of log files (or pipes). The PMDA +is written in C, and supports both sampled and event-style metrics. +# end pcp-pmda-logger # -# perl-PCP-LogImport +# pcp-pmda-mailq # -%package -n perl-PCP-LogImport +%package pmda-mailq License: GPLv2+ -Group: Development/Libraries -Summary: Performance Co-Pilot (PCP) Perl bindings for importing external data into PCP archives +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Mailq shell URL: http://www.pcp.io Requires: pcp-libs = %{version}-%{release} - -%description -n perl-PCP-LogImport -The PCP::LogImport module contains the Perl language bindings for -importing data in various 3rd party formats into PCP archives so -they can be replayed with standard PCP monitoring tools. +%description pmda-mailq +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about email queues managed by sendmail. The PMDA is +written in C. +# end pcp-pmda-mailq # -# perl-PCP-LogSummary +# pcp-pmda-mounts # -%package -n perl-PCP-LogSummary +%package pmda-mounts License: GPLv2+ -Group: Development/Libraries -Summary: Performance Co-Pilot (PCP) Perl bindings for post-processing output of pmlogsummary +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Mounts shell URL: http://www.pcp.io Requires: pcp-libs = %{version}-%{release} - -%description -n perl-PCP-LogSummary -The PCP::LogSummary module provides a Perl module for using the -statistical summary data produced by the Performance Co-Pilot -pmlogsummary utility. This utility produces various averages, -minima, maxima, and other calculations based on the performance -data stored in a PCP archive. The Perl interface is ideal for -exporting this data into third-party tools (e.g. spreadsheets). +%description pmda-mounts +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about filesystem mounts. The PMDA is written in C. +# end pcp-pmda-mounts # -# pcp-import-sar2pcp +# pcp-pmda-nvidia-gpu # -%package import-sar2pcp -License: LGPLv2+ +%package pmda-nvidia-gpu +License: GPLv2+ Group: Applications/System -Summary: Performance Co-Pilot tools for importing sar data into PCP archive logs +Summary: Performance Co-Pilot (PCP) metrics for the Nvidia shell URL: http://www.pcp.io Requires: pcp-libs = %{version}-%{release} -Requires: perl-PCP-LogImport = %{version}-%{release} -Requires: sysstat +%description pmda-nvidia-gpu +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Nvidia gpu metrics. The PMDA is written in C. +# end pcp-pmda-nvidia-gpu -%description import-sar2pcp -Performance Co-Pilot (PCP) front-end tools for importing sar data -into standard PCP archive logs for replay with any PCP monitoring tool. +# +# pcp-pmda-roomtemp +# +%package pmda-roomtemp +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Roomtemp shell +URL: http://www.pcp.io +Requires: pcp = %{version}-%{release} +%description pmda-roomtemp +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Room temperature metrics. The PMDA is written in C. +# end pcp-pmda-roomtemp # -# pcp-import-iostat2pcp +# pcp-pmda-rpm # -%package import-iostat2pcp -License: LGPLv2+ +%package pmda-rpm +License: GPLv2+ Group: Applications/System -Summary: Performance Co-Pilot tools for importing iostat data into PCP archive logs +Summary: Performance Co-Pilot (PCP) metrics for the Rpm shell URL: http://www.pcp.io -Requires: pcp-libs = %{version}-%{release} -Requires: perl-PCP-LogImport = %{version}-%{release} -Requires: sysstat +Requires: pcp = %{version}-%{release} +%description pmda-rpm +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the rpms. The PMDA is written in C. +# end pcp-pmda-rpm -%description import-iostat2pcp -Performance Co-Pilot (PCP) front-end tools for importing iostat data -into standard PCP archive logs for replay with any PCP monitoring tool. # -# pcp-import-mrtg2pcp +# pcp-pmda-sendmail # -%package import-mrtg2pcp -License: LGPLv2+ +%package pmda-sendmail +License: GPLv2+ Group: Applications/System -Summary: Performance Co-Pilot tools for importing MTRG data into PCP archive logs +Summary: Performance Co-Pilot (PCP) metrics for the Sendmail shell URL: http://www.pcp.io -Requires: pcp-libs = %{version}-%{release} -Requires: perl-PCP-LogImport = %{version}-%{release} - -%description import-mrtg2pcp -Performance Co-Pilot (PCP) front-end tools for importing MTRG data -into standard PCP archive logs for replay with any PCP monitoring tool. +Requires: pcp = %{version}-%{release} +%description pmda-sendmail +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about Sendmail traffic metrics. The PMDA is written in C. +# end pcp-pmda-sendmail # -# pcp-import-ganglia2pcp +# pcp-pmda-shping # -%package import-ganglia2pcp -License: LGPLv2+ +%package pmda-shping +License: GPLv2+ Group: Applications/System -Summary: Performance Co-Pilot tools for importing ganglia data into PCP archive logs +Summary: Performance Co-Pilot (PCP) metrics for the Shping shell URL: http://www.pcp.io Requires: pcp-libs = %{version}-%{release} -Requires: perl-PCP-LogImport = %{version}-%{release} +%description pmda-shping +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about quality of service and response time measurements of +arbitrary shell commands. The PMDA is written in C. +# end pcp-pmda-shping -%description import-ganglia2pcp -Performance Co-Pilot (PCP) front-end tools for importing ganglia data -into standard PCP archive logs for replay with any PCP monitoring tool. +# +# pcp-pmda-summary +# +%package pmda-summary +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for the Summary shell +URL: http://www.pcp.io +Requires: pcp = %{version}-%{release} +%description pmda-summary +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about other installed pmdas. The PMDA is written in C. +# end pcp-pmda-summary +### %if "@pmda_systemd@" == "true" # -# pcp-import-collectl2pcp +# pcp-pmda-systemd # -%package import-collectl2pcp -License: LGPLv2+ +%package pmda-systemd +License: GPLv2+ Group: Applications/System -Summary: Performance Co-Pilot tools for importing collectl log files into PCP archive logs +Summary: Performance Co-Pilot (PCP) metrics for the Systemd shell URL: http://www.pcp.io Requires: pcp-libs = %{version}-%{release} +%description pmda-systemd +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Systemd shell. The PMDA is written in C. +# end pcp-pmda-systemd +### %endif -%description import-collectl2pcp -Performance Co-Pilot (PCP) front-end tools for importing collectl data -into standard PCP archive logs for replay with any PCP monitoring tool. - -%if !%{disable_papi} # -# pcp-pmda-papi +# pcp-pmda-trace # -%package pmda-papi +%package pmda-trace License: GPLv2+ Group: Applications/System -Summary: Performance Co-Pilot (PCP) metrics for Performance API and hardware counters +Summary: Performance Co-Pilot (PCP) metrics for the Trace shell URL: http://www.pcp.io -Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} -BuildRequires: papi-devel - -%description pmda-papi +Requires: pcp-libs = %{version}-%{release} +%description pmda-trace This package contains the PCP Performance Metrics Domain Agent (PMDA) for -collecting hardware counters statistics through PAPI (Performance API). -%endif +collecting metrics about transaction performance metrics from applications. +The PMDA is written in C. +# end pcp-pmda-trace -%if !%{disable_perfevent} # -# pcp-pmda-perfevent +# pcp-pmda-weblog # -%package pmda-perfevent +%package pmda-weblog License: GPLv2+ Group: Applications/System -Summary: Performance Co-Pilot (PCP) metrics for hardware counters +Summary: Performance Co-Pilot (PCP) metrics for the Weblog shell URL: http://www.pcp.io -Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} -Requires: libpfm >= 4 -BuildRequires: libpfm-devel >= 4 - -%description pmda-perfevent +Requires: pcp = %{version}-%{release} +%description pmda-weblog This package contains the PCP Performance Metrics Domain Agent (PMDA) for -collecting hardware counters statistics through libpfm. -%endif +collecting metrics about web server logs. The PMDA is written in C. +# end pcp-pmda-weblog +# end C pmdas -%if !%{disable_infiniband} # -# pcp-pmda-infiniband +# pcp-compat # -%package pmda-infiniband +%if %{with_compat} +%package compat License: GPLv2+ Group: Applications/System -Summary: Performance Co-Pilot (PCP) metrics for Infiniband HCAs and switches +Summary: Performance Co-Pilot (PCP) compat package for existing systems URL: http://www.pcp.io -Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} -Requires: libibmad >= 1.3.7 libibumad >= 1.3.7 -BuildRequires: libibmad-devel >= 1.3.7 libibumad-devel >= 1.3.7 - -%description pmda-infiniband -This package contains the PCP Performance Metrics Domain Agent (PMDA) for -collecting Infiniband statistics. By default, it monitors the local HCAs -but can also be configured to monitor remote GUIDs such as IB switches. +Requires: pcp-pmda-activemq pcp-pmda-bonding pcp-pmda-dbping pcp-pmda-ds389 pcp-pmda-ds389log +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-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 pcp-pmda-logger +Requires: pcp-pmda-lustrecomm +%if !%{disable_python2} || !%{disable_python3} +Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-json +Requires: pcp-system-tools pcp-export-pcp2graphite +%endif +Requires: pcp-pmda-rpm +Requires: pcp-pmda-summary pcp-pmda-trace pcp-pmda-weblog +Requires: pcp-doc +%description compat +This package contains the PCP compatibility dependencies for existing PCP +installations. This is not a package that should be depended on, and will +be removed in future releases. +%endif #compat + +# pcp-collector metapackage +%package collector +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) Collection meta Package +URL: http://www.pcp.io +Requires: pcp-pmda-activemq pcp-pmda-bonding pcp-pmda-dbping pcp-pmda-ds389 pcp-pmda-ds389log +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-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 +Requires: pcp-pmda-lustrecomm pcp-pmda-logger +%if !%{disable_python2} || !%{disable_python3} +Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-json +%endif +Requires: pcp-pmda-rpm +Requires: pcp-pmda-summary pcp-pmda-trace pcp-pmda-weblog +%description collector +This package contains the PCP metric collection dependencies. This includes +all possible packages used to collect PCP metrics. +# collector + +# pcp-monitor metapackage +%package monitor +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) Monitoring meta Package +URL: http://www.pcp.io +%if !%{disable_microhttpd} +Requires: pcp-webapi +%endif +%if !%{disable_python2} || !%{disable_python3} +Requires: pcp-system-tools %endif +%if !%{disable_qt} +Requires: pcp-gui +%endif +%description monitor +This package contains the PCP metric monitoring dependencies. This includes all possible packages used +to monitor PCP metrics in various ways. +# monitor %if !%{disable_python2} # @@ -560,6 +1478,25 @@ Performance Metric API (PMAPI) monitor tools and Performance Metric Domain Agent (PMDA) collector tools written in Python3. %endif +%if !%{disable_python2} || !%{disable_python3} +# +# pcp-system-tools +# +%package -n pcp-system-tools +License: GPLv2+ +Group: Development/Libraries +Summary: Performance Co-Pilot (PCP) System and Monitoring Tools +URL: http://www.pcp.io +%if !%{disable_python3} +Requires: python3-pcp = %{version}-%{release} +%else +Requires: python-pcp = %{version}-%{release} +%endif +%description -n pcp-system-tools +This PCP module contains additional system monitoring tools written +in python. +%endif #end pcp-system-tools + %if !%{disable_qt} # # pcp-gui package for Qt tools @@ -613,7 +1550,7 @@ rm -Rf $RPM_BUILD_ROOT export PYTHON=python%{?default_python} %endif %configure %{?_with_initd} %{?_with_doc} %{?_with_ib} %{?_with_papi} %{?_with_perfevent} -make default_pcp +make %{?_smp_mflags} default_pcp %install rm -Rf $RPM_BUILD_ROOT @@ -632,8 +1569,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/sheet2pcp $RPM_BUILD_ROOT/%{_mandir}/man1/sheet rm -f $RPM_BUILD_ROOT/%{_includedir}/pcp/configsz.h %if %{disable_microhttpd} -rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pmwebd.* -rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/PMWEBAPI.* rm -fr $RPM_BUILD_ROOT/%{_confdir}/pmwebd rm -fr $RPM_BUILD_ROOT/%{_initddir}/pmwebd rm -fr $RPM_BUILD_ROOT/%{_unitdir}/pmwebd.service @@ -683,17 +1618,92 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ grep -E -v 'perfevent|perfalloc.1' |\ grep -E -v '^ib$|infiniband' |\ grep -E -v 'papi' |\ + grep -E -v 'activemq' |\ + grep -E -v 'bonding' |\ + grep -E -v 'dbping' |\ + grep -E -v 'ds389log'|\ + grep -E -v 'ds389' |\ + grep -E -v 'elasticsearch' |\ + grep -E -v 'gpfs' |\ + grep -E -v 'gpsd' |\ + grep -E -v 'kvm' |\ + grep -E -v 'lustre' |\ + grep -E -v 'lustrecomm' |\ + grep -E -v 'memcache' |\ + grep -E -v 'mysql' |\ + grep -E -v 'named' |\ + grep -E -v 'netfilter' |\ + grep -E -v 'news' |\ + grep -E -v 'nfsclient' |\ + grep -E -v 'nginx' |\ + grep -E -v 'pdns' |\ + grep -E -v 'postfix' |\ + grep -E -v 'postgresql' |\ + grep -E -v 'rsyslog' |\ + grep -E -v 'samba' |\ + grep -E -v 'snmp' |\ + grep -E -v 'vmware' |\ + grep -E -v 'zimbra' |\ + grep -E -v 'dm' |\ + grep -E -v 'apache' |\ + grep -E -v 'bash' |\ + grep -E -v 'cifs' |\ + grep -E -v 'cisco' |\ + grep -E -v 'gfs2' |\ + grep -E -v 'lmsensors' |\ + grep -E -v 'logger' |\ + grep -E -v 'mailq' |\ + grep -E -v 'mounts' |\ + grep -E -v 'nvidia' |\ + grep -E -v 'roomtemp' |\ + grep -E -v 'rpm' |\ + grep -E -v 'sendmail' |\ + grep -E -v 'shping' |\ + grep -E -v 'summary' |\ + grep -E -v 'trace' |\ + grep -E -v 'weblog' |\ + +%if !%{disable_python2} || !%{disable_python3} + grep -E -v 'gluster' |\ + grep -E -v 'zswap' |\ + grep -E -v 'unbound' |\ + grep -E -v 'json' |\ +%endif + sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list # all base pcp package files except those split out into sub packages ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ + grep -E -v 'pmiostat|pmatop|pcp2graphite' |\ sed -e 's#^#'%{_bindir}'\/#' >base_bin.list +# +# Seperate the pcp-system-tools package files. +# +# pmatop and pmiostat (and other python client tools) are symlinks to the +# pcp-foo variant, and so should also be in pcp-system-tools +%if !%{disable_python2} || !%{disable_python3} +ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ + grep -E 'pmiostat|pmatop' |\ + sed -e 's#^#'%{_bindir}'\/#' >pcp_system_tools.list +%endif + +%if !%{disable_python2} || !%{disable_python3} +ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ + grep -E 'atop|collectl|dmcache|free|iostat|numastat|verify|uptime|shping' |\ + sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp_system_tools.list +%endif + ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ +%if !%{disable_python2} || !%{disable_python3} + grep -E -v 'atop|collectl|dmcache|free|iostat|numastat|verify|uptime|shping' |\ +%endif sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >base_exec.list -ls -1 $RPM_BUILD_ROOT/%{_mandir}/man1 |\ - sed -e 's#^#'%{_mandir}'\/man1\/#' >base_man.list ls -1 $RPM_BUILD_ROOT/%{_booksdir} |\ sed -e 's#^#'%{_booksdir}'\/#' > pcp-doc.list +ls -1 $RPM_BUILD_ROOT/%{_mandir}/man1 |\ + sed -e 's#^#'%{_mandir}'\/man1\/#' >>pcp-doc.list +ls -1 $RPM_BUILD_ROOT/%{_mandir}/man5 |\ + sed -e 's#^#'%{_mandir}'\/man5\/#' >>pcp-doc.list ls -1 $RPM_BUILD_ROOT/%{_datadir}/pcp/demos/tutorials |\ sed -e 's#^#'%{_datadir}/pcp/demos/tutorials'\/#' >>pcp-doc.list %if !%{disable_qt} @@ -703,13 +1713,13 @@ cat base_bin.list base_exec.list base_man.list |\ grep -E "$PCP_GUI" >> pcp-gui.list %endif cat base_pmdas.list base_bin.list base_exec.list base_man.list |\ - grep -E -v 'pmdaib|pmmgr|pmweb|pmsnap|2pcp' |\ + grep -E -v 'pmdaib|pmmgr|pmweb|pmsnap|2pcp|pmdas/systemd' |\ grep -E -v "$PCP_GUI|pixmaps|pcp-doc|tutorials" |\ grep -E -v %{_confdir} | grep -E -v %{_logsdir} > base.list # all devel pcp package files except those split out into sub packages ls -1 $RPM_BUILD_ROOT/%{_mandir}/man3 |\ -sed -e 's#^#'%{_mandir}'\/man3\/#' | grep -E -v '3pm|PMWEBAPI' >devel.list +sed -e 's#^#'%{_mandir}'\/man3\/#' | grep -v '3pm' >>pcp-doc.list ls -1 $RPM_BUILD_ROOT/%{_datadir}/pcp/demos |\ sed -e 's#^#'%{_datadir}'\/pcp\/demos\/#' | grep -E -v tutorials >> devel.list @@ -911,6 +1921,9 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" /sbin/service pmproxy condrestart %endif +cd $PCP_PMNS_DIR && ./Rebuild -s && rm -f .NeedRebuild +cd + %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -958,7 +1971,6 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %{_unitdir}/pmie.service %{_unitdir}/pmproxy.service %endif -%{_mandir}/man5/* %config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie @@ -996,6 +2008,17 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %endif # ppc %endif +%if %{with_compat} +%files compat +#empty +%endif + +%files monitor +#empty + +%files collector +#empty + %files conf %dir %{_includedir}/pcp %{_includedir}/pcp/builddefs @@ -1044,8 +2067,6 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" # duplicate directories from pcp and pcp-webjs, but rpm copes with that. %dir %{_datadir}/pcp %dir %{_datadir}/pcp/webapps -%{_mandir}/man1/pmwebd.1* -%{_mandir}/man3/PMWEBAPI.3* %endif %files webjs @@ -1081,50 +2102,192 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %attr(0775,pcp,pcp) %{_logsdir}/pmmgr %config(missingok,noreplace) %{_confdir}/pmmgr %config(noreplace) %{_confdir}/pmmgr/pmmgr.options -%{_mandir}/man1/pmmgr.1* %files import-sar2pcp %{_bindir}/sar2pcp -%{_mandir}/man1/sar2pcp.1* %files import-iostat2pcp %{_bindir}/iostat2pcp -%{_mandir}/man1/iostat2pcp.1* %files import-mrtg2pcp %{_bindir}/mrtg2pcp -%{_mandir}/man1/mrtg2pcp.1* %files import-ganglia2pcp %{_bindir}/ganglia2pcp -%{_mandir}/man1/ganglia2pcp.1* %files import-collectl2pcp %{_bindir}/collectl2pcp -%{_mandir}/man1/collectl2pcp.1* %if !%{disable_papi} %files pmda-papi %{_pmdasdir}/papi -%{_mandir}/man1/pmdapapi.1* %endif %if !%{disable_perfevent} %files pmda-perfevent %{_pmdasdir}/perfevent %config(noreplace) %{_pmdasdir}/perfevent/perfevent.conf -%{_mandir}/man1/perfalloc.1* -%{_mandir}/man1/pmdaperfevent.1* -%{_mandir}/man5/perfevent.conf.5* %endif %if !%{disable_infiniband} %files pmda-infiniband %{_pmdasdir}/ib %{_pmdasdir}/infiniband -%{_mandir}/man1/pmdaib.1* %endif +%files pmda-activemq +%{_pmdasdir}/activemq + +%files pmda-bonding +%{_pmdasdir}/bonding + +%files pmda-dbping +%{_pmdasdir}/dbping + +%files pmda-ds389log +%{_pmdasdir}/ds389log + +%files pmda-ds389 +%{_pmdasdir}/ds389 + +%files pmda-elasticsearch +%{_pmdasdir}/elasticsearch + +%files pmda-gpfs +%{_pmdasdir}/gpfs + +%files pmda-gpsd +%{_pmdasdir}/gpsd + +%files pmda-kvm +%{_pmdasdir}/kvm + +%files pmda-lustre +%{_pmdasdir}/lustre + +%files pmda-lustrecomm +%{_pmdasdir}/lustrecomm + +%files pmda-memcache +%{_pmdasdir}/memcache + +%files pmda-mysql +%{_pmdasdir}/mysql + +%files pmda-named +%{_pmdasdir}/named + +%files pmda-netfilter +%{_pmdasdir}/netfilter + +%files pmda-news +%{_pmdasdir}/news + +%files pmda-nginx +%{_pmdasdir}/nginx + +%files pmda-nfsclient +%{_pmdasdir}/nfsclient + +%files pmda-pdns +%{_pmdasdir}/pdns + +%files pmda-postfix +%{_pmdasdir}/postfix + +%files pmda-postgresql +%{_pmdasdir}/postgresql + +%files pmda-rsyslog +%{_pmdasdir}/rsyslog + +%files pmda-samba +%{_pmdasdir}/samba + +%files pmda-snmp +%{_pmdasdir}/snmp + +%files pmda-vmware +%{_pmdasdir}/vmware + +%files pmda-zimbra +%{_pmdasdir}/zimbra + +%files pmda-dm +%{_pmdasdir}/dm + +%if !%{disable_python2} || !%{disable_python3} +%files pmda-gluster +%{_pmdasdir}/gluster + +%files pmda-zswap +%{_pmdasdir}/zswap + +%files pmda-unbound +%{_pmdasdir}/unbound + +%files pmda-json +%{_pmdasdir}/json + +%files export-pcp2graphite +%{_bindir}/pcp2graphite + +%endif # !%{disable_python2} || !%{disable_python3} + +%files pmda-apache +%{_pmdasdir}/apache + +%files pmda-bash +%{_pmdasdir}/bash + +%files pmda-cifs +%{_pmdasdir}/cifs + +%files pmda-cisco +%{_pmdasdir}/cisco + +%files pmda-gfs2 +%{_pmdasdir}/gfs2 + +%files pmda-lmsensors +%{_pmdasdir}/lmsensors + +%files pmda-logger +%{_pmdasdir}/logger + +%files pmda-mailq +%{_pmdasdir}/mailq + +%files pmda-mounts +%{_pmdasdir}/mounts + +%files pmda-nvidia-gpu +%{_pmdasdir}/nvidia + +%files pmda-roomtemp +%{_pmdasdir}/roomtemp + +%files pmda-rpm +%{_pmdasdir}/rpm + +%files pmda-sendmail +%{_pmdasdir}/sendmail + +%files pmda-shping +%{_pmdasdir}/shping + +%files pmda-summary +%{_pmdasdir}/summary + +%files pmda-systemd +%{_pmdasdir}/systemd + +%files pmda-trace +%{_pmdasdir}/trace + +%files pmda-weblog +%{_pmdasdir}/weblog + %files -n perl-PCP-PMDA -f perl-pcp-pmda.list %files -n perl-PCP-MMV -f perl-pcp-mmv.list @@ -1154,7 +2317,19 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %files -n pcp-doc -f pcp-doc.list +%if !%{disable_python2} || !%{disable_python3} +%files -n pcp-system-tools -f pcp_system_tools.list +%endif + %changelog +* Mon Jun 15 2015 Mark Goodwin - 3.10.5-1 +- Provide and use non-exit(1)ing pmGetConfig(3) variant (BZ 1187588) +- Resolve a pmdaproc.sh pmlogger restart regression (BZ 1229458) +- Replacement of pmatop/pcp-atop(1) utility (BZ 1160811, BZ 1018575) +- Reduced installation size for minimal applications (BZ 1182184) +- Ensure pmlogger start scripts wait on pmcd startup (BZ 1185760) +- Need to run pmcd at least once before pmval -L will work (BZ 185749) + * Wed Apr 15 2015 Nathan Scott - 3.10.4-1 - Update to latest PCP, pcp-webjs and Vector sources. - Packaging improvements after re-review (BZ 1204467) diff --git a/sources b/sources index 0d5f030..e12035e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7f7fd77a543049b945cab4f2fbda6038 pcp-3.10.4.src.tar.gz -56af52255268e8579bd89f42573d19dd pcp-webjs.src.tar.gz +9fc23f68769de375d35e629b8a879f10 pcp-3.10.5.src.tar.gz +628bb0764c2ee9647a79ed50136ed12f pcp-webjs.src.tar.gz