From e671ed8c6d39a5d79eed7bbd462f945fa5747716 Mon Sep 17 00:00:00 2001 From: Mark Goodwin Date: Fri, 11 May 2018 12:30:01 +1000 Subject: [PATCH] Update to latest community sources --- pcp.spec | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------ sources | 4 ++-- 2 files changed, 50 insertions(+), 8 deletions(-) diff --git a/pcp.spec b/pcp.spec index bb80fa8..d64316d 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,5 +1,5 @@ Name: pcp -Version: 4.0.1 +Version: 4.0.2 Release: 1%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2.1+ and CC-BY @@ -473,6 +473,7 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) web API service URL: http://www.pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +Requires: liberation-sans-fonts %description webapi Provides a daemon (pmwebd) that binds a large subset of the Performance @@ -1573,13 +1574,15 @@ Requires: python3-pcp Requires: libvirt-python3 python3-lxml BuildRequires: libvirt-python3 python3-lxml %else +%if 0%{?rhel} == 0 || 0%{?fedora} >= 27 Requires: %{__python2}-pcp Requires: %{__python2}-libvirt %{__python2}-lxml -%if 0%{?rhel} == 0 || 0%{?fedora} >= 28 BuildRequires: %{__python2}-libvirt %{__python2}-lxml %endif %if 0%{?rhel} > 5 -BuildRequires: libvirt-%{__python2} +Requires: %{__python2}-pcp +Requires: libvirt-%{__python2} %{__python2}-lxml +BuildRequires: libvirt-%{__python2} %{__python2}-lxml %endif %endif %description pmda-libvirt @@ -1868,6 +1871,21 @@ collecting metrics about quality of service and response time measurements of arbitrary shell commands. # end pcp-pmda-shping +# +# pcp-pmda-smart +# +%package pmda-smart +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for S.M.A.R.T values +URL: http://www.pcp.io +Requires: pcp-libs = %{verison}-%{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 # @@ -1942,7 +1960,7 @@ Requires: pcp-pmda-nginx pcp-pmda-nfsclient pcp-pmda-pdns pcp-pmda-postfix pcp-p 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-lmsensors pcp-pmda-mailq pcp-pmda-mounts -Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping +Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping pcp-pmda-smart Requires: pcp-pmda-lustrecomm pcp-pmda-logger pcp-pmda-docker pcp-pmda-bind2 %if !%{disable_nutcracker} Requires: pcp-pmda-nutcracker @@ -2282,6 +2300,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' |\ @@ -2601,6 +2620,16 @@ fi %{pmda_remove "$1" "bcc"} %endif +%if !%{disable_bcc} +%post pmda-bcc +# pcp-4.0.2 and later: pmdabcc starts "notready" - this is for upgrades +. /etc/pcp.env +if grep -q ^bcc "$PCP_PMCDCONF_PATH" 2>/dev/null +then + touch $PCP_PMDAS_DIR/bcc/.NeedInstall +fi +%endif + %if !%{disable_python2} || !%{disable_python3} %preun pmda-gluster %{pmda_remove "$1" "gluster"} @@ -2660,6 +2689,9 @@ fi %preun pmda-shping %{pmda_remove "$1" "shping"} +%preun pmda-smart +%{pmda_remove "$1" "smart"} + %preun pmda-summary %{pmda_remove "$1" "summary"} @@ -2783,6 +2815,7 @@ rm -f $PCP_LOG_DIR/configs.sh chown -R pcp:pcp %{_logsdir}/pmcd 2>/dev/null chown -R pcp:pcp %{_logsdir}/pmlogger 2>/dev/null +chown -R pcp:pcp %{_logsdir}/sa 2>/dev/null chown -R pcp:pcp %{_logsdir}/pmie 2>/dev/null chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null touch "$PCP_PMNS_DIR/.NeedRebuild" @@ -3216,6 +3249,7 @@ cd %files export-zabbix-agent %{_libdir}/zabbix +%{_sysconfdir}/zabbix/zabbix_agent.d/zbxpcp.conf %if !%{disable_json} %files pmda-json @@ -3266,6 +3300,9 @@ cd %files pmda-shping %{_pmdasdir}/shping +%files pmda-smart +%{_pmdasdir}/smart + %files pmda-summary %{_pmdasdir}/summary @@ -3320,10 +3357,15 @@ cd %endif %changelog +* Fri May 11 2018 Mark Goodwin - 4.0.2-1 +- Propogate build flags throughout PCP (BZ 1538187) +- Further additions to selinux policy (BZ 1565158) +- Update to Vector v1.2.2 in pcp-webapp-vector. +- Update to latest PCP sources. + * Thu Mar 29 2018 Mark Goodwin - 4.0.1-1 -- selinux blocks pmdagluster (BZ 1558708) +- Fix selinux policy to allow pmdagluster to work (BZ 1558708) - pmcd binding only to localhost:44321 by default (BZ 1529915) -- See also https://github.com/performancecopilot/pcp/issues - Update to latest PCP sources. * Thu Mar 01 2018 Iryna Shcherbina - 4.0.0-3 diff --git a/sources b/sources index 8cdae91..d1c2e81 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -SHA512 (pcp-4.0.1.src.tar.gz) = 80331827dac84a4dafd2507973885c35f80a753256656bb928b0cbbed6a22bbc5521acc41850c58065013417fe7884d206418d98353a6ba5241e336febe2cbb1 -SHA512 (pcp-webapp-blinkenlights-1.0.0.tar.gz) = 505eafd4b8eb2ab97ec6b0fea3b5510ab0b976fa07559f1d163d240c62a8d7419f062eecc180b28b6b240207b45daed6fcc39d8e2930c6d038790d5ac0c695ab +SHA512 (pcp-4.0.2.src.tar.gz) = 44eaccdb63456d66227c38f5ccd2a033b3c5b511cf4cf2ff39646fc3a1365e82fff1d0601878c85c8a2683c1b3cf8ed6e5d7dc2edd0aaf8d0e42ea46699253b7 SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21 SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa SHA512 (pcp-webapp-vector-1.2.2.tar.gz) = 967cb6e474191cba6359b3eca7c7064138d93f3549c6acf999c1dd7b19e3b9647ac197989f5e35ede78ed1ef25bd7d79420cf80e4ff9fb2aed8eb36ba43e8163 +SHA512 (pcp-webapp-blinkenlights-1.0.0.tar.gz) = 505eafd4b8eb2ab97ec6b0fea3b5510ab0b976fa07559f1d163d240c62a8d7419f062eecc180b28b6b240207b45daed6fcc39d8e2930c6d038790d5ac0c695ab