collectd: update to 5.10.0

Update collectd to 5.10.0
* leave new plugins as disabled for now (procevent, sysevent)
* refresh patches. Remove unenecessary version fix

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 94e591996ca7493437b7e86a5998318fb06f0391..9f9a34f328942b0bdedccbe8318fdc4a78a71d94 100644 (file)
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
-PKG_VERSION:=5.9.2
-PKG_RELEASE:=2
+PKG_VERSION:=5.10.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://collectd.org/files/ \
        https://github.com/collectd/collectd/releases/download/collectd-$(PKG_VERSION)
-PKG_HASH:=917c483608b9b38438b121737b510c3d68f335c091bc286aa6ebcc0c8e372a09
+PKG_HASH:=a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b
 
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4
@@ -82,6 +82,7 @@ COLLECTD_PLUGINS_DISABLED:= \
        perl \
        pf \
        pinba \
+       procevent \
        python \
        redis \
        rrdcached \
@@ -92,6 +93,7 @@ COLLECTD_PLUGINS_DISABLED:= \
        statsd \
        swap \
        synproxy \
+       sysevent \
        tape \
        tokyotyrant \
        turbostat \

diff --git a/utils/collectd/patches/0001-fix-5.9.2-version-string.patch b/utils/collectd/patches/0001-fix-5.9.2-version-string.patch
deleted file mode 100644 (file)
index a718f93..0000000
--- a/utils/collectd/patches/0001-fix-5.9.2-version-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/version-gen.sh
-+++ b/version-gen.sh
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--DEFAULT_VERSION="5.9.0.git"
-+DEFAULT_VERSION="5.9.2"
- 
- if [ -d .git ]; then
-       VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
-

diff --git a/utils/collectd/patches/300-delay-first-read-cycle.patch b/utils/collectd/patches/300-delay-first-read-cycle.patch
index 2554ba8304c631b402c3c2fbe9a900c3dd560f22..d4eb8266681cd4b726a1ad4eee97453f530a3c09 100644 (file)
--- a/utils/collectd/patches/300-delay-first-read-cycle.patch
+++ b/utils/collectd/patches/300-delay-first-read-cycle.patch
@@ -1,6 +1,6 @@
 --- a/src/daemon/plugin.c
 +++ b/src/daemon/plugin.c
-@@ -1087,7 +1087,7 @@ static int plugin_insert_read(read_func_
+@@ -1092,7 +1092,7 @@ static int plugin_insert_read(read_func_
    int status;
    llentry_t *le;
  

diff --git a/utils/collectd/patches/320-reaction-to-ntp-time-change-at-boot.patch b/utils/collectd/patches/320-reaction-to-ntp-time-change-at-boot.patch
index 6440a139d06751275657ae4746b7dc4e37bd415f..9b0d0338c1514a98ccae2da1266394955bd0bde9 100644 (file)
--- a/utils/collectd/patches/320-reaction-to-ntp-time-change-at-boot.patch
+++ b/utils/collectd/patches/320-reaction-to-ntp-time-change-at-boot.patch
@@ -44,8 +44,8 @@ when --enable-debug configure option is used in Makefile.
      while ((loop == 0) && (nanosleep(&ts_wait, &ts_wait) != 0)) {
        if (errno != EINTR) {
 --- a/src/daemon/plugin.c
-+++ a/src/daemon/plugin.c
-@@ -578,10 +578,11 @@
++++ b/src/daemon/plugin.c
+@@ -585,10 +585,11 @@ static void *plugin_read_thread(void __a
  
      /* Check, if `rf_next_read' is in the past. */
      if (rf->rf_next_read < now) {

diff --git a/utils/collectd/patches/600-fix-libmodbus-detection.patch b/utils/collectd/patches/600-fix-libmodbus-detection.patch
index 8c5d1722582a4dc7536f0c6b8ccaeda30951f71f..46460576260d34166b3da7a36bd5b3b6bcb9dbc6 100644 (file)
--- a/utils/collectd/patches/600-fix-libmodbus-detection.patch
+++ b/utils/collectd/patches/600-fix-libmodbus-detection.patch
@@ -18,7 +18,7 @@ Reversed patch to be applied:
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3393,9 +3393,9 @@ if test "x$with_libmodbus" = "xyes"; the
+@@ -3389,9 +3389,9 @@ if test "x$with_libmodbus" = "xyes"; the
    SAVE_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS $with_libmodbus_cflags"
  

diff --git a/utils/collectd/patches/900-add-iwinfo-plugin.patch b/utils/collectd/patches/900-add-iwinfo-plugin.patch
index e10528df80f1d67073b6f3453c09fe7d96512259..318cfb78b80ab07069d4675f31b2c97251ba5b3d 100644 (file)
--- a/utils/collectd/patches/900-add-iwinfo-plugin.patch
+++ b/utils/collectd/patches/900-add-iwinfo-plugin.patch
@@ -12,7 +12,7 @@
  
  #
  # Checks for typedefs, structures, and compiler characteristics.
-@@ -6394,6 +6399,7 @@ plugin_ipc="no"
+@@ -6397,6 +6402,7 @@ plugin_ipc="no"
  plugin_ipmi="no"
  plugin_ipvs="no"
  plugin_irq="no"
@@ -20,7 +20,7 @@
  plugin_load="no"
  plugin_log_logstash="no"
  plugin_mcelog="no"
-@@ -6828,6 +6834,7 @@ AC_PLUGIN([ipmi],                [$plugi
+@@ -6841,6 +6847,7 @@ AC_PLUGIN([ipmi],                [$plugi
  AC_PLUGIN([iptables],            [$with_libiptc],             [IPTables rule counters])
  AC_PLUGIN([ipvs],                [$plugin_ipvs],              [IPVS connection statistics])
  AC_PLUGIN([irq],                 [$plugin_irq],               [IRQ statistics])
@@ -28,7 +28,7 @@
  AC_PLUGIN([java],                [$with_java],                [Embed the Java Virtual Machine])
  AC_PLUGIN([load],                [$plugin_load],              [System load])
  AC_PLUGIN([log_logstash],        [$plugin_log_logstash],      [Logstash json_event compatible logging])
-@@ -7197,6 +7204,7 @@ AC_MSG_RESULT([    libyajl . . . . . . .
+@@ -7212,6 +7219,7 @@ AC_MSG_RESULT([    libyajl . . . . . . .
  AC_MSG_RESULT([    oracle  . . . . . . . $with_oracle])
  AC_MSG_RESULT([    protobuf-c  . . . . . $have_protoc_c])
  AC_MSG_RESULT([    protoc 3  . . . . . . $have_protoc3])
@@ -36,7 +36,7 @@
  AC_MSG_RESULT()
  AC_MSG_RESULT([  Features:])
  AC_MSG_RESULT([    daemon mode . . . . . $enable_daemon])
-@@ -7257,6 +7265,7 @@ AC_MSG_RESULT([    ipmi  . . . . . . . .
+@@ -7274,6 +7282,7 @@ AC_MSG_RESULT([    ipmi  . . . . . . . .
  AC_MSG_RESULT([    iptables  . . . . . . $enable_iptables])
  AC_MSG_RESULT([    ipvs  . . . . . . . . $enable_ipvs])
  AC_MSG_RESULT([    irq . . . . . . . . . $enable_irq])
@@ -46,7 +46,7 @@
  AC_MSG_RESULT([    logfile . . . . . . . $enable_logfile])
 --- a/src/collectd.conf.in
 +++ b/src/collectd.conf.in
-@@ -138,6 +138,7 @@
+@@ -140,6 +140,7 @@
  #@BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables
  #@BUILD_PLUGIN_IPVS_TRUE@LoadPlugin ipvs
  #@BUILD_PLUGIN_IRQ_TRUE@LoadPlugin irq
@@ -54,7 +54,7 @@
  #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java
  @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
  #@BUILD_PLUGIN_LPAR_TRUE@LoadPlugin lpar
-@@ -767,6 +768,12 @@
+@@ -775,6 +776,12 @@
  #     IgnoreSelected true
  #</Plugin>
  
@@ -69,7 +69,7 @@
  #     JVMArg "-Djava.class.path=@prefix@/share/collectd/java/collectd-api.jar"
 --- a/src/collectd.conf.pod
 +++ b/src/collectd.conf.pod
-@@ -3803,6 +3803,27 @@ and all other interrupts are collected.
+@@ -3873,6 +3873,27 @@ and all other interrupts are collected.
  
  =back
  
@@ -259,10 +259,10 @@
 +stations                value:GAUGE:0:256
  swap                    value:GAUGE:0:1099511627776
  swap_io                 value:DERIVE:0:U
- tcp_connections         value:GAUGE:0:4294967295
+ sysevent                value:GAUGE:0:1
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -1150,6 +1150,14 @@ irq_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+@@ -1165,6 +1165,14 @@ irq_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  irq_la_LIBADD = libignorelist.la
  endif