cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

collectd: update to 5.12.0

Browse Source 
Update collectd to version 5.12.0.

* Refresh patches
* Remove upstreamed patch 920-fix-ubi-data-source-type.patch
* Backport a patch from upstream to fix a missing define
  (920-backport-netlink-reg-noerror.patch)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 28747825df)
This commit is contained in:
Hannu Nyman
2020-09-19 19:44:55 +03:00
parent b60fa2de9e
commit 94866d76ab
7 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/collectd/patches/900-add-iwinfo-plugin.patch
+10 -10
View File
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -712,6 +712,11 @@ AC_CACHE_CHECK([whether clock_boottime a
@@ -713,6 +713,11 @@ AC_CACHE_CHECK([whether clock_boottime a
]
)
@@ -12,7 +12,7 @@
#
# Checks for typedefs, structures, and compiler characteristics.
@@ -6586,6 +6591,7 @@ plugin_ipmi="no"
@@ -6619,6 +6624,7 @@ plugin_ipmi="no"
plugin_ipstats="no"
plugin_ipvs="no"
plugin_irq="no"
@@ -20,7 +20,7 @@
plugin_load="no"
plugin_log_logstash="no"
plugin_mcelog="no"
@@ -7047,6 +7053,7 @@ AC_PLUGIN([iptables], [$with_
@@ -7086,6 +7092,7 @@ AC_PLUGIN([iptables], [$with_
AC_PLUGIN([ipstats], [$plugin_ipstats], [IP packet statistics])
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])
@@ -7424,6 +7431,7 @@ AC_MSG_RESULT([ libyajl . . . . . . .
@@ -7465,6 +7472,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])
@@ -7491,6 +7499,7 @@ AC_MSG_RESULT([ iptables . . . . . .
@@ -7533,6 +7541,7 @@ AC_MSG_RESULT([ iptables . . . . . .
AC_MSG_RESULT([ ipstats . . . . . . . $enable_ipstats])
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
@@ -145,6 +145,7 @@
@@ -147,6 +147,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
@@ -813,6 +814,12 @@
@@ -897,6 +898,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
@@ -4164,6 +4164,27 @@ and all other interrupts are collected.
@@ -4343,6 +4343,27 @@ and all other interrupts are collected.
=back
@@ -252,7 +252,7 @@
+}
--- a/src/types.db
+++ b/src/types.db
@@ -258,6 +258,7 @@ snr value:GAUGE:0:U
@@ -308,6 +308,7 @@ snr value:GAUGE:0:U
spam_check value:GAUGE:0:U
spam_score value:GAUGE:U:U
spl value:GAUGE:U:U
@@ -262,7 +262,7 @@
sysevent value:GAUGE:0:1
--- a/Makefile.am
+++ b/Makefile.am
@@ -1237,6 +1237,14 @@ irq_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@@ -1246,6 +1246,14 @@ irq_la_LDFLAGS = $(PLUGIN_LDFLAGS)
irq_la_LIBADD = libignorelist.la
endif