Accepting request 817908 from home:cvoegl:branches:server:monitoring

- Update to 5.11 * Adds buddyinfo, logparser, ubi, and write_influxdb_udp plugins * Remove lvm plugin * Multiple bugfixes/improvements - update collectd-fix_collection_cgi.patch OBS-URL: https://build.opensuse.org/request/show/817908 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=163
2020-07-05 07:15:39 +00:00 · 2020-07-05 07:15:39 +00:00 · 5e424461c4
commit 5e424461c4
parent 24c5d1a170
5 changed files with 72 additions and 49 deletions
--- a/collectd-5.10.0.tar.bz2
+++ b/collectd-5.10.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b
-size 1856377
--- a/collectd-5.11.0.tar.bz2
+++ b/collectd-5.11.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37b10a806e34aa8570c1cafa6006c604796fae13cc2e1b3e630d33dcba9e5db2
+size 1851663
--- a/collectd-fix_collection_cgi.patch
+++ b/collectd-fix_collection_cgi.patch
@ -1,16 +1,14 @@
-diff --git a/contrib/collection.cgi b/contrib/collection.cgi
-index 5ff259f..e0848e0 100755
--- a/contrib/collection.cgi
-+++ b/contrib/collection.cgi
-@@ -32,7 +32,7 @@ use URI::Escape ('uri_escape');
+--- collectd-5.11.0/contrib/collection.cgi.orig	2020-06-24 18:22:39.045940659 +0200
+++ collectd-5.11.0/contrib/collection.cgi	2020-06-24 18:23:01.377983888 +0200
+@@ -32,7 +32,7 @@
 use RRDs ();
 use Data::Dumper ();
 
 -our $Config = "/etc/collection.conf";
 +our $Config = "/etc/collectd/collection.conf";
+ our $TypesDB = "/usr/share/collectd/types.db";
 our @DataDirs = ();
 our @DontShowTypes = ();
- our $LibDir;
 diff --git a/contrib/collection.conf b/contrib/collection.conf
 index e8444f5..063141f 100644
 --- a/contrib/collection.conf
--- a/collectd.changes
+++ b/collectd.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 25 12:18:05 UTC 2020 - Christian Vögl <christian.voegl@suse.com>
+
+- Update to 5.11
+  * Adds buddyinfo, logparser, ubi, and write_influxdb_udp plugins
+  * Remove lvm plugin
+  * Multiple bugfixes/improvements
+- update collectd-fix_collection_cgi.patch
+
 -------------------------------------------------------------------
 Wed Jan 29 13:41:00 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

--- a/collectd.spec
+++ b/collectd.spec
@ -17,7 +17,7 @@
 #


-%define plugins apache apcups aggregation ascent battery bind \\\
+%define plugins apache apcups aggregation ascent battery bind  \\\
  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 \\\
@ -31,22 +31,8 @@
  table tail tail_csv target_notification target_replace target_scale target_set target_v5upgrade \\\
  tcpconns teamspeak2 ted thermal threshold \\\
  unixsock uptime users uuid vmem vserver \\\
-  wireless write_graphite write_http write_log write_sensu write_tsdb write_prometheus \\\
-  zfs_arc zookeeper
-
-%if !0%{?is_opensuse}
-%if 0%{?sle_version} <= 150100
-%define lvm2app 1
-%else
-%define lvm2app 0
-%endif
-%else
-%if !0%{?suse_version} > 1500
-%define lvm2app 1
-%else
-%define lvm2app 0
-%endif
-%endif
+  wireless write_graphite write_http write_log write_sensu write_tsdb \\\
+  write_prometheus zfs_arc zookeeper

 %ifnarch s390 s390x
 %define sensors    1
@ -56,7 +42,7 @@
 %define sensors_plugin %{nil}
 %endif
 Name:           collectd
-Version:        5.10.0
+Version:        5.11.0
 Release:        0
 Summary:        Statistics Collection Daemon for filling RRD Files
 License:        GPL-2.0-only AND MIT
@ -133,9 +119,6 @@ BuildRequires:  pkgconfig(libupsclient)
 BuildRequires:  pkgconfig(libvirt)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(lua)
-%if %{?lvm2app}
-BuildRequires:  pkgconfig(lvm2app)
-%endif
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(xtables)
 BuildRequires:  pkgconfig(zlib)
@ -251,16 +234,6 @@ Requires:       %{name} = %{version}-%{release}
 This plugin for collectd provides Network UPS Tools support.
 %endif

-%if %{?lvm2app}
-%package plugin-lvm
-Summary:        LVM plugin for collectd
-Group:          System/Monitoring
-Requires:       %{name} = %{version}-%{release}
-
-%description plugin-lvm
-This plugin collects information from lvm.
-%endif
-
 %package plugin-pcie
 Summary:        PCIe Monitoring Plugin for %{name}
 Group:          System/Monitoring
@ -444,10 +417,43 @@ Requires:       %{name} = %{version}-%{release}
 Optional %{name} plugin to listen to rsyslog events and submit matched values.
 .

+%package plugin-buddyinfo
+Summary:        Buddyinfo plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-buddyinfo
+Optional %{name} plugin for memory fragmentation.
+
+%package plugin-logparser
+Summary:        Logparser plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-logparser
+Optional %{name} plugin for filtering and parsing logs.
+
+%package plugin-ubi
+Summary:        ubifs plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-ubi
+Optional %{name} plugin for reporting block state of flash memory devices with UBIFS filesystem.
+
+%package plugin-write_influxdb_udp
+Summary:        write_influxdb_udp plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-write_influxdb_udp
+Optional %{name} plugin to send values to InfluxDB using line protocol via udp
+
 %package plugins-all
 Summary:        All Monitoring Plugins for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-plugin-buddyinfo = %{version}-%{release}
 Requires:       %{name}-plugin-connectivity = %{version}-%{release}
 Requires:       %{name}-plugin-dbi = %{version}-%{release}
 %if 0%{?sle_version} < 150000  || 0%{?is_opensuse}
@ -455,10 +461,8 @@ Requires:       %{name}-plugin-gps = %{version}-%{release}
 %endif
 Requires:       %{name}-plugin-ipmi = %{version}-%{release}
 Requires:       %{name}-plugin-java = %{version}-%{release}
+Requires:       %{name}-plugin-logparser = %{version}-%{release}
 Requires:       %{name}-plugin-lua = %{version}-%{release}
-%if %{?lvm2app}
-Requires:       %{name}-plugin-lvm = %{version}-%{release}
-%endif
 Requires:       %{name}-plugin-mcelog = %{version}-%{release}
 Requires:       %{name}-plugin-memcachec = %{version}-%{release}
 Requires:       %{name}-plugin-mysql = %{version}-%{release}
@ -477,8 +481,10 @@ Requires:       %{name}-plugin-smart = %{version}-%{release}
 Requires:       %{name}-plugin-snmp = %{version}-%{release}
 Requires:       %{name}-plugin-synproxy = %{version}-%{release}
 Requires:       %{name}-plugin-sysevent = %{version}-%{release}
+Requires:       %{name}-plugin-ubi = %{version}-%{release}
 Requires:       %{name}-plugin-uptime = %{version}-%{release}
 Requires:       %{name}-plugin-virt = %{version}-%{release}
+Requires:       %{name}-plugin-write_influxdb_udp = %{version}-%{release}
 Requires:       %{name}-plugin-write_stackdriver = %{version}-%{release}
 Requires:       %{name}-plugin-write_syslog = %{version}-%{release}
 Requires:       %{name}-web = %{version}-%{release}
@ -750,12 +756,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{_libdir}/collectd/snmp*.la
 %{_mandir}/man5/collectd-snmp.5%{?ext_man}

-%if %{?lvm2app}
-%files plugin-lvm
-%{_libdir}/collectd/lvm.so
-%{_libdir}/collectd/lvm.la
-%endif
-
 %files plugin-pinba
 %{_libdir}/collectd/pinba.so
 %{_libdir}/collectd/pinba.la
@ -858,6 +858,22 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{_libdir}/collectd/sysevent.la
 %{_libdir}/collectd/sysevent.so

+%files plugin-buddyinfo
+%{_libdir}/collectd/buddyinfo.la
+%{_libdir}/collectd/buddyinfo.so
+
+%files plugin-logparser
+%{_libdir}/collectd/logparser.la
+%{_libdir}/collectd/logparser.so
+
+%files plugin-ubi
+%{_libdir}/collectd/ubi.la
+%{_libdir}/collectd/ubi.so
+
+%files plugin-write_influxdb_udp
+%{_libdir}/collectd/write_influxdb_udp.la
+%{_libdir}/collectd/write_influxdb_udp.so
+
 %if 0%{?suse_version} >= 1330
 %files plugin-nut
 %{_libdir}/collectd/nut.so