Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package collectd for openSUSE:Factory checked in at 2022-03-07 17:47:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/collectd (Old) and /work/SRC/openSUSE:Factory/.collectd.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "collectd" Mon Mar 7 17:47:15 2022 rev:43 rq:959830 version:5.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/collectd/collectd.changes 2021-09-16 23:17:56.588001505 +0200 +++ /work/SRC/openSUSE:Factory/.collectd.new.1958/collectd.changes 2022-03-07 17:47:19.303113248 +0100 @@ -1,0 +2,12 @@ +Wed Feb 16 20:11:55 UTC 2022 - Thomas Renninger <[email protected]> + +- Add (Build)Requirements for these plugins (jsc#SLE-23472): + - dpdkevents + - dpdkstat + - dpdk_telemetry + and build a new collected-plugin-dpdk rpm for them +- Enable and add intel_rdt and capabilities to general plugin rpm +- Remove an old configure paramter: + configure: WARNING: unrecognized options: --without-included-ltdl + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ collectd.spec ++++++ --- /var/tmp/diff_new_pack.L9C83l/_old 2022-03-07 17:47:20.031113038 +0100 +++ /var/tmp/diff_new_pack.L9C83l/_new 2022-03-07 17:47:20.035113036 +0100 @@ -1,7 +1,7 @@ # # spec file for package collectd # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2005-2013 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,10 +18,10 @@ %define plugins apache apcups aggregation ascent battery bind \\\ - ceph cgroups chrony curl curl_json curl_xml conntrack contextswitch cpu cpufreq cpusleep csv \\\ + capabilities ceph cgroups chrony curl curl_json curl_xml conntrack contextswitch cpu cpufreq cpusleep csv \\\ df disk dns drbd \\\ email entropy ethstat exec fhcount filecount fscache hddtemp hugepages \\\ - infiniband interface ipc iptables ipvs irq \\\ + infiniband %{expand:%{rdt_plugin}} interface ipc iptables ipvs irq \\\ load logfile log_logstash \\\ madwifi match_empty_counter match_hashed match_regex match_timediff match_value \\\ mdevents mbmon md memcached memory multimeter \\\ @@ -41,6 +41,22 @@ %define sensors 0 %define sensors_plugin %{nil} %endif + +# dpdk exclusive build arch requirements copied: +%ifarch aarch64 x86_64 ppc64le +%define dpdk 1 +%else +%define dpdk 0 +%endif + +%ifarch x86_64 %{ix86} +%define intel_rdt 1 +%define rdt_plugin intel_rdt +%else +%define intel_rdt 0 +%define rdt_plugin %{nil} +%endif + Name: collectd Version: 5.12.0 Release: 0 @@ -70,14 +86,23 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: bison +%if %{dpdk} +BuildRequires: dpdk-devel >= 19.08 +%endif BuildRequires: flex BuildRequires: gcc BuildRequires: gdbm-devel BuildRequires: gettext-devel BuildRequires: intltool +# intel_rdt -> pqos.h +# intel-cmt-cat exclusive build arch requirements copied: +%if %{intel_rdt} +BuildRequires: libpqos-devel +%endif BuildRequires: java-devel BuildRequires: libesmtp-devel BuildRequires: libgcrypt-devel +BuildRequires: libjansson-devel BuildRequires: libnetlink-devel BuildRequires: libpcap-devel BuildRequires: libpng-devel @@ -438,7 +463,6 @@ %description plugin-connectivity Optional %{name} plugin to collect Event-based interface status. - %package plugin-procevent Summary: Procevent plugin for %{name} Group: System/Monitoring @@ -447,7 +471,6 @@ %description plugin-procevent Optional %{name} plugin to listen for process starts and exits via netlink. - %package plugin-sysevent Summary: Sysevent plugin for %{name} Group: System/Monitoring @@ -556,6 +579,17 @@ Plugin for filling %{name} with statistics from the SpamAsssassin anti-spam engine. +%package plugin-dpdk +Summary: Collect DPDK interface statistics +Group: System/Monitoring +Requires: %{name} = %{version}-%{release} + +%description plugin-dpdk +This plugin has a specific use case: monitoring DPDK applications +that don't expose stats in any other way than the DPDK xstats API. +For OVS or OVS-with-DPDK the Open vSwitch plugins (ovs) should be +used for collecting stats and events. + %package -n libcollectdclient1 Summary: Library for %{name} clients Group: System/Monitoring @@ -612,7 +646,6 @@ --disable-silent-rules \ --disable-static \ --with-java="$JAVA_HOME/" \ - --without-included-ltdl \ --disable-turbostat make %{?_smp_mflags} @@ -957,6 +990,16 @@ %{perl_vendorlib}/Mail/SpamAssassin/Plugin/Collectd.pm %doc %{perl_man3dir}/Mail::SpamAssassin::Plugin::Collectd.%{perl_man3ext}%{ext_man} +%files plugin-dpdk +%if %{dpdk} +%{_libdir}/collectd/dpdkevents.la +%{_libdir}/collectd/dpdkevents.so +%{_libdir}/collectd/dpdkstat.la +%{_libdir}/collectd/dpdkstat.so +%endif +%{_libdir}/collectd/dpdk_telemetry.la +%{_libdir}/collectd/dpdk_telemetry.so + %files plugins-all %doc README.plugins-all
