Merge pull request #1548 from bbczeuz/zseng_dev_chrony
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 4 Jun 2016 09:19:14 +0000 (11:19 +0200)
[plugin] Chrony NTP service check

1  2 
configure.ac
src/Makefile.am
src/collectd.conf.in
src/types.db

diff --combined configure.ac
@@@ -31,7 -31,7 +31,7 @@@ m4_ifdef([LT_PACKAGE_VERSION]
  
  AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"])
  
 -AM_INIT_AUTOMAKE([tar-pax dist-bzip2 foreign])
 +AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 foreign])
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
  AC_LANG(C)
  
@@@ -1956,6 -1956,7 +1956,6 @@@ the
                AC_DEFINE(HAVE_CURLOPT_TIMEOUT_MS, 1, [Define if libcurl supports CURLOPT_TIMEOUT_MS option.])
        fi
  fi
 -AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes")
  # }}}
  
  # --with-libdbi {{{
@@@ -3365,9 -3366,9 +3365,9 @@@ the
  fi
  if test "x$with_oracle" = "xyes"
  then
 -      BUILD_WITH_ORACLE_CFLAGS="$with_oracle_cppflags"
 +      BUILD_WITH_ORACLE_CPPFLAGS="$with_oracle_cppflags"
        BUILD_WITH_ORACLE_LIBS="$with_oracle_libs"
 -      AC_SUBST(BUILD_WITH_ORACLE_CFLAGS)
 +      AC_SUBST(BUILD_WITH_ORACLE_CPPFLAGS)
        AC_SUBST(BUILD_WITH_ORACLE_LIBS)
  fi
  # }}}
@@@ -4595,10 -4596,8 +4595,10 @@@ if test "x$with_libudev" = "xyes
  then
        BUILD_WITH_LIBUDEV_CFLAGS="$with_libudev_cflags"
        BUILD_WITH_LIBUDEV_LDFLAGS="$with_libudev_ldflags"
 +      BUILD_WITH_LIBUDEV_LIBS="-ludev"
        AC_SUBST(BUILD_WITH_LIBUDEV_CFLAGS)
        AC_SUBST(BUILD_WITH_LIBUDEV_LDFLAGS)
 +      AC_SUBST(BUILD_WITH_LIBUDEV_LIBS)
  fi
  AM_CONDITIONAL(BUILD_WITH_LIBUDEV, test "x$with_libudev" = "xyes")
  # }}}
  
        CPPFLAGS="$SAVE_CPPFLAGS"
        LDFLAGS="$SAVE_LDFLAGS"
 +      LIBXENCTL_CPPFLAGS="$with_libxenctl_cppflags"
 +      LIBXENCTL_LDFLAGS="$with_libxenctl_ldflags"
 +      AC_SUBST(LIBXENCTL_CPPFLAGS)
 +      AC_SUBST(LIBXENCTL_LDFLAGS)
  fi
  
  # --with-libxmms {{{
@@@ -5302,9 -5297,9 +5302,9 @@@ PKG_CHECK_MODULES([LIBNOTIFY], [libnoti
                [with_libnotify="no (pkg-config doesn't know libnotify)"]
  )
  
 -PKG_CHECK_MODULES([RIEMANN_C], [riemann-client >= 1.8.0],
 - [with_riemann_c="yes"],
 - [with_riemann_c="no (pkg-config doesn't know riemann-c-client)"])
 +PKG_CHECK_MODULES([LIBRIEMANN_CLIENT], [riemann-client >= 1.8.0],
 + [with_libriemann_client="yes"],
 + [with_libriemann_client="no (pkg-config doesn't know libriemann-client)"])
  
  # Check for enabled/disabled features
  #
@@@ -5466,7 -5461,6 +5466,7 @@@ plugin_perl="no
  plugin_processes="no"
  plugin_protocols="no"
  plugin_serial="no"
 +plugin_smart="no"
  plugin_swap="no"
  plugin_tape="no"
  plugin_tcpconns="no"
        plugin_processes="yes"
  fi
  
 +if test "x$with_libatasmart" = "xyes" && test "x$with_libudev" = "xyes"
 +then
 +      plugin_smart="yes"
 +fi
 +
  if test "x$with_kvm_getswapinfo" = "xyes"
  then
        plugin_swap="yes"
@@@ -5853,6 -5842,7 +5853,7 @@@ AC_PLUGIN([battery],             [$plug
  AC_PLUGIN([bind],                [$plugin_bind],            [ISC Bind nameserver statistics])
  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([conntrack],           [$plugin_conntrack],       [nf_conntrack statistics])
  AC_PLUGIN([contextswitch],       [$plugin_contextswitch],   [context switch statistics])
  AC_PLUGIN([cpu],                 [$plugin_cpu],             [CPU usage statistics])
@@@ -5936,7 -5926,7 +5937,7 @@@ AC_PLUGIN([rrdtool],             [$with
  AC_PLUGIN([sensors],             [$with_libsensors],        [lm_sensors statistics])
  AC_PLUGIN([serial],              [$plugin_serial],          [serial port traffic])
  AC_PLUGIN([sigrok],              [$with_libsigrok],         [sigrok acquisition sources])
 -AC_PLUGIN([smart],               [$with_libatasmart],       [SMART statistics])
 +AC_PLUGIN([smart],               [$plugin_smart],           [SMART statistics])
  AC_PLUGIN([snmp],                [$with_libnetsnmp],        [SNMP querying plugin])
  AC_PLUGIN([statsd],              [yes],                     [StatsD plugin])
  AC_PLUGIN([swap],                [$plugin_swap],            [Swap usage statistics])
@@@ -5972,7 -5962,7 +5973,7 @@@ AC_PLUGIN([write_kafka],         [$with
  AC_PLUGIN([write_log],           [yes],                     [Log output plugin])
  AC_PLUGIN([write_mongodb],       [$with_libmongoc],         [MongoDB output plugin])
  AC_PLUGIN([write_redis],         [$with_libhiredis],        [Redis output plugin])
 -AC_PLUGIN([write_riemann],       [$with_riemann_c],         [Riemann output plugin])
 +AC_PLUGIN([write_riemann],       [$with_libriemann_client], [Riemann output plugin])
  AC_PLUGIN([write_sensu],         [yes],                     [Sensu output plugin])
  AC_PLUGIN([write_tsdb],          [yes],                     [TSDB output plugin])
  AC_PLUGIN([xencpu],              [$plugin_xencpu],          [Xen Host CPU usage])
@@@ -6216,7 -6206,6 +6217,7 @@@ Configuration
      libpq . . . . . . . . $with_libpq
      libpthread  . . . . . $with_libpthread
      librabbitmq . . . . . $with_librabbitmq
 +    libriemann-client . . $with_libriemann_client
      librdkafka  . . . . . $with_librdkafka
      librouteros . . . . . $with_librouteros
      librrd  . . . . . . . $with_librrd
      oracle  . . . . . . . $with_oracle
      protobuf-c  . . . . . $have_protoc_c
      python  . . . . . . . $with_python
 -    riemann-c-client  . . $with_riemann_c
  
    Features:
      daemon mode . . . . . $enable_daemon
      bind  . . . . . . . . $enable_bind
      ceph  . . . . . . . . $enable_ceph
      cgroups . . . . . . . $enable_cgroups
+     chrony. . . . . . . . $enable_chrony
      conntrack . . . . . . $enable_conntrack
      contextswitch . . . . $enable_contextswitch
      cpu . . . . . . . . . $enable_cpu
diff --combined src/Makefile.am
@@@ -17,6 -17,8 +17,6 @@@ endi
  AM_CPPFLAGS += -DPLUGINDIR='"${pkglibdir}"'
  AM_CPPFLAGS += -DPKGDATADIR='"${pkgdatadir}"'
  
 -AUTOMAKE_OPTIONS = subdir-objects
 -
  noinst_LTLIBRARIES =
  check_PROGRAMS =
  TESTS =
@@@ -53,12 -55,11 +53,12 @@@ sbin_PROGRAMS = collectdmo
  bin_PROGRAMS = collectd-nagios collectdctl collectd-tg
  
  collectdmon_SOURCES = collectdmon.c
 -collectdmon_CPPFLAGS = $(AM_CPPFLAGS)
  
  collectd_nagios_SOURCES = collectd-nagios.c
 -collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
 -collectd_nagios_LDADD =
 +collectd_nagios_CPPFLAGS = $(AM_CPPFLAGS) \
 +      -I$(top_srcdir)/src/libcollectdclient/collectd \
 +      -I$(top_builddir)/src/libcollectdclient/collectd
 +collectd_nagios_LDADD = libcollectdclient/libcollectdclient.la
  if BUILD_WITH_LIBSOCKET
  collectd_nagios_LDADD += -lsocket
  endif
@@@ -66,27 -67,26 +66,27 @@@ if BUILD_AI
  collectd_nagios_LDADD += -lm
  endif
  
 -collectd_nagios_LDADD += libcollectdclient/libcollectdclient.la
 -collectd_nagios_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 -
  
  collectdctl_SOURCES = collectdctl.c
 -collectdctl_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
 -collectdctl_LDADD =
 +collectdctl_CPPFLAGS = $(AM_CPPFLAGS) \
 +      -I$(top_srcdir)/src/libcollectdclient/collectd \
 +      -I$(top_builddir)/src/libcollectdclient/collectd
 +collectdctl_LDADD = libcollectdclient/libcollectdclient.la
  if BUILD_WITH_LIBSOCKET
  collectdctl_LDADD += -lsocket
  endif
  if BUILD_AIX
  collectdctl_LDADD += -lm
  endif
 -collectdctl_LDADD += libcollectdclient/libcollectdclient.la
 -collectdctl_DEPENDENCIES = libcollectdclient/libcollectdclient.la
 +
  
  collectd_tg_SOURCES = collectd-tg.c
  collectd_tg_CPPFLAGS = $(AM_CPPFLAGS) \
 -                     -I$(top_srcdir)/src/libcollectdclient/collectd -I$(top_builddir)/src/libcollectdclient/collectd
 -collectd_tg_LDADD = daemon/libheap.la
 +      -I$(top_srcdir)/src/libcollectdclient/collectd \
 +      -I$(top_builddir)/src/libcollectdclient/collectd
 +collectd_tg_LDADD = \
 +      daemon/libheap.la \
 +      libcollectdclient/libcollectdclient.la
  if BUILD_WITH_LIBSOCKET
  collectd_tg_LDADD += -lsocket
  endif
@@@ -99,6 -99,8 +99,6 @@@ endi
  if BUILD_WITH_LIBPTHREAD
  collectd_tg_LDADD += $(PTHREAD_LIBS)
  endif
 -collectd_tg_LDADD += libcollectdclient/libcollectdclient.la
 -collectd_tg_DEPENDENCIES = libcollectdclient/libcollectdclient.la
  
  
  pkglib_LTLIBRARIES =
@@@ -130,8 -132,12 +130,8 @@@ if BUILD_PLUGIN_APACH
  pkglib_LTLIBRARIES += apache.la
  apache_la_SOURCES = apache.c
  apache_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -apache_la_CFLAGS = $(AM_CFLAGS)
 -apache_la_LIBADD =
 -if BUILD_WITH_LIBCURL
 -apache_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -apache_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +apache_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 +apache_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
  endif
  
  if BUILD_PLUGIN_APCUPS
@@@ -147,15 -153,16 +147,15 @@@ endi
  if BUILD_PLUGIN_APPLE_SENSORS
  pkglib_LTLIBRARIES += apple_sensors.la
  apple_sensors_la_SOURCES = apple_sensors.c
 -apple_sensors_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -apple_sensors_la_LDFLAGS += -framework IOKit
 +apple_sensors_la_LDFLAGS = $(PLUGIN_LDFLAGS) -framework IOKit
  endif
  
  if BUILD_PLUGIN_AQUAERO
  pkglib_LTLIBRARIES += aquaero.la
  aquaero_la_SOURCES = aquaero.c
 -aquaero_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  aquaero_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBAQUAERO5_CFLAGS)
 -aquaero_la_LIBADD = $(BUILD_WITH_LIBAQUAERO5_LDFLAGS) -laquaero5
 +aquaero_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBAQUAERO5_LDFLAGS)
 +aquaero_la_LIBADD = -laquaero5
  endif
  
  if BUILD_PLUGIN_ASCENT
@@@ -178,6 -185,7 +178,6 @@@ if BUILD_PLUGIN_BATTER
  pkglib_LTLIBRARIES += battery.la
  battery_la_SOURCES = battery.c
  battery_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -battery_la_LIBADD =
  if BUILD_WITH_LIBIOKIT
  battery_la_LDFLAGS += -framework IOKit
  endif
@@@ -208,6 -216,12 +208,12 @@@ cgroups_la_LDFLAGS = $(PLUGIN_LDFLAGS
  cgroups_la_LIBADD = libmount.la
  endif
  
+ if BUILD_PLUGIN_CHRONY
+ pkglib_LTLIBRARIES += chrony.la
+ chrony_la_SOURCES = chrony.c
+ chrony_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+ endif
  if BUILD_PLUGIN_CONNTRACK
  pkglib_LTLIBRARIES += conntrack.la
  conntrack_la_SOURCES = conntrack.c
@@@ -261,17 -275,25 +267,17 @@@ if BUILD_PLUGIN_CUR
  pkglib_LTLIBRARIES += curl.la
  curl_la_SOURCES = curl.c
  curl_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -curl_la_CFLAGS = $(AM_CFLAGS)
 -curl_la_LIBADD =
 -if BUILD_WITH_LIBCURL
 -curl_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -curl_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +curl_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
 +curl_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
  endif
  
  if BUILD_PLUGIN_CURL_JSON
  pkglib_LTLIBRARIES += curl_json.la
  curl_json_la_SOURCES = curl_json.c
 -curl_json_la_CFLAGS = $(AM_CFLAGS)
 -curl_json_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 +curl_json_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
  curl_json_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
 -curl_json_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
 -if BUILD_WITH_LIBCURL
 -curl_json_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -curl_json_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +curl_json_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 +curl_json_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS) $(BUILD_WITH_LIBYAJL_LIBS)
  endif
  
  if BUILD_PLUGIN_CURL_XML
@@@ -319,9 -341,7 +325,9 @@@ disk_la_CFLAGS += $(BUILD_WITH_LIBSTATG
  disk_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
  endif
  if BUILD_WITH_LIBUDEV
 -disk_la_LIBADD += -ludev
 +disk_la_CFLAGS += $(BUILD_WITH_LIBUDEV_CFLAGS)
 +disk_la_LDFLAGS += $(BUILD_WITH_LIBUDEV_LDFLAGS)
 +disk_la_LIBADD += $(BUILD_WITH_LIBUDEV_LIBS)
  endif
  if BUILD_FREEBSD
  disk_la_LIBADD += -ldevstat -lgeom
@@@ -428,6 -448,7 +434,6 @@@ endif # BUILD_PLUGIN_INTERFAC
  if BUILD_PLUGIN_IPC
  pkglib_LTLIBRARIES += ipc.la
  ipc_la_SOURCES = ipc.c
 -ipc_la_CFLAGS = $(AM_CFLAGS)
  ipc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
@@@ -450,9 -471,10 +456,9 @@@ endi
  if BUILD_PLUGIN_IPVS
  pkglib_LTLIBRARIES += ipvs.la
  ipvs_la_SOURCES = ipvs.c
 -if IP_VS_H_NEEDS_KERNEL_CFLAGS
 -ipvs_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS)
 -else
  ipvs_la_CFLAGS = $(AM_CFLAGS)
 +if IP_VS_H_NEEDS_KERNEL_CFLAGS
 +ipvs_la_CFLAGS += $(KERNEL_CFLAGS)
  endif
  ipvs_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
@@@ -496,6 -518,7 +502,6 @@@ endi
  if BUILD_PLUGIN_LOG_LOGSTASH
  pkglib_LTLIBRARIES += log_logstash.la
  log_logstash_la_SOURCES = log_logstash.c
 -log_logstash_la_CFLAGS = $(AM_CFLAGS)
  log_logstash_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
  log_logstash_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
  log_logstash_la_LIBADD = $(BUILD_WITH_LIBYAJL_LIBS)
@@@ -511,8 -534,7 +517,8 @@@ endi
  if BUILD_PLUGIN_LVM
  pkglib_LTLIBRARIES += lvm.la
  lvm_la_SOURCES = lvm.c
 -lvm_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +lvm_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBLVM2APP_CPPFLAGS)
 +lvm_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBLVM2APP_LDFLAGS)
  lvm_la_LIBADD = $(BUILD_WITH_LIBLVM2APP_LIBS)
  endif
  
@@@ -640,9 -662,13 +646,9 @@@ endi
  if BUILD_PLUGIN_MYSQL
  pkglib_LTLIBRARIES += mysql.la
  mysql_la_SOURCES = mysql.c
 +mysql_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBMYSQL_CFLAGS)
  mysql_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -mysql_la_CFLAGS = $(AM_CFLAGS)
 -mysql_la_LIBADD =
 -if BUILD_WITH_LIBMYSQL
 -mysql_la_CFLAGS += $(BUILD_WITH_LIBMYSQL_CFLAGS)
 -mysql_la_LIBADD += $(BUILD_WITH_LIBMYSQL_LIBS)
 -endif
 +mysql_la_LIBADD = $(BUILD_WITH_LIBMYSQL_LIBS)
  endif
  
  if BUILD_PLUGIN_NETAPP
@@@ -693,9 -719,13 +699,9 @@@ endi
  if BUILD_PLUGIN_NGINX
  pkglib_LTLIBRARIES += nginx.la
  nginx_la_SOURCES = nginx.c
 -nginx_la_CFLAGS = $(AM_CFLAGS)
 -nginx_la_LIBADD =
 +nginx_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
  nginx_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -if BUILD_WITH_LIBCURL
 -nginx_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -nginx_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +nginx_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
  endif
  
  if BUILD_PLUGIN_NOTIFY_DESKTOP
@@@ -756,6 -786,7 +762,6 @@@ endi
  if BUILD_PLUGIN_ONEWIRE
  pkglib_LTLIBRARIES += onewire.la
  onewire_la_SOURCES = onewire.c
 -onewire_la_CFLAGS = $(AM_CFLAGS)
  onewire_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOWCAPI_CPPFLAGS)
  onewire_la_LIBADD = $(BUILD_WITH_LIBOWCAPI_LIBS)
  onewire_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBOWCAPI_LDFLAGS)
@@@ -764,14 -795,15 +770,14 @@@ endi
  if BUILD_PLUGIN_OPENLDAP
  pkglib_LTLIBRARIES += openldap.la
  openldap_la_SOURCES = openldap.c
 -openldap_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBLDAP_LDFLAGS)
 -openldap_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBLDAP_CPPFLAGS)
 +openldap_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBLDAP_CPPFLAGS)
 +openldap_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBLDAP_LDFLAGS)
  openldap_la_LIBADD = -lldap
  endif
  
  if BUILD_PLUGIN_OPENVPN
  pkglib_LTLIBRARIES += openvpn.la
  openvpn_la_SOURCES = openvpn.c
 -openvpn_la_CFLAGS = $(AM_CFLAGS)
  openvpn_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
@@@ -779,7 -811,8 +785,7 @@@ if BUILD_PLUGIN_ORACL
  pkglib_LTLIBRARIES += oracle.la
  oracle_la_SOURCES = oracle.c \
        utils_db_query.c utils_db_query.h
 -oracle_la_CFLAGS = $(AM_CFLAGS)
 -oracle_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_ORACLE_CFLAGS)
 +oracle_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_ORACLE_CPPFLAGS)
  oracle_la_LIBADD = $(BUILD_WITH_ORACLE_LIBS)
  oracle_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
@@@ -927,9 -960,9 +933,9 @@@ if BUILD_PLUGIN_SMAR
  if BUILD_WITH_LIBUDEV
  pkglib_LTLIBRARIES += smart.la
  smart_la_SOURCES = smart.c
 -smart_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBATASMART_CPPFLAGS)
 -smart_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBATASMART_LDFLAGS)
 -smart_la_LIBADD = $(BUILD_WITH_LIBATASMART_LIBS) -ludev
 +smart_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBATASMART_CPPFLAGS) $(BUILD_WITH_LIBUDEV_CFLAGS)
 +smart_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBATASMART_LDFLAGS) $(BUILD_WITH_LIBUDEV_LDFLAGS)
 +smart_la_LIBADD = $(BUILD_WITH_LIBATASMART_LIBS) $(BUILD_WITH_LIBUDEV_LIBS)
  endif
  endif
  
@@@ -1187,9 -1220,13 +1193,9 @@@ if BUILD_PLUGIN_WRITE_HTT
  pkglib_LTLIBRARIES += write_http.la
  write_http_la_SOURCES = write_http.c \
                        utils_format_json.c utils_format_json.h
 +write_http_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBCURL_CFLAGS)
  write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 -write_http_la_CFLAGS = $(AM_CFLAGS)
 -write_http_la_LIBADD =
 -if BUILD_WITH_LIBCURL
 -write_http_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
 -write_http_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 -endif
 +write_http_la_LIBADD = $(BUILD_WITH_LIBCURL_LIBS)
  endif
  
  if BUILD_PLUGIN_WRITE_KAFKA
@@@ -1223,15 -1260,15 +1229,15 @@@ if BUILD_PLUGIN_WRITE_REDI
  pkglib_LTLIBRARIES += write_redis.la
  write_redis_la_SOURCES = write_redis.c
  write_redis_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBHIREDIS_LDFLAGS)
 -write_redis_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHIREDIS_CPPFLAGS)
 +write_redis_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBHIREDIS_CPPFLAGS)
  write_redis_la_LIBADD = -lhiredis
  endif
  
  if BUILD_PLUGIN_WRITE_RIEMANN
  pkglib_LTLIBRARIES += write_riemann.la
  write_riemann_la_SOURCES = write_riemann.c write_riemann_threshold.c write_riemann_threshold.h
 -write_riemann_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(RIEMANN_C_LIBS)
 -write_riemann_la_CFLAGS = $(AM_CFLAGS) $(RIEMANN_C_CFLAGS)
 +write_riemann_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBRIEMANN_CLIENT_LIBS)
 +write_riemann_la_CFLAGS = $(AM_CFLAGS) $(LIBRIEMANN_CLIENT_CFLAGS)
  endif
  
  if BUILD_PLUGIN_WRITE_SENSU
@@@ -1249,8 -1286,7 +1255,8 @@@ endi
  if BUILD_PLUGIN_XENCPU
  pkglib_LTLIBRARIES += xencpu.la
  xencpu_la_SOURCES = xencpu.c
 -xencpu_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 +xencpu_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBXENCTL_CPPFLAGS)
 +xencpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBXENCTL_LDFLAGS)
  xencpu_la_LIBADD = -lxenctrl
  endif
  
@@@ -1265,12 -1301,17 +1271,12 @@@ endi
  if BUILD_PLUGIN_ZFS_ARC
  pkglib_LTLIBRARIES += zfs_arc.la
  zfs_arc_la_SOURCES = zfs_arc.c
 -zfs_arc_la_CFLAGS = $(AM_CFLAGS)
  zfs_arc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  if BUILD_FREEBSD
  zfs_arc_la_LIBADD = -lm
 -else
 -if BUILD_LINUX
 -# zfs_arc requires no library on linux
 -else
 -# solaris
 -zfs_arc_la_LIBADD = -lkstat
  endif
 +if BUILD_SOLARIS
 +zfs_arc_la_LIBADD = -lkstat
  endif
  endif
  
@@@ -1285,6 -1326,7 +1291,6 @@@ BUILT_SOURCES += $(dist_man_MANS
  if BUILD_PLUGIN_ZONE
  pkglib_LTLIBRARIES += zone.la
  zone_la_SOURCES = zone.c
 -zone_la_CFLAGS = $(AM_CFLAGS)
  zone_la_LDFLAGS = $(PLUGIN_LDFLAGS)
  endif
  
@@@ -1304,7 -1346,11 +1310,7 @@@ dist_man_MANS = collectd.1 
                collectd-unixsock.5 \
                types.db.5
  
 -#collectd_1_SOURCES = collectd.pod
 -
 -EXTRA_DIST = types.db
 -
 -EXTRA_DIST +=   collectd.conf.pod \
 +EXTRA_DIST =  collectd.conf.pod \
                collectd-email.pod \
                collectd-exec.pod \
                collectdctl.pod \
                collectd-threshold.pod \
                collectd-unixsock.pod \
                postgresql_default.conf \
 +              types.db \
                types.db.pod
  
  .pod.1:
@@@ -1375,7 -1420,7 +1381,7 @@@ if BUILD_PLUGIN_CEP
  test_plugin_ceph_SOURCES = ceph_test.c
  test_plugin_ceph_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBYAJL_CPPFLAGS)
  test_plugin_ceph_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBYAJL_LDFLAGS)
 -test_plugin_ceph_LDADD = daemon/libcommon.la daemon/libplugin_mock.la $(BUILD_WITH_LIBYAJL_LIBS)
 +test_plugin_ceph_LDADD = daemon/libplugin_mock.la $(BUILD_WITH_LIBYAJL_LIBS)
  check_PROGRAMS += test_plugin_ceph
  TESTS += test_plugin_ceph
  endif
diff --combined src/collectd.conf.in
  #@BUILD_PLUGIN_BIND_TRUE@LoadPlugin bind
  #@BUILD_PLUGIN_CEPH_TRUE@LoadPlugin ceph
  #@BUILD_PLUGIN_CGROUPS_TRUE@LoadPlugin cgroups
+ #@BUILD_PLUGIN_CHRONY_TRUE@LoadPlugin chrony
  #@BUILD_PLUGIN_CONNTRACK_TRUE@LoadPlugin conntrack
  #@BUILD_PLUGIN_CONTEXTSWITCH_TRUE@LoadPlugin contextswitch
  @BUILD_PLUGIN_CPU_TRUE@@BUILD_PLUGIN_CPU_TRUE@LoadPlugin cpu
  #@BUILD_PLUGIN_GMOND_TRUE@LoadPlugin gmond
  #@BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp
  @BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface
 -#@BUILD_PLUGIN_IPC_TRUE@@BUILD_PLUGIN_IPC_TRUE@LoadPlugin ipc
 +#@BUILD_PLUGIN_IPC_TRUE@LoadPlugin ipc
  #@BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
  #@BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables
  #@BUILD_PLUGIN_IPVS_TRUE@LoadPlugin ipvs
  #  </Daemon>
  #</Plugin>
  
+ #<Plugin chrony>
+ #     Host "localhost"
+ #     Port "323"
+ #</Plugin>
  #<Plugin cgroups>
  #  CGroup "libvirt"
  #  IgnoreSelected false
diff --combined src/types.db
@@@ -21,6 -21,13 +21,13 @@@ ceph_latency            value:GAUGE:U:
  ceph_rate               value:DERIVE:0:U
  changes_since_last_save value:GAUGE:0:U
  charge                  value:GAUGE:0:U
+ clock_state             value:GAUGE:0:U
+ clock_mode              value:GAUGE:0:U
+ clock_reachability      value:GAUGE:0:U
+ clock_stratum           value:GAUGE:0:U
+ clock_last_meas         value:GAUGE:0:U
+ clock_last_update       value:GAUGE:U:U
+ clock_skew_ppm          value:GAUGE:-2:2
  compression             uncompressed:DERIVE:0:U, compressed:DERIVE:0:U
  compression_ratio       value:GAUGE:0:2
  connections             value:DERIVE:0:U
@@@ -77,6 -84,7 +84,7 @@@ flow                    value:GAUGE:0:
  fork_rate               value:DERIVE:0:U
  frequency               value:GAUGE:0:U
  frequency_offset        value:GAUGE:-1000000:1000000
+ frequency_error         value:GAUGE:-2:2 
  fscache_stat            value:DERIVE:0:U
  gauge                   value:GAUGE:U:U
  hash_collisions         value:DERIVE:0:U
@@@ -111,7 -119,6 +119,7 @@@ memcached_octets        rx:DERIVE:0:U, 
  memcached_ops           value:DERIVE:0:U
  memory                  value:GAUGE:0:281474976710656
  memory_lua              value:GAUGE:0:281474976710656
 +memory_throttle_count   value:DERIVE:0:U
  multimeter              value:GAUGE:U:U
  mutex_operations        value:DERIVE:0:U
  mysql_bpool_bytes       value:GAUGE:0:U
@@@ -182,6 -189,8 +190,8 @@@ records                 value:GAUGE:0:
  requests                value:GAUGE:0:U
  response_code           value:GAUGE:0:U
  response_time           value:GAUGE:0:U
+ root_dispersion         value:GAUGE:U:U
+ root_delay              value:GAUGE:U:U
  route_etx               value:GAUGE:0:U
  route_metric            value:GAUGE:0:U
  routes                  value:GAUGE:0:U
@@@ -204,9 -213,12 +214,12 @@@ swap_io                 value:DERIVE:0:
  tcp_connections         value:GAUGE:0:4294967295
  temperature             value:GAUGE:U:U
  threads                 value:GAUGE:0:U
+ timeleft                value:GAUGE:0:U
  time_dispersion         value:GAUGE:-1000000:1000000
  time_offset             value:GAUGE:-1000000:1000000
- timeleft                value:GAUGE:0:U
+ time_offset_ntp         value:GAUGE:-1000000:1000000
+ time_offset_rms         value:GAUGE:-1000000:1000000
+ time_ref                value:GAUGE:0:U
  total_bytes             value:DERIVE:0:U
  total_connections       value:DERIVE:0:U
  total_objects           value:DERIVE:0:U