Update to latest community sources
This commit is contained in:
Mark Goodwin
commit
cecf79fec3
116
pcp.spec
116
pcp.spec
@ -1,8 +1,8 @@
|
||||
Name: pcp
|
||||
Version: 4.3.0
|
||||
Release: 4%{?dist}
|
||||
Version: 4.3.1
|
||||
Release: 1%{?dist}
|
||||
Summary: System-level performance monitoring and performance management
|
||||
License: GPLv2+ and LGPLv2.1+ and CC-BY
|
||||
License: GPLv2+ and LGPLv2+ and CC-BY
|
||||
URL: https://pcp.io
|
||||
Group: Applications/System
|
||||
|
||||
@ -14,9 +14,6 @@ Source1: %{github}/pcp-webapp-vector/archive/1.3.1-1/pcp-webapp-vector-1.3.1-1.t
|
||||
Source2: %{github}/pcp-webapp-grafana/archive/1.9.1-2/pcp-webapp-grafana-1.9.1-2.tar.gz
|
||||
Source3: %{github}/pcp-webapp-graphite/archive/0.9.10/pcp-webapp-graphite-0.9.10.tar.gz
|
||||
Source4: %{github}/pcp-webapp-blinkenlights/archive/1.0.1/pcp-webapp-blinkenlights-1.0.1.tar.gz
|
||||
# patch for GH#597
|
||||
Patch0: pcp-revert-pmlogger_daily-daystart.patch
|
||||
Patch1: pmcd-pmlogger-local-context.patch
|
||||
|
||||
%if 0%{?fedora} >= 26 || 0%{?rhel} > 7
|
||||
%global __python2 python2
|
||||
@ -50,7 +47,7 @@ Patch1: pmcd-pmlogger-local-context.patch
|
||||
%endif
|
||||
|
||||
# libvarlink and pmdapodman
|
||||
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 7
|
||||
%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
|
||||
%global disable_podman 0
|
||||
%else
|
||||
%global disable_podman 1
|
||||
@ -89,15 +86,11 @@ Patch1: pmcd-pmlogger-local-context.patch
|
||||
%endif
|
||||
|
||||
# support for pmdabcc
|
||||
%if 0%{?fedora} >= 25 || 0%{?rhel} > 7
|
||||
%if 0%{?fedora} >= 25 || 0%{?rhel} > 6
|
||||
%ifarch s390 s390x armv7hl aarch64 i686
|
||||
%global disable_bcc 1
|
||||
%else
|
||||
%if !%{disable_python3}
|
||||
%global disable_bcc 0
|
||||
%else
|
||||
%global disable_bcc 1
|
||||
%endif
|
||||
%endif
|
||||
%else
|
||||
%global disable_bcc 1
|
||||
@ -378,14 +371,6 @@ then
|
||||
fi
|
||||
}
|
||||
|
||||
# force upgrade of PMDAs starting in "notready" state
|
||||
%global pmda_notready() %{expand:
|
||||
if grep -q ^%2 "%{_confdir}/pmcd/pmcd.conf" 2>/dev/null
|
||||
then
|
||||
touch %{_pmdasdir}/%2/.NeedInstall
|
||||
fi
|
||||
}
|
||||
|
||||
%global selinux_handle_policy() %{expand:
|
||||
if [ %1 -ge 1 ]
|
||||
then
|
||||
@ -408,7 +393,7 @@ applications to easily retrieve and process any subset of that data.
|
||||
# pcp-conf
|
||||
#
|
||||
%package conf
|
||||
License: LGPLv2.1+
|
||||
License: LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
Summary: Performance Co-Pilot run-time configuration
|
||||
URL: https://pcp.io
|
||||
@ -423,7 +408,7 @@ Performance Co-Pilot (PCP) run-time configuration
|
||||
# pcp-libs
|
||||
#
|
||||
%package libs
|
||||
License: LGPLv2.1+
|
||||
License: LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
Summary: Performance Co-Pilot run-time libraries
|
||||
URL: https://pcp.io
|
||||
@ -436,7 +421,7 @@ Performance Co-Pilot (PCP) run-time libraries
|
||||
# pcp-libs-devel
|
||||
#
|
||||
%package libs-devel
|
||||
License: GPLv2+ and LGPLv2.1+
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: Development/Libraries
|
||||
Summary: Performance Co-Pilot (PCP) development headers
|
||||
URL: https://pcp.io
|
||||
@ -449,7 +434,7 @@ Performance Co-Pilot (PCP) headers for development.
|
||||
# pcp-devel
|
||||
#
|
||||
%package devel
|
||||
License: GPLv2+ and LGPLv2.1+
|
||||
License: GPLv2+ and LGPLv2+
|
||||
Group: Development/Libraries
|
||||
Summary: Performance Co-Pilot (PCP) development tools and documentation
|
||||
URL: https://pcp.io
|
||||
@ -518,6 +503,7 @@ Requires: pcp-system-tools
|
||||
Requires: pcp-gui
|
||||
%endif
|
||||
Requires: bc gcc gzip bzip2
|
||||
Requires: redhat-rpm-config
|
||||
|
||||
%description testsuite
|
||||
Quality assurance test suite for Performance Co-Pilot (PCP).
|
||||
@ -2023,7 +2009,7 @@ Requires: pcp = %{version}-%{release}
|
||||
Requires: pcp-libs = %{version}-%{release}
|
||||
%description pmda-summary
|
||||
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
|
||||
collecting metrics about other installed pmdas.
|
||||
collecting metrics about other installed PMDAs.
|
||||
# end pcp-pmda-summary
|
||||
|
||||
%if !%{disable_systemd}
|
||||
@ -2236,8 +2222,6 @@ updated policy package.
|
||||
%setup -q -T -D -a 3 -c -n graphite
|
||||
%setup -q -T -D -a 4 -c -n blinkenlights
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%if !%{disable_python2} && 0%{?default_python} != 3
|
||||
@ -2307,6 +2291,15 @@ for f in $RPM_BUILD_ROOT/%{_initddir}/{pcp,pmcd,pmlogger,pmie,pmwebd,pmmgr,pmpro
|
||||
sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f
|
||||
done
|
||||
|
||||
%if 0%{?fedora} > 26
|
||||
if [ "$1" -eq 1 ]
|
||||
then
|
||||
PCP_SYSCONFIG_DIR=%{_sysconfdir}/sysconfig
|
||||
sed -i 's/^\#\ PMLOGGER_LOCAL.*/PMLOGGER_LOCAL=1/g' "$RPM_BUILD_ROOT/$PCP_SYSCONFIG_DIR/pmlogger"
|
||||
sed -i 's/^\#\ PMCD_LOCAL.*/PMCD_LOCAL=1/g' "$RPM_BUILD_ROOT/$PCP_SYSCONFIG_DIR/pmcd"
|
||||
fi
|
||||
%endif
|
||||
|
||||
# list of PMDAs in the base pkg
|
||||
ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
|
||||
grep -E -v '^simple|sample|trivial|txmon' |\
|
||||
@ -2766,6 +2759,17 @@ fi
|
||||
%preun pmda-weblog
|
||||
%{pmda_remove "$1" "weblog"}
|
||||
|
||||
%if !%{disable_systemd}
|
||||
%preun zeroconf
|
||||
if [ "$1" -eq 0 ]
|
||||
then
|
||||
%systemd_preun pmlogger_daily_report.timer
|
||||
%systemd_preun pmlogger_daily_report.service
|
||||
%systemd_preun pmlogger_daily_report-poll.timer
|
||||
%systemd_preun pmlogger_daily_report-poll.service
|
||||
fi
|
||||
%endif
|
||||
|
||||
%preun
|
||||
if [ "$1" -eq 0 ]
|
||||
then
|
||||
@ -2819,9 +2823,13 @@ chown -R pcp:pcp %{_logsdir}/pmmgr 2>/dev/null
|
||||
%post zeroconf
|
||||
PCP_PMDAS_DIR=%{_pmdasdir}
|
||||
PCP_SYSCONFIG_DIR=%{_sysconfdir}/sysconfig
|
||||
# auto-install important PMDAs for RH Support
|
||||
PCP_PMCDCONF_PATH=%{_confdir}/pmcd/pmcd.conf
|
||||
# auto-install important PMDAs for RH Support (if not present already)
|
||||
for PMDA in dm nfsclient ; do
|
||||
touch "$PCP_PMDAS_DIR/$PMDA/.NeedInstall"
|
||||
if ! grep -q "$PMDA/pmda$PMDA" "$PCP_PMCDCONF_PATH"
|
||||
then
|
||||
touch "$PCP_PMDAS_DIR/$PMDA/.NeedInstall"
|
||||
fi
|
||||
done
|
||||
# increase default pmlogger recording frequency
|
||||
sed -i 's/^\#\ PMLOGGER_INTERVAL.*/PMLOGGER_INTERVAL=10/g' "$PCP_SYSCONFIG_DIR/pmlogger"
|
||||
@ -2834,6 +2842,8 @@ pmieconf -c enable dmthin
|
||||
systemctl restart pmie >/dev/null 2>&1
|
||||
systemctl enable pmcd >/dev/null 2>&1
|
||||
systemctl enable pmlogger >/dev/null 2>&1
|
||||
systemctl enable pmlogger_daily_report >/dev/null 2>&1
|
||||
systemctl enable pmlogger_daily_report-poll >/dev/null 2>&1
|
||||
systemctl enable pmie >/dev/null 2>&1
|
||||
%else
|
||||
/sbin/chkconfig --add pmcd >/dev/null 2>&1
|
||||
@ -2856,14 +2866,6 @@ pmieconf -c enable dmthin
|
||||
%{selinux_handle_policy "$1" "pcpupstream-container"}
|
||||
%endif
|
||||
|
||||
%if !%{disable_bcc}
|
||||
%post pmda-bcc
|
||||
%{pmda_notready "$1" "bcc"}
|
||||
%endif
|
||||
|
||||
%post pmda-prometheus
|
||||
%{pmda_notready "$1" "prometheus"}
|
||||
|
||||
%post
|
||||
PCP_LOG_DIR=%{_logsdir}
|
||||
PCP_PMNS_DIR=%{_pmnsdir}
|
||||
@ -2958,10 +2960,23 @@ cd
|
||||
%{_unitdir}/pmlogger.service
|
||||
%{_unitdir}/pmie.service
|
||||
%{_unitdir}/pmproxy.service
|
||||
%endif
|
||||
%config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf
|
||||
# services and timers replacing the old cron scripts
|
||||
%{_unitdir}/pmlogger_check.service
|
||||
%{_unitdir}/pmlogger_check.timer
|
||||
%{_unitdir}/pmlogger_daily.service
|
||||
%{_unitdir}/pmlogger_daily.timer
|
||||
%{_unitdir}/pmlogger_daily-poll.service
|
||||
%{_unitdir}/pmlogger_daily-poll.timer
|
||||
%{_unitdir}/pmie_check.service
|
||||
%{_unitdir}/pmie_check.timer
|
||||
%{_unitdir}/pmie_daily.service
|
||||
%{_unitdir}/pmie_daily.timer
|
||||
%else
|
||||
# cron scripts
|
||||
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger
|
||||
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie
|
||||
%endif
|
||||
%config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pmproxy
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pmcd
|
||||
@ -2984,6 +2999,8 @@ cd
|
||||
%dir %attr(0775,pcp,pcp) %{_confdir}/nssdb
|
||||
%dir %{_confdir}/discover
|
||||
%config(noreplace) %{_confdir}/discover/pcp-kube-pods.conf
|
||||
%dir %{_confdir}/pmseries
|
||||
%config(noreplace) %{_confdir}/pmseries/pmseries.conf
|
||||
|
||||
%ghost %dir %attr(0775,pcp,pcp) %{_localstatedir}/run/pcp
|
||||
%{_localstatedir}/lib/pcp/config/pmafm
|
||||
@ -3004,7 +3021,15 @@ cd
|
||||
|
||||
%files zeroconf
|
||||
%{_libexecdir}/pcp/bin/pmlogger_daily_report
|
||||
%if !%{disable_systemd}
|
||||
# systemd services for pmlogger_daily_report to replace the cron script
|
||||
%{_unitdir}/pmlogger_daily_report.service
|
||||
%{_unitdir}/pmlogger_daily_report.timer
|
||||
%{_unitdir}/pmlogger_daily_report-poll.service
|
||||
%{_unitdir}/pmlogger_daily_report-poll.timer
|
||||
%else
|
||||
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger-daily-report
|
||||
%endif
|
||||
%{_localstatedir}/lib/pcp/config/pmlogconf/zeroconf
|
||||
|
||||
#additional pmlogger config files
|
||||
@ -3416,14 +3441,11 @@ cd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Feb 12 2019 Lukas Berk <lberk@redhat.com> - 4.3.0-4
|
||||
- Add patch to enable PMCD_LOCAL and PMLOGGER_LOCAL sysconfig vars
|
||||
|
||||
* Thu Jan 10 2019 Mark Goodwin <mgoodwin@redhat.com> - 4.3.0-3
|
||||
- add missing build deps on libuv for pmseries and libpcp_web (BZ 1630540)
|
||||
|
||||
* Wed Dec 26 2018 Mark Goodwin <mgoodwin@redhat.com> - 4.3.0-2
|
||||
- Revert pmlogger_daily daystart patch (BZ 1662034)
|
||||
* Wed Feb 27 2019 Mark Goodwin <mgoodwin@redhat.com> - 4.3.1-1
|
||||
- Fixes pcp-dstat in --full (all instances) mode (BZ 1661912)
|
||||
- Remove package dependencies on initscripts (BZ 1592380)
|
||||
- Set include directory for cppcheck use (BZ 1663372)
|
||||
- Update to latest PCP sources.
|
||||
|
||||
* Fri Dec 21 2018 Nathan Scott <nathans@redhat.com> - 4.3.0-1
|
||||
- Add the dstat -f/--full option to expand instances (BZ 1651536)
|
||||
|
||||
6
sources
6
sources
@ -1,7 +1,5 @@
|
||||
SHA512 (pcp-4.3.0.src.tar.gz) = 9dd6e3aeb05e1e90408365b87dc850a6ddd6576b5697d9c61c8d4316503397daa38198ceec92ca83f4e0b3a668c43c0c50f710b6919782d63b6e7b8cdcf33f3b
|
||||
SHA512 (pcp-4.3.1.src.tar.gz) = 8e5bcaf7e4cff88009041b5eb8fe1f4f89b0a873a4ad88f011efe8357e7c052efc800153b8805747e25fbdc1383c19396f4291e06f08d3d756c018a346acbf7a
|
||||
SHA512 (pcp-webapp-blinkenlights-1.0.1.tar.gz) = dadf0bc0742a3344a75f8f304851762572ddc9a5c7c66fd085adcabb70f9e7a9b2c9b6095a8fb358f6a6c64dbf41cf245e2da74a60b8120880f314b6ed3d271c
|
||||
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.3.1-1.tar.gz) = b1463d4da3727f130752699dd433e997212c19241ac440df389c1153e468ace840b7d5f43a37b2173e4eee4f4a807338a3c40cc9635801e626c1530baf46e289
|
||||
SHA512 (pcp-revert-pmlogger_daily-daystart.patch) = b12febf6b7df9a79a225f5aff858b2ef755428349d86181f98da5986c479ab4375ffaa55af3dd749725341e4026fa26d54287f1668f19acbe59ff1c97e16967c
|
||||
SHA512 (pmcd-pmlogger-local-context.patch) = 8f4b6b49494781d0a711ac27738a75b1adead72cb1baef9a78754686c48ae2d278d691108233e9cf9ad33fede5ba7b7a43f4674205b9bf448f267c844ddc1a01
|
||||
SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21
|
||||
|
||||
Loading…
Reference in New Issue
Block a user