From: Kepka, Krzysztof <krzysztof.kepka@intel.com>
Date: Tue, 14 Jan 2020 07:45:46 +0000 (+0100)
Subject: Merge branch 'master' into upstream_redfish_v0.2
X-Git-Tag: collectd-5.11.0~21^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65645fcb7d7a520882f5ea9e5ed2fbda972f5184;p=thirdparty%2Fcollectd.git

Merge branch 'master' into upstream_redfish_v0.2
---

65645fcb7d7a520882f5ea9e5ed2fbda972f5184
diff --cc configure.ac
index d150cd1a6,00e1f6a53..1a21d3a79
--- a/configure.ac
+++ b/configure.ac
@@@ -6929,9 -6834,9 +6889,10 @@@ AC_PLUGIN([ping],                [$with
  AC_PLUGIN([postgresql],          [$with_libpq],               [PostgreSQL database statistics])
  AC_PLUGIN([powerdns],            [yes],                       [PowerDNS statistics])
  AC_PLUGIN([processes],           [$plugin_processes],         [Process statistics])
+ AC_PLUGIN([procevent],           [$plugin_procevent],         [Process event (start, stop) statistics])
  AC_PLUGIN([protocols],           [$plugin_protocols],         [Protocol (IP, TCP, ...) statistics])
  AC_PLUGIN([python],              [$plugin_python],            [Embed a Python interpreter])
 +AC_PLUGIN([redfish],             [$with_libredfish],          [Redfish plugin])
  AC_PLUGIN([redis],               [$with_libhiredis],          [Redis plugin])
  AC_PLUGIN([routeros],            [$with_librouteros],         [RouterOS plugin])
  AC_PLUGIN([rrdcached],           [$librrd_rrdc_update],       [RRDTool output plugin])
@@@ -7358,9 -7264,9 +7320,10 @@@ AC_MSG_RESULT([    ping  . . . . . . . 
  AC_MSG_RESULT([    postgresql  . . . . . $enable_postgresql])
  AC_MSG_RESULT([    powerdns  . . . . . . $enable_powerdns])
  AC_MSG_RESULT([    processes . . . . . . $enable_processes])
+ AC_MSG_RESULT([    procevent . . . . . . $enable_procevent])
  AC_MSG_RESULT([    protocols . . . . . . $enable_protocols])
  AC_MSG_RESULT([    python  . . . . . . . $enable_python])
 +AC_MSG_RESULT([    redfish . . . . . . . $enable_redfish])
  AC_MSG_RESULT([    redis . . . . . . . . $enable_redis])
  AC_MSG_RESULT([    routeros  . . . . . . $enable_routeros])
  AC_MSG_RESULT([    rrdcached . . . . . . $enable_rrdcached])
diff --cc src/collectd.conf.in
index 4746e1774,63db8b1a3..4db3779d5
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -180,9 -181,9 +181,10 @@@
  #@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql
  #@BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns
  #@BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes
+ #@BUILD_PLUGIN_PROCEVENT_TRUE@LoadPlugin procevent
  #@BUILD_PLUGIN_PROTOCOLS_TRUE@LoadPlugin protocols
  #@BUILD_PLUGIN_PYTHON_TRUE@LoadPlugin python
 +#@BUILD_PLUGIN_REDFISH_TRUE@LoadPlugin redfish
  #@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
  #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
  #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached