From 6455ea9ef282dea58bdf99b98708524d5a9fa1f6 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Fri, 15 Jun 2018 12:11:17 +1000 Subject: [PATCH] Update to latest community sources --- pcp.spec | 366 +++++++++++++++++++++++++++---------------------------- sources | 2 +- 2 files changed, 181 insertions(+), 187 deletions(-) diff --git a/pcp.spec b/pcp.spec index 946f254..83fa912 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,9 +1,9 @@ Name: pcp -Version: 4.0.2 -Release: 2%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2.1+ and CC-BY -URL: http://www.pcp.io +URL: https://pcp.io Group: Applications/System %global bintray https://bintray.com/artifact/download @@ -50,7 +50,12 @@ Source4: %{github}/pcp-webapp-blinkenlights/archive/1.0.0/pcp-webapp-blinkenligh %global disable_webapps 0 %global disable_cairo 0 +%if 0%{?rhel} > 7 +%global disable_python2 1 +%else %global disable_python2 0 +%endif + # Default for epel5 is python24, so use the (optional) python26 packages %if 0%{?rhel} == 5 %global default_python 26 @@ -161,10 +166,8 @@ Source4: %{github}/pcp-webapp-blinkenlights/archive/1.0.0/pcp-webapp-blinkenligh %global disable_elasticsearch 1 %endif -# python's xlsxwriter module hasn't been included yet, but hopefully -# it will be eventually, leaving this as a variable for now. -%if 0%{?fedora} || 0%{?rhel} -%global disable_xlsx 1 +%if 0%{?fedora} >= 24 +%global disable_xlsx 0 %else %global disable_xlsx 1 %endif @@ -328,41 +331,29 @@ Requires: pcp-libs = %{version}-%{release} %global pmda_remove() %{expand: if [ %1 -eq 0 ] then - if [ -f "%{_confdir}/pmcd/pmcd.conf" ] && [ -f "%{_pmdasdir}/%2/domain.h" ] + if [ -f "%{_confdir}/pmcd/pmcd.conf" -a -f "%{_pmdasdir}/%2/domain.h" ] then (cd %{_pmdasdir}/%2/ && ./Remove >/dev/null 2>&1) fi fi } -%global selinux_handle_policy() %{expand: -if [ -e /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled +# force upgrade of PMDAs starting in "notready" state +%global pmda_notready() %{expand: +if grep -q ^%2 "%{_confdir}/pmcd/pmcd.conf" 2>/dev/null then - if [ %1 -ge 1 ] - then - PCP_SELINUX_DIR=%{_selinuxdir} - if [ -f "$PCP_SELINUX_DIR/%2" ] - then - if semodule -h | grep -q -- "-X" >/dev/null 2>&1 - then - (semodule -X 400 -i %{_selinuxdir}/%2) - else - (semodule -i %{_selinuxdir}/%2) - fi #semodule -X flag check - fi - elif [ %1 -eq 0 ] - then - if semodule -l | grep %2 >/dev/null 2>&1 - then - if semodule -h | grep -q -- "-X" >/dev/null 2>&1 - then - (semodule -X 400 -r %2 >/dev/null) - else - (semodule -r %2 >/dev/null) - fi #semodule -X flag check - fi - fi -fi # check for an active selinux install + touch %{_pmdasdir}/%2/.NeedInstall +fi +} + +%global selinux_handle_policy() %{expand: +if [ %1 -ge 1 ] +then + %{_libexecdir}/pcp/bin/selinux-setup %{_selinuxdir} install %2 +elif [ %1 -eq 0 ] +then + %{_libexecdir}/pcp/bin/selinux-setup %{_selinuxdir} remove %2 +fi } %description @@ -380,7 +371,7 @@ applications to easily retrieve and process any subset of that data. License: LGPLv2.1+ Group: System Environment/Libraries Summary: Performance Co-Pilot run-time configuration -URL: http://www.pcp.io +URL: https://pcp.io # http://fedoraproject.org/wiki/Packaging:Conflicts "Splitting Packages" Conflicts: pcp-libs < 3.9 @@ -395,7 +386,7 @@ Performance Co-Pilot (PCP) run-time configuration License: LGPLv2.1+ Group: System Environment/Libraries Summary: Performance Co-Pilot run-time libraries -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-conf = %{version}-%{release} %description libs @@ -408,7 +399,8 @@ Performance Co-Pilot (PCP) run-time libraries License: GPLv2+ and LGPLv2.1+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) development headers -URL: http://www.pcp.io +URL: https://pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} %description libs-devel Performance Co-Pilot (PCP) headers for development. @@ -420,7 +412,7 @@ Performance Co-Pilot (PCP) headers for development. License: GPLv2+ and LGPLv2.1+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) development tools and documentation -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} Requires: pcp-libs-devel = %{version}-%{release} @@ -435,7 +427,7 @@ Performance Co-Pilot (PCP) documentation and tools for development. License: GPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) test suite -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} Requires: pcp-libs-devel = %{version}-%{release} @@ -452,7 +444,7 @@ Quality assurance test suite for Performance Co-Pilot (PCP). License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) manager daemon -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} %description manager @@ -471,7 +463,7 @@ scripts. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) web API service -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} Requires: liberation-sans-fonts @@ -486,7 +478,7 @@ HTTP (PMWEBAPI) protocol. # pcp-webjs and pcp-webapp packages # %package webjs -License: ASL2.0 and MIT and CC-BY and GPLv3 +License: ASL 2.0 and MIT and CC-BY and GPLv3 Group: Applications/Internet Conflicts: pcp-webjs < 3.11.9 %if !%{disable_noarch} @@ -495,14 +487,14 @@ BuildArch: noarch Requires: pcp-webapp-vector pcp-webapp-blinkenlights Requires: pcp-webapp-graphite pcp-webapp-grafana Summary: Performance Co-Pilot (PCP) web applications -URL: http://www.pcp.io +URL: https://pcp.io %description webjs Javascript web application content for the Performance Co-Pilot (PCP) web service. %package webapp-vector -License: ASL2.0 +License: ASL 2.0 Group: Applications/Internet %if !%{disable_noarch} BuildArch: noarch @@ -514,7 +506,7 @@ URL: https://github.com/Netflix/vector Vector web application for the Performance Co-Pilot (PCP). %package webapp-grafana -License: ASL2.0 +License: ASL 2.0 Group: Applications/Internet Conflicts: pcp-webjs < 3.10.4 %if !%{disable_noarch} @@ -534,7 +526,7 @@ Grafana can render time series dashboards at the browser via flot.js server via png (less interactive, faster). %package webapp-graphite -License: ASL2.0 and GPLv3 +License: ASL 2.0 and GPLv3 Group: Applications/Internet Conflicts: pcp-webjs < 3.10.4 %if !%{disable_noarch} @@ -550,13 +542,13 @@ as the data repository, and Graphites web interface renders it. The Carbon and Whisper subsystems of Graphite are not included nor used. %package webapp-blinkenlights -License: ASL2.0 +License: ASL 2.0 Group: Applications/Internet %if !%{disable_noarch} BuildArch: noarch %endif Summary: Blinking lights web application for Performance Co-Pilot (PCP) -URL: http://pcp.io +URL: https://pcp.io %description webapp-blinkenlights Demo web application showing traffic lights that change colour based @@ -570,7 +562,7 @@ on the periodic evaluation of performance metric expressions. License: GPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) Perl bindings and documentation -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} Requires: %{perl_interpreter} @@ -588,7 +580,7 @@ an application, etc. License: GPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} Requires: %{perl_interpreter} @@ -607,7 +599,7 @@ and analysis with pmchart, pmie, pmlogger and other PCP tools. License: GPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) Perl bindings for importing external data into PCP archives -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} Requires: %{perl_interpreter} @@ -623,7 +615,7 @@ they can be replayed with standard PCP monitoring tools. License: GPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) Perl bindings for post-processing output of pmlogsummary -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} Requires: %{perl_interpreter} @@ -642,7 +634,7 @@ exporting this data into third-party tools (e.g. spreadsheets). License: LGPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for importing sar data into PCP archive logs -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} Requires: perl-PCP-LogImport = %{version}-%{release} Requires: perl(XML::TokeParser) @@ -658,7 +650,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. License: LGPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for importing iostat data into PCP archive logs -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} Requires: perl-PCP-LogImport = %{version}-%{release} @@ -673,7 +665,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. License: LGPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for importing MTRG data into PCP archive logs -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} Requires: perl-PCP-LogImport = %{version}-%{release} @@ -688,7 +680,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. License: LGPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for importing ganglia data into PCP archive logs -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} Requires: perl-PCP-LogImport = %{version}-%{release} @@ -703,7 +695,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. License: LGPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for importing collectl log files into PCP archive logs -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description import-collectl2pcp @@ -717,7 +709,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool. License: GPLv2+ Group: Applications/System Summary: Module for exporting PCP metrics to Zabbix agent -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description export-zabbix-agent @@ -733,7 +725,7 @@ Zabbix via the Zabbix agent - see zbxpcp(3) for further details. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for exporting PCP metrics to ElasticSearch -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} @@ -757,7 +749,7 @@ See https://www.elastic.co/community for further details. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for exporting PCP metrics to Graphite -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} @@ -775,7 +767,7 @@ to graphite (http://graphite.readthedocs.org). License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for exporting PCP metrics to InfluxDB -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} @@ -796,7 +788,7 @@ to InfluxDB (https://influxdata.com/time-series-platform/influxdb). License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for exporting PCP metrics in JSON format -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} @@ -816,12 +808,16 @@ in JSON format. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for exporting PCP metrics to Excel -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} +Requires: python3-openpyxl +BuildRequires: python3-openpyxl %else Requires: %{__python2}-pcp = %{version}-%{release} +Requires: %{__python2}-openpyxl +BuildRequires: %{__python2}-openpyxl %endif %description export-pcp2xlsx @@ -835,7 +831,7 @@ in Excel spreadsheet format. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for exporting PCP metrics in XML format -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} @@ -854,7 +850,7 @@ in XML format. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot tools for exporting PCP metrics to Zabbix -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs >= %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} @@ -875,7 +871,7 @@ to the Zabbix (https://www.zabbix.org/) monitoring software. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Performance API and hardware counters -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} BuildRequires: papi-devel @@ -892,7 +888,7 @@ collecting hardware counters statistics through PAPI (Performance API). License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for hardware counters -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} Requires: libpfm >= 4 BuildRequires: libpfm-devel >= 4 @@ -910,7 +906,7 @@ collecting hardware counters statistics through libpfm. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Infiniband HCAs and switches -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} Requires: libibmad >= 1.3.7 libibumad >= 1.3.7 BuildRequires: libibmad-devel >= 1.3.7 libibumad-devel >= 1.3.7 @@ -928,7 +924,7 @@ but can also be configured to monitor remote GUIDs such as IB switches. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for ActiveMQ -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(LWP::UserAgent) @@ -944,7 +940,7 @@ collecting metrics about the ActiveMQ message broker. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for BIND servers -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(LWP::UserAgent) Requires: perl(XML::LibXML) @@ -962,7 +958,7 @@ collecting metrics from BIND (Berkeley Internet Name Domain). License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Redis -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-redis @@ -978,7 +974,7 @@ collecting metrics from Redis servers (redis.io). License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for NutCracker (TwemCache) -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(YAML::XS::LibYAML) Requires: perl(JSON) @@ -996,7 +992,7 @@ collecting metrics from NutCracker (TwemCache). License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Bonded network interfaces -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-bonding @@ -1011,7 +1007,7 @@ collecting metrics about bonded network interfaces. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Database response times and Availablility -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-dbping @@ -1026,7 +1022,7 @@ collecting metrics about the Database response times and Availablility. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Servers -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl-LDAP @@ -1042,7 +1038,7 @@ collecting metrics about a 389 Directory Server. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Server Loggers -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl-Date-Manip @@ -1058,7 +1054,7 @@ collecting metrics from a 389 Directory Server log. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(LWP::UserAgent) BuildRequires: perl(LWP::UserAgent) @@ -1075,7 +1071,7 @@ collecting metrics about Elasticsearch. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for GPFS Filesystem -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-gpfs @@ -1090,7 +1086,7 @@ collecting metrics about the GPFS filesystem. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for a GPS Daemon -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-gpsd @@ -1105,7 +1101,7 @@ collecting metrics about a GPS Daemon. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for KVM -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-kvm @@ -1120,7 +1116,8 @@ collecting metrics about the Kernel based Virtual Machine. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics from the Docker daemon -URL: http://www.pcp.io +URL: https://pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} %description pmda-docker This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1134,7 +1131,7 @@ collecting metrics using the Docker daemon REST API. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-lustre @@ -1149,7 +1146,7 @@ collecting metrics about the Lustre Filesystem. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem Comms -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} @@ -1165,7 +1162,7 @@ collecting metrics about the Lustre Filesystem Comms. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Memcached -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-memcache @@ -1180,7 +1177,7 @@ collecting metrics about Memcached. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for MySQL -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(DBI) perl(DBD::mysql) BuildRequires: perl(DBI) perl(DBD::mysql) @@ -1197,7 +1194,7 @@ collecting metrics about the MySQL database. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Named -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-named @@ -1211,7 +1208,7 @@ collecting metrics about the Named nameserver. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Netfilter framework -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-netfilter @@ -1226,7 +1223,7 @@ collecting metrics about the Netfilter packet filtering framework. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Usenet News -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-news @@ -1241,7 +1238,7 @@ collecting metrics about Usenet News. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Nginx Webserver -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(LWP::UserAgent) BuildRequires: perl(LWP::UserAgent) @@ -1258,7 +1255,7 @@ collecting metrics about the Nginx Webserver. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for NFS Clients -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-nfsclient @@ -1273,7 +1270,7 @@ collecting metrics for NFS Clients. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Oracle database -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(DBI) BuildRequires: perl(DBI) @@ -1290,7 +1287,7 @@ collecting metrics about the Oracle database. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for PowerDNS -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-pdns @@ -1305,7 +1302,7 @@ collecting metrics about the PowerDNS. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Postfix (MTA) -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %if 0%{?fedora} > 16 || 0%{?rhel} > 5 Requires: postfix-perl-scripts @@ -1332,7 +1329,7 @@ collecting metrics about the Postfix (MTA). License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for PostgreSQL -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(DBI) perl(DBD::Pg) BuildRequires: perl(DBI) perl(DBD::Pg) @@ -1349,7 +1346,7 @@ collecting metrics about the PostgreSQL database. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Rsyslog -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-rsyslog @@ -1364,7 +1361,7 @@ collecting metrics about Rsyslog. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Samba -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-samba @@ -1379,7 +1376,7 @@ collecting metrics about Samba. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for NFS Clients -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-slurm @@ -1395,7 +1392,7 @@ collecting metrics from the SLURM Workload Manager. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Simple Network Management Protocol -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} # There are no perl-Net-SNMP packages in rhel, disable unless non-rhel or epel5 %if 0%{?rhel} == 0 || 0%{?rhel} < 6 @@ -1415,7 +1412,7 @@ collecting metrics about SNMP. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for VMware -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-vmware @@ -1430,7 +1427,7 @@ collecting metrics for VMware. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Zimbra -URL: http://www.pcp.io +URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-zimbra @@ -1445,7 +1442,7 @@ collecting metrics about Zimbra. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Device Mapper Cache and Thin Client -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-dm This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1458,10 +1455,10 @@ collecting metrics about the Device Mapper Cache and Thin Client. # pcp-pmda-bcc # %package pmda-bcc -License: ASL2.0 and GPLv2+ +License: ASL 2.0 and GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics from eBPF/BCC modules -URL: http://www.pcp.io +URL: https://pcp.io Requires: python3-bcc Requires: python3-pcp %description pmda-bcc @@ -1478,7 +1475,7 @@ extracting performance metrics from eBPF/BCC Python modules. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Gluster filesystem -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %else @@ -1496,7 +1493,7 @@ collecting metrics about the gluster filesystem. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for compressed swap -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %else @@ -1514,7 +1511,7 @@ collecting metrics about compressed swap. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Unbound DNS Resolver -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %else @@ -1532,7 +1529,7 @@ collecting metrics about the Unbound DNS Resolver. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Intel MIC cards -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %else @@ -1550,7 +1547,7 @@ collecting metrics about Intel MIC cards. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for HAProxy -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_python3} Requires: python3-pcp %else @@ -1568,7 +1565,7 @@ extracting performance metrics from HAProxy over the HAProxy stats socket. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for virtual machines -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_python3} Requires: python3-pcp Requires: libvirt-python3 python3-lxml @@ -1598,7 +1595,7 @@ and hypervisor machines. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the LIO subsystem -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_python3} Requires: python3-pcp Requires: python3-rtslib @@ -1623,7 +1620,7 @@ target. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics from Prometheus endpoints -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %if !%{disable_python3} Requires: python3-pcp @@ -1650,7 +1647,7 @@ extracting statistics from programs instrumented as Prometheus endpoints. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for JSON data -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_python3} Requires: python3-pcp Requires: python3-jsonpointer python3-six @@ -1674,7 +1671,7 @@ collecting metrics output in JSON. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Apache webserver -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-apache This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1688,7 +1685,7 @@ collecting metrics about the Apache webserver. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Bash shell -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-bash This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1702,7 +1699,7 @@ collecting metrics about the Bash shell. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the CIFS protocol -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-cifs This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1716,7 +1713,7 @@ collecting metrics about the Common Internet Filesytem. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Cisco routers -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-cisco This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1730,7 +1727,7 @@ collecting metrics about Cisco routers. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the GFS2 filesystem -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-gfs2 This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1744,7 +1741,7 @@ collecting metrics about the Global Filesystem v2. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for hardware sensors -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-lmsensors This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1758,7 +1755,7 @@ collecting metrics about the Linux hardware monitoring sensors. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics from arbitrary log files -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-logger This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1773,7 +1770,7 @@ supports both sampled and event-style metrics. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the sendmail queue -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-mailq This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1787,7 +1784,7 @@ collecting metrics about email queues managed by sendmail. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for filesystem mounts -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-mounts This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1801,7 +1798,7 @@ collecting metrics about filesystem mounts. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Nvidia GPU -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-nvidia-gpu This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1815,7 +1812,7 @@ collecting metrics about Nvidia GPUs. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the room temperature -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} %description pmda-roomtemp @@ -1831,7 +1828,7 @@ collecting metrics about the room temperature. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the RPM package manager -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} %description pmda-rpm @@ -1848,7 +1845,7 @@ collecting metrics about the installed RPM packages. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Sendmail -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} %description pmda-sendmail @@ -1863,7 +1860,7 @@ collecting metrics about Sendmail traffic. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for shell command responses -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-shping This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1878,7 +1875,7 @@ arbitrary shell commands. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for S.M.A.R.T values -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-smart This package contains the PCP Performance Metric Domain Agent (PMDA) for @@ -1893,7 +1890,7 @@ smartmontools package. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) summary metrics from pmie -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} %description pmda-summary @@ -1909,7 +1906,7 @@ collecting metrics about other installed pmdas. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics from the Systemd journal -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-systemd This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1924,7 +1921,7 @@ collecting metrics from the Systemd journal. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for application tracing -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-libs = %{version}-%{release} %description pmda-trace This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1938,7 +1935,7 @@ collecting metrics about trace performance data in applications. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics from web server logs -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} %description pmda-weblog @@ -1952,7 +1949,7 @@ collecting metrics about web server logs. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) Collection meta Package -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp-pmda-activemq pcp-pmda-bonding pcp-pmda-dbping pcp-pmda-ds389 pcp-pmda-ds389log Requires: pcp-pmda-elasticsearch pcp-pmda-gpfs pcp-pmda-gpsd pcp-pmda-kvm pcp-pmda-lustre Requires: pcp-pmda-memcache pcp-pmda-mysql pcp-pmda-named pcp-pmda-netfilter pcp-pmda-news @@ -1994,7 +1991,7 @@ pmlogger services. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) Monitoring meta Package -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_microhttpd} Requires: pcp-webapi %endif @@ -2013,7 +2010,7 @@ includes a large number of packages for analysing PCP metrics in various ways. License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) Zeroconf Package -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp pcp-doc pcp-system-tools Requires: pcp-pmda-dm pcp-pmda-nfsclient # to make pcp-zeroconf replace sysstat, uncomment the next line @@ -2033,7 +2030,7 @@ those written by sysstat. License: GPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) Python bindings and documentation -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} %if 0%{?fedora} >= 26 || 0%{?rhel} > 7 # on these platforms, python2-pcp replaces python-pcp @@ -2059,7 +2056,7 @@ Metric Domain Agent (PMDA) collector tools written in Python. License: GPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) Python3 bindings and documentation -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} Requires: python3 @@ -2077,18 +2074,17 @@ Metric Domain Agent (PMDA) collector tools written in Python3. License: GPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot (PCP) System and Monitoring Tools -URL: http://www.pcp.io +URL: https://pcp.io %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} -%endif -%if !%{disable_python2} +%else Requires: %{__python2}-pcp = %{version}-%{release} %endif Requires: pcp-libs = %{version}-%{release} %description system-tools This PCP module contains additional system monitoring tools written -in python. +in the Python language. %endif #end pcp-system-tools %if !%{disable_qt} @@ -2099,7 +2095,7 @@ in python. License: GPLv2+ and LGPLv2+ and LGPLv2+ with exceptions Group: Applications/System Summary: Visualization tools for the Performance Co-Pilot toolkit -URL: http://www.pcp.io +URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} Requires: liberation-sans-fonts BuildRequires: hicolor-icon-theme @@ -2121,7 +2117,7 @@ Group: Documentation BuildArch: noarch %endif Summary: Documentation and tutorial for the Performance Co-Pilot -URL: http://www.pcp.io +URL: https://pcp.io # http://fedoraproject.org/wiki/Packaging:Conflicts "Splitting Packages" # (all man pages migrated to pcp-doc during great package split of '15) Conflicts: pcp-pmda-pmda < 3.10.5 @@ -2146,7 +2142,7 @@ PCP utilities and daemons, and the PCP graphical tools. License: GPLv2+ and CC-BY Group: Applications/System Summary: Selinux policy package -URL: http://www.pcp.io +URL: https://pcp.io BuildRequires: selinux-policy-devel BuildRequires: selinux-policy-targeted %if 0%{?rhel} == 5 @@ -2314,30 +2310,39 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ grep -E -v '^haproxy' |\ sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list -# all base pcp package files except those split out into sub packages +# all base pcp package files except those split out into sub-packages ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ - grep -E -v 'pmiostat|pmcollectl|pmatop|zabbix|zbxpcp' |\ + grep -E -v 'pmiostat|pmcollectl|zabbix|zbxpcp|dstat' |\ grep -E -v 'pmrep|pcp2graphite|pcp2influxdb|pcp2zabbix' |\ grep -E -v 'pcp2elasticsearch|pcp2json|pcp2xlsx|pcp2xml' |\ grep -E -v 'pmdbg|pmclient|pmerr|genpmda' |\ sed -e 's#^#'%{_bindir}'\/#' >base_bin.list -# + # Separate the pcp-system-tools package files. -# -# pmatop, pmcollectl and pmiostat are back-compat symlinks to their -# pcp(1) sub-command variants so must also be in pcp-system-tools. +# pmcollectl and pmiostat are back-compat symlinks to their +# pcp(1) sub-command variants so are also in pcp-system-tools. %if !%{disable_python2} || !%{disable_python3} ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ - grep -E 'pmiostat|pmcollectl|pmatop|pmrep' |\ - sed -e 's#^#'%{_bindir}'\/#' >pcp_system_tools.list + egrep -e 'pmiostat|pmcollectl|pmrep|dstat' |\ + sed -e 's#^#'%{_bindir}'\/#' >pcp-system-tools.list ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ - grep -E 'atop|collectl|dmcache|free|iostat|mpstat|numastat|pidstat|tapestat|verify|uptime|shping' |\ - sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp_system_tools.list + egrep -e 'atop|collectl|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' \ + -e 'numastat|pidstat|shping|tapestat|uptime|verify' |\ + sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp-system-tools.list +%endif +# Separate the pcp-selinux package files. +%if !%{disable_selinux} +ls -1 $RPM_BUILD_ROOT/%{_selinuxdir} |\ + sed -e 's#^#'%{_selinuxdir}'\/#' > pcp-selinux.list +ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ + grep -E 'selinux-setup' |\ + sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >> pcp-selinux.list %endif ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ %if !%{disable_python2} || !%{disable_python3} - grep -E -v 'atop|collectl|dmcache|free|iostat|mpstat|numastat|pidstat|tapestat|verify|uptime|shping' |\ + grep -E -v 'atop|collectl|dmcache|dstat|free|iostat|mpstat|numastat' |\ + grep -E -v 'shping|tapestat|uptime|verify|selinux-setup' |\ %endif sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >base_exec.list ls -1 $RPM_BUILD_ROOT/%{_booksdir} |\ @@ -2348,10 +2353,6 @@ ls -1 $RPM_BUILD_ROOT/%{_mandir}/man5 |\ sed -e 's#^#'%{_mandir}'\/man5\/#' >>pcp-doc.list ls -1 $RPM_BUILD_ROOT/%{_datadir}/pcp/demos/tutorials |\ sed -e 's#^#'%{_datadir}/pcp/demos/tutorials'\/#' >>pcp-doc.list -%if !%{disable_selinux} -ls -1 $RPM_BUILD_ROOT/%{_selinuxdir} |\ - sed -e 's#^#'%{_selinuxdir}'\/#' > pcp-selinux.list -%endif %if !%{disable_qt} ls -1 $RPM_BUILD_ROOT/%{_pixmapdir} |\ sed -e 's#^#'%{_pixmapdir}'\/#' > pcp-gui.list @@ -2560,14 +2561,6 @@ fi %preun pmda-prometheus %{pmda_remove "$1" "prometheus"} -%post pmda-prometheus -# pcp-4.0.1 and later: pmdaprometheus starts "notready" - this is for upgrades -. /etc/pcp.env -if grep -q ^prometheus "$PCP_PMCDCONF_PATH" 2>/dev/null -then - touch $PCP_PMDAS_DIR/prometheus/.NeedInstall -fi - %preun pmda-lustre %{pmda_remove "$1" "lustre"} @@ -2620,16 +2613,6 @@ 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"} @@ -2797,15 +2780,23 @@ pmieconf -c enable dmthin %if !%{disable_selinux} %post selinux -%{selinux_handle_policy "$1" "pcpupstream.pp"} +%{selinux_handle_policy "$1" "pcpupstream"} %triggerin selinux -- docker-selinux -%{selinux_handle_policy "$1" "pcpupstream-docker.pp"} +%{selinux_handle_policy "$1" "pcpupstream-docker"} %triggerin selinux -- container-selinux -%{selinux_handle_policy "$1" "pcpupstream-container.pp"} +%{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} @@ -2927,7 +2918,7 @@ cd %dir %{_confdir}/discover %config(noreplace) %{_confdir}/discover/pcp-kube-pods.conf -%ghost %{_localstatedir}/run/pcp +%ghost %dir %attr(0775,pcp,pcp) %{_localstatedir}/run/pcp %{_localstatedir}/lib/pcp/config/pmafm %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie %{_localstatedir}/lib/pcp/config/pmie @@ -3249,7 +3240,7 @@ cd %files export-zabbix-agent %{_libdir}/zabbix -%{_sysconfdir}/zabbix/zabbix_agent.d/zbxpcp.conf +%{_sysconfdir}/zabbix/zabbix_agentd.d/zbxpcp.conf %if !%{disable_json} %files pmda-json @@ -3351,14 +3342,17 @@ cd %endif %if !%{disable_python2} || !%{disable_python3} -%files system-tools -f pcp_system_tools.list +%files system-tools -f pcp-system-tools.list +%dir %{_confdir}/dstat %dir %{_confdir}/pmrep -%config(noreplace) %{_confdir}/pmrep/pmrep.conf +%config(noreplace) %{_confdir}/dstat/* +%config(noreplace) %{_confdir}/pmrep/* %endif %changelog -* Fri May 11 2018 Mark Goodwin - 4.0.2-2 -- fix minor spec typo +* Fri Jun 15 2018 Nathan Scott - 4.1.0-1 +- Rapid compression of PCP log data and metadata (BZ 1293471) +- Update to latest PCP sources. * Fri May 11 2018 Mark Goodwin - 4.0.2-1 - Propogate build flags throughout PCP (BZ 1538187) diff --git a/sources b/sources index d1c2e81..41a3ef9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (pcp-4.0.2.src.tar.gz) = 44eaccdb63456d66227c38f5ccd2a033b3c5b511cf4cf2ff39646fc3a1365e82fff1d0601878c85c8a2683c1b3cf8ed6e5d7dc2edd0aaf8d0e42ea46699253b7 +SHA512 (pcp-4.1.0.src.tar.gz) = 432afeb6fa6af3268a722afcaf9ccf226b39f122f443ad7484c9818b7684aa2c55251459442859ea65434a25401e57aec662d2f70bf6e9b0a6dd8fbc82692eee 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