Merge pull request #2020 from ktsaou/master

ZFS plugin for Linux

diff --combined conf.d/Makefile.am
index 0df2605370c01f458ebff7055a253b6ce27c5867,db263e85995b4b12bce40469793422c8943e4a47..f53429928949bfb103dec20db4626b0dd4e1aa6c
--- 1/conf.d/Makefile.am
--- 2/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@@ -28,7 -28,6 +28,7 @@@ dist_pythonconfig_DATA = 
      python.d/apache_cache.conf \
      python.d/bind_rndc.conf \
      python.d/cpufreq.conf \
 +    python.d/dns_query_time.conf \
      python.d/dovecot.conf \
      python.d/elasticsearch.conf \
      python.d/example.conf \
@@@ -82,6 -81,7 +82,7 @@@ dist_healthconfig_DATA = 
      health.d/squid.conf \
      health.d/varnish.conf \
      health.d/web_log.conf \
+     health.d/zfs.conf \
      $(NULL)
  
  if LINUX