Merge branch 'master' into connectivity

diff --cc Makefile.am
index e46d8dc5c863f4625da9c16efa89ff240659359e,5470b9b34607d79b15a94e04a8d3a962880090d7..f8353d4c58cf5b22eaef5249be207f27ac6070f8
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -768,15 -768,12 +768,21 @@@ chrony_la_LDFLAGS = $(PLUGIN_LDFLAGS
  chrony_la_LIBADD = -lm
  endif
  
+ if BUILD_PLUGIN_CHECK_UPTIME
+ pkglib_LTLIBRARIES += check_uptime.la
+ check_uptime_la_SOURCES = src/check_uptime.c
+ check_uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ endif
+ 
 +if BUILD_PLUGIN_CONNECTIVITY
 +pkglib_LTLIBRARIES += connectivity.la
 +connectivity_la_SOURCES = src/connectivity.c
 +connectivity_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMNL_CFLAGS)
 +connectivity_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 +connectivity_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 +connectivity_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS) $(BUILD_WITH_LIBMNL_LIBS) libignorelist.la
 +endif
 +
  if BUILD_PLUGIN_CONNTRACK
  pkglib_LTLIBRARIES += conntrack.la
  conntrack_la_SOURCES = src/conntrack.c

diff --cc configure.ac
index 3ff2189f5411726adcc1d0dbe4bed4ddb0012412,9ff6408f19a1e61a349baa865eb03ad0b1772c50..c190784dcaa0deb4ef9b5c576874ebd352ce1492
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -6795,7 -6790,7 +6795,8 @@@ AC_PLUGIN([bind],                [$plug
  AC_PLUGIN([ceph],                [$plugin_ceph],              [Ceph daemon statistics])
  AC_PLUGIN([cgroups],             [$plugin_cgroups],           [CGroups CPU usage accounting])
  AC_PLUGIN([chrony],              [yes],                       [Chrony statistics])
+ AC_PLUGIN([check_uptime],        [yes],                       [Notify about uptime reset])
 +AC_PLUGIN([connectivity],        [$plugin_connectivity],      [Network interface up/down events])
  AC_PLUGIN([conntrack],           [$plugin_conntrack],         [nf_conntrack statistics])
  AC_PLUGIN([contextswitch],       [$plugin_contextswitch],     [context switch statistics])
  AC_PLUGIN([cpu],                 [$plugin_cpu],               [CPU usage statistics])
@@@ -7227,7 -7222,7 +7228,8 @@@ AC_MSG_RESULT([    bind  . . . . . . . 
  AC_MSG_RESULT([    ceph  . . . . . . . . $enable_ceph])
  AC_MSG_RESULT([    cgroups . . . . . . . $enable_cgroups])
  AC_MSG_RESULT([    chrony. . . . . . . . $enable_chrony])
+ AC_MSG_RESULT([    check_uptime. . . . . $enable_check_uptime])
 +AC_MSG_RESULT([    connectivity. . . . . $enable_connectivity])
  AC_MSG_RESULT([    conntrack . . . . . . $enable_conntrack])
  AC_MSG_RESULT([    contextswitch . . . . $enable_contextswitch])
  AC_MSG_RESULT([    cpu . . . . . . . . . $enable_cpu])

diff --cc src/collectd.conf.in
index 659c098bda54249980939160bbff004a19370980,f8c48080778d5e6a57c5bf88650dbfbfdb476991..a194b4752bf8d5772f0271de41ad9dcd521fccf0
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -102,7 -102,7 +102,8 @@@
  #@BUILD_PLUGIN_CEPH_TRUE@LoadPlugin ceph
  #@BUILD_PLUGIN_CGROUPS_TRUE@LoadPlugin cgroups
  #@BUILD_PLUGIN_CHRONY_TRUE@LoadPlugin chrony
+ #@BUILD_PLUGIN_CHECK_UPTIME_TRUE@LoadPlugin check_uptime
 +#@BUILD_PLUGIN_CONNECTIVITY_TRUE@LoadPlugin connectivity
  #@BUILD_PLUGIN_CONNTRACK_TRUE@LoadPlugin conntrack
  #@BUILD_PLUGIN_CONTEXTSWITCH_TRUE@LoadPlugin contextswitch
  @BUILD_PLUGIN_CPU_TRUE@@BUILD_PLUGIN_CPU_TRUE@LoadPlugin cpu

diff --cc src/collectd.conf.pod
Simple merge