Accepting request 1174091 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1174091
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcp?expand=0&rev=75
This commit is contained in:
Ana Guerrero 2024-05-16 15:12:43 +00:00 committed by Git OBS Bridge
commit 275e031025
5 changed files with 107 additions and 351 deletions

View File

@ -1,29 +0,0 @@
From 3bde240a2acc85e63e2f7813330713dd9b59386e Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Wed, 27 Mar 2024 14:51:28 +1100
Subject: [PATCH] pmproxy: disable Redis protocol proxying by default
If a redis-server has been locked down in terms of connections,
we want to prevent pmproxy from being allowed to send arbitrary
RESP commands to it.
This protocol proxying doesn't affect PCP functionality at all,
its more of a developer/sysadmin convenience when Redis used in
cluster mode (relatively uncommon compared to localhost mode).
---
src/pmproxy/pmproxy.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pmproxy/pmproxy.conf b/src/pmproxy/pmproxy.conf
index e54891792e..4cbc1c96af 100644
--- a/src/pmproxy/pmproxy.conf
+++ b/src/pmproxy/pmproxy.conf
@@ -29,7 +29,7 @@ pcp.enabled = true
http.enabled = true
# support Redis protocol proxying
-redis.enabled = true
+redis.enabled = false
# support SSL/TLS protocol wrapping
secure.enabled = true

BIN
pcp-6.2.0.tar.gz (Stored with Git LFS)

Binary file not shown.

3
pcp-6.2.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:189d6cb56e6b8e2eae5fab93c11d1a58cdc3ec8c8860b52aa8819c79a7fedc9e
size 52260893

View File

@ -1,3 +1,64 @@
-------------------------------------------------------------------
Tue May 14 20:25:32 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
- Remove 0011-disable-redis-proxying-by-default.patch. This patch has
been merged upstream during the 6.2.1 release.
- Add new subpackage: pcp-pmda-uwsgi.
- Upgrade to 6.2.1. Changelog:
- PMDA additions, enhancements and bug fixes:
pmdauwsgi: (new) instrumentation from uWSGI servers
pmdalinux: new hugepage metrics from sysfs (fixed size hugepages)
pmdalinux: new filesys.uuid and filesys.type metrics
pmdalinux: new TcpExt metrics from /proc/net/netstat
pmdalinux: new softnet metrics from newer kernel versions
pmdalinux: new /proc/vmstat khugepaged metrics
pmdabpf: updates to add eBPF networking metrics for pcp-atop
pmdaopenmetrics: fix script error diagnostic cascading exception
- Client tools and utilities:
pcp2openmetrics: (new) push PCP metrics in OpenMetrics format
pmcheck: (new) interrogate and control PCP components
pmcheck: Redis server detection and agent recommendation
pmcheck: PostgreSQL server detection and agent recommendation
pmcheck: uwSGI server detection and agent recommendation
pcp-atopsar: fix TZ mishandling relating to day-crossover
pcp-dstat: fix an I/O config typo, sum reads and writes
pcp-htop: sync latest htop-3.3.0 fixes
pmrep.conf: use bpf instead of bcc pmda for proc net metrics
pmrep.conf: proc-essential cosmetic improvements
pmrep.conf: remove vmeff field from sar -B config
pmrepconf: use pmrep-internal representations for each metric
- Server-side utilities and log management scripts:
pmlogger: bizarre timezone fix (github #1936)
pmlogger: improve handling of a change in metadata semantics
pmlogdump: add support for multi-archive contexts
pmproxy: disable Redis protocol proxying by default
runaspcp: remove hard-coded "pcp" for user and group
init scripts: drop conditonal use of setpriv(1) or runuser(1)
- libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings:
libpcp: fix logmeta.c SEGV with V3 archives
libpcp: fix memleak on repeated __pmFixPMNSHashTab calls
libpcp: add pmgetopt pmflush() call for warnings
libpcp: fixes for V3 archives and multi-archive contexts
libpcp: export __pmLogChangeArchive() interface to tools
libpcp: fix for PMNS with multi-archive contexts
libpcp: small derived metrics bug fix (github #1921)
- Build, infrastructure and packaging updates:
Linux MX distro support (Debian without systemd)
riscv: configure pmdabpf_arch value correctly
tar packages: fix perl modules install in postinstall script
eBPF updates: add submodule for blazesym, sync to latest
debian build: add postrm for pcp-zeroconf
build: removed cppcheck from 'make check', too flakey
container: Fedora 40 container testing added
constainer: fixed Fedora base image location (quay.io)
build: add support for riscv64 to pcp rpm spec files
- Security Enhanced Linux:
selinux policy: small tweak for pmie signal handling
- Documentation:
man pages: document pmlogger_check and pmlogger_daily SaveLogs
man pages: man-spell and corrections
docs: updated donations page with new fiscal sponsor details
-------------------------------------------------------------------
Mon Apr 15 10:51:06 UTC 2024 - Dirk Müller <dmueller@suse.com>

362
pcp.spec
View File

@ -66,7 +66,7 @@ Summary: System-level performance monitoring and performance management
License: %{license_gplv2plus} AND %{license_lgplv2plus} AND %{license_cc_by}
Group: %{pcp_gr}
Name: pcp
Version: 6.2.0
Version: 6.2.1
Release: 0
%global buildversion 1
@ -88,8 +88,6 @@ Patch5: 0005-SUSE-fy-pmsnap-control-path.patch
Patch6: 0006-pmsnap-control-var-www-srv-www.patch
# PATCH-FIX-UPSTREAM, ddiss@suse.de
Patch10: 0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch
# PATCH-FIX-UPSTREAM (bsc#1222121), martin.schreiner@suse.com
Patch11: 0011-disable-redis-proxying-by-default.patch
%if 0%{?fedora} || 0%{?rhel}
%global disable_selinux 0
@ -556,10 +554,6 @@ applications to easily retrieve and process any subset of that data.
#
# pcp-conf
#
@ -579,10 +573,6 @@ Performance Co-Pilot (PCP) run-time configuration
#
# pcp-libs
#
@ -670,10 +660,6 @@ Performance Co-Pilot (PCP) headers for development.
#
# pcp-devel
#
@ -694,10 +680,6 @@ Performance Co-Pilot (PCP) documentation and tools for development.
#
# pcp-testsuite
#
@ -723,10 +705,6 @@ Quality assurance test suite for Performance Co-Pilot (PCP).
#
# perl-PCP-PMDA. This is the PCP agent perl binding.
#
@ -749,10 +727,6 @@ an application, etc.
#
# perl-PCP-MMV
#
@ -776,11 +750,6 @@ and analysis with pmchart, pmie, pmlogger and other PCP tools.
#
# perl-PCP-LogImport
#
@ -801,11 +770,6 @@ they can be replayed with standard PCP monitoring tools.
#
# perl-PCP-LogSummary
#
@ -829,11 +793,6 @@ exporting this data into third-party tools (e.g. spreadsheets).
#
# pcp-import-sar2pcp
#
@ -857,11 +816,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
#
# pcp-import-iostat2pcp
#
@ -926,11 +880,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
#
# pcp-import-ganglia2pcp
#
@ -953,11 +902,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
#
# pcp-import-collectl2pcp
#
@ -1019,11 +963,6 @@ See https://www.elastic.co/community for further details.
#
# pcp-export-pcp2graphite
#
@ -1046,11 +985,6 @@ to graphite (http://graphite.readthedocs.org).
# pcp-export-pcp2influxdb
#
%package export-pcp2influxdb
@ -1074,11 +1008,6 @@ to InfluxDB (https://influxdata.com/time-series-platform/influxdb).
#
# pcp-export-pcp2json
#
@ -1099,11 +1028,6 @@ in JSON format.
#
# pcp-export-pcp2spark
#
@ -1162,11 +1086,6 @@ in XML format.
#
# pcp-export-pcp2zabbix
#
@ -1273,11 +1192,6 @@ collecting metrics about the ActiveMQ message broker.
#end pcp-pmda-activemq
#
# pcp-pmda-bind2
@ -1298,11 +1212,6 @@ collecting metrics from BIND (Berkeley Internet Name Domain).
#end pcp-pmda-bind2
#
# pcp-pmda-redis
@ -1364,10 +1273,6 @@ collecting metrics about bonded network interfaces.
#end pcp-pmda-bonding
#
# pcp-pmda-dbping
@ -1389,11 +1294,6 @@ collecting metrics about the Database response times and Availablility.
#end pcp-pmda-dbping
#
# pcp-pmda-ds389
@ -1419,10 +1319,6 @@ collecting metrics about a 389 Directory Server.
#end pcp-pmda-ds389
#
# pcp-pmda-ds389log
@ -1444,10 +1340,6 @@ collecting metrics from a 389 Directory Server log.
#end pcp-pmda-ds389log
#
# pcp-pmda-gpfs
@ -1468,10 +1360,6 @@ collecting metrics about the GPFS filesystem.
#end pcp-pmda-gpfs
#
# pcp-pmda-gpsd
@ -1493,10 +1381,6 @@ collecting metrics about a GPS Daemon.
#end pcp-pmda-gpsd
#
# pcp-pmda-docker
@ -1513,10 +1397,6 @@ collecting metrics using the Docker daemon REST API.
#end pcp-pmda-docker
#
# pcp-pmda-lustre
@ -1537,11 +1417,6 @@ collecting metrics about the Lustre Filesystem.
#end pcp-pmda-lustre
#
# pcp-pmda-lustrecomm
@ -1563,11 +1438,6 @@ collecting metrics about the Lustre Filesystem Comms.
#end pcp-pmda-lustrecomm
#
# pcp-pmda-memcache
@ -1589,11 +1459,6 @@ collecting metrics about Memcached.
#end pcp-pmda-memcache
#
# pcp-pmda-mysql
@ -1619,11 +1484,6 @@ collecting metrics about the MySQL database.
#end pcp-pmda-mysql
#
# pcp-pmda-named
@ -1645,11 +1505,6 @@ collecting metrics about the Named nameserver.
#end pcp-pmda-named
# pcp-pmda-netfilter
#
@ -1670,11 +1525,6 @@ collecting metrics about the Netfilter packet filtering framework.
#end pcp-pmda-netfilter
#
# pcp-pmda-news
@ -1696,11 +1546,6 @@ collecting metrics about Usenet News.
#end pcp-pmda-news
#
# pcp-pmda-nginx
@ -1723,11 +1568,6 @@ collecting metrics about the Nginx Webserver.
#end pcp-pmda-nginx
#
# pcp-pmda-oracle
@ -1750,11 +1590,6 @@ collecting metrics about the Oracle database.
#end pcp-pmda-oracle
#
# pcp-pmda-pdns
@ -1776,11 +1611,6 @@ collecting metrics about the PowerDNS.
#end pcp-pmda-pdns
#
# pcp-pmda-postfix
@ -1819,11 +1649,6 @@ collecting metrics about the Postfix (MTA).
#end pcp-pmda-postfix
#
# pcp-pmda-rsyslog
@ -1850,11 +1675,6 @@ collecting metrics about Rsyslog.
#end pcp-pmda-rsyslog
#
# pcp-pmda-samba
@ -1876,11 +1696,6 @@ collecting metrics about Samba.
#end pcp-pmda-samba
#
# pcp-pmda-slurm
@ -1942,11 +1757,6 @@ collecting metrics for VMware.
#end pcp-pmda-vmware
#
# pcp-pmda-zimbra
@ -1965,11 +1775,6 @@ collecting metrics about Zimbra.
#end pcp-pmda-zimbra
#
# pcp-pmda-dm
@ -2008,11 +1813,6 @@ collecting metrics about the gluster filesystem.
# end pcp-pmda-gluster
#
# pcp-pmda-nfsclient
@ -2070,11 +1870,6 @@ collecting metrics about compressed swap.
# end pcp-pmda-zswap
#
# pcp-pmda-unbound
@ -2095,11 +1890,6 @@ collecting metrics about the Unbound DNS Resolver.
# end pcp-pmda-unbound
#
# pcp-pmda-mic
@ -2120,11 +1910,6 @@ collecting metrics about Intel MIC cards.
# end pcp-pmda-mic
#
# pcp-pmda-haproxy
@ -2190,11 +1975,6 @@ collecting metrics about Elasticsearch.
#end pcp-pmda-elasticsearch
#
# pcp-pmda-openvswitch
@ -2215,11 +1995,6 @@ collecting metrics from Open vSwitch.
#end pcp-pmda-openvswitch
#
# pcp-pmda-rabbitmq
@ -2292,11 +2067,6 @@ extracting metrics from OpenMetrics (https://openmetrics.io/) endpoints.
#end pcp-pmda-openmetrics
#
# pcp-pmda-lmsensors
@ -2320,11 +2090,6 @@ collecting metrics about the Linux hardware monitoring sensors.
# end pcp-pmda-lmsensors
#
# pcp-pmda-netcheck
@ -2389,6 +2154,23 @@ interface to provide information on the last level cache.
# end pcp-pmda-resctrl
%endif
#
# pcp-pmda-uwsgi
#
%package pmda-uwsgi
Summary: Performance Co-Pilot (PCP) metrics uWSGI servers
License: %{license_gplv2plus}
Group: %{pcp_gr}
URL: https://pcp.io
%if !0%{?suse_version}
Requires: %{lib_pkg} = %{version}-%{release}
%endif
%description pmda-uwsgi
This package contains the PCP Performance Metrics Domain Agent (PMDA)
for collecting metrics from uWSGI servers.
# end pcp-pmda-uwsgi
%if !%{disable_json}
#
# pcp-pmda-json
@ -2433,11 +2215,6 @@ collecting metrics about the Apache webserver.
# end pcp-pmda-apache
#
# pcp-pmda-bash
@ -2458,11 +2235,6 @@ collecting metrics about the Bash shell.
# end pcp-pmda-bash
#
# pcp-pmda-cifs
@ -2482,11 +2254,6 @@ collecting metrics about the Common Internet Filesytem.
# end pcp-pmda-cifs
#
# pcp-pmda-cisco
@ -2507,11 +2274,6 @@ collecting metrics about Cisco routers.
# end pcp-pmda-cisco
#
# pcp-pmda-gfs2
@ -2531,11 +2293,6 @@ collecting metrics about the Global Filesystem v2.
# end pcp-pmda-gfs2
#
# pcp-pmda-logger
@ -2557,11 +2314,6 @@ supports both sampled and event-style metrics.
# end pcp-pmda-logger
#
# pcp-pmda-mailq
@ -2582,11 +2334,6 @@ collecting metrics about email queues managed by sendmail.
# end pcp-pmda-mailq
#
# pcp-pmda-mounts
@ -2607,11 +2354,6 @@ collecting metrics about filesystem mounts.
# end pcp-pmda-mounts
#
# pcp-pmda-nvidia-gpu
@ -2631,11 +2373,6 @@ collecting metrics about Nvidia GPUs.
# end pcp-pmda-nvidia-gpu
#
# pcp-pmda-roomtemp
@ -2696,11 +2433,6 @@ collecting metrics about Sendmail traffic.
# end pcp-pmda-sendmail
#
# pcp-pmda-shping
@ -2722,11 +2454,6 @@ arbitrary shell commands.
# end pcp-pmda-shping
#
# pcp-pmda-smart
@ -2745,11 +2472,6 @@ smartmontools package.
#end pcp-pmda-smart
#
# pcp-pmda-sockets
@ -2768,11 +2490,6 @@ collecting per-socket statistics, making use of utilities such as 'ss'.
#end pcp-pmda-sockets
#
# pcp-pmda-hacluster
@ -2790,11 +2507,6 @@ collecting metrics about linux High Availability (HA) Clusters.
# end pcp-pmda-hacluster
#
# pcp-pmda-summary
@ -2853,11 +2565,6 @@ collecting metrics about trace performance data in applications.
# end pcp-pmda-trace
#
# pcp-pmda-weblog
@ -2879,11 +2586,6 @@ collecting metrics about web server logs.
# end pcp-pmda-weblog
# end C pmdas
@ -3597,8 +3299,19 @@ PCP_LOG_DIR=%{_logsdir}
%{_datadir}/pcp/lib/rc-proc.sh
%{_datadir}/pcp/lib/rc-proc.sh.minimal
%{_datadir}/pcp/lib/unlockpmns
%{_datadir}/pcp/lib/checkproc.sh
%{_datadir}/pcp/lib/pmcheck/pmcd
%{_datadir}/pcp/lib/pmcheck/pmda-overhead
%{_datadir}/pcp/lib/pmcheck/pmda-postgresql
%{_datadir}/pcp/lib/pmcheck/pmda-redis
%{_datadir}/pcp/lib/pmcheck/pmda-sample
%{_datadir}/pcp/lib/pmcheck/pmda-uwsgi
%{_datadir}/pcp/lib/pmcheck/pmie
%{_datadir}/pcp/lib/pmcheck/pmlogger
%{_datadir}/pcp/lib/pmcheck/pmproxy
%{_datadir}/pcp/lib/pmcheck/zeroconf
%dir %{_datadir}/pcp/lib/pmcheck
### 6.2.0 BEGIN
%config %{_sysusersdir}/pcp-testsuite.conf
%config %{_sysusersdir}/pcp.conf
%config %{_tmpfilesdir}/pcp-reboot-init.conf
@ -3661,7 +3374,6 @@ PCP_LOG_DIR=%{_logsdir}
%{_usr}/share/pcp/htop/screens/exitsnoop
%{_usr}/share/pcp/htop/screens/filesystems
%{_usr}/share/pcp/htop/screens/opensnoop
%dir %{_libexecdir}/pcp/pmdas/farm
%dir %{_libexecdir}/pcp/pmdas/overhead
%dir %{_localstatedir}/lib/pcp/config/pmlogredact
@ -3672,7 +3384,6 @@ PCP_LOG_DIR=%{_logsdir}
%dir %{_sysconfdir}/pcp/overhead/examples
%dir %{_sysconfdir}/pcp/pmlogredact
%dir %{_usr}/share/pcp/htop/screens
### 6.2.0 END
%dir %attr(0775,pcp,pcp) %{_logsdir}
%attr(0775,pcp,pcp) %{_logsdir}/pmcd
@ -4197,6 +3908,19 @@ PCP_LOG_DIR=%{_logsdir}
%dir %{_localstatedir}/lib/pcp/pmdas/resctrl
%endif
%files pmda-uwsgi
%config(noreplace) %{_confdir}/uwsgi/uwsgi.conf
%{_libexecdir}/pcp/pmdas/uwsgi/Install
%{_libexecdir}/pcp/pmdas/uwsgi/Remove
%{_libexecdir}/pcp/pmdas/uwsgi/pmdauwsgi.python
%{_localstatedir}/lib/pcp/pmdas/uwsgi/Install
%{_localstatedir}/lib/pcp/pmdas/uwsgi/Remove
%{_localstatedir}/lib/pcp/pmdas/uwsgi/pmdauwsgi.python
%{_localstatedir}/lib/pcp/pmdas/uwsgi/uwsgi.conf
%dir %{_confdir}/uwsgi
%dir %{_libexecdir}/pcp/pmdas/uwsgi
%dir %{_localstatedir}/lib/pcp/pmdas/uwsgi
%if !%{disable_json}
%files pmda-json
%{_pmdasdir}/json