From f7e1944dfe694776fe0553c0ac72ffd8633254be Mon Sep 17 00:00:00 2001 From: Mark Goodwin Date: Jul 30 2021 05:25:03 +0000 Subject: Update to latest community sources --- diff --git a/pcp.spec b/pcp.spec index 4e5e4ce..4767ac7 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,6 +1,6 @@ Name: pcp -Version: 5.3.1 -Release: 3%{?dist} +Version: 5.3.2 +Release: 1%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2+ and CC-BY URL: https://pcp.io @@ -501,7 +501,7 @@ Requires: pcp-pmda-samba pcp-pmda-slurm pcp-pmda-vmware pcp-pmda-zimbra Requires: pcp-pmda-dm pcp-pmda-apache Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-mailq pcp-pmda-mounts Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping pcp-pmda-smart -Requires: pcp-pmda-hacluster pcp-pmda-lustrecomm pcp-pmda-logger pcp-pmda-docker pcp-pmda-bind2 +Requires: pcp-pmda-hacluster pcp-pmda-lustrecomm pcp-pmda-logger pcp-pmda-denki pcp-pmda-docker pcp-pmda-bind2 Requires: pcp-pmda-sockets %if !%{disable_podman} Requires: pcp-pmda-podman @@ -534,9 +534,7 @@ Requires: pcp-pmda-snmp Requires: pcp-pmda-json %endif Requires: pcp-pmda-summary pcp-pmda-trace pcp-pmda-weblog -%if !%{disable_python2} || !%{disable_python3} Requires: pcp-system-tools -%endif %if !%{disable_qt} Requires: pcp-gui %endif @@ -1105,6 +1103,20 @@ collecting metrics about a GPS Daemon. #end pcp-pmda-gpsd # +# pcp-pmda-denki +# +%package pmda-denki +License: GPLv2+ +Summary: Performance Co-Pilot (PCP) metrics dealing with electrical power +URL: https://pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +%description pmda-denki +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics related to the electrical power consumed by and inside +the system. +# end pcp-pmda-denki + +# # pcp-pmda-docker # %package pmda-docker @@ -2118,7 +2130,6 @@ Performance Metric API (PMAPI) monitor tools and Performance Metric Domain Agent (PMDA) collector tools written in Python3. %endif -%if !%{disable_python2} || !%{disable_python3} # # pcp-system-tools # @@ -2126,23 +2137,24 @@ Metric Domain Agent (PMDA) collector tools written in Python3. License: GPLv2+ Summary: Performance Co-Pilot (PCP) System and Monitoring Tools URL: https://pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +%if !%{disable_python2} || !%{disable_python3} %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} %else Requires: %{__python2}-pcp = %{version}-%{release} %endif -Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} %if !%{disable_dstat} # https://fedoraproject.org/wiki/Packaging:Guidelines "Renaming/Replacing Existing Packages" Provides: dstat = %{version}-%{release} Provides: /usr/bin/dstat Obsoletes: dstat <= 0.8 %endif +%endif %description system-tools This PCP module contains additional system monitoring tools written in the Python language. -%endif %if !%{disable_qt} # @@ -2359,11 +2371,11 @@ total_manifest | keep 'testsuite|etc/systemd/system' >pcp-testsuite-files basic_manifest | keep "$PCP_GUI|pcp-gui|applications|pixmaps|hicolor" | cull 'pmtime.h' >pcp-gui-files basic_manifest | keep 'selinux' | cull 'tmp|GNUselinuxdefs' >pcp-selinux-files basic_manifest | keep 'zeroconf|daily[-_]report|/sa$' >pcp-zeroconf-files -basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|pcp2csv' \ +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-numastat|pcp-pidstat|pcp-shping|pcp-tapestat' \ - -e 'pcp-uptime|pcp-verify' | \ + -e 'pcp-uptime|pcp-verify|pcp-ss' | \ cull 'selinux|pmlogconf|pmieconf|pmrepconf' >pcp-system-tools-files basic_manifest | keep 'sar2pcp' >pcp-import-sar2pcp-files @@ -2392,6 +2404,7 @@ basic_manifest | keep '(etc/pcp|pmdas)/cifs(/|$)' >pcp-pmda-cifs-files basic_manifest | keep '(etc/pcp|pmdas)/cisco(/|$)' >pcp-pmda-cisco-files basic_manifest | keep '(etc/pcp|pmdas)/dbping(/|$)' >pcp-pmda-dbping-files basic_manifest | keep '(etc/pcp|pmdas|pmieconf)/dm(/|$)' >pcp-pmda-dm-files +basic_manifest | keep '(etc/pcp|pmdas)/denki(/|$)' >pcp-pmda-denki-files basic_manifest | keep '(etc/pcp|pmdas)/docker(/|$)' >pcp-pmda-docker-files basic_manifest | keep '(etc/pcp|pmdas)/ds389log(/|$)' >pcp-pmda-ds389log-files basic_manifest | keep '(etc/pcp|pmdas)/ds389(/|$)' >pcp-pmda-ds389-files @@ -2459,7 +2472,7 @@ for pmda_package in \ activemq apache \ bash bcc bind2 bonding bpftrace \ cifs cisco \ - dbping docker dm ds389 ds389log \ + dbping denki docker dm ds389 ds389log \ elasticsearch \ gfs2 gluster gpfs gpsd \ hacluster haproxy \ @@ -2701,6 +2714,9 @@ exit 0 %preun pmda-dbping %{pmda_remove "$1" "dbping"} +%preun pmda-denki +%{pmda_remove "$1" "denki"} + %preun pmda-docker %{pmda_remove "$1" "docker"} @@ -3092,6 +3108,8 @@ PCP_LOG_DIR=%{_logsdir} %files pmda-zimbra -f pcp-pmda-zimbra-files.rpm %endif +%files pmda-denki -f pcp-pmda-denki-files.rpm + %files pmda-docker -f pcp-pmda-docker-files.rpm %files pmda-lustrecomm -f pcp-pmda-lustrecomm-files.rpm @@ -3263,30 +3281,18 @@ PCP_LOG_DIR=%{_logsdir} %files -n python3-pcp -f python3-pcp.list.rpm %endif -%if !%{disable_python2} || !%{disable_python3} %files system-tools -f pcp-system-tools-files.rpm -%endif %files zeroconf -f pcp-zeroconf-files.rpm %changelog -* Thu Jul 22 2021 Fedora Release Engineering - 5.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 5.3.1-2 -- Rebuilt for Python 3.10 +* Fri Jul 30 2021 Mark Goodwin - 5.3.2-1 +- Update to latest PCP sources. * Fri Jun 04 2021 Nathan Scott - 5.3.1-1 -- Really fix selinux AVCs for pmdakvm on debugfs (BZ 1929259) +- Fix selinux violations for pmdakvm on debugfs (BZ 1929259) - Update to latest PCP sources. -* Fri May 21 2021 Jitka Plesnikova - 5.3.0-4 -- Perl 5.34 rebuild - -* Thu Apr 22 2021 Nathan Scott - 5.3.0-3 -- Correct pcp-testsuite file permissions and ownership. -- Update location of upstream sources. - * Fri Apr 16 2021 Nathan Scott - 5.3.0-1 - Added conditional lockdown policy access by pmdakvm (BZ 1929259) - Update to latest PCP sources. diff --git a/sources b/sources index 8d95bc5..fecaec8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcp-5.3.1.src.tar.gz) = c669d08cff66bba0cd747d2e0ca37f967497945cf1913358e7523c5f9877d68d0ffa810d960a42c168f3f75d52ec08b71ed350f23bad64b181223c6c8874c697 +SHA512 (pcp-5.3.2.src.tar.gz) = ac0cb5bb3e7efa69e7b2c604e18e52974fbf750691cf9b634b1dceb775faec2c4cdf93281fb488d3b9e16f7ba10b399ba0ea3838e42005976d0fbeb3de55e377