diff --git a/.gitignore b/.gitignore index e1cfdc1..295d64c 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,6 @@ pcp-3.3.3-1.src.tar.gz /pcp-3.11.4-0.20160704git3192207.tar.gz /pcp-webjs-20160704gitcce8001.src.tar.gz /vector-20160704git6d01399.tar.gz +/pcp-3.11.4-0.20160711git274b6ca.tar.gz +/pcp-webjs-20160711gitcce8001.src.tar.gz +/vector-20160711git6d01399.tar.gz diff --git a/pcp.spec b/pcp.spec index 837ddd0..18f45d0 100644 --- a/pcp.spec +++ b/pcp.spec @@ -3,16 +3,16 @@ Name: pcp Version: 3.11.4 %global buildversion 0 -Release: 0.20160704git3192207%{?dist} +Release: 0.20160711git274b6ca%{?dist} License: GPLv2+ and LGPLv2.1+ and CC-BY URL: http://www.pcp.io Group: Applications/System # https://bintray.com/artifact/download/pcp/source/pcp-%{version}.src.tar.gz -Source0: %{name}-%{version}-0.20160704git3192207.tar.gz +Source0: %{name}-%{version}-0.20160711git274b6ca.tar.gz # https://bintray.com/artifact/download/netflixoss/downloads/vector.tar.gz -Source1: vector-20160704git6d01399.tar.gz +Source1: vector-20160711git6d01399.tar.gz # https://github.com/performancecopilot/pcp-webjs/archive/x.y.z.tar.gz -Source2: pcp-webjs-20160704gitcce8001.src.tar.gz +Source2: pcp-webjs-20160711gitcce8001.src.tar.gz %global disable_snmp 0 @@ -580,6 +580,26 @@ Requires: python-pcp = %{version}-%{release} %description export-pcp2graphite Performance Co-Pilot (PCP) front-end tools for exporting metric values to graphite (http://graphite.readthedocs.org). + +# pcp-export-pcp2influxdb +# +%package export-pcp2influxdb +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot tools for exporting PCP metrics to InfluxDB +URL: http://www.pcp.io +Requires: pcp-libs >= %{version}-%{release} +%if !%{disable_python3} +Requires: python3-pcp = @package_version@ +Requires: python3-requests +%else +Requires: python-pcp = @package_version@ +Requires: python-requests +%endif + +%description export-pcp2influxdb +Performance Co-Pilot (PCP) front-end tools for exporting metric values +to InfluxDB (https://influxdata.com/time-series-platform/influxdb). %endif # @@ -704,6 +724,7 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Servers URL: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Requires: perl-LDAP %description pmda-ds389 This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -719,6 +740,7 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Server Loggers URL: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Requires: perl-Date-Manip %description pmda-ds389log This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1769,7 +1791,8 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ # all base pcp package files except those split out into sub packages ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ - grep -E -v 'pmiostat|pmcollectl|pmatop|pmrep|pcp2graphite|zabbix|zbxpcp' |\ + grep -E -v 'pmiostat|pmcollectl|pmatop|zabbix|zbxpcp' |\ + grep -E -v 'pmrep|pcp2graphite|pcp2influxdb' |\ grep -E -v 'pmdbg|pmclient|pmerr|genpmda' |\ sed -e 's#^#'%{_bindir}'\/#' >base_bin.list # @@ -1782,13 +1805,13 @@ ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ grep -E 'pmiostat|pmcollectl|pmatop|pmrep' |\ sed -e 's#^#'%{_bindir}'\/#' >pcp_system_tools.list ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ - grep -E 'atop|collectl|dmcache|free|iostat|numastat|verify|uptime|shping' |\ + grep -E 'atop|collectl|dmcache|free|iostat|numastat|pidstat|verify|uptime|shping' |\ sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp_system_tools.list %endif ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ %if !%{disable_python2} || !%{disable_python3} - grep -E -v 'atop|collectl|dmcache|free|iostat|numastat|verify|uptime|shping' |\ + grep -E -v 'atop|collectl|dmcache|free|iostat|numastat|pidstat|verify|uptime|shping' |\ %endif sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >base_exec.list ls -1 $RPM_BUILD_ROOT/%{_booksdir} |\ @@ -2531,6 +2554,9 @@ cd %files export-pcp2graphite %{_bindir}/pcp2graphite + +%files export-pcp2influxdb +%{_bindir}/pcp2influxdb %endif # !%{disable_python2} || !%{disable_python3} %files export-zabbix-agent @@ -2635,6 +2661,10 @@ cd %endif %changelog +* Mon Jul 11 2016 Lukas Berk - 3.11.4-0.20160711git274b6ca +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Mon Jul 04 2016 Lukas Berk - 3.11.4-0.20160704git3192207 - Automated weekly rawhide release diff --git a/sources b/sources index 15002f7..d16cfde 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -5f4e919ffc4d7d283fe260fe34a4f69e pcp-3.11.4-0.20160704git3192207.tar.gz -286ad4bee0b01fe53b005b9d0bab8a7c pcp-webjs-20160704gitcce8001.src.tar.gz -529fc1c903ae8afc8b36eec9308c181d vector-20160704git6d01399.tar.gz +589150a02dcd290184f6f9afc25b6a6b pcp-3.11.4-0.20160711git274b6ca.tar.gz +286ad4bee0b01fe53b005b9d0bab8a7c pcp-webjs-20160711gitcce8001.src.tar.gz +d6b422a94b35cc232417c7e4b9f44b47 vector-20160711git6d01399.tar.gz