Merge branch 'master' into f28

This commit is contained in:
Nathan Scott 2019-03-07 14:50:10 +11:00
commit 93c903cfd9
3 changed files with 14 additions and 115 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ pcp-webjs-*
vector-*
/pcp-revert-pmlogger_daily-daystart.patch
/pmcd-pmlogger-local-context.patch
/selinux-policy-updates.patch

126
pcp.spec
View File

@ -1,10 +1,9 @@
Name: pcp
Version: 4.3.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: System-level performance monitoring and performance management
License: GPLv2+ and LGPLv2+ and CC-BY
URL: https://pcp.io
Group: Applications/System
%global bintray https://bintray.com/artifact/download
%global github https://github.com/performancecopilot
@ -14,6 +13,8 @@ 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
Patch0: pmcd-pmlogger-local-context.patch
Patch1: selinux-policy-updates.patch
%if 0%{?fedora} >= 26 || 0%{?rhel} > 7
%global __python2 python2
@ -394,7 +395,6 @@ applications to easily retrieve and process any subset of that data.
#
%package conf
License: LGPLv2+
Group: System Environment/Libraries
Summary: Performance Co-Pilot run-time configuration
URL: https://pcp.io
@ -409,7 +409,6 @@ Performance Co-Pilot (PCP) run-time configuration
#
%package libs
License: LGPLv2+
Group: System Environment/Libraries
Summary: Performance Co-Pilot run-time libraries
URL: https://pcp.io
Requires: pcp-conf = %{version}-%{release}
@ -422,7 +421,6 @@ Performance Co-Pilot (PCP) run-time libraries
#
%package libs-devel
License: GPLv2+ and LGPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) development headers
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -435,7 +433,6 @@ Performance Co-Pilot (PCP) headers for development.
#
%package devel
License: GPLv2+ and LGPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) development tools and documentation
URL: https://pcp.io
Requires: pcp = %{version}-%{release}
@ -450,7 +447,6 @@ Performance Co-Pilot (PCP) documentation and tools for development.
#
%package testsuite
License: GPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) test suite
URL: https://pcp.io
Requires: pcp = %{version}-%{release}
@ -514,7 +510,6 @@ Quality assurance test suite for Performance Co-Pilot (PCP).
#
%package manager
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) manager daemon
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -533,7 +528,6 @@ scripts.
#
%package webapi
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) web API service
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -551,7 +545,6 @@ HTTP (PMWEBAPI) protocol.
#
%package webjs
License: ASL 2.0 and MIT and CC-BY and GPLv3
Group: Applications/Internet
Conflicts: pcp-webjs < 3.11.9
%if !%{disable_noarch}
BuildArch: noarch
@ -567,7 +560,6 @@ web service.
%package webapp-vector
License: ASL 2.0
Group: Applications/Internet
%if !%{disable_noarch}
BuildArch: noarch
%endif
@ -579,7 +571,6 @@ Vector web application for the Performance Co-Pilot (PCP).
%package webapp-grafana
License: ASL 2.0
Group: Applications/Internet
Conflicts: pcp-webjs < 3.10.4
%if !%{disable_noarch}
BuildArch: noarch
@ -599,7 +590,6 @@ server via png (less interactive, faster).
%package webapp-graphite
License: ASL 2.0 and GPLv3
Group: Applications/Internet
Conflicts: pcp-webjs < 3.10.4
%if !%{disable_noarch}
BuildArch: noarch
@ -615,7 +605,6 @@ Carbon and Whisper subsystems of Graphite are not included nor used.
%package webapp-blinkenlights
License: ASL 2.0
Group: Applications/Internet
%if !%{disable_noarch}
BuildArch: noarch
%endif
@ -632,7 +621,6 @@ on the periodic evaluation of performance metric expressions.
#
%package -n perl-PCP-PMDA
License: GPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Perl bindings and documentation
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -650,7 +638,6 @@ an application, etc.
#
%package -n perl-PCP-MMV
License: GPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -669,7 +656,6 @@ and analysis with pmchart, pmie, pmlogger and other PCP tools.
#
%package -n perl-PCP-LogImport
License: GPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Perl bindings for importing external data into PCP archives
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -685,7 +671,6 @@ they can be replayed with standard PCP monitoring tools.
#
%package -n perl-PCP-LogSummary
License: GPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Perl bindings for post-processing output of pmlogsummary
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -704,7 +689,6 @@ exporting this data into third-party tools (e.g. spreadsheets).
#
%package import-sar2pcp
License: LGPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for importing sar data into PCP archive logs
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -720,7 +704,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
#
%package import-iostat2pcp
License: LGPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for importing iostat data into PCP archive logs
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -735,7 +718,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
#
%package import-mrtg2pcp
License: LGPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for importing MTRG data into PCP archive logs
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -750,7 +732,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
#
%package import-ganglia2pcp
License: LGPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for importing ganglia data into PCP archive logs
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -765,7 +746,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
#
%package import-collectl2pcp
License: LGPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for importing collectl log files into PCP archive logs
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -779,7 +759,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
#
%package export-zabbix-agent
License: GPLv2+
Group: Applications/System
Summary: Module for exporting PCP metrics to Zabbix agent
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -794,7 +773,6 @@ Zabbix via the Zabbix agent - see zbxpcp(3) for further details.
#
%package export-pcp2elasticsearch
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for exporting PCP metrics to ElasticSearch
URL: https://pcp.io
Requires: pcp-libs >= %{version}-%{release}
@ -818,7 +796,6 @@ See https://www.elastic.co/community for further details.
#
%package export-pcp2graphite
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for exporting PCP metrics to Graphite
URL: https://pcp.io
Requires: pcp-libs >= %{version}-%{release}
@ -836,7 +813,6 @@ to graphite (http://graphite.readthedocs.org).
#
%package export-pcp2influxdb
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for exporting PCP metrics to InfluxDB
URL: https://pcp.io
Requires: pcp-libs >= %{version}-%{release}
@ -857,7 +833,6 @@ to InfluxDB (https://influxdata.com/time-series-platform/influxdb).
#
%package export-pcp2json
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for exporting PCP metrics in JSON format
URL: https://pcp.io
Requires: pcp-libs >= %{version}-%{release}
@ -876,7 +851,6 @@ in JSON format.
#
%package export-pcp2spark
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for exporting PCP metrics to Apache Spark
URL: https://pcp.io
Requires: pcp-libs >= %{version}-%{release}
@ -897,7 +871,6 @@ further details on Apache Spark.
%if !%{disable_xlsx}
%package export-pcp2xlsx
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for exporting PCP metrics to Excel
URL: https://pcp.io
Requires: pcp-libs >= %{version}-%{release}
@ -920,7 +893,6 @@ in Excel spreadsheet format.
#
%package export-pcp2xml
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for exporting PCP metrics in XML format
URL: https://pcp.io
Requires: pcp-libs >= %{version}-%{release}
@ -939,7 +911,6 @@ in XML format.
#
%package export-pcp2zabbix
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot tools for exporting PCP metrics to Zabbix
URL: https://pcp.io
Requires: pcp-libs >= %{version}-%{release}
@ -960,7 +931,6 @@ to the Zabbix (https://www.zabbix.org/) monitoring software.
#
%package pmda-papi
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Performance API and hardware counters
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -977,7 +947,6 @@ collecting hardware counters statistics through PAPI (Performance API).
#
%package pmda-podman
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for podman containers
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -995,7 +964,6 @@ collecting podman container and pod statistics through libvarlink.
#
%package pmda-perfevent
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for hardware counters
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -1013,7 +981,6 @@ collecting hardware counters statistics through libpfm.
#
%package pmda-infiniband
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Infiniband HCAs and switches
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -1031,7 +998,6 @@ but can also be configured to monitor remote GUIDs such as IB switches.
#
%package pmda-activemq
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for ActiveMQ
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1047,7 +1013,6 @@ collecting metrics about the ActiveMQ message broker.
#
%package pmda-bind2
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for BIND servers
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1065,7 +1030,6 @@ collecting metrics from BIND (Berkeley Internet Name Domain).
#
%package pmda-redis
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Redis
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1081,7 +1045,6 @@ collecting metrics from Redis servers (redis.io).
#
%package pmda-nutcracker
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for NutCracker (TwemCache)
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1099,7 +1062,6 @@ collecting metrics from NutCracker (TwemCache).
#
%package pmda-bonding
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Bonded network interfaces
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1114,7 +1076,6 @@ collecting metrics about bonded network interfaces.
#
%package pmda-dbping
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Database response times and Availablility
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1129,7 +1090,6 @@ collecting metrics about the Database response times and Availablility.
#
%package pmda-ds389
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Servers
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1147,7 +1107,6 @@ collecting metrics about a 389 Directory Server.
#
%package pmda-ds389log
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Server Loggers
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1164,7 +1123,6 @@ collecting metrics from a 389 Directory Server log.
#
%package pmda-gpfs
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for GPFS Filesystem
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1179,7 +1137,6 @@ collecting metrics about the GPFS filesystem.
#
%package pmda-gpsd
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for a GPS Daemon
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1194,7 +1151,6 @@ collecting metrics about a GPS Daemon.
#
%package pmda-docker
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics from the Docker daemon
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -1209,7 +1165,6 @@ collecting metrics using the Docker daemon REST API.
#
%package pmda-lustre
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1224,7 +1179,6 @@ collecting metrics about the Lustre Filesystem.
#
%package pmda-lustrecomm
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem Comms
URL: https://pcp.io
Requires: pcp = %{version}-%{release}
@ -1240,7 +1194,6 @@ collecting metrics about the Lustre Filesystem Comms.
#
%package pmda-memcache
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Memcached
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1255,7 +1208,6 @@ collecting metrics about Memcached.
#
%package pmda-mysql
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for MySQL
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1272,7 +1224,6 @@ collecting metrics about the MySQL database.
#
%package pmda-named
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Named
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1286,7 +1237,6 @@ collecting metrics about the Named nameserver.
#
%package pmda-netfilter
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Netfilter framework
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1301,7 +1251,6 @@ collecting metrics about the Netfilter packet filtering framework.
#
%package pmda-news
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Usenet News
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1316,7 +1265,6 @@ collecting metrics about Usenet News.
#
%package pmda-nginx
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Nginx Webserver
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1333,7 +1281,6 @@ collecting metrics about the Nginx Webserver.
#
%package pmda-oracle
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Oracle database
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1350,7 +1297,6 @@ collecting metrics about the Oracle database.
#
%package pmda-pdns
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for PowerDNS
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1365,7 +1311,6 @@ collecting metrics about the PowerDNS.
#
%package pmda-postfix
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Postfix (MTA)
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1392,7 +1337,6 @@ collecting metrics about the Postfix (MTA).
#
%package pmda-rsyslog
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Rsyslog
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1407,7 +1351,6 @@ collecting metrics about Rsyslog.
#
%package pmda-samba
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Samba
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1422,7 +1365,6 @@ collecting metrics about Samba.
#
%package pmda-slurm
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the SLURM Workload Manager
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1438,7 +1380,6 @@ collecting metrics from the SLURM Workload Manager.
#
%package pmda-snmp
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Simple Network Management Protocol
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1458,7 +1399,6 @@ collecting metrics about SNMP.
#
%package pmda-vmware
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for VMware
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1473,7 +1413,6 @@ collecting metrics for VMware.
#
%package pmda-zimbra
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Zimbra
URL: https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
@ -1488,7 +1427,6 @@ collecting metrics about Zimbra.
#
%package pmda-dm
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Device Mapper Cache and Thin Client
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1505,7 +1443,6 @@ collecting metrics about the Device Mapper Cache and Thin Client.
#
%package pmda-bcc
License: ASL 2.0 and GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics from eBPF/BCC modules
URL: https://pcp.io
Requires: python3-bcc
@ -1522,7 +1459,6 @@ extracting performance metrics from eBPF/BCC Python modules.
#
%package pmda-gluster
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Gluster filesystem
URL: https://pcp.io
%if !%{disable_python3}
@ -1540,7 +1476,6 @@ collecting metrics about the gluster filesystem.
#
%package pmda-nfsclient
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for NFS Clients
URL: https://pcp.io
%if !%{disable_python3}
@ -1558,7 +1493,6 @@ collecting metrics for NFS Clients.
#
%package pmda-postgresql
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for PostgreSQL
URL: https://pcp.io
%if !%{disable_python3}
@ -1580,7 +1514,6 @@ collecting metrics about the PostgreSQL database.
#
%package pmda-zswap
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for compressed swap
URL: https://pcp.io
%if !%{disable_python3}
@ -1598,7 +1531,6 @@ collecting metrics about compressed swap.
#
%package pmda-unbound
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Unbound DNS Resolver
URL: https://pcp.io
%if !%{disable_python3}
@ -1616,7 +1548,6 @@ collecting metrics about the Unbound DNS Resolver.
#
%package pmda-mic
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Intel MIC cards
URL: https://pcp.io
%if !%{disable_python3}
@ -1634,7 +1565,6 @@ collecting metrics about Intel MIC cards.
#
%package pmda-haproxy
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for HAProxy
URL: https://pcp.io
%if !%{disable_python3}
@ -1652,7 +1582,6 @@ extracting performance metrics from HAProxy over the HAProxy stats socket.
#
%package pmda-libvirt
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for virtual machines
URL: https://pcp.io
%if !%{disable_python3}
@ -1682,7 +1611,6 @@ and hypervisor machines.
#
%package pmda-elasticsearch
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch
URL: https://pcp.io
%if !%{disable_python3}
@ -1700,7 +1628,6 @@ collecting metrics about Elasticsearch.
#
%package pmda-lio
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the LIO subsystem
URL: https://pcp.io
%if !%{disable_python3}
@ -1725,7 +1652,6 @@ target.
#
%package pmda-prometheus
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics from Prometheus endpoints
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1749,7 +1675,6 @@ extracting statistics from programs instrumented as Prometheus endpoints.
#
%package pmda-lmsensors
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for hardware sensors
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1773,7 +1698,6 @@ collecting metrics about the Linux hardware monitoring sensors.
#
%package pmda-json
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for JSON data
URL: https://pcp.io
%if !%{disable_python3}
@ -1797,7 +1721,6 @@ collecting metrics output in JSON.
#
%package pmda-apache
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Apache webserver
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1811,7 +1734,6 @@ collecting metrics about the Apache webserver.
#
%package pmda-bash
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Bash shell
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1825,7 +1747,6 @@ collecting metrics about the Bash shell.
#
%package pmda-cifs
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the CIFS protocol
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1839,7 +1760,6 @@ collecting metrics about the Common Internet Filesytem.
#
%package pmda-cisco
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Cisco routers
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1853,7 +1773,6 @@ collecting metrics about Cisco routers.
#
%package pmda-gfs2
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the GFS2 filesystem
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1867,7 +1786,6 @@ collecting metrics about the Global Filesystem v2.
#
%package pmda-logger
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics from arbitrary log files
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1882,7 +1800,6 @@ supports both sampled and event-style metrics.
#
%package pmda-mailq
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the sendmail queue
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1896,7 +1813,6 @@ collecting metrics about email queues managed by sendmail.
#
%package pmda-mounts
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for filesystem mounts
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1910,7 +1826,6 @@ collecting metrics about filesystem mounts.
#
%package pmda-nvidia-gpu
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the Nvidia GPU
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1924,7 +1839,6 @@ collecting metrics about Nvidia GPUs.
#
%package pmda-roomtemp
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the room temperature
URL: https://pcp.io
Requires: pcp = %{version}-%{release}
@ -1940,7 +1854,6 @@ collecting metrics about the room temperature.
#
%package pmda-rpm
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for the RPM package manager
URL: https://pcp.io
Requires: pcp = %{version}-%{release}
@ -1957,7 +1870,6 @@ collecting metrics about the installed RPM packages.
#
%package pmda-sendmail
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for Sendmail
URL: https://pcp.io
Requires: pcp = %{version}-%{release}
@ -1972,7 +1884,6 @@ collecting metrics about Sendmail traffic.
#
%package pmda-shping
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for shell command responses
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -1987,7 +1898,6 @@ arbitrary shell commands.
#
%package pmda-smart
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for S.M.A.R.T values
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -2002,7 +1912,6 @@ smartmontools package.
#
%package pmda-summary
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) summary metrics from pmie
URL: https://pcp.io
Requires: pcp = %{version}-%{release}
@ -2018,7 +1927,6 @@ collecting metrics about other installed PMDAs.
#
%package pmda-systemd
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics from the Systemd journal
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -2033,7 +1941,6 @@ collecting metrics from the Systemd journal.
#
%package pmda-trace
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics for application tracing
URL: https://pcp.io
Requires: pcp-libs = %{version}-%{release}
@ -2047,7 +1954,6 @@ collecting metrics about trace performance data in applications.
#
%package pmda-weblog
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) metrics from web server logs
URL: https://pcp.io
Requires: pcp = %{version}-%{release}
@ -2060,7 +1966,6 @@ collecting metrics about web server logs.
%package zeroconf
License: GPLv2+
Group: Applications/System
Summary: Performance Co-Pilot (PCP) Zeroconf Package
URL: https://pcp.io
Requires: pcp pcp-doc pcp-system-tools
@ -2080,7 +1985,6 @@ those written by sysstat.
#
%package -n %{__python2}-pcp
License: GPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Python bindings and documentation
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -2106,7 +2010,6 @@ Metric Domain Agent (PMDA) collector tools written in Python.
#
%package -n python3-pcp
License: GPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) Python3 bindings and documentation
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -2124,7 +2027,6 @@ Metric Domain Agent (PMDA) collector tools written in Python3.
#
%package system-tools
License: GPLv2+
Group: Development/Libraries
Summary: Performance Co-Pilot (PCP) System and Monitoring Tools
URL: https://pcp.io
%if !%{disable_python3}
@ -2151,7 +2053,6 @@ in the Python language.
#
%package gui
License: GPLv2+ and LGPLv2+ and LGPLv2+ with exceptions
Group: Applications/System
Summary: Visualization tools for the Performance Co-Pilot toolkit
URL: https://pcp.io
Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
@ -2170,7 +2071,6 @@ monitoring systems using live and archived Performance Co-Pilot
#
%package doc
License: GPLv2+ and CC-BY
Group: Documentation
%if !%{disable_noarch}
BuildArch: noarch
%endif
@ -2198,7 +2098,6 @@ PCP utilities and daemons, and the PCP graphical tools.
%if !%{disable_selinux}
%package selinux
License: GPLv2+ and CC-BY
Group: Applications/System
Summary: Selinux policy package
URL: https://pcp.io
BuildRequires: selinux-policy-devel
@ -2222,6 +2121,8 @@ 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
@ -2291,15 +2192,6 @@ 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' |\
@ -2902,8 +2794,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
cd $PCP_PMNS_DIR && ./Rebuild -s && rm -f .NeedRebuild
cd
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%ldconfig_scriptlets libs
%if !%{disable_selinux}
%preun selinux
@ -3441,6 +3332,11 @@ cd
%endif
%changelog
* Thu Mar 07 2019 Nathan Scott <nathans@redhat.com> - 4.3.1-2
- Remove Group: spec settings, use %ldconfig_scriptlets once more
- Revert removal of pmcd/pmlogger-local-mode patch
- Update selinux policy.
* 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)

View File

@ -3,3 +3,5 @@ SHA512 (pcp-webapp-blinkenlights-1.0.1.tar.gz) = dadf0bc0742a3344a75f8f304851762
SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa
SHA512 (pcp-webapp-vector-1.3.1-1.tar.gz) = b1463d4da3727f130752699dd433e997212c19241ac440df389c1153e468ace840b7d5f43a37b2173e4eee4f4a807338a3c40cc9635801e626c1530baf46e289
SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21
SHA512 (pmcd-pmlogger-local-context.patch) = 8f4b6b49494781d0a711ac27738a75b1adead72cb1baef9a78754686c48ae2d278d691108233e9cf9ad33fede5ba7b7a43f4674205b9bf448f267c844ddc1a01
SHA512 (selinux-policy-updates.patch) = 1d765d1fc11ec7576231f53048ceb315d9168613526aff60b972b297b8ad4ec08a00911858ee8989533e27b17c686590fea0d859acab2482f6c260cf41b21178