diff --git a/pcp.spec b/pcp.spec index 6f2c879..df23e53 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,14 +1,11 @@ Name: pcp -Version: 6.0.5 -Release: 4%{?dist} +Version: 6.1.0 +Release: 1%{?dist} Summary: System-level performance monitoring and performance management License: GPL-2.0-or-later AND LGPL-2.1-or-later AND CC-BY-3.0 URL: https://pcp.io -%global artifactory https://performancecopilot.jfrog.io/artifactory -Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz -Patch0: redhat-bugzilla-2175602.patch -Patch1: redhat-bugzilla-2185803.patch +Source0: https://github.com/performancecopilot/pcp/releases/pcp-%{version}.src.tar.gz # The additional linker flags break out-of-tree PMDAs. # https://bugzilla.redhat.com/show_bug.cgi?id=2043092 @@ -457,7 +454,7 @@ applications to easily retrieve and process any subset of that data. # pcp-conf # %package conf -License: LGPLv2+ +License: LGPL-2.1-or-later Summary: Performance Co-Pilot run-time configuration URL: https://pcp.io @@ -471,7 +468,7 @@ Performance Co-Pilot (PCP) run-time configuration # pcp-libs # %package libs -License: LGPLv2+ +License: LGPL-2.1-or-later Summary: Performance Co-Pilot run-time libraries URL: https://pcp.io Requires: pcp-conf = %{version}-%{release} @@ -486,7 +483,7 @@ Performance Co-Pilot (PCP) run-time libraries # pcp-libs-devel # %package libs-devel -License: GPLv2+ and LGPLv2+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Summary: Performance Co-Pilot (PCP) development headers URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -501,7 +498,7 @@ Performance Co-Pilot (PCP) headers for development. # pcp-devel # %package devel -License: GPLv2+ and LGPLv2+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Summary: Performance Co-Pilot (PCP) development tools and documentation URL: https://pcp.io Requires: pcp = %{version}-%{release} @@ -515,7 +512,7 @@ Performance Co-Pilot (PCP) documentation and tools for development. # pcp-testsuite # %package testsuite -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) test suite URL: https://pcp.io Requires: pcp = %{version}-%{release} @@ -593,7 +590,7 @@ Quality assurance test suite for Performance Co-Pilot (PCP). # perl-PCP-PMDA. This is the PCP agent perl binding. # %package -n perl-PCP-PMDA -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) Perl bindings and documentation URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -610,7 +607,7 @@ an application, etc. # perl-PCP-MMV # %package -n perl-PCP-MMV -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -628,7 +625,7 @@ and analysis with pmchart, pmie, pmlogger and other PCP tools. # perl-PCP-LogImport # %package -n perl-PCP-LogImport -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) Perl bindings for importing external data into PCP archives URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -643,7 +640,7 @@ they can be replayed with standard PCP monitoring tools. # perl-PCP-LogSummary # %package -n perl-PCP-LogSummary -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) Perl bindings for post-processing output of pmlogsummary URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -661,7 +658,7 @@ exporting this data into third-party tools (e.g. spreadsheets). # pcp-import-sar2pcp # %package import-sar2pcp -License: LGPLv2+ +License: LGPL-2.1-or-later Summary: Performance Co-Pilot tools for importing sar data into PCP archive logs URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -676,7 +673,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. # pcp-import-iostat2pcp # %package import-iostat2pcp -License: LGPLv2+ +License: LGPL-2.1-or-later Summary: Performance Co-Pilot tools for importing iostat data into PCP archive logs URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -690,7 +687,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. # pcp-import-mrtg2pcp # %package import-mrtg2pcp -License: LGPLv2+ +License: LGPL-2.1-or-later Summary: Performance Co-Pilot tools for importing MTRG data into PCP archive logs URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -704,7 +701,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. # pcp-import-ganglia2pcp # %package import-ganglia2pcp -License: LGPLv2+ +License: LGPL-2.1-or-later Summary: Performance Co-Pilot tools for importing ganglia data into PCP archive logs URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -718,7 +715,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. # pcp-import-collectl2pcp # %package import-collectl2pcp -License: LGPLv2+ +License: LGPL-2.1-or-later Summary: Performance Co-Pilot tools for importing collectl log files into PCP archive logs URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -731,7 +728,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. # pcp-export-zabbix-agent # %package export-zabbix-agent -License: GPLv2+ +License: GPL-2.0-or-later Summary: Module for exporting PCP metrics to Zabbix agent URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} @@ -745,7 +742,7 @@ Zabbix via the Zabbix agent - see zbxpcp(3) for further details. # pcp-export-pcp2elasticsearch # %package export-pcp2elasticsearch -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot tools for exporting PCP metrics to ElasticSearch URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} @@ -768,7 +765,7 @@ See https://www.elastic.co/community for further details. # pcp-export-pcp2graphite # %package export-pcp2graphite -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot tools for exporting PCP metrics to Graphite URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} @@ -785,7 +782,7 @@ to graphite (http://graphite.readthedocs.org). # pcp-export-pcp2influxdb # %package export-pcp2influxdb -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot tools for exporting PCP metrics to InfluxDB URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} @@ -805,7 +802,7 @@ to InfluxDB (https://influxdata.com/time-series-platform/influxdb). # pcp-export-pcp2json # %package export-pcp2json -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot tools for exporting PCP metrics in JSON format URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} @@ -823,7 +820,7 @@ in JSON format. # pcp-export-pcp2spark # %package export-pcp2spark -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot tools for exporting PCP metrics to Apache Spark URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} @@ -843,7 +840,7 @@ further details on Apache Spark. # %if !%{disable_xlsx} %package export-pcp2xlsx -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot tools for exporting PCP metrics to Excel URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} @@ -865,7 +862,7 @@ in Excel spreadsheet format. # pcp-export-pcp2xml # %package export-pcp2xml -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot tools for exporting PCP metrics in XML format URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} @@ -883,7 +880,7 @@ in XML format. # pcp-export-pcp2zabbix # %package export-pcp2zabbix -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot tools for exporting PCP metrics to Zabbix URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} @@ -902,7 +899,7 @@ to the Zabbix (https://www.zabbix.org/) monitoring software. # pcp-pmda-podman # %package pmda-podman -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for podman containers URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -916,7 +913,7 @@ collecting podman container and pod statistics via the podman REST API. # pcp-pmda-statsd # %package pmda-statsd -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from statsd URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -932,7 +929,7 @@ collecting statistics from the statsd daemon. # pcp-pmda-perfevent # %package pmda-perfevent -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for hardware counters URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -951,7 +948,7 @@ collecting hardware counters statistics through libpfm. # pcp-pmda-infiniband # %package pmda-infiniband -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Infiniband HCAs and switches URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -968,7 +965,7 @@ but can also be configured to monitor remote GUIDs such as IB switches. # pcp-pmda-activemq # %package pmda-activemq -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for ActiveMQ URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -984,7 +981,7 @@ collecting metrics about the ActiveMQ message broker. # pcp-pmda-bind2 # %package pmda-bind2 -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for BIND servers URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1004,7 +1001,7 @@ collecting metrics from BIND (Berkeley Internet Name Domain). # pcp-pmda-redis # %package pmda-redis -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Redis URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1023,7 +1020,7 @@ collecting metrics from Redis servers (redis.io). # pcp-pmda-nutcracker # %package pmda-nutcracker -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for NutCracker (TwemCache) URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1041,7 +1038,7 @@ collecting metrics from NutCracker (TwemCache). # pcp-pmda-bonding # %package pmda-bonding -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Bonded network interfaces URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1056,7 +1053,7 @@ collecting metrics about bonded network interfaces. # pcp-pmda-dbping # %package pmda-dbping -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Database response times and Availablility URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1072,7 +1069,7 @@ collecting metrics about the Database response times and Availablility. # pcp-pmda-ds389 # %package pmda-ds389 -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Servers URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1090,7 +1087,7 @@ collecting metrics about a 389 Directory Server. # pcp-pmda-ds389log # %package pmda-ds389log -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Server Loggers URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1107,7 +1104,7 @@ collecting metrics from a 389 Directory Server log. # pcp-pmda-gpfs # %package pmda-gpfs -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for GPFS Filesystem URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1122,7 +1119,7 @@ collecting metrics about the GPFS filesystem. # pcp-pmda-gpsd # %package pmda-gpsd -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for a GPS Daemon URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1139,7 +1136,7 @@ collecting metrics about a GPS Daemon. # pcp-pmda-denki # %package pmda-denki -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics dealing with electrical power URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1153,7 +1150,7 @@ the system. # pcp-pmda-docker # %package pmda-docker -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from the Docker daemon URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1167,7 +1164,7 @@ collecting metrics using the Docker daemon REST API. # pcp-pmda-lustre # %package pmda-lustre -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1182,7 +1179,7 @@ collecting metrics about the Lustre Filesystem. # pcp-pmda-lustrecomm # %package pmda-lustrecomm -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem Comms URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1196,7 +1193,7 @@ collecting metrics about the Lustre Filesystem Comms. # pcp-pmda-memcache # %package pmda-memcache -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Memcached URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1211,7 +1208,7 @@ collecting metrics about Memcached. # pcp-pmda-mysql # %package pmda-mysql -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for MySQL URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1228,7 +1225,7 @@ collecting metrics about the MySQL database. # pcp-pmda-named # %package pmda-named -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Named URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1242,7 +1239,7 @@ collecting metrics about the Named nameserver. # pcp-pmda-netfilter # %package pmda-netfilter -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Netfilter framework URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1257,7 +1254,7 @@ collecting metrics about the Netfilter packet filtering framework. # pcp-pmda-news # %package pmda-news -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Usenet News URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1272,7 +1269,7 @@ collecting metrics about Usenet News. # pcp-pmda-nginx # %package pmda-nginx -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Nginx Webserver URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1289,7 +1286,7 @@ collecting metrics about the Nginx Webserver. # pcp-pmda-oracle # %package pmda-oracle -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Oracle database URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1306,7 +1303,7 @@ collecting metrics about the Oracle database. # pcp-pmda-pdns # %package pmda-pdns -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for PowerDNS URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1322,7 +1319,7 @@ collecting metrics about the PowerDNS. # pcp-pmda-postfix # %package pmda-postfix -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Postfix (MTA) URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1350,7 +1347,7 @@ collecting metrics about the Postfix (MTA). # pcp-pmda-rsyslog # %package pmda-rsyslog -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Rsyslog URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1365,7 +1362,7 @@ collecting metrics about Rsyslog. # pcp-pmda-samba # %package pmda-samba -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Samba URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1380,7 +1377,7 @@ collecting metrics about Samba. # pcp-pmda-slurm # %package pmda-slurm -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the SLURM Workload Manager URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1396,7 +1393,7 @@ collecting metrics from the SLURM Workload Manager. # pcp-pmda-snmp # %package pmda-snmp -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Simple Network Management Protocol URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1416,7 +1413,7 @@ collecting metrics about SNMP. # pcp-pmda-zimbra # %package pmda-zimbra -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Zimbra URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1431,7 +1428,7 @@ collecting metrics about Zimbra. # pcp-pmda-dm # %package pmda-dm -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Device Mapper Cache and Thin Client URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1447,7 +1444,7 @@ collecting metrics about the Device Mapper Cache and Thin Client. # pcp-pmda-bcc # %package pmda-bcc -License: ASL 2.0 and GPLv2+ +License: Apache-2.0 AND GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from eBPF/BCC modules URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1464,7 +1461,7 @@ extracting performance metrics from eBPF/BCC Python modules. # pcp-pmda-bpf # %package pmda-bpf -License: ASL 2.0 and GPLv2+ +License: Apache-2.0 AND GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from eBPF ELF modules URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1481,7 +1478,7 @@ extracting performance metrics from eBPF ELF modules. # pcp-pmda-bpftrace # %package pmda-bpftrace -License: ASL 2.0 and GPLv2+ +License: Apache-2.0 AND GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from bpftrace scripts URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1499,7 +1496,7 @@ extracting performance metrics from bpftrace scripts. # pcp-pmda-gluster # %package pmda-gluster -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Gluster filesystem URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1517,7 +1514,7 @@ collecting metrics about the gluster filesystem. # pcp-pmda-nfsclient # %package pmda-nfsclient -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for NFS Clients URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1535,7 +1532,7 @@ collecting metrics for NFS Clients. # pcp-pmda-postgresql # %package pmda-postgresql -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for PostgreSQL URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1557,7 +1554,7 @@ collecting metrics about the PostgreSQL database. # pcp-pmda-zswap # %package pmda-zswap -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for compressed swap URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1575,7 +1572,7 @@ collecting metrics about compressed swap. # pcp-pmda-unbound # %package pmda-unbound -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Unbound DNS Resolver URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1593,7 +1590,7 @@ collecting metrics about the Unbound DNS Resolver. # pcp-pmda-mic # %package pmda-mic -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Intel MIC cards URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1611,7 +1608,7 @@ collecting metrics about Intel MIC cards. # pcp-pmda-haproxy # %package pmda-haproxy -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for HAProxy URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1629,7 +1626,7 @@ extracting performance metrics from HAProxy over the HAProxy stats socket. # pcp-pmda-libvirt # %package pmda-libvirt -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from virtual machines URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1659,7 +1656,7 @@ and hypervisor machines. # pcp-pmda-elasticsearch # %package pmda-elasticsearch -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1677,7 +1674,7 @@ collecting metrics about Elasticsearch. # pcp-pmda-openvswitch # %package pmda-openvswitch -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Open vSwitch URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1695,7 +1692,7 @@ collecting metrics from Open vSwitch. # pcp-pmda-rabbitmq # %package pmda-rabbitmq -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for RabbitMQ queues URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1713,7 +1710,7 @@ collecting metrics about RabbitMQ message queues. # pcp-pmda-lio # %package pmda-lio -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the LIO subsystem URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1738,7 +1735,7 @@ target. # pcp-pmda-openmetrics # %package pmda-openmetrics -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from OpenMetrics endpoints URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1764,7 +1761,7 @@ extracting metrics from OpenMetrics (https://openmetrics.io/) endpoints. # pcp-pmda-lmsensors # %package pmda-lmsensors -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for hardware sensors URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1785,7 +1782,7 @@ collecting metrics about the Linux hardware monitoring sensors. # pcp-pmda-netcheck # %package pmda-netcheck -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for simple network checks URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1805,7 +1802,7 @@ collecting metrics from simple network checks. # pcp-pmda-mongodb # %package pmda-mongodb -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for MongoDB URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1833,19 +1830,21 @@ collecting metrics from MongoDB. # pcp-pmda-mssql # %package pmda-mssql -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Microsoft SQL Server URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp -%if 0%{?rhel} == 0 || 0%{?rhel} > 7 +%if 0%{?rhel} == 0 Requires: python3-pyodbc +BuildRequires: python3-pyodbc %endif %else Requires: %{__python2}-pcp %if 0%{?rhel} == 0 Requires: %{__python2}-pyodbc +BuildRequires: %{__python2}-pyodbc %endif %endif %description pmda-mssql @@ -1859,7 +1858,7 @@ collecting metrics from Microsoft SQL Server. # pcp-pmda-json # %package pmda-json -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for JSON data URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1883,7 +1882,7 @@ collecting metrics output in JSON. # pcp-pmda-apache # %package pmda-apache -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Apache webserver URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1896,7 +1895,7 @@ collecting metrics about the Apache webserver. # pcp-pmda-bash # %package pmda-bash -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Bash shell URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1909,7 +1908,7 @@ collecting metrics about the Bash shell. # pcp-pmda-cifs # %package pmda-cifs -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the CIFS protocol URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1922,7 +1921,7 @@ collecting metrics about the Common Internet Filesytem. # pcp-pmda-cisco # %package pmda-cisco -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Cisco routers URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1935,7 +1934,7 @@ collecting metrics about Cisco routers. # pcp-pmda-gfs2 # %package pmda-gfs2 -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the GFS2 filesystem URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1948,7 +1947,7 @@ collecting metrics about the Global Filesystem v2. # pcp-pmda-logger # %package pmda-logger -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from arbitrary log files URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1962,7 +1961,7 @@ supports both sampled and event-style metrics. # pcp-pmda-mailq # %package pmda-mailq -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the sendmail queue URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1975,7 +1974,7 @@ collecting metrics about email queues managed by sendmail. # pcp-pmda-mounts # %package pmda-mounts -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for filesystem mounts URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -1988,7 +1987,7 @@ collecting metrics about filesystem mounts. # pcp-pmda-nvidia-gpu # %package pmda-nvidia-gpu -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the Nvidia GPU URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2001,7 +2000,7 @@ collecting metrics about Nvidia GPUs. # pcp-pmda-roomtemp # %package pmda-roomtemp -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for the room temperature URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2014,7 +2013,7 @@ collecting metrics about the room temperature. # pcp-pmda-sendmail # %package pmda-sendmail -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for Sendmail URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2027,7 +2026,7 @@ collecting metrics about Sendmail traffic. # pcp-pmda-shping # %package pmda-shping -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for shell command responses URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2041,7 +2040,7 @@ arbitrary shell commands. # pcp-pmda-smart # %package pmda-smart -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for S.M.A.R.T values URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2056,7 +2055,7 @@ smartmontools package. # pcp-pmda-sockets # %package pmda-sockets -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) per-socket metrics URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2070,7 +2069,7 @@ collecting per-socket statistics, making use of utilities such as 'ss'. # pcp-pmda-hacluster # %package pmda-hacluster -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for High Availability Clusters URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2083,7 +2082,7 @@ collecting metrics about linux High Availability (HA) Clusters. # pcp-pmda-summary # %package pmda-summary -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) summary metrics from pmie URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2097,7 +2096,7 @@ collecting metrics about other installed PMDAs. # pcp-pmda-systemd # %package pmda-systemd -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from the Systemd journal URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2111,7 +2110,7 @@ collecting metrics from the Systemd journal. # pcp-pmda-trace # %package pmda-trace -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics for application tracing URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2124,7 +2123,7 @@ collecting metrics about trace performance data in applications. # pcp-pmda-weblog # %package pmda-weblog -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) metrics from web server logs URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2135,7 +2134,7 @@ collecting metrics about web server logs. # end C pmdas %package zeroconf -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) Zeroconf Package URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2156,7 +2155,7 @@ automated pmie diagnosis, alerting and self-healing for the localhost. # python2-pcp. This is the PCP library bindings for python. # %package -n %{__python2}-pcp -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) Python bindings and documentation URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2181,7 +2180,7 @@ Metric Domain Agent (PMDA) collector tools written in Python. # python3-pcp. This is the PCP library bindings for python3. # %package -n python3-pcp -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) Python3 bindings and documentation URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2197,7 +2196,7 @@ Metric Domain Agent (PMDA) collector tools written in Python3. # pcp-system-tools # %package system-tools -License: GPLv2+ +License: GPL-2.0-or-later Summary: Performance Co-Pilot (PCP) System and Monitoring Tools URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2224,7 +2223,7 @@ in the Python language. # pcp-gui package for Qt tools # %package gui -License: GPLv2+ and LGPLv2+ and LGPLv2+ with exceptions +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH Qwt-exception-1.0 Summary: Visualization tools for the Performance Co-Pilot toolkit URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} @@ -2242,7 +2241,7 @@ monitoring systems using live and archived Performance Co-Pilot # pcp-doc package # %package doc -License: GPLv2+ and CC-BY +License: GPL-2.0-or-later AND CC-BY-3.0 %if !%{disable_noarch} BuildArch: noarch %endif @@ -2268,7 +2267,7 @@ PCP utilities and daemons, and the PCP graphical tools. # %if !%{disable_selinux} %package selinux -License: GPLv2+ and CC-BY +License: GPL-2.0-or-later AND CC-BY-3.0 Summary: Selinux policy package URL: https://pcp.io BuildRequires: selinux-policy-devel @@ -2440,7 +2439,8 @@ basic_manifest | keep 'selinux' | cull 'tmp|testsuite' >pcp-selinux-files basic_manifest | keep 'zeroconf|daily[-_]report|/sa$' >pcp-zeroconf-files basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|htop|pcp2csv' \ -e 'pcp-atop|pcp-dmcache|pcp-dstat|pcp-free|pcp-htop' \ - -e 'pcp-ipcs|pcp-iostat|pcp-lvmcache|pcp-mpstat' \ + -e 'pcp-ipcs|pcp-iostat|pcp-lvmcache|pcp-mpstat|pcp-netstat' \ + -e 'pcp-buddyinfo|pcp-meminfo|pcp-slabinfo|pcp-zoneinfo' \ -e 'pcp-numastat|pcp-pidstat|pcp-shping|pcp-tapestat' \ -e 'pcp-uptime|pcp-verify|pcp-ss|pcp-ps' | \ cull 'selinux|pmlogconf|pmieconf|pmrepconf' >pcp-system-tools-files @@ -3364,6 +3364,10 @@ fi %files zeroconf -f pcp-zeroconf-files.rpm %changelog +* Thu Sep 14 2023 Nathan Scott - 6.1.0-1 +- Use absolute path in default PCP_PYTHON_PROG (BZ 2227011) +- Update to latest PCP sources. + * Mon Aug 07 2023 Nathan Scott - 6.0.5-4 - Improve Event Driven Ansible integration (BZ 2185803) @@ -3617,7 +3621,7 @@ fi - SELinux is preventing pmdalinux from 'search' accesses on the directory /var/lib/libvirt/images (BZ 1579988) - SELinux is preventing pmdalinux from 'unix_read' accesses - on the semáforo Unknown (BZ 1607658) + on the semáforo Unknown (BZ 1607658) - SELinux is preventing pmdalinux from 'unix_read' accesses on the shared memory Unknown (BZ 1618756, BZ 1619381, BZ 1601721) - Update to latest PCP sources. @@ -3665,13 +3669,13 @@ fi * Tue Jul 03 2018 Petr Pisar - 4.1.0-6 - Perl 5.28 rebuild -* Fri Jun 29 2018 Miro HronÄok - 4.1.0-5 +* Fri Jun 29 2018 Miro Hron¿ok - 4.1.0-5 - Rebuilt for Python 3.7 * Thu Jun 28 2018 Jitka Plesnikova - 4.1.0-4 - Perl 5.28 rebuild -* Tue Jun 19 2018 Miro HronÄok - 4.1.0-3 +* Tue Jun 19 2018 Miro Hron¿ok - 4.1.0-3 - Rebuilt for Python 3.7 * Fri Jun 15 2018 Nathan Scott - 4.1.0-2 diff --git a/redhat-bugzilla-2175602.patch b/redhat-bugzilla-2175602.patch deleted file mode 100644 index 2d01881..0000000 --- a/redhat-bugzilla-2175602.patch +++ /dev/null @@ -1,69 +0,0 @@ -commit e97d64cfab956e3542a0f25442086ee2fd74d9a5 -Author: Nathan Scott -Date: Tue Jul 18 16:22:30 2023 +1000 - - pmieconf: move test_action from primary into a separate group - - Problem with using primary is that it is automatically enabled - as part of the primary pmie startup and thats not whats needed - for this diagnostic rule. - - Resolves Red Hat BZ #2223348 - -diff --git a/src/pmieconf/.gitignore b/src/pmieconf/.gitignore -index 3c0b7b51ef..0670d80057 100644 ---- a/src/pmieconf/.gitignore -+++ b/src/pmieconf/.gitignore -@@ -9,6 +9,7 @@ perdisk/GNUmakefile - pernetif/GNUmakefile - power/GNUmakefile - primary/GNUmakefile -+testing/GNUmakefile - zeroconf/GNUmakefile - pmieconf - pmieconf.static -diff --git a/src/pmieconf/GNUmakefile b/src/pmieconf/GNUmakefile -index 567d94dce1..7a82e45a28 100644 ---- a/src/pmieconf/GNUmakefile -+++ b/src/pmieconf/GNUmakefile -@@ -18,7 +18,7 @@ include $(TOPDIR)/src/include/builddefs - include $(TOPDIR)/src/libpcp/src/GNUlibrarydefs - - MKFILE_SUBDIRS = cpu entropy filesys memory network percpu perdisk pernetif \ -- power global primary zeroconf -+ power global primary testing zeroconf - SUBDIRS = $(MKFILE_SUBDIRS) - - CMDTARGET = pmieconf$(EXECSUFFIX) -diff --git a/src/pmieconf/primary/localdefs b/src/pmieconf/primary/localdefs -index 3d51dd69d9..ca21fca8b5 100644 ---- a/src/pmieconf/primary/localdefs -+++ b/src/pmieconf/primary/localdefs -@@ -1,2 +1,2 @@ --ALL_RULES = pmda_status test_actions -+ALL_RULES = pmda_status - LOCAL_RULES = $(ALL_RULES) -diff --git a/src/pmieconf/testing/localdefs b/src/pmieconf/testing/localdefs -new file mode 100644 -index 0000000000..a2af94f1c0 ---- /dev/null -+++ b/src/pmieconf/testing/localdefs -@@ -0,0 +1,2 @@ -+ALL_RULES = test_actions -+LOCAL_RULES = $(ALL_RULES) -diff --git a/src/pmieconf/primary/test_actions b/src/pmieconf/testing/test_actions -similarity index 97% -rename from src/pmieconf/primary/test_actions -rename to src/pmieconf/testing/test_actions -index cc0ee1f7cb..56c89787a0 100644 ---- a/src/pmieconf/primary/test_actions -+++ b/src/pmieconf/testing/test_actions -@@ -2,7 +2,7 @@ - # --- DO NOT MODIFY THIS FILE --- see pmieconf(5) - # - --rule primary.test_actions -+rule testing.test_actions - default = "$rule$" - predicate = "hinv.ncpu > 0" - enabled = no diff --git a/redhat-bugzilla-2185803.patch b/redhat-bugzilla-2185803.patch deleted file mode 100644 index 995c714..0000000 --- a/redhat-bugzilla-2185803.patch +++ /dev/null @@ -1,94 +0,0 @@ -commit b4869520fd98f8b2ad09d39fb4466100d508b926 -Author: Nathan Scott -Date: Mon Aug 7 13:04:38 2023 +1000 - - pmieconf: update webhook action for better EDA integration - - The pmieconf webhook action was initially created for Event - Driven Ansible (EDA); two issues have been resolved related - - using the JSON key "values" conflicts with something deep - down in EDA that also interprets this JSON. Use "message", - which is more descriptive of the content anyway. - - there is no easily accessible hostname JSON key - add one - via the usual %h pmie action string expansion. - - Related to Red Hat BZ #2185803 - -diff --git a/qa/1567 b/qa/1567 -index ba90aa9cc8..10c1756ca4 100755 ---- a/qa/1567 -+++ b/qa/1567 -@@ -53,7 +53,7 @@ sleep 2 # let nc start up - ( sleep 2; $signal $pid1 ) >>$seq.full 2>&1 & - - echo "pmie webhook invocation" | tee -a $here/$seq.full --pmie_webhook "http://localhost:$port/webhook|Busy CPU|100%hosta|100%@hostb" 2> $tmp.webhook.err -+pmie_webhook "http://localhost:$port/webhook|Busy CPU|www.abc.com|100%@www.abc.com" 2> $tmp.webhook.err - cat $tmp.webhook.err >> $here/$seq.full - echo - -diff --git a/qa/1567.out b/qa/1567.out -index e3fce64bb3..153aec9581 100644 ---- a/qa/1567.out -+++ b/qa/1567.out -@@ -9,5 +9,5 @@ Content-Type: application/json - Host: localhost:PORT - POST /webhook HTTP/1.1 - User-Agent: curl VERSION --{"pcp":{"pmie":{"rule":"Busy CPU","values":"100%hosta 100%@hostb"}}} -+{"pcp":{"pmie":{"rule":"Busy CPU","hostname":"www.abc.com","message":"100%@www.abc.com"}}} - -diff --git a/src/pmieconf/global/pcp_actions b/src/pmieconf/global/pcp_actions -index 476bef0553..61e787f21e 100644 ---- a/src/pmieconf/global/pcp_actions -+++ b/src/pmieconf/global/pcp_actions -@@ -95,7 +95,7 @@ the rule condition is true."; - - shell global.webhook_action - enabled = no -- default = "pmie_webhook '$webhook_endpoint$|$rule$^|$action_expand$^'" -+ default = "pmie_webhook '$webhook_endpoint$|$rule$^|%h|$action_expand$^'" - help = - "HTTP POST message will be sent to \"webhook_endpoint\" when a - rule condition is true. The message will be in JSON format."; -diff --git a/src/pmieconf/pmie_webhook b/src/pmieconf/pmie_webhook -index 87193fca60..8d386f1ae6 100755 ---- a/src/pmieconf/pmie_webhook -+++ b/src/pmieconf/pmie_webhook -@@ -19,7 +19,8 @@ - # - # "line" 1 - HTTP/HTTPS endpoint, as passed to a http client - # "line" 2 - pmie rule name --# "line" 3,4,.. - values from predicate evaluation [optional] -+# "line" 3 - rule evaluated for hostname -+# "line" 4,5,.. - values from predicate evaluation [optional] - - # source the PCP configuration environment variables - . /etc/pcp.env -@@ -28,7 +29,7 @@ prog=`basename $0` - - if [ $# -ne 1 ] - then -- echo "Usage: $prog url|rule|message" -+ echo "Usage: $prog url|rule|hostname|message" - exit 1 - fi - -@@ -46,14 +47,14 @@ if [ -z "$CURL" ] ; then - fi - - cat <