Compare commits
2 Commits
32d092876e
...
0f7d616244
Author | SHA1 | Date |
---|---|---|
Nathan Scott | 0f7d616244 | |
Nathan Scott | ca85c78730 |
|
@ -0,0 +1 @@
|
||||||
|
a984d4bea0111428b1922d213f8a1542562cc187 pcp-6.2.1.src.tar.gz
|
76
pcp.spec
76
pcp.spec
|
@ -1,5 +1,5 @@
|
||||||
Name: pcp
|
Name: pcp
|
||||||
Version: 6.2.0
|
Version: 6.2.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: System-level performance monitoring and performance management
|
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
|
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND CC-BY-3.0
|
||||||
|
@ -7,6 +7,7 @@ URL: https://pcp.io
|
||||||
|
|
||||||
Source0: https://github.com/performancecopilot/pcp/releases/pcp-%{version}.src.tar.gz
|
Source0: https://github.com/performancecopilot/pcp/releases/pcp-%{version}.src.tar.gz
|
||||||
|
|
||||||
|
# Keep xx-default-archive-version.patch for the life of RHEL9
|
||||||
Patch1: redhat-issues-RHEL-2317-default-archive-version.patch
|
Patch1: redhat-issues-RHEL-2317-default-archive-version.patch
|
||||||
|
|
||||||
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
|
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
|
||||||
|
@ -106,7 +107,7 @@ ExcludeArch: %{ix86}
|
||||||
|
|
||||||
# support for pmdabpf, check bcc.spec for supported architectures of libbpf-tools
|
# support for pmdabpf, check bcc.spec for supported architectures of libbpf-tools
|
||||||
%if 0%{?fedora} >= 37 || 0%{?rhel} > 8
|
%if 0%{?fedora} >= 37 || 0%{?rhel} > 8
|
||||||
%ifarch x86_64 %{power64} aarch64
|
%ifarch x86_64 %{power64} aarch64 s390x
|
||||||
%global disable_bpf 0
|
%global disable_bpf 0
|
||||||
%else
|
%else
|
||||||
%global disable_bpf 1
|
%global disable_bpf 1
|
||||||
|
@ -206,13 +207,9 @@ ExcludeArch: %{ix86}
|
||||||
%global disable_noarch 1
|
%global disable_noarch 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# build pcp2arrow whenever possible (no RHEL or 32 bit x86 Fedora python3-arrow)
|
# build pcp2arrow (no python3-arrow on RHEL or 32-bit Fedora)
|
||||||
%if 0%{?fedora} >= 36
|
%if 0%{?fedora} >= 40
|
||||||
%ifarch %{ix86} x86_64
|
|
||||||
%global disable_arrow 1
|
|
||||||
%else
|
|
||||||
%global disable_arrow 0
|
%global disable_arrow 0
|
||||||
%endif
|
|
||||||
%else
|
%else
|
||||||
%global disable_arrow 1
|
%global disable_arrow 1
|
||||||
%endif
|
%endif
|
||||||
|
@ -577,7 +574,7 @@ Requires: pcp-pmda-bpftrace
|
||||||
%if !%{disable_python2} || !%{disable_python3}
|
%if !%{disable_python2} || !%{disable_python3}
|
||||||
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
|
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
|
||||||
Requires: pcp-pmda-libvirt pcp-pmda-lio pcp-pmda-openmetrics pcp-pmda-haproxy
|
Requires: pcp-pmda-libvirt pcp-pmda-lio pcp-pmda-openmetrics pcp-pmda-haproxy
|
||||||
Requires: pcp-pmda-lmsensors pcp-pmda-netcheck pcp-pmda-rabbitmq
|
Requires: pcp-pmda-lmsensors pcp-pmda-netcheck pcp-pmda-rabbitmq pcp-pmda-uwsgi
|
||||||
Requires: pcp-pmda-openvswitch
|
Requires: pcp-pmda-openvswitch
|
||||||
%endif
|
%endif
|
||||||
%if !%{disable_mongodb}
|
%if !%{disable_mongodb}
|
||||||
|
@ -865,6 +862,24 @@ Requires: %{__python2}-pcp = %{version}-%{release}
|
||||||
Performance Co-Pilot (PCP) front-end tools for exporting metric values
|
Performance Co-Pilot (PCP) front-end tools for exporting metric values
|
||||||
in JSON format.
|
in JSON format.
|
||||||
|
|
||||||
|
#
|
||||||
|
# pcp-export-pcp2openmetrics
|
||||||
|
#
|
||||||
|
%package export-pcp2openmetrics
|
||||||
|
License: GPL-2.0-or-later
|
||||||
|
Summary: Performance Co-Pilot tools for exporting PCP metrics in OpenMetrics format
|
||||||
|
URL: https://pcp.io
|
||||||
|
Requires: pcp-libs >= %{version}-%{release}
|
||||||
|
%if !%{disable_python3}
|
||||||
|
Requires: python3-pcp = %{version}-%{release}
|
||||||
|
%else
|
||||||
|
Requires: %{__python2}-pcp = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description export-pcp2openmetrics
|
||||||
|
Performance Co-Pilot (PCP) front-end tools for exporting metric values
|
||||||
|
in OpenMetrics (https://openmetrics.io/) format.
|
||||||
|
|
||||||
#
|
#
|
||||||
# pcp-export-pcp2spark
|
# pcp-export-pcp2spark
|
||||||
#
|
#
|
||||||
|
@ -1780,6 +1795,24 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||||
collecting metrics about RabbitMQ message queues.
|
collecting metrics about RabbitMQ message queues.
|
||||||
#end pcp-pmda-rabbitmq
|
#end pcp-pmda-rabbitmq
|
||||||
|
|
||||||
|
#
|
||||||
|
# pcp-pmda-uwsgi
|
||||||
|
#
|
||||||
|
%package pmda-uwsgi
|
||||||
|
License: GPL-2.0-or-later
|
||||||
|
Summary: Performance Co-Pilot (PCP) metrics from uWSGI servers
|
||||||
|
URL: https://pcp.io
|
||||||
|
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
|
||||||
|
%if !%{disable_python3}
|
||||||
|
Requires: python3-pcp
|
||||||
|
%else
|
||||||
|
Requires: %{__python2}-pcp
|
||||||
|
%endif
|
||||||
|
%description pmda-uwsgi
|
||||||
|
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||||
|
collecting metrics from uWSGI servers.
|
||||||
|
#end pcp-pmda-uwsgi
|
||||||
|
|
||||||
#
|
#
|
||||||
# pcp-pmda-lio
|
# pcp-pmda-lio
|
||||||
#
|
#
|
||||||
|
@ -2488,7 +2521,7 @@ sed -i '/.a$/d' pcp-devel-files
|
||||||
sed -i '/\/man\//d' pcp-devel-files
|
sed -i '/\/man\//d' pcp-devel-files
|
||||||
sed -i '/\/include\//d' pcp-devel-files
|
sed -i '/\/include\//d' pcp-devel-files
|
||||||
|
|
||||||
%ifarch x86_64 ppc64 ppc64le aarch64 s390x
|
%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64
|
||||||
sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-libs-files
|
sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-libs-files
|
||||||
sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-devel-files
|
sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-devel-files
|
||||||
sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-libs-devel-files
|
sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-libs-devel-files
|
||||||
|
@ -2537,7 +2570,7 @@ basic_manifest() {
|
||||||
# Likewise, for the pcp-pmda and pcp-testsuite subpackages.
|
# Likewise, for the pcp-pmda and pcp-testsuite subpackages.
|
||||||
#
|
#
|
||||||
total_manifest | keep 'tutorials|/html/|pcp-doc|man.*\.[1-9].*' | cull 'out' >pcp-doc-files
|
total_manifest | keep 'tutorials|/html/|pcp-doc|man.*\.[1-9].*' | cull 'out' >pcp-doc-files
|
||||||
total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault.h' >pcp-testsuite-files
|
total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault.h|pmcheck/pmda-sample' >pcp-testsuite-files
|
||||||
|
|
||||||
basic_manifest | keep "$PCP_GUI|pcp-gui|applications|pixmaps|hicolor" | cull 'pmtime.h' >pcp-gui-files
|
basic_manifest | keep "$PCP_GUI|pcp-gui|applications|pixmaps|hicolor" | cull 'pmtime.h' >pcp-gui-files
|
||||||
basic_manifest | keep 'selinux' | cull 'tmp|testsuite' >pcp-selinux-files
|
basic_manifest | keep 'selinux' | cull 'tmp|testsuite' >pcp-selinux-files
|
||||||
|
@ -2561,6 +2594,7 @@ basic_manifest | keep 'pcp2influxdb' >pcp-export-pcp2influxdb-files
|
||||||
basic_manifest | keep 'pcp2xlsx' >pcp-export-pcp2xlsx-files
|
basic_manifest | keep 'pcp2xlsx' >pcp-export-pcp2xlsx-files
|
||||||
basic_manifest | keep 'pcp2graphite' >pcp-export-pcp2graphite-files
|
basic_manifest | keep 'pcp2graphite' >pcp-export-pcp2graphite-files
|
||||||
basic_manifest | keep 'pcp2json' >pcp-export-pcp2json-files
|
basic_manifest | keep 'pcp2json' >pcp-export-pcp2json-files
|
||||||
|
basic_manifest | keep 'pcp2openmetrics' >pcp-export-pcp2openmetrics-files
|
||||||
basic_manifest | keep 'pcp2spark' >pcp-export-pcp2spark-files
|
basic_manifest | keep 'pcp2spark' >pcp-export-pcp2spark-files
|
||||||
basic_manifest | keep 'pcp2xml' >pcp-export-pcp2xml-files
|
basic_manifest | keep 'pcp2xml' >pcp-export-pcp2xml-files
|
||||||
basic_manifest | keep 'pcp2zabbix' >pcp-export-pcp2zabbix-files
|
basic_manifest | keep 'pcp2zabbix' >pcp-export-pcp2zabbix-files
|
||||||
|
@ -2638,6 +2672,7 @@ basic_manifest | keep '(etc/pcp|pmdas)/summary(/|$)' >pcp-pmda-summary-files
|
||||||
basic_manifest | keep '(etc/pcp|pmdas)/systemd(/|$)' >pcp-pmda-systemd-files
|
basic_manifest | keep '(etc/pcp|pmdas)/systemd(/|$)' >pcp-pmda-systemd-files
|
||||||
basic_manifest | keep '(etc/pcp|pmdas)/trace(/|$)' >pcp-pmda-trace-files
|
basic_manifest | keep '(etc/pcp|pmdas)/trace(/|$)' >pcp-pmda-trace-files
|
||||||
basic_manifest | keep '(etc/pcp|pmdas)/unbound(/|$)' >pcp-pmda-unbound-files
|
basic_manifest | keep '(etc/pcp|pmdas)/unbound(/|$)' >pcp-pmda-unbound-files
|
||||||
|
basic_manifest | keep '(etc/pcp|pmdas)/uwsgi(/|$)' >pcp-pmda-uwsgi-files
|
||||||
basic_manifest | keep '(etc/pcp|pmdas)/weblog(/|$)' >pcp-pmda-weblog-files
|
basic_manifest | keep '(etc/pcp|pmdas)/weblog(/|$)' >pcp-pmda-weblog-files
|
||||||
basic_manifest | keep '(etc/pcp|pmdas)/zimbra(/|$)' >pcp-pmda-zimbra-files
|
basic_manifest | keep '(etc/pcp|pmdas)/zimbra(/|$)' >pcp-pmda-zimbra-files
|
||||||
basic_manifest | keep '(etc/pcp|pmdas)/zswap(/|$)' >pcp-pmda-zswap-files
|
basic_manifest | keep '(etc/pcp|pmdas)/zswap(/|$)' >pcp-pmda-zswap-files
|
||||||
|
@ -2663,7 +2698,7 @@ for pmda_package in \
|
||||||
rabbitmq redis resctrl roomtemp rpm rsyslog \
|
rabbitmq redis resctrl roomtemp rpm rsyslog \
|
||||||
samba sendmail shping slurm smart snmp \
|
samba sendmail shping slurm smart snmp \
|
||||||
sockets statsd summary systemd \
|
sockets statsd summary systemd \
|
||||||
unbound \
|
unbound uwsgi \
|
||||||
trace \
|
trace \
|
||||||
weblog \
|
weblog \
|
||||||
zimbra zswap ; \
|
zimbra zswap ; \
|
||||||
|
@ -2679,7 +2714,7 @@ done
|
||||||
|
|
||||||
for export_package in \
|
for export_package in \
|
||||||
pcp2arrow pcp2elasticsearch pcp2graphite pcp2influxdb pcp2json \
|
pcp2arrow pcp2elasticsearch pcp2graphite pcp2influxdb pcp2json \
|
||||||
pcp2spark pcp2xlsx pcp2xml pcp2zabbix zabbix-agent ; \
|
pcp2openmetrics pcp2spark pcp2xlsx pcp2xml pcp2zabbix zabbix-agent ; \
|
||||||
do \
|
do \
|
||||||
export_packages="$export_packages pcp-export-$export_package"; \
|
export_packages="$export_packages pcp-export-$export_package"; \
|
||||||
done
|
done
|
||||||
|
@ -2892,6 +2927,9 @@ exit 0
|
||||||
%preun pmda-rabbitmq
|
%preun pmda-rabbitmq
|
||||||
%{pmda_remove "$1" "rabbitmq"}
|
%{pmda_remove "$1" "rabbitmq"}
|
||||||
|
|
||||||
|
%preun pmda-uwsgi
|
||||||
|
%{pmda_remove "$1" "uwsgi"}
|
||||||
|
|
||||||
%if !%{disable_snmp}
|
%if !%{disable_snmp}
|
||||||
%preun pmda-snmp
|
%preun pmda-snmp
|
||||||
%{pmda_remove "$1" "snmp"}
|
%{pmda_remove "$1" "snmp"}
|
||||||
|
@ -3367,10 +3405,14 @@ fi
|
||||||
|
|
||||||
%files pmda-rabbitmq -f pcp-pmda-rabbitmq-files.rpm
|
%files pmda-rabbitmq -f pcp-pmda-rabbitmq-files.rpm
|
||||||
|
|
||||||
|
%files pmda-uwsgi -f pcp-pmda-uwsgi-files.rpm
|
||||||
|
|
||||||
%files export-pcp2graphite -f pcp-export-pcp2graphite-files.rpm
|
%files export-pcp2graphite -f pcp-export-pcp2graphite-files.rpm
|
||||||
|
|
||||||
%files export-pcp2json -f pcp-export-pcp2json-files.rpm
|
%files export-pcp2json -f pcp-export-pcp2json-files.rpm
|
||||||
|
|
||||||
|
%files export-pcp2openmetrics -f pcp-export-pcp2openmetrics-files.rpm
|
||||||
|
|
||||||
%files export-pcp2spark -f pcp-export-pcp2spark-files.rpm
|
%files export-pcp2spark -f pcp-export-pcp2spark-files.rpm
|
||||||
|
|
||||||
%files export-pcp2xml -f pcp-export-pcp2xml-files.rpm
|
%files export-pcp2xml -f pcp-export-pcp2xml-files.rpm
|
||||||
|
@ -3492,6 +3534,14 @@ fi
|
||||||
%files zeroconf -f pcp-zeroconf-files.rpm
|
%files zeroconf -f pcp-zeroconf-files.rpm
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 10 2024 Nathan Scott <nathans@redhat.com> - 6.2.1-1
|
||||||
|
- Rebase to latest stable version of PCP (RHEL-30198)
|
||||||
|
- Disable pmproxy(1) RESP proxying by default (RHEL-30720)
|
||||||
|
- Add pmcheck(1) utility to check installation (RHEL-25497)
|
||||||
|
|
||||||
|
* Wed Mar 20 2024 Nathan Scott <nathans@redhat.com> - 6.2.0-2
|
||||||
|
- Fix python sub-package year day range issue (RHEL-25543)
|
||||||
|
|
||||||
* Mon Feb 12 2024 Nathan Scott <nathans@redhat.com> - 6.2.0-1
|
* Mon Feb 12 2024 Nathan Scott <nathans@redhat.com> - 6.2.0-1
|
||||||
- Rebase to latest stable version of PCP (RHEL-2317)
|
- Rebase to latest stable version of PCP (RHEL-2317)
|
||||||
|
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (pcp-6.2.0.src.tar.gz) = 249ceebf9b87d03fd024d2c75c1f32362cad3d315b68bf3bc305705cbec564d0c162d695988332183f1a595bc88f80929e7d111435ae09ce3c240e0df9b47a1b
|
SHA512 (pcp-6.2.1.src.tar.gz) = 80b7ada7850b8950a5f8047b2ecf69911c7901fcf3ec211f79497674bcb4ded4c4b5e55febb7236fa5fabe1b3ebb4bd2525216c9c36e19609ff19181bc0458ca
|
||||||
|
|
Loading…
Reference in New Issue