diff --git a/pcp.changes b/pcp.changes index c5aa9bb..a818560 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Mar 8 16:04:30 UTC 2019 - David Disseldorp + +- Split out zeroconf, pmda-haproxy, pmda-smart, pmda-prometheus, + pcp2elasticsearch, pcp2json, pcp2spark, and pmlogger_daily_report files + into separate packages, matching upstream; (bsc#1128523). +- Fix incorrect dependencies for rewritten monitoring agents; (bsc#1128606). +- Ensure symlink sources and targets are in the same package; (bsc#1127978). +- Move pcp-dstat into the pcp-system-tools package; (bsc#1127978). + +------------------------------------------------------------------- +Thu Mar 7 11:48:47 UTC 2019 - Bernhard Wiedemann + +- drop unreproducible perfevent_coverage program (boo#1040589) +- override build date to make package build reproducible (boo#1047218) + ------------------------------------------------------------------- Thu Feb 28 23:04:12 UTC 2019 - ddiss@suse.com diff --git a/pcp.spec b/pcp.spec index 449d79f..86cf43a 100644 --- a/pcp.spec +++ b/pcp.spec @@ -77,7 +77,7 @@ Version: 4.3.1 Release: 0 %global buildversion 1 -Url: http://www.pcp.io +Url: https://pcp.io Source0: pcp-%{version}.tar.bz2 %if 0%{?suse_version} Source2: pcp-rpmlintrc @@ -221,6 +221,12 @@ Patch6: 0006-pmsnap-control-var-www-srv-www.patch %global disable_noarch 1 %endif +%if 0%{?fedora} >= 24 +%global disable_xlsx 0 +%else +%global disable_xlsx 1 +%endif + # python3-rtslib-fb not yet available on SUSE, see boo#1045332 %if 0%{?suse_version} && !%{disable_python3} %global disable_lio 1 @@ -228,6 +234,10 @@ Patch6: 0006-pmsnap-control-var-www-srv-www.patch %global disable_lio 0 %endif +# KVM PMDA moved into pcp (no longer using Perl, default on) +Obsoletes: pcp-pmda-kvm < %{version} +Provides: pcp-pmda-kvm + %if 0%{?suse_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %else @@ -343,6 +353,7 @@ Obsoletes: pcp-pmda-nvidia < %{version} %global _pmdasdir %{_localstatedir}/lib/pcp/pmdas %global _testsdir %{_localstatedir}/lib/pcp/testsuite %global _selinuxdir %{_localstatedir}/lib/pcp/selinux +%global _logconfdir %{_localstatedir}/lib/pcp/config/pmlogconf %if 0%{?suse_version} %global _pixmapdir %{_datadir}/pixmaps %global _booksdir %{_docdir}/pcp-doc @@ -425,7 +436,7 @@ applications to easily retrieve and process any subset of that data. Summary: Performance Co-Pilot run-time configuration License: %{license_lgplv21plus} Group: %{lib_gr} -Url: http://www.pcp.io +Url: https://pcp.io # http://fedoraproject.org/wiki/Packaging:Conflicts "Splitting Packages" Conflicts: pcp-libs < 3.9 @@ -440,7 +451,7 @@ Performance Co-Pilot (PCP) run-time configuration Summary: Performance Co-Pilot run-time libraries License: %{license_lgplv21plus} Group: %{lib_gr} -Url: http://www.pcp.io +Url: https://pcp.io Conflicts: %{lib_pkg_conflict} Requires: pcp-conf >= %{version}-%{release} @@ -452,7 +463,7 @@ Performance Co-Pilot (PCP) run-time libraries Summary: Performance Co-Pilot run-time GUI library License: %{license_lgplv21plus} Group: %{lib_gr} -Url: http://www.pcp.io +Url: https://pcp.io %description -n libpcp_gui%{libpcp_gui_sover} Performance Co-Pilot (PCP) run-time graphical user interface library @@ -461,7 +472,7 @@ Performance Co-Pilot (PCP) run-time graphical user interface library Summary: Performance Co-Pilot run-time MMV library License: %{license_lgplv21plus} Group: %{lib_gr} -Url: http://www.pcp.io +Url: https://pcp.io %description -n libpcp_mmv%{libpcp_mmv_sover} Performance Co-Pilot (PCP) run-time Memory Mapped Values library @@ -470,7 +481,7 @@ Performance Co-Pilot (PCP) run-time Memory Mapped Values library Summary: Performance Co-Pilot run-time tracing library License: %{license_lgplv21plus} Group: %{lib_gr} -Url: http://www.pcp.io +Url: https://pcp.io %description -n libpcp_trace%{libpcp_trace_sover} Performance Co-Pilot (PCP) run-time tracing library @@ -479,7 +490,7 @@ Performance Co-Pilot (PCP) run-time tracing library Summary: Performance Co-Pilot run-time import library License: %{license_lgplv21plus} Group: %{lib_gr} -Url: http://www.pcp.io +Url: https://pcp.io %description -n libpcp_import%{libpcp_import_sover} Performance Co-Pilot (PCP) run-time import library @@ -488,7 +499,7 @@ Performance Co-Pilot (PCP) run-time import library Summary: Performance Co-Pilot run-time web library License: %{license_lgplv21plus} Group: %{lib_gr} -Url: http://www.pcp.io +Url: https://pcp.io %description -n libpcp_web%{libpcp_web_sover} Performance Co-Pilot (PCP) run-time web library @@ -502,7 +513,7 @@ Performance Co-Pilot (PCP) run-time web library Summary: Performance Co-Pilot (PCP) development headers License: %{license_gplv2plus} AND %{license_lgplv21plus} Group: %{lib_devel_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: %{lib_pkg} = %{version}-%{release} Conflicts: %{lib_devel_pkg_conflict} %if (0%{?suse_version} > 0) @@ -520,7 +531,7 @@ Performance Co-Pilot (PCP) headers for development. Summary: Performance Co-Pilot (PCP) development tools and documentation License: %{license_gplv2plus} AND %{license_lgplv21plus} Group: %{lib_devel_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_devel_pkg} = %{version}-%{release} Requires: %{lib_pkg} = %{version}-%{release} @@ -537,7 +548,7 @@ Performance Co-Pilot (PCP) documentation and tools for development. Summary: Performance Co-Pilot (PCP) test suite License: %{license_gplv2plus} AND %{license_mit} Group: %{lib_devel_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_devel_pkg} = %{version}-%{release} Requires: %{lib_pkg} = %{version}-%{release} @@ -556,7 +567,7 @@ Quality assurance test suite for Performance Co-Pilot (PCP). Summary: Performance Co-Pilot (PCP) manager daemon License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -578,7 +589,7 @@ scripts. Summary: Performance Co-Pilot (PCP) web API service License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -597,7 +608,7 @@ HTTP (PMWEBAPI) protocol. Summary: Performance Co-Pilot (PCP) Perl bindings and documentation License: %{license_gplv2plus} Group: %{lib_devel_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if 0%{?suse_version} %perl_requires %endif @@ -617,7 +628,7 @@ an application, etc. Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values License: %{license_gplv2plus} Group: %{lib_devel_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if 0%{?suse_version} %perl_requires %endif @@ -638,7 +649,7 @@ and analysis with pmchart, pmie, pmlogger and other PCP tools. Summary: Performance Co-Pilot Perl bindings for importing external archive data License: %{license_gplv2plus} Group: %{lib_devel_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if 0%{?suse_version} %perl_requires %endif @@ -656,7 +667,7 @@ they can be replayed with standard PCP monitoring tools. Summary: Performance Co-Pilot Perl bindings for processing pmlogsummary output License: %{license_gplv2plus} Group: %{lib_devel_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if 0%{?suse_version} %perl_requires %endif @@ -677,7 +688,7 @@ exporting this data into third-party tools (e.g. spreadsheets). Summary: Performance Co-Pilot archive tools for importing sar data License: %{license_lgplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -695,7 +706,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. Summary: Performance Co-Pilot archive tools for importing iostat data License: %{license_lgplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -714,7 +725,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. Summary: Performance Co-Pilot archive tools for importing spreadsheet data License: %{license_lgplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -734,7 +745,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. Summary: Performance Co-Pilot archive tools for importing MTRG data License: %{license_lgplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -751,7 +762,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. Summary: Performance Co-Pilot archive tools for importing ganglia data License: %{license_lgplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -768,7 +779,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. Summary: Performance Co-Pilot archive tools for importing collectl data License: %{license_lgplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -784,7 +795,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. Summary: Module for exporting from PCP into a Zabbix agent daemon License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} >= %{version}-%{release} %endif @@ -794,14 +805,38 @@ Performance Co-Pilot (PCP) module for exporting metrics from PCP to Zabbix via the Zabbix agent - see zbxpcp(3) for further details. %if !%{disable_python2} || !%{disable_python3} +# +# pcp-export-pcp2elasticsearch +# +%package export-pcp2elasticsearch +Summary: Performance Co-Pilot tools for exporting PCP metrics to ElasticSearch +License: %{license_gplv2plus} +Group: %{pcp_gr} +URL: https://pcp.io +Requires: %{lib_pkg} >= %{version}-%{release} +%if !%{disable_python3} +Requires: python3-pcp = %{version}-%{release} +Requires: python3-requests +BuildRequires: python3-requests +%else +Requires: %{__python2}-pcp = %{version}-%{release} +Requires: %{__python2}-requests +BuildRequires: %{__python2}-requests +%endif + +%description export-pcp2elasticsearch +Performance Co-Pilot (PCP) front-end tools for exporting metric values +to Elasticsearch - a distributed, RESTful search and analytics engine. +See https://www.elastic.co/community for further details. + # # pcp-export-pcp2graphite # %package export-pcp2graphite Summary: Performance Co-Pilot tools for exporting PCP metrics to Graphite -License: %{license_lgplv2plus} +License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -819,9 +854,9 @@ to graphite (http://graphite.readthedocs.org). # %package export-pcp2influxdb Summary: Performance Co-Pilot tools for exporting PCP metrics to InfluxDB -License: %{license_lgplv2plus} +License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} >= %{version}-%{release} %endif @@ -838,6 +873,106 @@ BuildRequires: %{__python2}-requests %description export-pcp2influxdb Performance Co-Pilot (PCP) front-end tools for exporting metric values to InfluxDB (https://influxdata.com/time-series-platform/influxdb). + +# +# pcp-export-pcp2json +# +%package export-pcp2json +Url: https://pcp.io +Summary: Performance Co-Pilot tools for exporting PCP metrics in JSON format +License: %{license_gplv2plus} +Group: %{pcp_gr} +Requires: %{lib_pkg} >= %{version}-%{release} +%if !%{disable_python3} +Requires: python3-pcp = %{version}-%{release} +%else +Requires: %{__python2}-pcp = %{version}-%{release} +%endif + +%description export-pcp2json +Performance Co-Pilot (PCP) front-end tools for exporting metric values +in JSON format. + +# +# pcp-export-pcp2spark +# +%package export-pcp2spark +Url: https://pcp.io +Summary: Performance Co-Pilot tools for exporting PCP metrics to Apache Spark +License: %{license_gplv2plus} +Group: %{pcp_gr} +Requires: %{lib_pkg} >= %{version}-%{release} +%if !%{disable_python3} +Requires: python3-pcp = %{version}-%{release} +%else +Requires: %{__python2}-pcp = %{version}-%{release} +%endif + +%description export-pcp2spark +Performance Co-Pilot (PCP) front-end tools for exporting metric values +in JSON format to Apache Spark. See https://spark.apache.org/ for +further details on Apache Spark. + +# +# pcp-export-pcp2xlsx +# +%if !%{disable_xlsx} +%package export-pcp2xlsx +Url: https://pcp.io +Summary: Performance Co-Pilot tools for exporting PCP metrics to Excel +License: %{license_gplv2plus} +Group: %{pcp_gr} +Requires: %{lib_pkg} >= %{version}-%{release} +%if !%{disable_python3} +Requires: python3-openpyxl +Requires: python3-pcp = %{version}-%{release} +BuildRequires: python3-openpyxl +%else +Requires: %{__python2}-openpyxl +Requires: %{__python2}-pcp = %{version}-%{release} +BuildRequires: %{__python2}-openpyxl +%endif + +%description export-pcp2xlsx +Performance Co-Pilot (PCP) front-end tools for exporting metric values +in Excel spreadsheet format. +%endif +# +# pcp-export-pcp2xml +# +%package export-pcp2xml +Url: https://pcp.io +Summary: Performance Co-Pilot tools for exporting PCP metrics in XML format +License: %{license_gplv2plus} +Group: %{pcp_gr} +Requires: %{lib_pkg} >= %{version}-%{release} +%if !%{disable_python3} +Requires: python3-pcp = %{version}-%{release} +%else +Requires: %{__python2}-pcp = %{version}-%{release} +%endif + +%description export-pcp2xml +Performance Co-Pilot (PCP) front-end tools for exporting metric values +in XML format. + +# +# pcp-export-pcp2zabbix +# +%package export-pcp2zabbix +Summary: Performance Co-Pilot tools for exporting PCP metrics to Zabbix +License: %{license_gplv2plus} +Group: %{pcp_gr} +Url: https://pcp.io +%if !%{disable_python3} +Requires: python3-pcp = %{version}-%{release} +%else +Requires: %{__python2}-pcp = %{version}-%{release} +%endif + +%description export-pcp2zabbix +Performance Co-Pilot (PCP) front-end tools for exporting metric values +to the Zabbix (https://www.zabbix.org/) monitoring software. %endif %if !%{disable_papi} @@ -848,7 +983,7 @@ to InfluxDB (https://influxdata.com/time-series-platform/influxdb). Summary: Performance Co-Pilot (PCP) metrics for Performance API and hardware counters License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -867,7 +1002,7 @@ collecting hardware counters statistics through PAPI (Performance API). Summary: Performance Co-Pilot (PCP) metrics for hardware counters License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} Requires: libpfm >= 4.4 @@ -887,7 +1022,7 @@ collecting hardware counters statistics through libpfm. Summary: Performance Co-Pilot (PCP) metrics for Infiniband HCAs and switches License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} Requires: libibmad >= 1.3.7 @@ -909,7 +1044,7 @@ but can also be configured to monitor remote GUIDs such as IB switches. Summary: Performance Co-Pilot (PCP) metrics for ActiveMQ License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(LWP::UserAgent) @@ -925,7 +1060,7 @@ collecting metrics about the ActiveMQ message broker. Summary: Performance Co-Pilot (PCP) metrics for BIND servers License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(File::Slurp) Requires: perl(LWP::UserAgent) @@ -943,7 +1078,7 @@ collecting metrics from BIND (Berkeley Internet Name Domain). Summary: Performance Co-Pilot (PCP) metrics for Redis License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-redis @@ -959,7 +1094,7 @@ collecting metrics from Redis servers (redis.io). Summary: Performance Co-Pilot (PCP) metrics for NutCracker (TwemCache) License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(JSON) Requires: perl(YAML::XS::LibYAML) @@ -977,7 +1112,7 @@ collecting metrics from NutCracker (TwemCache). Summary: Performance Co-Pilot (PCP) metrics for Bonded network interfaces License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -993,7 +1128,7 @@ collecting metrics about bonded network interfaces. Summary: Performance Co-Pilot (PCP) metrics for Database response times and Availablility License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1009,7 +1144,7 @@ collecting metrics about the Database response times and Availablility. Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Servers License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if 0%{?suse_version} Requires: perl-ldap %else @@ -1029,7 +1164,7 @@ collecting metrics about a 389 Directory Server. Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Server Loggers License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-Date-Manip Requires: perl-PCP-PMDA = %{version}-%{release} @@ -1038,24 +1173,6 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from a 389 Directory Server log. #end pcp-pmda-ds389log -# -# pcp-pmda-elasticsearch -# -%package pmda-elasticsearch -Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch -License: %{license_gplv2plus} -Group: %{pcp_gr} -Url: http://www.pcp.io -Requires: perl-PCP-PMDA = %{version}-%{release} -Requires: perl(LWP::UserAgent) -BuildRequires: perl(LWP::UserAgent) -Supplements: pcp - -%description pmda-elasticsearch -This package contains the PCP Performance Metrics Domain Agent (PMDA) for -collecting metrics about Elasticsearch. -#end pcp-pmda-elasticsearch - # # pcp-pmda-gpfs # @@ -1063,7 +1180,7 @@ collecting metrics about Elasticsearch. Summary: Performance Co-Pilot (PCP) metrics for GPFS Filesystem License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-gpfs @@ -1078,7 +1195,7 @@ collecting metrics about the GPFS filesystem. Summary: Performance Co-Pilot (PCP) metrics for a GPS Daemon License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1087,22 +1204,6 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about a GPS Daemon. #end pcp-pmda-gpsd -# -# pcp-pmda-kvm -# -%package pmda-kvm -Summary: Performance Co-Pilot (PCP) metrics for KVM -License: %{license_gplv2plus} -Group: %{pcp_gr} -Url: http://www.pcp.io -Requires: perl-PCP-PMDA = %{version}-%{release} -Supplements: pcp - -%description pmda-kvm -This package contains the PCP Performance Metrics Domain Agent (PMDA) for -collecting metrics about the Kernel based Virtual Machine. -#end pcp-pmda-kvm - # # pcp-pmda-docker # @@ -1110,7 +1211,7 @@ collecting metrics about the Kernel based Virtual Machine. Summary: Performance Co-Pilot (PCP) metrics from the Docker daemon License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %description pmda-docker This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1124,7 +1225,7 @@ collecting metrics using the Docker daemon REST API. Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-lustre @@ -1139,7 +1240,7 @@ collecting metrics about the Lustre Filesystem. Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem Comms License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1158,7 +1259,7 @@ collecting metrics about the Lustre Filesystem Comms. Summary: Performance Co-Pilot (PCP) metrics for Memcached License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1174,7 +1275,7 @@ collecting metrics about Memcached. Summary: Performance Co-Pilot (PCP) metrics for MySQL License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(DBD::mysql) Requires: perl(DBI) @@ -1194,7 +1295,7 @@ collecting metrics about the MySQL database. Summary: Performance Co-Pilot (PCP) metrics for Named License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1209,7 +1310,7 @@ collecting metrics about the Named nameserver. Summary: Performance Co-Pilot (PCP) metrics for Netfilter framework License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1225,7 +1326,7 @@ collecting metrics about the Netfilter packet filtering framework. Summary: Performance Co-Pilot (PCP) metrics for Usenet News License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1241,7 +1342,7 @@ collecting metrics about Usenet News. Summary: Performance Co-Pilot (PCP) metrics for the Nginx Webserver License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(LWP::UserAgent) BuildRequires: perl(LWP::UserAgent) @@ -1251,21 +1352,6 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Nginx Webserver. #end pcp-pmda-nginx -# -# pcp-pmda-nfsclient -# -%package pmda-nfsclient -Summary: Performance Co-Pilot (PCP) metrics for NFS Clients -License: %{license_gplv2plus} -Group: %{pcp_gr} -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. -#end pcp-pmda-nfsclient - # # pcp-pmda-oracle # @@ -1273,7 +1359,7 @@ collecting metrics for NFS Clients. Summary: Performance Co-Pilot (PCP) metrics for the Oracle database License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(DBI) BuildRequires: perl(DBI) @@ -1290,7 +1376,7 @@ collecting metrics about the Oracle database. Summary: Performance Co-Pilot (PCP) metrics for PowerDNS License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1306,7 +1392,7 @@ collecting metrics about the PowerDNS. Summary: Performance Co-Pilot (PCP) metrics for the Postfix (MTA) License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %if 0%{?fedora} > 16 || 0%{?rhel} > 5 Requires: postfix-perl-scripts @@ -1327,32 +1413,6 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Postfix (MTA). #end pcp-pmda-postfix -%if !%{disable_postgresql} -# -# pcp-pmda-postgresql -# -%package pmda-postgresql -Summary: Performance Co-Pilot (PCP) metrics for PostgreSQL -License: %{license_gplv2plus} -Group: %{pcp_gr} -Url: http://www.pcp.io -%if !%{disable_python3} -Requires: python3-pcp -Requires: python3-psycopg2 -BuildRequires: python3-psycopg2 -%else -Requires: %{__python2}-pcp -Requires: %{__python2}-psycopg2 -BuildRequires: %{__python2}-psycopg2 -%endif -Supplements: pcp - -%description pmda-postgresql -This package contains the PCP Performance Metrics Domain Agent (PMDA) for -collecting metrics about the PostgreSQL database. -#end pcp-pmda-postgresql -%endif - # # pcp-pmda-rsyslog # @@ -1360,7 +1420,7 @@ collecting metrics about the PostgreSQL database. Summary: Performance Co-Pilot (PCP) metrics for Rsyslog License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1376,7 +1436,7 @@ collecting metrics about Rsyslog. Summary: Performance Co-Pilot (PCP) metrics for Samba License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1392,7 +1452,7 @@ collecting metrics about Samba. Summary: Performance Co-Pilot (PCP) metrics for NFS Clients License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-slurm @@ -1408,7 +1468,7 @@ collecting metrics from the SLURM Workload Manager. Summary: Performance Co-Pilot (PCP) metrics for Simple Network Management Protocol License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} # There are no perl-Net-SNMP packages in rhel, disable unless non-rhel or epel5 %if 0%{?rhel} == 0 || 0%{?rhel} < 6 @@ -1429,7 +1489,7 @@ collecting metrics about SNMP. Summary: Performance Co-Pilot (PCP) metrics for VMware License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1445,7 +1505,7 @@ collecting metrics for VMware. Summary: Performance Co-Pilot (PCP) metrics for Zimbra License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Supplements: pcp @@ -1461,7 +1521,7 @@ collecting metrics about Zimbra. Summary: Performance Co-Pilot (PCP) metrics for the Device Mapper Cache and Thin Client License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1480,7 +1540,7 @@ collecting metrics about the Device Mapper Cache and Thin Client. Summary: Performance Co-Pilot (PCP) metrics for the Gluster filesystem License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %else @@ -1490,7 +1550,49 @@ Requires: %{__python2}-pcp This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the gluster filesystem. # end pcp-pmda-gluster - + +# +# pcp-pmda-nfsclient +# +%package pmda-nfsclient +Summary: Performance Co-Pilot (PCP) metrics for NFS Clients +License: %{license_gplv2plus} +Group: %{pcp_gr} +Url: https://pcp.io +%if !%{disable_python3} +Requires: python3-pcp +%else +Requires: %{__python2}-pcp +%endif +%description pmda-nfsclient +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics for NFS Clients. +#end pcp-pmda-nfsclient + +%if !%{disable_postgresql} +# +# pcp-pmda-postgresql +# +%package pmda-postgresql +Summary: Performance Co-Pilot (PCP) metrics for PostgreSQL +License: %{license_gplv2plus} +Group: %{pcp_gr} +Url: https://pcp.io +%if !%{disable_python3} +Requires: python3-pcp +Requires: python3-psycopg2 +BuildRequires: python3-psycopg2 +%else +Requires: %{__python2}-pcp +Requires: %{__python2}-psycopg2 +BuildRequires: %{__python2}-psycopg2 +%endif +%description pmda-postgresql +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the PostgreSQL database. +#end pcp-pmda-postgresql +%endif + # # pcp-pmda-zswap # @@ -1498,7 +1600,7 @@ collecting metrics about the gluster filesystem. Summary: Performance Co-Pilot (PCP) metrics for compressed swap License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %else @@ -1516,7 +1618,7 @@ collecting metrics about compressed swap. Summary: Performance Co-Pilot (PCP) metrics for the Unbound DNS Resolver License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %else @@ -1534,7 +1636,7 @@ collecting metrics about the Unbound DNS Resolver. Summary: Performance Co-Pilot (PCP) metrics for Intel MIC cards License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %else @@ -1545,6 +1647,24 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Intel MIC cards. # end pcp-pmda-mic +# +# pcp-pmda-haproxy +# +%package pmda-haproxy +Summary: Performance Co-Pilot (PCP) metrics for HAProxy +License: %{license_gplv2plus} +Group: %{pcp_gr} +URL: https://pcp.io +%if !%{disable_python3} +Requires: python3-pcp +%else +Requires: %{__python2}-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 + %if !%{disable_libvirt} # # pcp-pmda-libvirt @@ -1553,7 +1673,7 @@ collecting metrics about Intel MIC cards. Summary: Performance Co-Pilot (PCP) metrics for virtual machines License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !%{disable_python3} Requires: libvirt-python3 Requires: python3-lxml @@ -1574,6 +1694,24 @@ and hypervisor machines. # end pcp-pmda-libvirt %endif +# +# pcp-pmda-elasticsearch +# +%package pmda-elasticsearch +Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch +License: %{license_gplv2plus} +Group: %{pcp_gr} +Url: https://pcp.io +%if !%{disable_python3} +Requires: python3-pcp +%else +Requires: %{__python2}-pcp +%endif +%description pmda-elasticsearch +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about Elasticsearch. +#end pcp-pmda-elasticsearch + %if !%{disable_lio} # # pcp-pmda-lio @@ -1582,7 +1720,7 @@ and hypervisor machines. Summary: Performance Co-Pilot (PCP) metrics for the LIO subsystem License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %if 0%{?suse_version} @@ -1607,6 +1745,50 @@ target. #end pcp-pmda-lio %endif # !%{disable_lio} +# +# pcp-pmda-prometheus +# +%package pmda-prometheus +Summary: Performance Co-Pilot (PCP) metrics from Prometheus endpoints +License: %{license_gplv2plus} +Group: %{pcp_gr} +Url: https://pcp.io +%if !%{disable_python3} +Requires: python3-pcp +Requires: python3-requests +BuildRequires: python3-requests +%else +Requires: %{__python2}-pcp +Requires: %{__python2}-requests +BuildRequires: %{__python2}-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 + +# +# pcp-pmda-lmsensors +# +%package pmda-lmsensors +Summary: Performance Co-Pilot (PCP) metrics for hardware sensors +License: %{license_gplv2plus} +Group: %{pcp_gr} +Url: https://pcp.io +%if !%{disable_python3} +Requires: python3-pcp +%else +Requires: %{__python2}-pcp +%endif +# rewritten in python, so there is no longer a debuginfo package +Obsoletes: pcp-pmda-lmsensors-debuginfo + +%description pmda-lmsensors +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics about the Linux hardware monitoring sensors. +# end pcp-pmda-lmsensors + %endif # !%{disable_python2} || !%{disable_python3} %if !%{disable_json} @@ -1617,7 +1799,7 @@ target. Summary: Performance Co-Pilot (PCP) metrics for JSON data License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !%{disable_python3} Requires: python3-pcp Requires: python3-six @@ -1645,7 +1827,7 @@ collecting metrics output in JSON. Summary: Performance Co-Pilot (PCP) metrics for the Apache webserver License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1663,7 +1845,7 @@ collecting metrics about the Apache webserver. Summary: Performance Co-Pilot (PCP) metrics for the Bash shell License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1681,7 +1863,7 @@ collecting metrics about the Bash shell. Summary: Performance Co-Pilot (PCP) metrics for the CIFS protocol License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1698,7 +1880,7 @@ collecting metrics about the Common Internet Filesytem. Summary: Performance Co-Pilot (PCP) metrics for Cisco routers License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1716,7 +1898,7 @@ collecting metrics about Cisco routers. Summary: Performance Co-Pilot (PCP) metrics for the GFS2 filesystem License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1726,24 +1908,6 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Global Filesystem v2. # end pcp-pmda-gfs2 -# -# pcp-pmda-lmsensors -# -%package pmda-lmsensors -Summary: Performance Co-Pilot (PCP) metrics for hardware sensors -License: %{license_gplv2plus} -Group: %{pcp_gr} -Url: http://www.pcp.io -%if !0%{?suse_version} -Requires: %{lib_pkg} = %{version}-%{release} -%endif -Supplements: pcp - -%description pmda-lmsensors -This package contains the PCP Performance Metrics Domain Agent (PMDA) for -collecting metrics about the Linux hardware monitoring sensors. -# end pcp-pmda-lmsensors - # # pcp-pmda-logger # @@ -1751,7 +1915,7 @@ collecting metrics about the Linux hardware monitoring sensors. Summary: Performance Co-Pilot (PCP) metrics from arbitrary log files License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1770,7 +1934,7 @@ supports both sampled and event-style metrics. Summary: Performance Co-Pilot (PCP) metrics for the sendmail queue License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1788,7 +1952,7 @@ collecting metrics about email queues managed by sendmail. Summary: Performance Co-Pilot (PCP) metrics for filesystem mounts License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1806,7 +1970,7 @@ collecting metrics about filesystem mounts. Summary: Performance Co-Pilot (PCP) metrics for the Nvidia GPU License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1823,7 +1987,7 @@ collecting metrics about Nvidia GPUs. Summary: Performance Co-Pilot (PCP) metrics for the room temperature License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1843,7 +2007,7 @@ collecting metrics about the room temperature. Summary: Performance Co-Pilot (PCP) metrics for the RPM package manager License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1862,7 +2026,7 @@ collecting metrics about the installed RPM packages. Summary: Performance Co-Pilot (PCP) metrics for Sendmail License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1881,7 +2045,7 @@ collecting metrics about Sendmail traffic. Summary: Performance Co-Pilot (PCP) metrics for shell command responses License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1893,6 +2057,22 @@ collecting metrics about quality of service and response time measurements of arbitrary shell commands. # end pcp-pmda-shping +# +# pcp-pmda-smart +# +%package pmda-smart +Summary: Performance Co-Pilot (PCP) metrics for S.M.A.R.T values +License: %{license_gplv2plus} +Group: %{pcp_gr} +Url: https://pcp.io +Requires: %{lib_pkg} = %{version}-%{release} + +%description pmda-smart +This package contains the PCP Performance Metric Domain Agent (PMDA) for +collecting metrics of disk S.M.A.R.T values making use of data from the +smartmontools package. +#end pcp-pmda-smart + # # pcp-pmda-summary # @@ -1900,7 +2080,7 @@ arbitrary shell commands. Summary: Performance Co-Pilot (PCP) summary metrics from pmie License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1920,7 +2100,7 @@ collecting metrics about other installed pmdas. Summary: Performance Co-Pilot (PCP) metrics from the Systemd journal License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1938,7 +2118,7 @@ collecting metrics from the Systemd journal. Summary: Performance Co-Pilot (PCP) metrics for application tracing License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1956,7 +2136,7 @@ collecting metrics about trace performance data in applications. Summary: Performance Co-Pilot (PCP) metrics from web server logs License: %{license_gplv2plus} Group: %{pcp_gr} -Url: http://www.pcp.io +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -1969,6 +2149,25 @@ collecting metrics about web server logs. # end pcp-pmda-weblog # end C pmdas +%package zeroconf +Summary: Performance Co-Pilot (PCP) Zeroconf Package +License: %{license_gplv2plus} +Group: %{pcp_gr} +URL: https://pcp.io +Requires: pcp +Requires: pcp-doc +Requires: pcp-pmda-dm +Requires: pcp-pmda-nfsclient +Requires: pcp-system-tools +# to make pcp-zeroconf replace sysstat, uncomment the next line +# Obsoletes: sysstat +%description zeroconf +This package contains configuration tweaks and files to increase metrics +gathering frequency, several extended pmlogger configurations, as well as +automated pmie diagnosis, alerting and self-healing for the localhost. +A timer script also writes daily performance summary reports similar to +those written by sysstat. + %if !%{disable_python2} # # python-pcp. This is the PCP library bindings for python. @@ -1976,8 +2175,8 @@ collecting metrics about web server logs. %package -n %{__python2}-pcp Summary: Performance Co-Pilot (PCP) Python bindings and documentation License: %{license_gplv2plus} -Group: Development/Libraries -Url: http://www.pcp.io +Group: %{lib_gr} +Url: https://pcp.io BuildRequires: %{__python2}-devel %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} @@ -2003,11 +2202,9 @@ Metric Domain Agent (PMDA) collector tools written in Python. %package -n python3-pcp Summary: Performance Co-Pilot (PCP) Python3 bindings and documentation License: %{license_gplv2plus} -Group: Development/Libraries -Url: http://www.pcp.io -%if !0%{?suse_version} +Group: %{lib_gr} +Url: https://pcp.io Requires: %{lib_pkg} = %{version}-%{release} -%endif Requires: python3 BuildRequires: python3-setuptools @@ -2024,8 +2221,8 @@ Metric Domain Agent (PMDA) collector tools written in Python3. %package system-tools Summary: Performance Co-Pilot (PCP) System and Monitoring Tools License: %{license_gplv2plus} -Group: Development/Libraries -Url: http://www.pcp.io +Group: %{pcp_gr} +Url: https://pcp.io %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} %endif @@ -2047,8 +2244,8 @@ in python. %package gui Summary: Visualization tools for the Performance Co-Pilot toolkit License: %{license_gplv2plus} AND %{license_lgplv2plus} -Group: Applications/System -Url: http://www.pcp.io +Group: %{pcp_gr} +Url: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -2069,8 +2266,8 @@ BuildArch: noarch %endif Summary: Documentation and tutorial for the Performance Co-Pilot License: %{license_gplv2plus} AND %{license_cc_by} -Group: Documentation -Url: http://www.pcp.io +Group: Documentation/Other +Url: https://pcp.io # http://fedoraproject.org/wiki/Packaging:Conflicts "Splitting Packages" # (all man pages migrated to pcp-doc during great package split of '15) Conflicts: pcp-pmda-pmda < 3.10.5 @@ -2095,7 +2292,7 @@ PCP utilities and daemons, and the PCP graphical tools. Summary: Selinux policy package License: %{license_gplv2plus} AND %{license_cc_by} Group: Applications/System -Url: http://www.pcp.io +Url: https://pcp.io BuildRequires: selinux-policy-devel %if 0%{?rhel} == 5 BuildRequires: setools @@ -2129,6 +2326,7 @@ rm -Rf $RPM_BUILD_ROOT # in case we're building without os-release (bsc#1123311)... export PACKAGE_DISTRIBUTION="suse" %endif +export PACKAGE_BUILD_DATE=`date -u -r CHANGELOG +%Y-%m-%d` PCP_CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %configure \ --with-tmpdir=%{_tempsdir} \ --datarootdir=%{_datadir} \ @@ -2218,6 +2416,8 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop rm -fr $RPM_BUILD_ROOT/%{_pmdasdir}/lio %endif +rm -f $RPM_BUILD_ROOT/%{_localstatedir}/lib/pcp/testsuite/perfevent/perfevent_coverage # drop unreproducible file (boo#1040589) + %if 0%{?suse_version} rm -rf $RPM_BUILD_ROOT/%{_datadir}/pcp/webapps @@ -2272,7 +2472,6 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ grep -E -v '^elasticsearch' |\ grep -E -v '^gpfs' |\ grep -E -v '^gpsd' |\ - grep -E -v '^kvm' |\ grep -E -v '^lio' |\ grep -E -v '^lustre' |\ grep -E -v '^lustrecomm' |\ @@ -2289,6 +2488,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ grep -E -v '^pdns' |\ grep -E -v '^postfix' |\ grep -E -v '^postgresql' |\ + grep -E -v '^prometheus' |\ grep -E -v '^redis' |\ grep -E -v '^rsyslog' |\ grep -E -v '^samba' |\ @@ -2311,6 +2511,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ grep -E -v '^roomtemp' |\ grep -E -v '^sendmail' |\ grep -E -v '^shping' |\ + grep -E -v '^smart' |\ grep -E -v '^summary' |\ grep -E -v '^trace' |\ grep -E -v '^weblog' |\ @@ -2320,31 +2521,43 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ grep -E -v '^gluster' |\ grep -E -v '^zswap' |\ grep -E -v '^unbound' |\ + grep -E -v '^haproxy' |\ 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|pmcollectl|pmatop|zabbix|zbxpcp' |\ - grep -E -v 'pmrep|pcp2graphite|pcp2influxdb' |\ + grep -E -v 'pmiostat|pmcollectl|zabbix|zbxpcp|dstat' |\ + grep -E -v 'pmrep|pcp2csv|pcp2graphite|pcp2influxdb|pcp2zabbix' |\ + grep -E -v 'pcp2elasticsearch|pcp2json|pcp2xlsx|pcp2xml' |\ + grep -E -v 'pcp2spark' |\ grep -E -v 'pmdbg|pmclient|pmerr|genpmda' |\ sed -e 's#^#'%{_bindir}'\/#' >base_bin.list # # Separate the pcp-system-tools package files. -# -# pmatop, pmcollectl and pmiostat are back-compat symlinks to their -# pcp(1) sub-command variants so must also be in pcp-system-tools. +# pmcollectl and pmiostat are back-compat symlinks to their +# pcp(1) sub-command variants so are also in pcp-system-tools. %if !%{disable_python2} || !%{disable_python3} ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ - grep -E 'pmiostat|pmcollectl|pmatop|pmrep' |\ - sed -e 's#^#'%{_bindir}'\/#' >pcp_system_tools.list + egrep -e 'pmiostat|pmcollectl|pmrep|pcp2csv|dstat' |\ + sed -e 's#^#'%{_bindir}'\/#' >pcp-system-tools.list ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ - grep -E 'atop|collectl|dmcache|free|iostat|mpstat|numastat|pidstat|tapestat|verify|uptime|shping' |\ - sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp_system_tools.list + egrep -e 'atop|collectl|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' \ + -e 'numastat|pidstat|shping|tapestat|uptime|verify' |\ + sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp-system-tools.list +%endif +# Separate the pcp-selinux package files. +%if !%{disable_selinux} +ls -1 $RPM_BUILD_ROOT/%{_selinuxdir} |\ + sed -e 's#^#'%{_selinuxdir}'\/#' > pcp-selinux.list +ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ + grep -E 'selinux-setup' |\ + sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >> pcp-selinux.list %endif ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ %if !%{disable_python2} || !%{disable_python3} - grep -E -v 'atop|collectl|dmcache|free|iostat|mpstat|numastat|pidstat|tapestat|verify|uptime|shping' |\ + grep -E -v 'atop|collectl|dmcache|lvmcache|dstat|free|iostat|ipcs|mpstat|numastat' |\ + grep -E -v 'shping|tapestat|uptime|verify|selinux-setup' |\ %endif sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >base_exec.list ls -1 $RPM_BUILD_ROOT/%{_booksdir} |\ @@ -2363,19 +2576,18 @@ find $RPM_BUILD_ROOT/%{_datadir}/doc/pcp-doc |\ ls -1 $RPM_BUILD_ROOT/%{_datadir}/pcp/demos/tutorials |\ sed -e 's#^#'%{_datadir}/pcp/demos/tutorials'\/#' >>pcp-doc.list %endif -%if !%{disable_selinux} -ls -1 $RPM_BUILD_ROOT/%{_selinuxdir} |\ - sed -e 's#^#'%{_selinuxdir}'\/#' > pcp-selinux.list -%endif %if !%{disable_qt} ls -1 $RPM_BUILD_ROOT/%{_pixmapdir} |\ sed -e 's#^#'%{_pixmapdir}'\/#' > pcp-gui.list cat base_bin.list base_exec.list |\ grep -E "$PCP_GUI" >> pcp-gui.list %endif -cat base_pmdas.list 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 |\ grep -E -v 'pmdaib|pmmgr|pmweb|pmsnap|2pcp|pmdas/systemd' |\ - grep -E -v "$PCP_GUI|pixmaps|pcp-doc|tutorials|selinux" |\ + grep -E -v "$PCP_GUI|pixmaps|pcp-doc|tutorials|selinux|pmlogger_daily_report" |\ grep -E -v %{_confdir} | grep -E -v %{_logsdir} > base.list # all devel pcp package files except those split out into sub packages @@ -2404,7 +2616,15 @@ exit 0 chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null exit 0 +%if 0%{?suse_version} && !%{disable_systemd} +%pre zeroconf +%service_add_pre pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%endif + %pre +%if 0%{?suse_version} && !%{disable_systemd} +%service_add_pre pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer +%endif getent group pcp >/dev/null || groupadd -r pcp getent passwd pcp >/dev/null || \ useradd -c "Performance Co-Pilot" -g pcp -d %{_localstatedir}/lib/pcp -M -r -s /sbin/nologin pcp @@ -2504,6 +2724,11 @@ then fi %endif +%if 0%{?suse_version} && !%{disable_systemd} +%preun zeroconf +%service_del_preun pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%endif + %preun %if 0%{?suse_version} %if !%{disable_systemd} @@ -2572,6 +2797,31 @@ chown -R pcp:pcp %{_logsdir}/pmmgr 2>/dev/null %endif %endif +%post zeroconf +%if 0%{?suse_version} +%if !%{disable_systemd} +%service_add_post pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%endif +%else +%if !%{disable_systemd} + systemctl restart pmcd >/dev/null 2>&1 + systemctl restart pmlogger >/dev/null 2>&1 + systemctl restart pmie >/dev/null 2>&1 + systemctl enable pmcd >/dev/null 2>&1 + systemctl enable pmlogger >/dev/null 2>&1 + systemctl enable pmlogger_daily_report >/dev/null 2>&1 + systemctl enable pmlogger_daily_report-poll >/dev/null 2>&1 + systemctl enable pmie >/dev/null 2>&1 +%else + /sbin/chkconfig --add pmcd >/dev/null 2>&1 + /sbin/chkconfig --add pmlogger >/dev/null 2>&1 + /sbin/chkconfig --add pmie >/dev/null 2>&1 + /sbin/service pmcd condrestart + /sbin/service pmlogger condrestart + /sbin/service pmie condrestart +%endif +%endif #zeroconf + %if !%{disable_selinux} %post selinux %if 0%{?fedora} >= 24 || 0%{?rhel} > 6 @@ -2642,7 +2892,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %{fillup_only -n pmcd} %{fillup_only -n pmlogger} %{fillup_only -n pmproxy} -%service_add_post pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%service_add_post pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer %else %{fillup_and_insserv pmcd} %{fillup_and_insserv pmlogger} @@ -2718,11 +2968,16 @@ then fi %endif +%if 0%{?suse_version} && !%{disable_systemd} +%postun zeroconf +%service_del_postun pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%endif + %if 0%{?suse_version} %postun /sbin/ldconfig %if !%{disable_systemd} -%service_del_postun pmcd pmlogger pmproxy pmie pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%service_del_postun pmcd pmlogger pmproxy pmie pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer %else %{?restart_on_update:%{restart_on_update pcp pmproxy pmie}} %{?insserv_cleanup:%{insserv_cleanup}} @@ -2744,10 +2999,6 @@ fi %endif %dir %{_confdir} -%dir %{_confdir}/dstat -%{_confdir}/dstat/* -%dir %{_confdir}/discover -%{_confdir}/discover/* %dir %{_pmdasdir} %dir %{_datadir}/pcp %dir %{_localstatedir}/lib/pcp @@ -2806,7 +3057,6 @@ fi %config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf %if %{disable_systemd} %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger -%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger-daily-report %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie %else %{_unitdir}/pmie_check.service @@ -2819,10 +3069,6 @@ fi %{_unitdir}/pmlogger_check.timer %{_unitdir}/pmlogger_daily-poll.service %{_unitdir}/pmlogger_daily-poll.timer -%{_unitdir}/pmlogger_daily_report.service -%{_unitdir}/pmlogger_daily_report.timer -%{_unitdir}/pmlogger_daily_report-poll.service -%{_unitdir}/pmlogger_daily_report-poll.timer %endif %if 0%{?suse_version} %{_fillupdir}/sysconfig.pmlogger @@ -2849,6 +3095,8 @@ fi %config(noreplace) %{_confdir}/pmlogger/control %config(noreplace) %{_confdir}/pmlogger/control.d/local %dir %attr(0775,pcp,pcp) %{_confdir}/nssdb +%dir %{_confdir}/discover +%config(noreplace) %{_confdir}/discover/pcp-kube-pods.conf %{_localstatedir}/lib/pcp/config/pmafm %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie @@ -2856,7 +3104,7 @@ fi %{_localstatedir}/lib/pcp/config/pmieconf %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmlogger %{_localstatedir}/lib/pcp/config/pmlogger/* -%{_localstatedir}/lib/pcp/config/pmlogconf +%dir %{_logconfdir} %{_localstatedir}/lib/pcp/config/pmlogrewrite %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmda @@ -2867,6 +3115,19 @@ fi %{tapsetdir}/pmcd.stp %endif +%files zeroconf +%defattr(-,root,root) +%{_libexecdir}/pcp/bin/pmlogger_daily_report +%if %{disable_systemd} +%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger-daily-report +%else +%{_unitdir}/pmlogger_daily_report.service +%{_unitdir}/pmlogger_daily_report.timer +%{_unitdir}/pmlogger_daily_report-poll.service +%{_unitdir}/pmlogger_daily_report-poll.timer +%endif +%{_logconfdir}/zeroconf + %files conf %defattr(-,root,root) @@ -2961,8 +3222,7 @@ fi %endif %{_libexecdir}/pcp/bin/pmmgr %attr(0775,pcp,pcp) %{_logsdir}/pmmgr -%dir %{_confdir}/pmmgr -%{_confdir}/pmmgr +%config(missingok,noreplace) %{_confdir}/pmmgr %config(noreplace) %{_confdir}/pmmgr/pmmgr.options %files import-sar2pcp @@ -3038,9 +3298,6 @@ fi %files pmda-gpsd %{_pmdasdir}/gpsd -%files pmda-kvm -%{_pmdasdir}/kvm - %files pmda-docker %{_pmdasdir}/docker @@ -3049,6 +3306,9 @@ fi %{_pmdasdir}/lio %endif +%files pmda-prometheus +%{_pmdasdir}/prometheus + %files pmda-lustre %{_pmdasdir}/lustre @@ -3093,6 +3353,7 @@ fi %if !%{disable_postgresql} %files pmda-postgresql %{_pmdasdir}/postgresql +%config(noreplace) %{_pmdasdir}/postgresql/pmdapostgresql.conf %endif %files pmda-redis @@ -3134,23 +3395,48 @@ fi %files pmda-mic %{_pmdasdir}/mic +%files pmda-haproxy +%{_pmdasdir}/haproxy + %if !%{disable_libvirt} %files pmda-libvirt %{_pmdasdir}/libvirt %endif +%files export-pcp2elasticsearch +%{_bindir}/pcp2elasticsearch + %files export-pcp2graphite %{_bindir}/pcp2graphite %files export-pcp2influxdb %{_bindir}/pcp2influxdb + +%files export-pcp2json +%{_bindir}/pcp2json + +%files export-pcp2spark +%{_bindir}/pcp2spark + +%if !%{disable_xlsx} +%files export-pcp2xlsx +%{_bindir}/pcp2xlsx +%endif + +%files export-pcp2xml +%{_bindir}/pcp2xml + +%files export-pcp2zabbix +%{_bindir}/pcp2zabbix + +%files pmda-lmsensors +%{_pmdasdir}/lmsensors + %endif # !%{disable_python2} || !%{disable_python3} %files export-zabbix-agent %{_libdir}/zabbix -%{_bindir}/pcp2zabbix -%dir %{_sysconfdir}/zabbix -%{_sysconfdir}/zabbix/* +%{_sysconfdir}/zabbix %if !%{disable_json} %files pmda-json @@ -3172,9 +3458,6 @@ fi %files pmda-gfs2 %{_pmdasdir}/gfs2 -%files pmda-lmsensors -%{_pmdasdir}/lmsensors - %files pmda-logger %{_pmdasdir}/logger @@ -3201,6 +3484,9 @@ fi %files pmda-shping %{_pmdasdir}/shping +%files pmda-smart +%{_pmdasdir}/smart + %files pmda-summary %{_pmdasdir}/summary @@ -3286,9 +3572,11 @@ fi %endif %if !%{disable_python2} || !%{disable_python3} -%files system-tools -f pcp_system_tools.list +%files system-tools -f pcp-system-tools.list +%dir %{_confdir}/dstat %dir %{_confdir}/pmrep -%config(noreplace) %{_confdir}/pmrep/pmrep.conf +%config(noreplace) %{_confdir}/dstat/* +%config(noreplace) %{_confdir}/pmrep/* %endif %changelog