Merging upstream version 1.14.0~rc0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

64 files changed, 193 insertions, 3913 deletions

diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
index b6bdbcc4f..e883aa7c4 100644
--- a/collectors/python.d.plugin/Makefile.am
+++ b/collectors/python.d.plugin/Makefile.am
@@ -44,8 +44,6 @@ include boinc/Makefile.inc
 include ceph/Makefile.inc
 include chrony/Makefile.inc
 include couchdb/Makefile.inc
-include cpufreq/Makefile.inc
-include cpuidle/Makefile.inc
 include dnsdist/Makefile.inc
 include dns_query_time/Makefile.inc
 include dockerd/Makefile.inc
@@ -62,10 +60,8 @@ include httpcheck/Makefile.inc
 include icecast/Makefile.inc
 include ipfs/Makefile.inc
 include isc_dhcpd/Makefile.inc
-include linux_power_supply/Makefile.inc
 include litespeed/Makefile.inc
 include logind/Makefile.inc
-include mdstat/Makefile.inc
 include megacli/Makefile.inc
 include memcached/Makefile.inc
 include mongodb/Makefile.inc
diff --git a/collectors/python.d.plugin/Makefile.in b/collectors/python.d.plugin/Makefile.in
deleted file mode 100644
index 6e42fbb0c..000000000
--- a/collectors/python.d.plugin/Makefile.in
+++ /dev/null
@@ -1,2039 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/build/subst.inc \
-	$(srcdir)/adaptec_raid/Makefile.inc \
-	$(srcdir)/apache/Makefile.inc $(srcdir)/beanstalk/Makefile.inc \
-	$(srcdir)/bind_rndc/Makefile.inc $(srcdir)/boinc/Makefile.inc \
-	$(srcdir)/ceph/Makefile.inc $(srcdir)/chrony/Makefile.inc \
-	$(srcdir)/couchdb/Makefile.inc $(srcdir)/cpufreq/Makefile.inc \
-	$(srcdir)/cpuidle/Makefile.inc $(srcdir)/dnsdist/Makefile.inc \
-	$(srcdir)/dns_query_time/Makefile.inc \
-	$(srcdir)/dockerd/Makefile.inc $(srcdir)/dovecot/Makefile.inc \
-	$(srcdir)/elasticsearch/Makefile.inc \
-	$(srcdir)/example/Makefile.inc $(srcdir)/exim/Makefile.inc \
-	$(srcdir)/fail2ban/Makefile.inc \
-	$(srcdir)/freeradius/Makefile.inc \
-	$(srcdir)/go_expvar/Makefile.inc \
-	$(srcdir)/haproxy/Makefile.inc $(srcdir)/hddtemp/Makefile.inc \
-	$(srcdir)/httpcheck/Makefile.inc \
-	$(srcdir)/icecast/Makefile.inc $(srcdir)/ipfs/Makefile.inc \
-	$(srcdir)/isc_dhcpd/Makefile.inc \
-	$(srcdir)/linux_power_supply/Makefile.inc \
-	$(srcdir)/litespeed/Makefile.inc $(srcdir)/logind/Makefile.inc \
-	$(srcdir)/mdstat/Makefile.inc $(srcdir)/megacli/Makefile.inc \
-	$(srcdir)/memcached/Makefile.inc \
-	$(srcdir)/mongodb/Makefile.inc $(srcdir)/monit/Makefile.inc \
-	$(srcdir)/mysql/Makefile.inc $(srcdir)/nginx/Makefile.inc \
-	$(srcdir)/nginx_plus/Makefile.inc \
-	$(srcdir)/nvidia_smi/Makefile.inc $(srcdir)/nsd/Makefile.inc \
-	$(srcdir)/ntpd/Makefile.inc \
-	$(srcdir)/ovpn_status_log/Makefile.inc \
-	$(srcdir)/openldap/Makefile.inc \
-	$(srcdir)/oracledb/Makefile.inc $(srcdir)/phpfpm/Makefile.inc \
-	$(srcdir)/portcheck/Makefile.inc \
-	$(srcdir)/postfix/Makefile.inc $(srcdir)/postgres/Makefile.inc \
-	$(srcdir)/powerdns/Makefile.inc \
-	$(srcdir)/proxysql/Makefile.inc $(srcdir)/puppet/Makefile.inc \
-	$(srcdir)/rabbitmq/Makefile.inc $(srcdir)/redis/Makefile.inc \
-	$(srcdir)/rethinkdbs/Makefile.inc \
-	$(srcdir)/retroshare/Makefile.inc $(srcdir)/samba/Makefile.inc \
-	$(srcdir)/sensors/Makefile.inc \
-	$(srcdir)/smartd_log/Makefile.inc \
-	$(srcdir)/spigotmc/Makefile.inc \
-	$(srcdir)/springboot/Makefile.inc $(srcdir)/squid/Makefile.inc \
-	$(srcdir)/tomcat/Makefile.inc $(srcdir)/tor/Makefile.inc \
-	$(srcdir)/traefik/Makefile.inc $(srcdir)/unbound/Makefile.inc \
-	$(srcdir)/uwsgi/Makefile.inc $(srcdir)/varnish/Makefile.inc \
-	$(srcdir)/w1sensor/Makefile.inc $(srcdir)/web_log/Makefile.inc \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(dist_plugins_SCRIPTS) $(dist_python_SCRIPTS) \
-	$(dist_bases_DATA) $(dist_bases_framework_services_DATA) \
-	$(dist_libconfig_DATA) $(dist_noinst_DATA) $(dist_python_DATA) \
-	$(dist_python_urllib3_DATA) \
-	$(dist_python_urllib3_backports_DATA) \
-	$(dist_python_urllib3_contrib_DATA) \
-	$(dist_python_urllib3_packages_DATA) \
-	$(dist_python_urllib3_securetransport_DATA) \
-	$(dist_python_urllib3_ssl_match_hostname_DATA) \
-	$(dist_python_urllib3_util_DATA) $(dist_pythonconfig_DATA) \
-	$(dist_pythonmodules_DATA) $(dist_pythonyaml2_DATA) \
-	$(dist_pythonyaml3_DATA) $(dist_third_party_DATA) \
-	$(dist_userpythonconfig_DATA)
-subdir = collectors/python.d.plugin
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/build/m4/ax_c___atomic.m4 \
-	$(top_srcdir)/build/m4/ax_c__generic.m4 \
-	$(top_srcdir)/build/m4/ax_c_lto.m4 \
-	$(top_srcdir)/build/m4/ax_c_mallinfo.m4 \
-	$(top_srcdir)/build/m4/ax_c_mallopt.m4 \
-	$(top_srcdir)/build/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/build/m4/ax_gcc_func_attribute.m4 \
-	$(top_srcdir)/build/m4/ax_pthread.m4 \
-	$(top_srcdir)/build/m4/jemalloc.m4 \
-	$(top_srcdir)/build/m4/tcmalloc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(pythondir)" \
-	"$(DESTDIR)$(basesdir)" \
-	"$(DESTDIR)$(bases_framework_servicesdir)" \
-	"$(DESTDIR)$(libconfigdir)" "$(DESTDIR)$(pythondir)" \
-	"$(DESTDIR)$(python_urllib3dir)" \
-	"$(DESTDIR)$(python_urllib3_backportsdir)" \
-	"$(DESTDIR)$(python_urllib3_contribdir)" \
-	"$(DESTDIR)$(python_urllib3_packagesdir)" \
-	"$(DESTDIR)$(python_urllib3_securetransportdir)" \
-	"$(DESTDIR)$(python_urllib3_ssl_match_hostnamedir)" \
-	"$(DESTDIR)$(python_urllib3_utildir)" \
-	"$(DESTDIR)$(pythonconfigdir)" "$(DESTDIR)$(pythonmodulesdir)" \
-	"$(DESTDIR)$(pythonyaml2dir)" "$(DESTDIR)$(pythonyaml3dir)" \
-	"$(DESTDIR)$(third_partydir)" \
-	"$(DESTDIR)$(userpythonconfigdir)"
-SCRIPTS = $(dist_plugins_SCRIPTS) $(dist_python_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-DATA = $(dist_bases_DATA) $(dist_bases_framework_services_DATA) \
-	$(dist_libconfig_DATA) $(dist_noinst_DATA) $(dist_python_DATA) \
-	$(dist_python_urllib3_DATA) \
-	$(dist_python_urllib3_backports_DATA) \
-	$(dist_python_urllib3_contrib_DATA) \
-	$(dist_python_urllib3_packages_DATA) \
-	$(dist_python_urllib3_securetransport_DATA) \
-	$(dist_python_urllib3_ssl_match_hostname_DATA) \
-	$(dist_python_urllib3_util_DATA) $(dist_pythonconfig_DATA) \
-	$(dist_pythonmodules_DATA) $(dist_pythonyaml2_DATA) \
-	$(dist_pythonyaml3_DATA) $(dist_third_party_DATA) \
-	$(dist_userpythonconfig_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CUPSCONFIG = @CUPSCONFIG@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-IPMIMONITORING_CFLAGS = @IPMIMONITORING_CFLAGS@
-IPMIMONITORING_LIBS = @IPMIMONITORING_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBCAP_CFLAGS = @LIBCAP_CFLAGS@
-LIBCAP_LIBS = @LIBCAP_LIBS@
-LIBMNL_CFLAGS = @LIBMNL_CFLAGS@
-LIBMNL_LIBS = @LIBMNL_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MATH_CFLAGS = @MATH_CFLAGS@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-NFACCT_CFLAGS = @NFACCT_CFLAGS@
-NFACCT_LIBS = @NFACCT_LIBS@
-OBJEXT = @OBJEXT@
-OPTIONAL_CUPS_CFLAGS = @OPTIONAL_CUPS_CFLAGS@
-OPTIONAL_CUPS_LIBS = @OPTIONAL_CUPS_LIBS@
-OPTIONAL_IPMIMONITORING_CFLAGS = @OPTIONAL_IPMIMONITORING_CFLAGS@
-OPTIONAL_IPMIMONITORING_LIBS = @OPTIONAL_IPMIMONITORING_LIBS@
-OPTIONAL_LIBCAP_CFLAGS = @OPTIONAL_LIBCAP_CFLAGS@
-OPTIONAL_LIBCAP_LIBS = @OPTIONAL_LIBCAP_LIBS@
-OPTIONAL_MATH_CLFAGS = @OPTIONAL_MATH_CLFAGS@
-OPTIONAL_MATH_LIBS = @OPTIONAL_MATH_LIBS@
-OPTIONAL_NFACCT_CLFAGS = @OPTIONAL_NFACCT_CLFAGS@
-OPTIONAL_NFACCT_LIBS = @OPTIONAL_NFACCT_LIBS@
-OPTIONAL_UUID_CLFAGS = @OPTIONAL_UUID_CLFAGS@
-OPTIONAL_UUID_LIBS = @OPTIONAL_UUID_LIBS@
-OPTIONAL_ZLIB_CLFAGS = @OPTIONAL_ZLIB_CLFAGS@
-OPTIONAL_ZLIB_LIBS = @OPTIONAL_ZLIB_LIBS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_RPM_VERSION = @PACKAGE_RPM_VERSION@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SSE_CANDIDATE = @SSE_CANDIDATE@
-STRIP = @STRIP@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VERSION = @VERSION@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
-ZLIB_LIBS = @ZLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_target = @build_target@
-build_vendor = @build_vendor@
-builddir = @builddir@
-cachedir = @cachedir@
-chartsdir = @chartsdir@
-configdir = @configdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-has_jemalloc = @has_jemalloc@
-has_tcmalloc = @has_tcmalloc@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libconfigdir = @libconfigdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-logdir = @logdir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-nodedir = @nodedir@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pluginsdir = @pluginsdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pythondir = @pythondir@
-registrydir = @registrydir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-varlibdir = @varlibdir@
-webdir = @webdir@
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-CLEANFILES = \
-    python.d.plugin \
-    $(NULL)
-
-SUFFIXES = .in
-dist_libconfig_DATA = \
-    python.d.conf \
-    $(NULL)
-
-dist_plugins_SCRIPTS = \
-    python.d.plugin \
-    $(NULL)
-
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-
-# do not install these files, but include them in the distribution
-dist_noinst_DATA = python.d.plugin.in README.md $(NULL) \
-	adaptec_raid/README.md adaptec_raid/Makefile.inc \
-	apache/README.md apache/Makefile.inc beanstalk/README.md \
-	beanstalk/Makefile.inc bind_rndc/README.md \
-	bind_rndc/Makefile.inc boinc/README.md boinc/Makefile.inc \
-	ceph/README.md ceph/Makefile.inc chrony/README.md \
-	chrony/Makefile.inc couchdb/README.md couchdb/Makefile.inc \
-	cpufreq/README.md cpufreq/Makefile.inc cpuidle/README.md \
-	cpuidle/Makefile.inc dnsdist/README.md dnsdist/Makefile.inc \
-	dns_query_time/README.md dns_query_time/Makefile.inc \
-	dockerd/README.md dockerd/Makefile.inc dovecot/README.md \
-	dovecot/Makefile.inc elasticsearch/README.md \
-	elasticsearch/Makefile.inc example/README.md \
-	example/Makefile.inc exim/README.md exim/Makefile.inc \
-	fail2ban/README.md fail2ban/Makefile.inc freeradius/README.md \
-	freeradius/Makefile.inc go_expvar/README.md \
-	go_expvar/Makefile.inc haproxy/README.md haproxy/Makefile.inc \
-	hddtemp/README.md hddtemp/Makefile.inc httpcheck/README.md \
-	httpcheck/Makefile.inc icecast/README.md icecast/Makefile.inc \
-	ipfs/README.md ipfs/Makefile.inc isc_dhcpd/README.md \
-	isc_dhcpd/Makefile.inc linux_power_supply/README.md \
-	linux_power_supply/Makefile.inc litespeed/README.md \
-	litespeed/Makefile.inc logind/README.md logind/Makefile.inc \
-	mdstat/README.md mdstat/Makefile.inc megacli/README.md \
-	megacli/Makefile.inc memcached/README.md \
-	memcached/Makefile.inc mongodb/README.md mongodb/Makefile.inc \
-	monit/README.md monit/Makefile.inc mysql/README.md \
-	mysql/Makefile.inc nginx/README.md nginx/Makefile.inc \
-	nginx_plus/README.md nginx_plus/Makefile.inc \
-	nvidia_smi/README.md nvidia_smi/Makefile.inc nsd/README.md \
-	nsd/Makefile.inc ntpd/README.md ntpd/Makefile.inc \
-	ovpn_status_log/README.md ovpn_status_log/Makefile.inc \
-	openldap/README.md openldap/Makefile.inc oracledb/README.md \
-	oracledb/Makefile.inc phpfpm/README.md phpfpm/Makefile.inc \
-	portcheck/README.md portcheck/Makefile.inc postfix/README.md \
-	postfix/Makefile.inc postgres/README.md postgres/Makefile.inc \
-	powerdns/README.md powerdns/Makefile.inc proxysql/README.md \
-	proxysql/Makefile.inc puppet/README.md puppet/Makefile.inc \
-	rabbitmq/README.md rabbitmq/Makefile.inc redis/README.md \
-	redis/Makefile.inc rethinkdbs/README.md \
-	rethinkdbs/Makefile.inc retroshare/README.md \
-	retroshare/Makefile.inc samba/README.md samba/Makefile.inc \
-	sensors/README.md sensors/Makefile.inc smartd_log/README.md \
-	smartd_log/Makefile.inc spigotmc/README.md \
-	spigotmc/Makefile.inc springboot/README.md \
-	springboot/Makefile.inc squid/README.md squid/Makefile.inc \
-	tomcat/README.md tomcat/Makefile.inc tor/README.md \
-	tor/Makefile.inc traefik/README.md traefik/Makefile.inc \
-	unbound/README.md unbound/Makefile.inc uwsgi/README.md \
-	uwsgi/Makefile.inc varnish/README.md varnish/Makefile.inc \
-	w1sensor/README.md w1sensor/Makefile.inc web_log/README.md \
-	web_log/Makefile.inc
-dist_python_SCRIPTS = \
-    $(NULL)
-
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-
-# install these files
-dist_python_DATA = $(NULL) adaptec_raid/adaptec_raid.chart.py \
-	apache/apache.chart.py beanstalk/beanstalk.chart.py \
-	bind_rndc/bind_rndc.chart.py boinc/boinc.chart.py \
-	ceph/ceph.chart.py chrony/chrony.chart.py \
-	couchdb/couchdb.chart.py cpufreq/cpufreq.chart.py \
-	cpuidle/cpuidle.chart.py dnsdist/dnsdist.chart.py \
-	dns_query_time/dns_query_time.chart.py \
-	dockerd/dockerd.chart.py dovecot/dovecot.chart.py \
-	elasticsearch/elasticsearch.chart.py example/example.chart.py \
-	exim/exim.chart.py fail2ban/fail2ban.chart.py \
-	freeradius/freeradius.chart.py go_expvar/go_expvar.chart.py \
-	haproxy/haproxy.chart.py hddtemp/hddtemp.chart.py \
-	httpcheck/httpcheck.chart.py icecast/icecast.chart.py \
-	ipfs/ipfs.chart.py isc_dhcpd/isc_dhcpd.chart.py \
-	linux_power_supply/linux_power_supply.chart.py \
-	litespeed/litespeed.chart.py logind/logind.chart.py \
-	mdstat/mdstat.chart.py megacli/megacli.chart.py \
-	memcached/memcached.chart.py mongodb/mongodb.chart.py \
-	monit/monit.chart.py mysql/mysql.chart.py nginx/nginx.chart.py \
-	nginx_plus/nginx_plus.chart.py nvidia_smi/nvidia_smi.chart.py \
-	nsd/nsd.chart.py ntpd/ntpd.chart.py \
-	ovpn_status_log/ovpn_status_log.chart.py \
-	openldap/openldap.chart.py oracledb/oracledb.chart.py \
-	phpfpm/phpfpm.chart.py portcheck/portcheck.chart.py \
-	postfix/postfix.chart.py postgres/postgres.chart.py \
-	powerdns/powerdns.chart.py proxysql/proxysql.chart.py \
-	puppet/puppet.chart.py rabbitmq/rabbitmq.chart.py \
-	redis/redis.chart.py rethinkdbs/rethinkdbs.chart.py \
-	retroshare/retroshare.chart.py samba/samba.chart.py \
-	sensors/sensors.chart.py smartd_log/smartd_log.chart.py \
-	spigotmc/spigotmc.chart.py springboot/springboot.chart.py \
-	squid/squid.chart.py tomcat/tomcat.chart.py tor/tor.chart.py \
-	traefik/traefik.chart.py unbound/unbound.chart.py \
-	uwsgi/uwsgi.chart.py varnish/varnish.chart.py \
-	w1sensor/w1sensor.chart.py web_log/web_log.chart.py
-userpythonconfigdir = $(configdir)/python.d
-dist_userpythonconfig_DATA = \
-    .keep \
-    $(NULL)
-
-pythonconfigdir = $(libconfigdir)/python.d
-dist_pythonconfig_DATA = $(NULL) adaptec_raid/adaptec_raid.conf \
-	apache/apache.conf beanstalk/beanstalk.conf \
-	bind_rndc/bind_rndc.conf boinc/boinc.conf ceph/ceph.conf \
-	chrony/chrony.conf couchdb/couchdb.conf cpufreq/cpufreq.conf \
-	cpuidle/cpuidle.conf dnsdist/dnsdist.conf \
-	dns_query_time/dns_query_time.conf dockerd/dockerd.conf \
-	dovecot/dovecot.conf elasticsearch/elasticsearch.conf \
-	example/example.conf exim/exim.conf fail2ban/fail2ban.conf \
-	freeradius/freeradius.conf go_expvar/go_expvar.conf \
-	haproxy/haproxy.conf hddtemp/hddtemp.conf \
-	httpcheck/httpcheck.conf icecast/icecast.conf ipfs/ipfs.conf \
-	isc_dhcpd/isc_dhcpd.conf \
-	linux_power_supply/linux_power_supply.conf \
-	litespeed/litespeed.conf logind/logind.conf mdstat/mdstat.conf \
-	megacli/megacli.conf memcached/memcached.conf \
-	mongodb/mongodb.conf monit/monit.conf mysql/mysql.conf \
-	nginx/nginx.conf nginx_plus/nginx_plus.conf \
-	nvidia_smi/nvidia_smi.conf nsd/nsd.conf ntpd/ntpd.conf \
-	ovpn_status_log/ovpn_status_log.conf openldap/openldap.conf \
-	oracledb/oracledb.conf phpfpm/phpfpm.conf \
-	portcheck/portcheck.conf postfix/postfix.conf \
-	postgres/postgres.conf powerdns/powerdns.conf \
-	proxysql/proxysql.conf puppet/puppet.conf \
-	rabbitmq/rabbitmq.conf redis/redis.conf \
-	rethinkdbs/rethinkdbs.conf retroshare/retroshare.conf \
-	samba/samba.conf sensors/sensors.conf \
-	smartd_log/smartd_log.conf spigotmc/spigotmc.conf \
-	springboot/springboot.conf squid/squid.conf tomcat/tomcat.conf \
-	tor/tor.conf traefik/traefik.conf unbound/unbound.conf \
-	uwsgi/uwsgi.conf varnish/varnish.conf w1sensor/w1sensor.conf \
-	web_log/web_log.conf
-pythonmodulesdir = $(pythondir)/python_modules
-dist_pythonmodules_DATA = \
-    python_modules/__init__.py \
-    $(NULL)
-
-basesdir = $(pythonmodulesdir)/bases
-dist_bases_DATA = \
-    python_modules/bases/__init__.py \
-    python_modules/bases/charts.py \
-    python_modules/bases/collection.py \
-    python_modules/bases/loaders.py \
-    python_modules/bases/loggers.py \
-    $(NULL)
-
-bases_framework_servicesdir = $(basesdir)/FrameworkServices
-dist_bases_framework_services_DATA = \
-    python_modules/bases/FrameworkServices/__init__.py \
-    python_modules/bases/FrameworkServices/ExecutableService.py \
-    python_modules/bases/FrameworkServices/LogService.py \
-    python_modules/bases/FrameworkServices/MySQLService.py \
-    python_modules/bases/FrameworkServices/SimpleService.py \
-    python_modules/bases/FrameworkServices/SocketService.py \
-    python_modules/bases/FrameworkServices/UrlService.py \
-    $(NULL)
-
-third_partydir = $(pythonmodulesdir)/third_party
-dist_third_party_DATA = \
-    python_modules/third_party/__init__.py \
-    python_modules/third_party/ordereddict.py \
-    python_modules/third_party/lm_sensors.py \
-    python_modules/third_party/mcrcon.py \
-    python_modules/third_party/boinc_client.py \
-    python_modules/third_party/monotonic.py \
-    $(NULL)
-
-pythonyaml2dir = $(pythonmodulesdir)/pyyaml2
-dist_pythonyaml2_DATA = \
-    python_modules/pyyaml2/__init__.py \
-    python_modules/pyyaml2/composer.py \
-    python_modules/pyyaml2/constructor.py \
-    python_modules/pyyaml2/cyaml.py \
-    python_modules/pyyaml2/dumper.py \
-    python_modules/pyyaml2/emitter.py \
-    python_modules/pyyaml2/error.py \
-    python_modules/pyyaml2/events.py \
-    python_modules/pyyaml2/loader.py \
-    python_modules/pyyaml2/nodes.py \
-    python_modules/pyyaml2/parser.py \
-    python_modules/pyyaml2/reader.py \
-    python_modules/pyyaml2/representer.py \
-    python_modules/pyyaml2/resolver.py \
-    python_modules/pyyaml2/scanner.py \
-    python_modules/pyyaml2/serializer.py \
-    python_modules/pyyaml2/tokens.py \
-    $(NULL)
-
-pythonyaml3dir = $(pythonmodulesdir)/pyyaml3
-dist_pythonyaml3_DATA = \
-    python_modules/pyyaml3/__init__.py \
-    python_modules/pyyaml3/composer.py \
-    python_modules/pyyaml3/constructor.py \
-    python_modules/pyyaml3/cyaml.py \
-    python_modules/pyyaml3/dumper.py \
-    python_modules/pyyaml3/emitter.py \
-    python_modules/pyyaml3/error.py \
-    python_modules/pyyaml3/events.py \
-    python_modules/pyyaml3/loader.py \
-    python_modules/pyyaml3/nodes.py \
-    python_modules/pyyaml3/parser.py \
-    python_modules/pyyaml3/reader.py \
-    python_modules/pyyaml3/representer.py \
-    python_modules/pyyaml3/resolver.py \
-    python_modules/pyyaml3/scanner.py \
-    python_modules/pyyaml3/serializer.py \
-    python_modules/pyyaml3/tokens.py \
-    $(NULL)
-
-python_urllib3dir = $(pythonmodulesdir)/urllib3
-dist_python_urllib3_DATA = \
-    python_modules/urllib3/__init__.py \
-    python_modules/urllib3/_collections.py \
-    python_modules/urllib3/connection.py \
-    python_modules/urllib3/connectionpool.py \
-    python_modules/urllib3/exceptions.py \
-    python_modules/urllib3/fields.py \
-    python_modules/urllib3/filepost.py \
-    python_modules/urllib3/response.py \
-    python_modules/urllib3/poolmanager.py \
-    python_modules/urllib3/request.py \
-    $(NULL)
-
-python_urllib3_utildir = $(python_urllib3dir)/util
-dist_python_urllib3_util_DATA = \
-    python_modules/urllib3/util/__init__.py \
-    python_modules/urllib3/util/connection.py \
-    python_modules/urllib3/util/request.py \
-    python_modules/urllib3/util/response.py \
-    python_modules/urllib3/util/retry.py \
-    python_modules/urllib3/util/selectors.py \
-    python_modules/urllib3/util/ssl_.py \
-    python_modules/urllib3/util/timeout.py \
-    python_modules/urllib3/util/url.py \
-    python_modules/urllib3/util/wait.py \
-    $(NULL)
-
-python_urllib3_packagesdir = $(python_urllib3dir)/packages
-dist_python_urllib3_packages_DATA = \
-    python_modules/urllib3/packages/__init__.py \
-    python_modules/urllib3/packages/ordered_dict.py \
-    python_modules/urllib3/packages/six.py \
-    $(NULL)
-
-python_urllib3_backportsdir = $(python_urllib3_packagesdir)/backports
-dist_python_urllib3_backports_DATA = \
-    python_modules/urllib3/packages/backports/__init__.py \
-    python_modules/urllib3/packages/backports/makefile.py \
-    $(NULL)
-
-python_urllib3_ssl_match_hostnamedir = $(python_urllib3_packagesdir)/ssl_match_hostname
-dist_python_urllib3_ssl_match_hostname_DATA = \
-    python_modules/urllib3/packages/ssl_match_hostname/__init__.py \
-    python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \
-    $(NULL)
-
-python_urllib3_contribdir = $(python_urllib3dir)/contrib
-dist_python_urllib3_contrib_DATA = \
-    python_modules/urllib3/contrib/__init__.py \
-    python_modules/urllib3/contrib/appengine.py \
-    python_modules/urllib3/contrib/ntlmpool.py \
-    python_modules/urllib3/contrib/pyopenssl.py \
-    python_modules/urllib3/contrib/securetransport.py \
-    python_modules/urllib3/contrib/socks.py \
-    $(NULL)
-
-python_urllib3_securetransportdir = $(python_urllib3_contribdir)/_securetransport
-dist_python_urllib3_securetransport_DATA = \
-    python_modules/urllib3/contrib/_securetransport/__init__.py \
-    python_modules/urllib3/contrib/_securetransport/bindings.py \
-    python_modules/urllib3/contrib/_securetransport/low_level.py \
-    $(NULL)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .in
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/build/subst.inc $(srcdir)/adaptec_raid/Makefile.inc $(srcdir)/apache/Makefile.inc $(srcdir)/beanstalk/Makefile.inc $(srcdir)/bind_rndc/Makefile.inc $(srcdir)/boinc/Makefile.inc $(srcdir)/ceph/Makefile.inc $(srcdir)/chrony/Makefile.inc $(srcdir)/couchdb/Makefile.inc $(srcdir)/cpufreq/Makefile.inc $(srcdir)/cpuidle/Makefile.inc $(srcdir)/dnsdist/Makefile.inc $(srcdir)/dns_query_time/Makefile.inc $(srcdir)/dockerd/Makefile.inc $(srcdir)/dovecot/Makefile.inc $(srcdir)/elasticsearch/Makefile.inc $(srcdir)/example/Makefile.inc $(srcdir)/exim/Makefile.inc $(srcdir)/fail2ban/Makefile.inc $(srcdir)/freeradius/Makefile.inc $(srcdir)/go_expvar/Makefile.inc $(srcdir)/haproxy/Makefile.inc $(srcdir)/hddtemp/Makefile.inc $(srcdir)/httpcheck/Makefile.inc $(srcdir)/icecast/Makefile.inc $(srcdir)/ipfs/Makefile.inc $(srcdir)/isc_dhcpd/Makefile.inc $(srcdir)/linux_power_supply/Makefile.inc $(srcdir)/litespeed/Makefile.inc $(srcdir)/logind/Makefile.inc $(srcdir)/mdstat/Makefile.inc $(srcdir)/megacli/Makefile.inc $(srcdir)/memcached/Makefile.inc $(srcdir)/mongodb/Makefile.inc $(srcdir)/monit/Makefile.inc $(srcdir)/mysql/Makefile.inc $(srcdir)/nginx/Makefile.inc $(srcdir)/nginx_plus/Makefile.inc $(srcdir)/nvidia_smi/Makefile.inc $(srcdir)/nsd/Makefile.inc $(srcdir)/ntpd/Makefile.inc $(srcdir)/ovpn_status_log/Makefile.inc $(srcdir)/openldap/Makefile.inc $(srcdir)/oracledb/Makefile.inc $(srcdir)/phpfpm/Makefile.inc $(srcdir)/portcheck/Makefile.inc $(srcdir)/postfix/Makefile.inc $(srcdir)/postgres/Makefile.inc $(srcdir)/powerdns/Makefile.inc $(srcdir)/proxysql/Makefile.inc $(srcdir)/puppet/Makefile.inc $(srcdir)/rabbitmq/Makefile.inc $(srcdir)/redis/Makefile.inc $(srcdir)/rethinkdbs/Makefile.inc $(srcdir)/retroshare/Makefile.inc $(srcdir)/samba/Makefile.inc $(srcdir)/sensors/Makefile.inc $(srcdir)/smartd_log/Makefile.inc $(srcdir)/spigotmc/Makefile.inc $(srcdir)/springboot/Makefile.inc $(srcdir)/squid/Makefile.inc $(srcdir)/tomcat/Makefile.inc $(srcdir)/tor/Makefile.inc $(srcdir)/traefik/Makefile.inc $(srcdir)/unbound/Makefile.inc $(srcdir)/uwsgi/Makefile.inc $(srcdir)/varnish/Makefile.inc $(srcdir)/w1sensor/Makefile.inc $(srcdir)/web_log/Makefile.inc $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu collectors/python.d.plugin/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu collectors/python.d.plugin/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/build/subst.inc $(srcdir)/adaptec_raid/Makefile.inc $(srcdir)/apache/Makefile.inc $(srcdir)/beanstalk/Makefile.inc $(srcdir)/bind_rndc/Makefile.inc $(srcdir)/boinc/Makefile.inc $(srcdir)/ceph/Makefile.inc $(srcdir)/chrony/Makefile.inc $(srcdir)/couchdb/Makefile.inc $(srcdir)/cpufreq/Makefile.inc $(srcdir)/cpuidle/Makefile.inc $(srcdir)/dnsdist/Makefile.inc $(srcdir)/dns_query_time/Makefile.inc $(srcdir)/dockerd/Makefile.inc $(srcdir)/dovecot/Makefile.inc $(srcdir)/elasticsearch/Makefile.inc $(srcdir)/example/Makefile.inc $(srcdir)/exim/Makefile.inc $(srcdir)/fail2ban/Makefile.inc $(srcdir)/freeradius/Makefile.inc $(srcdir)/go_expvar/Makefile.inc $(srcdir)/haproxy/Makefile.inc $(srcdir)/hddtemp/Makefile.inc $(srcdir)/httpcheck/Makefile.inc $(srcdir)/icecast/Makefile.inc $(srcdir)/ipfs/Makefile.inc $(srcdir)/isc_dhcpd/Makefile.inc $(srcdir)/linux_power_supply/Makefile.inc $(srcdir)/litespeed/Makefile.inc $(srcdir)/logind/Makefile.inc $(srcdir)/mdstat/Makefile.inc $(srcdir)/megacli/Makefile.inc $(srcdir)/memcached/Makefile.inc $(srcdir)/mongodb/Makefile.inc $(srcdir)/monit/Makefile.inc $(srcdir)/mysql/Makefile.inc $(srcdir)/nginx/Makefile.inc $(srcdir)/nginx_plus/Makefile.inc $(srcdir)/nvidia_smi/Makefile.inc $(srcdir)/nsd/Makefile.inc $(srcdir)/ntpd/Makefile.inc $(srcdir)/ovpn_status_log/Makefile.inc $(srcdir)/openldap/Makefile.inc $(srcdir)/oracledb/Makefile.inc $(srcdir)/phpfpm/Makefile.inc $(srcdir)/portcheck/Makefile.inc $(srcdir)/postfix/Makefile.inc $(srcdir)/postgres/Makefile.inc $(srcdir)/powerdns/Makefile.inc $(srcdir)/proxysql/Makefile.inc $(srcdir)/puppet/Makefile.inc $(srcdir)/rabbitmq/Makefile.inc $(srcdir)/redis/Makefile.inc $(srcdir)/rethinkdbs/Makefile.inc $(srcdir)/retroshare/Makefile.inc $(srcdir)/samba/Makefile.inc $(srcdir)/sensors/Makefile.inc $(srcdir)/smartd_log/Makefile.inc $(srcdir)/spigotmc/Makefile.inc $(srcdir)/springboot/Makefile.inc $(srcdir)/squid/Makefile.inc $(srcdir)/tomcat/Makefile.inc $(srcdir)/tor/Makefile.inc $(srcdir)/traefik/Makefile.inc $(srcdir)/unbound/Makefile.inc $(srcdir)/uwsgi/Makefile.inc $(srcdir)/varnish/Makefile.inc $(srcdir)/w1sensor/Makefile.inc $(srcdir)/web_log/Makefile.inc:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-dist_pluginsSCRIPTS: $(dist_plugins_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_plugins_SCRIPTS)'; test -n "$(pluginsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pluginsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pluginsdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pluginsdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pluginsdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-dist_pluginsSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_plugins_SCRIPTS)'; test -n "$(pluginsdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(pluginsdir)'; $(am__uninstall_files_from_dir)
-install-dist_pythonSCRIPTS: $(dist_python_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_python_SCRIPTS)'; test -n "$(pythondir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pythondir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pythondir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pythondir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pythondir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-dist_pythonSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_SCRIPTS)'; test -n "$(pythondir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(pythondir)'; $(am__uninstall_files_from_dir)
-install-dist_basesDATA: $(dist_bases_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_bases_DATA)'; test -n "$(basesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(basesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(basesdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(basesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(basesdir)" || exit $$?; \
-	done
-
-uninstall-dist_basesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_bases_DATA)'; test -n "$(basesdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(basesdir)'; $(am__uninstall_files_from_dir)
-install-dist_bases_framework_servicesDATA: $(dist_bases_framework_services_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_bases_framework_services_DATA)'; test -n "$(bases_framework_servicesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bases_framework_servicesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bases_framework_servicesdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bases_framework_servicesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(bases_framework_servicesdir)" || exit $$?; \
-	done
-
-uninstall-dist_bases_framework_servicesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_bases_framework_services_DATA)'; test -n "$(bases_framework_servicesdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(bases_framework_servicesdir)'; $(am__uninstall_files_from_dir)
-install-dist_libconfigDATA: $(dist_libconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_libconfig_DATA)'; test -n "$(libconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(libconfigdir)" || exit $$?; \
-	done
-
-uninstall-dist_libconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_libconfig_DATA)'; test -n "$(libconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(libconfigdir)'; $(am__uninstall_files_from_dir)
-install-dist_pythonDATA: $(dist_python_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_python_DATA)'; test -n "$(pythondir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pythondir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pythondir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pythondir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pythondir)" || exit $$?; \
-	done
-
-uninstall-dist_pythonDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_DATA)'; test -n "$(pythondir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pythondir)'; $(am__uninstall_files_from_dir)
-install-dist_python_urllib3DATA: $(dist_python_urllib3_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_python_urllib3_DATA)'; test -n "$(python_urllib3dir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(python_urllib3dir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(python_urllib3dir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(python_urllib3dir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(python_urllib3dir)" || exit $$?; \
-	done
-
-uninstall-dist_python_urllib3DATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_urllib3_DATA)'; test -n "$(python_urllib3dir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(python_urllib3dir)'; $(am__uninstall_files_from_dir)
-install-dist_python_urllib3_backportsDATA: $(dist_python_urllib3_backports_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_python_urllib3_backports_DATA)'; test -n "$(python_urllib3_backportsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(python_urllib3_backportsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(python_urllib3_backportsdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(python_urllib3_backportsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(python_urllib3_backportsdir)" || exit $$?; \
-	done
-
-uninstall-dist_python_urllib3_backportsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_urllib3_backports_DATA)'; test -n "$(python_urllib3_backportsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(python_urllib3_backportsdir)'; $(am__uninstall_files_from_dir)
-install-dist_python_urllib3_contribDATA: $(dist_python_urllib3_contrib_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_python_urllib3_contrib_DATA)'; test -n "$(python_urllib3_contribdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(python_urllib3_contribdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(python_urllib3_contribdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(python_urllib3_contribdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(python_urllib3_contribdir)" || exit $$?; \
-	done
-
-uninstall-dist_python_urllib3_contribDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_urllib3_contrib_DATA)'; test -n "$(python_urllib3_contribdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(python_urllib3_contribdir)'; $(am__uninstall_files_from_dir)
-install-dist_python_urllib3_packagesDATA: $(dist_python_urllib3_packages_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_python_urllib3_packages_DATA)'; test -n "$(python_urllib3_packagesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(python_urllib3_packagesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(python_urllib3_packagesdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(python_urllib3_packagesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(python_urllib3_packagesdir)" || exit $$?; \
-	done
-
-uninstall-dist_python_urllib3_packagesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_urllib3_packages_DATA)'; test -n "$(python_urllib3_packagesdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(python_urllib3_packagesdir)'; $(am__uninstall_files_from_dir)
-install-dist_python_urllib3_securetransportDATA: $(dist_python_urllib3_securetransport_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_python_urllib3_securetransport_DATA)'; test -n "$(python_urllib3_securetransportdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(python_urllib3_securetransportdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(python_urllib3_securetransportdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(python_urllib3_securetransportdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(python_urllib3_securetransportdir)" || exit $$?; \
-	done
-
-uninstall-dist_python_urllib3_securetransportDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_urllib3_securetransport_DATA)'; test -n "$(python_urllib3_securetransportdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(python_urllib3_securetransportdir)'; $(am__uninstall_files_from_dir)
-install-dist_python_urllib3_ssl_match_hostnameDATA: $(dist_python_urllib3_ssl_match_hostname_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_python_urllib3_ssl_match_hostname_DATA)'; test -n "$(python_urllib3_ssl_match_hostnamedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(python_urllib3_ssl_match_hostnamedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(python_urllib3_ssl_match_hostnamedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(python_urllib3_ssl_match_hostnamedir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(python_urllib3_ssl_match_hostnamedir)" || exit $$?; \
-	done
-
-uninstall-dist_python_urllib3_ssl_match_hostnameDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_urllib3_ssl_match_hostname_DATA)'; test -n "$(python_urllib3_ssl_match_hostnamedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(python_urllib3_ssl_match_hostnamedir)'; $(am__uninstall_files_from_dir)
-install-dist_python_urllib3_utilDATA: $(dist_python_urllib3_util_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_python_urllib3_util_DATA)'; test -n "$(python_urllib3_utildir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(python_urllib3_utildir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(python_urllib3_utildir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(python_urllib3_utildir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(python_urllib3_utildir)" || exit $$?; \
-	done
-
-uninstall-dist_python_urllib3_utilDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_python_urllib3_util_DATA)'; test -n "$(python_urllib3_utildir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(python_urllib3_utildir)'; $(am__uninstall_files_from_dir)
-install-dist_pythonconfigDATA: $(dist_pythonconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_pythonconfig_DATA)'; test -n "$(pythonconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pythonconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pythonconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pythonconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pythonconfigdir)" || exit $$?; \
-	done
-
-uninstall-dist_pythonconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pythonconfig_DATA)'; test -n "$(pythonconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pythonconfigdir)'; $(am__uninstall_files_from_dir)
-install-dist_pythonmodulesDATA: $(dist_pythonmodules_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_pythonmodules_DATA)'; test -n "$(pythonmodulesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pythonmodulesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pythonmodulesdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pythonmodulesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pythonmodulesdir)" || exit $$?; \
-	done
-
-uninstall-dist_pythonmodulesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pythonmodules_DATA)'; test -n "$(pythonmodulesdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pythonmodulesdir)'; $(am__uninstall_files_from_dir)
-install-dist_pythonyaml2DATA: $(dist_pythonyaml2_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_pythonyaml2_DATA)'; test -n "$(pythonyaml2dir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pythonyaml2dir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pythonyaml2dir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pythonyaml2dir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pythonyaml2dir)" || exit $$?; \
-	done
-
-uninstall-dist_pythonyaml2DATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pythonyaml2_DATA)'; test -n "$(pythonyaml2dir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pythonyaml2dir)'; $(am__uninstall_files_from_dir)
-install-dist_pythonyaml3DATA: $(dist_pythonyaml3_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_pythonyaml3_DATA)'; test -n "$(pythonyaml3dir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pythonyaml3dir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pythonyaml3dir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pythonyaml3dir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pythonyaml3dir)" || exit $$?; \
-	done
-
-uninstall-dist_pythonyaml3DATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pythonyaml3_DATA)'; test -n "$(pythonyaml3dir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pythonyaml3dir)'; $(am__uninstall_files_from_dir)
-install-dist_third_partyDATA: $(dist_third_party_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_third_party_DATA)'; test -n "$(third_partydir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(third_partydir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(third_partydir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(third_partydir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(third_partydir)" || exit $$?; \
-	done
-
-uninstall-dist_third_partyDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_third_party_DATA)'; test -n "$(third_partydir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(third_partydir)'; $(am__uninstall_files_from_dir)
-install-dist_userpythonconfigDATA: $(dist_userpythonconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_userpythonconfig_DATA)'; test -n "$(userpythonconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(userpythonconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(userpythonconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(userpythonconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(userpythonconfigdir)" || exit $$?; \
-	done
-
-uninstall-dist_userpythonconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_userpythonconfig_DATA)'; test -n "$(userpythonconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(userpythonconfigdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(SCRIPTS) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(basesdir)" "$(DESTDIR)$(bases_framework_servicesdir)" "$(DESTDIR)$(libconfigdir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(python_urllib3dir)" "$(DESTDIR)$(python_urllib3_backportsdir)" "$(DESTDIR)$(python_urllib3_contribdir)" "$(DESTDIR)$(python_urllib3_packagesdir)" "$(DESTDIR)$(python_urllib3_securetransportdir)" "$(DESTDIR)$(python_urllib3_ssl_match_hostnamedir)" "$(DESTDIR)$(python_urllib3_utildir)" "$(DESTDIR)$(pythonconfigdir)" "$(DESTDIR)$(pythonmodulesdir)" "$(DESTDIR)$(pythonyaml2dir)" "$(DESTDIR)$(pythonyaml3dir)" "$(DESTDIR)$(third_partydir)" "$(DESTDIR)$(userpythonconfigdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_basesDATA \
-	install-dist_bases_framework_servicesDATA \
-	install-dist_libconfigDATA install-dist_pluginsSCRIPTS \
-	install-dist_pythonDATA install-dist_pythonSCRIPTS \
-	install-dist_python_urllib3DATA \
-	install-dist_python_urllib3_backportsDATA \
-	install-dist_python_urllib3_contribDATA \
-	install-dist_python_urllib3_packagesDATA \
-	install-dist_python_urllib3_securetransportDATA \
-	install-dist_python_urllib3_ssl_match_hostnameDATA \
-	install-dist_python_urllib3_utilDATA \
-	install-dist_pythonconfigDATA install-dist_pythonmodulesDATA \
-	install-dist_pythonyaml2DATA install-dist_pythonyaml3DATA \
-	install-dist_third_partyDATA install-dist_userpythonconfigDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_basesDATA \
-	uninstall-dist_bases_framework_servicesDATA \
-	uninstall-dist_libconfigDATA uninstall-dist_pluginsSCRIPTS \
-	uninstall-dist_pythonDATA uninstall-dist_pythonSCRIPTS \
-	uninstall-dist_python_urllib3DATA \
-	uninstall-dist_python_urllib3_backportsDATA \
-	uninstall-dist_python_urllib3_contribDATA \
-	uninstall-dist_python_urllib3_packagesDATA \
-	uninstall-dist_python_urllib3_securetransportDATA \
-	uninstall-dist_python_urllib3_ssl_match_hostnameDATA \
-	uninstall-dist_python_urllib3_utilDATA \
-	uninstall-dist_pythonconfigDATA \
-	uninstall-dist_pythonmodulesDATA \
-	uninstall-dist_pythonyaml2DATA uninstall-dist_pythonyaml3DATA \
-	uninstall-dist_third_partyDATA \
-	uninstall-dist_userpythonconfigDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
-	ctags-am distclean distclean-generic distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dist_basesDATA \
-	install-dist_bases_framework_servicesDATA \
-	install-dist_libconfigDATA install-dist_pluginsSCRIPTS \
-	install-dist_pythonDATA install-dist_pythonSCRIPTS \
-	install-dist_python_urllib3DATA \
-	install-dist_python_urllib3_backportsDATA \
-	install-dist_python_urllib3_contribDATA \
-	install-dist_python_urllib3_packagesDATA \
-	install-dist_python_urllib3_securetransportDATA \
-	install-dist_python_urllib3_ssl_match_hostnameDATA \
-	install-dist_python_urllib3_utilDATA \
-	install-dist_pythonconfigDATA install-dist_pythonmodulesDATA \
-	install-dist_pythonyaml2DATA install-dist_pythonyaml3DATA \
-	install-dist_third_partyDATA install-dist_userpythonconfigDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \
-	uninstall uninstall-am uninstall-dist_basesDATA \
-	uninstall-dist_bases_framework_servicesDATA \
-	uninstall-dist_libconfigDATA uninstall-dist_pluginsSCRIPTS \
-	uninstall-dist_pythonDATA uninstall-dist_pythonSCRIPTS \
-	uninstall-dist_python_urllib3DATA \
-	uninstall-dist_python_urllib3_backportsDATA \
-	uninstall-dist_python_urllib3_contribDATA \
-	uninstall-dist_python_urllib3_packagesDATA \
-	uninstall-dist_python_urllib3_securetransportDATA \
-	uninstall-dist_python_urllib3_ssl_match_hostnameDATA \
-	uninstall-dist_python_urllib3_utilDATA \
-	uninstall-dist_pythonconfigDATA \
-	uninstall-dist_pythonmodulesDATA \
-	uninstall-dist_pythonyaml2DATA uninstall-dist_pythonyaml3DATA \
-	uninstall-dist_third_partyDATA \
-	uninstall-dist_userpythonconfigDATA
-
-.in:
-	if sed \
-		-e 's#[@]localstatedir_POST@#$(localstatedir)#g' \
-		-e 's#[@]sbindir_POST@#$(sbindir)#g' \
-		-e 's#[@]configdir_POST@#$(configdir)#g' \
-		-e 's#[@]libconfigdir_POST@#$(libconfigdir)#g' \
-		-e 's#[@]cachedir_POST@#$(cachedir)#g' \
-		-e 's#[@]registrydir_POST@#$(registrydir)#g' \
-		-e 's#[@]varlibdir_POST@#$(varlibdir)#g' \
-		$< > $@.tmp; then \
-		mv "$@.tmp" "$@"; \
-	else \
-		rm -f "$@.tmp"; \
-		false; \
-	fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/collectors/python.d.plugin/adaptec_raid/adaptec_raid.chart.py b/collectors/python.d.plugin/adaptec_raid/adaptec_raid.chart.py
index 1fb1e4336..052c93144 100644
--- a/collectors/python.d.plugin/adaptec_raid/adaptec_raid.chart.py
+++ b/collectors/python.d.plugin/adaptec_raid/adaptec_raid.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: adaptec_raid netdata python.d module
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 
diff --git a/collectors/python.d.plugin/beanstalk/beanstalk.chart.py b/collectors/python.d.plugin/beanstalk/beanstalk.chart.py
index aa85a9f0a..9c8319872 100644
--- a/collectors/python.d.plugin/beanstalk/beanstalk.chart.py
+++ b/collectors/python.d.plugin/beanstalk/beanstalk.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: beanstalk netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 try:
diff --git a/collectors/python.d.plugin/bind_rndc/bind_rndc.chart.py b/collectors/python.d.plugin/bind_rndc/bind_rndc.chart.py
index 7ac1bc3dc..60f40c2f7 100644
--- a/collectors/python.d.plugin/bind_rndc/bind_rndc.chart.py
+++ b/collectors/python.d.plugin/bind_rndc/bind_rndc.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: bind rndc netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
diff --git a/collectors/python.d.plugin/couchdb/couchdb.chart.py b/collectors/python.d.plugin/couchdb/couchdb.chart.py
index a58694d70..b40c41229 100644
--- a/collectors/python.d.plugin/couchdb/couchdb.chart.py
+++ b/collectors/python.d.plugin/couchdb/couchdb.chart.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: couchdb netdata python.d module
 # Author: wohali <wohali@apache.org>
-# Thanks to l2isbad for good examples :)
+# Thanks to ilyam8 for good examples :)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from collections import namedtuple, defaultdict
diff --git a/collectors/python.d.plugin/cpufreq/Makefile.inc b/collectors/python.d.plugin/cpufreq/Makefile.inc
deleted file mode 100644
index d6138801d..000000000
--- a/collectors/python.d.plugin/cpufreq/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# install these files
-dist_python_DATA       += cpufreq/cpufreq.chart.py
-dist_pythonconfig_DATA += cpufreq/cpufreq.conf
-
-# do not install these files, but include them in the distribution
-dist_noinst_DATA       += cpufreq/README.md cpufreq/Makefile.inc
-
diff --git a/collectors/python.d.plugin/cpufreq/README.md b/collectors/python.d.plugin/cpufreq/README.md
deleted file mode 100644
index f1fc1e8f2..000000000
--- a/collectors/python.d.plugin/cpufreq/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# cpufreq
-
-> THIS MODULE IS OBSOLETE.
-> USE THE [PROC PLUGIN](../../proc.plugin) - IT IS MORE EFFICIENT
-
----
-
-This module shows the current CPU frequency as set by the cpufreq kernel
-module.
-
-**Requirement:**
-You need to have `CONFIG_CPU_FREQ` and (optionally) `CONFIG_CPU_FREQ_STAT`
-enabled in your kernel.
-
-This module tries to read from one of two possible locations. On
-initialization, it tries to read the `time_in_state` files provided by
-cpufreq\_stats. If this file does not exist, or doesn't contain valid data, it
-falls back to using the more inaccurate `scaling_cur_freq` file (which only
-represents the **current** CPU frequency, and doesn't account for any state
-changes which happen between updates).
-
-It produces one chart with multiple lines (one line per core).
-
-### configuration
-
-Sample:
-
-```yaml
-sys_dir: "/sys/devices"
-```
-
-If no configuration is given, module will search for cpufreq files in `/sys/devices` directory.
-Directory is also prefixed with `NETDATA_HOST_PREFIX` if specified.
-
----
-
-[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fpython.d.plugin%2Fcpufreq%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/python.d.plugin/cpufreq/cpufreq.chart.py b/collectors/python.d.plugin/cpufreq/cpufreq.chart.py
deleted file mode 100644
index cbbab6d7f..000000000
--- a/collectors/python.d.plugin/cpufreq/cpufreq.chart.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-# Description: cpufreq netdata python.d module
-# Author: Pawel Krupa (paulfantom)
-# Author: Steven Noonan (tycho)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import glob
-import os
-
-from bases.FrameworkServices.SimpleService import SimpleService
-
-# default module values (can be overridden per job in `config`)
-# update_every = 2
-
-ORDER = ['cpufreq']
-
-CHARTS = {
-    'cpufreq': {
-        'options': [None, 'CPU Clock', 'MHz', 'cpufreq', 'cpufreq.cpufreq', 'line'],
-        'lines': [
-            # lines are created dynamically in `check()` method
-        ]
-    }
-}
-
-
-class Service(SimpleService):
-    def __init__(self, configuration=None, name=None):
-        prefix = os.getenv('NETDATA_HOST_PREFIX', "")
-        if prefix.endswith('/'):
-            prefix = prefix[:-1]
-        self.sys_dir = prefix + "/sys/devices"
-        SimpleService.__init__(self, configuration=configuration, name=name)
-        self.order = ORDER
-        self.definitions = CHARTS
-        self.fake_name = 'cpu'
-        self.assignment = {}
-        self.accurate_exists = True
-        self.accurate_last = {}
-
-    def _get_data(self):
-        data = {}
-
-        if self.accurate_exists:
-            accurate_ok = True
-
-            for name, paths in self.assignment.items():
-                last = self.accurate_last[name]
-
-                current = {}
-                deltas = {}
-                ticks_since_last = 0
-
-                for line in open(paths['accurate'], 'r'):
-                    line = list(map(int, line.split()))
-                    current[line[0]] = line[1]
-                    ticks = line[1] - last.get(line[0], 0)
-                    ticks_since_last += ticks
-                    deltas[line[0]] = line[1] - last.get(line[0], 0)
-
-                avg_freq = 0
-                if ticks_since_last != 0:
-                    for frequency, ticks in deltas.items():
-                        avg_freq += frequency * ticks
-                    avg_freq /= ticks_since_last
-
-                data[name] = avg_freq
-                self.accurate_last[name] = current
-                if avg_freq == 0 or ticks_since_last == 0:
-                    # Delta is either too large or nonexistent, fall back to
-                    # less accurate reading. This can happen if we switch
-                    # to/from the 'schedutil' governor, which doesn't report
-                    # stats.
-                    accurate_ok = False
-
-            if accurate_ok:
-                return data
-
-        for name, paths in self.assignment.items():
-            data[name] = open(paths['inaccurate'], 'r').read()
-
-        return data
-
-    def check(self):
-        try:
-            self.sys_dir = str(self.configuration['sys_dir'])
-        except (KeyError, TypeError):
-            self.error("No path specified. Using: '" + self.sys_dir + "'")
-
-        for path in glob.glob(self.sys_dir + '/system/cpu/cpu*/cpufreq/stats/time_in_state'):
-            path_elem = path.split('/')
-            cpu = path_elem[-4]
-            if cpu not in self.assignment:
-                self.assignment[cpu] = {}
-            self.assignment[cpu]['accurate'] = path
-            self.accurate_last[cpu] = {}
-
-        if not self.assignment:
-            self.accurate_exists = False
-
-        for path in glob.glob(self.sys_dir + '/system/cpu/cpu*/cpufreq/scaling_cur_freq'):
-            path_elem = path.split('/')
-            cpu = path_elem[-3]
-            if cpu not in self.assignment:
-                self.assignment[cpu] = {}
-            self.assignment[cpu]['inaccurate'] = path
-
-        if not self.assignment:
-            self.error("couldn't find a method to read cpufreq statistics")
-            return False
-
-        for name in sorted(self.assignment, key=lambda v: int(v[3:])):
-            self.definitions[ORDER[0]]['lines'].append([name, name, 'absolute', 1, 1000])
-
-        return True
diff --git a/collectors/python.d.plugin/cpufreq/cpufreq.conf b/collectors/python.d.plugin/cpufreq/cpufreq.conf
deleted file mode 100644
index 96c0884c6..000000000
--- a/collectors/python.d.plugin/cpufreq/cpufreq.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# netdata python.d.plugin configuration for cpufreq
-#
-# This file is in YaML format. Generally the format is:
-#
-# name: value
-#
-# There are 2 sections:
-#  - global variables
-#  - one or more JOBS
-#
-# JOBS allow you to collect values from multiple sources.
-# Each source will have its own set of charts.
-#
-# JOB parameters have to be indented (using spaces only, example below).
-
-# ----------------------------------------------------------------------
-# Global Variables
-# These variables set the defaults for all JOBs, however each JOB
-# may define its own, overriding the defaults.
-
-# update_every sets the default data collection frequency.
-# If unset, the python.d.plugin default is used.
-# update_every: 1
-
-# priority controls the order of charts at the netdata dashboard.
-# Lower numbers move the charts towards the top of the page.
-# If unset, the default for python.d.plugin is used.
-# priority: 60000
-
-# penalty indicates whether to apply penalty to update_every in case of failures.
-# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
-# penalty: yes
-
-# autodetection_retry sets the job re-check interval in seconds.
-# The job is not deleted if check fails.
-# Attempts to start the job are made once every autodetection_retry.
-# This feature is disabled by default.
-# autodetection_retry: 0
-
-# The directory to search for the file scaling_cur_freq
-sys_dir: "/sys/devices"
diff --git a/collectors/python.d.plugin/cpuidle/Makefile.inc b/collectors/python.d.plugin/cpuidle/Makefile.inc
deleted file mode 100644
index 66c47d3cf..000000000
--- a/collectors/python.d.plugin/cpuidle/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# install these files
-dist_python_DATA       += cpuidle/cpuidle.chart.py
-dist_pythonconfig_DATA += cpuidle/cpuidle.conf
-
-# do not install these files, but include them in the distribution
-dist_noinst_DATA       += cpuidle/README.md cpuidle/Makefile.inc
-
diff --git a/collectors/python.d.plugin/cpuidle/README.md b/collectors/python.d.plugin/cpuidle/README.md
deleted file mode 100644
index bb6722a11..000000000
--- a/collectors/python.d.plugin/cpuidle/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# cpuidle
-
-This module monitors the usage of CPU idle states.
-
-**Requirement:**
-Your kernel needs to have `CONFIG_CPU_IDLE` enabled.
-
-It produces one stacked chart per CPU, showing the percentage of time spent in
-each state.
-
----
-
-[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fpython.d.plugin%2Fcpuidle%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/python.d.plugin/cpuidle/cpuidle.chart.py b/collectors/python.d.plugin/cpuidle/cpuidle.chart.py
deleted file mode 100644
index feac025bf..000000000
--- a/collectors/python.d.plugin/cpuidle/cpuidle.chart.py
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*- coding: utf-8 -*-
-# Description: cpuidle netdata python.d module
-# Author: Steven Noonan (tycho)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import ctypes
-import glob
-import os
-import platform
-
-from bases.FrameworkServices.SimpleService import SimpleService
-
-syscall = ctypes.CDLL('libc.so.6').syscall
-
-# default module values (can be overridden per job in `config`)
-# update_every = 2
-
-
-class Service(SimpleService):
-    def __init__(self, configuration=None, name=None):
-        prefix = os.getenv('NETDATA_HOST_PREFIX', "")
-        if prefix.endswith('/'):
-            prefix = prefix[:-1]
-        self.sys_dir = prefix + "/sys/devices/system/cpu"
-        self.schedstat_path = prefix + "/proc/schedstat"
-        SimpleService.__init__(self, configuration=configuration, name=name)
-        self.order = []
-        self.definitions = {}
-        self.fake_name = 'cpu'
-        self.assignment = {}
-        self.last_schedstat = None
-
-    @staticmethod
-    def __gettid():
-        # This is horrendous. We need the *thread id* (not the *process id*),
-        # but there's no Python standard library way of doing that. If you need
-        # to enable this module on a non-x86 machine type, you'll have to find
-        # the Linux syscall number for gettid() and add it to the dictionary
-        # below.
-        syscalls = {
-            'i386':    224,
-            'x86_64':  186,
-        }
-        if platform.machine() not in syscalls:
-            return None
-        tid = syscall(syscalls[platform.machine()])
-        return tid
-
-    def __wake_cpus(self, cpus):
-        # Requires Python 3.3+. This will "tickle" each CPU to force it to
-        # update its idle counters.
-        if hasattr(os, 'sched_setaffinity'):
-            pid = self.__gettid()
-            save_affinity = os.sched_getaffinity(pid)
-            for idx in cpus:
-                os.sched_setaffinity(pid, [idx])
-                os.sched_getaffinity(pid)
-            os.sched_setaffinity(pid, save_affinity)
-
-    def __read_schedstat(self):
-        cpus = {}
-        for line in open(self.schedstat_path, 'r'):
-            if not line.startswith('cpu'):
-                continue
-            line = line.rstrip().split()
-            cpu = line[0]
-            active_time = line[7]
-            cpus[cpu] = int(active_time) // 1000
-        return cpus
-
-    def _get_data(self):
-        results = {}
-
-        # Use the kernel scheduler stats to determine how much time was spent
-        # in C0 (active).
-        schedstat = self.__read_schedstat()
-
-        # Determine if any of the CPUs are idle. If they are, then we need to
-        # tickle them in order to update their C-state residency statistics.
-        if self.last_schedstat is None:
-            needs_tickle = list(self.assignment.keys())
-        else:
-            needs_tickle = []
-            for cpu, active_time in self.last_schedstat.items():
-                delta = schedstat[cpu] - active_time
-                if delta < 1:
-                    needs_tickle.append(cpu)
-
-        if needs_tickle:
-            # This line is critical for the stats to update. If we don't "tickle"
-            # idle CPUs, then the counters for those CPUs stop counting.
-            self.__wake_cpus([int(cpu[3:]) for cpu in needs_tickle])
-
-            # Re-read schedstat now that we've tickled any idlers.
-            schedstat = self.__read_schedstat()
-
-        self.last_schedstat = schedstat
-
-        for cpu, metrics in self.assignment.items():
-            update_time = schedstat[cpu]
-            results[cpu + '_active_time'] = update_time
-
-            for metric, path in metrics.items():
-                residency = int(open(path, 'r').read())
-                results[metric] = residency
-
-        return results
-
-    def check(self):
-        if self.__gettid() is None:
-            self.error('Cannot get thread ID. Stats would be completely broken.')
-            return False
-
-        for path in sorted(glob.glob(self.sys_dir + '/cpu*/cpuidle/state*/name')):
-            # ['', 'sys', 'devices', 'system', 'cpu', 'cpu0', 'cpuidle', 'state3', 'name']
-            path_elem = path.split('/')
-            cpu = path_elem[-4]
-            state = path_elem[-2]
-            statename = open(path, 'rt').read().rstrip()
-
-            orderid = '%s_cpuidle' % (cpu,)
-            if orderid not in self.definitions:
-                self.order.append(orderid)
-                active_name = '%s_active_time' % (cpu,)
-                self.definitions[orderid] = {
-                    'options': [None, 'C-state residency', 'time%', 'cpuidle', 'cpuidle.cpuidle', 'stacked'],
-                    'lines': [
-                        [active_name, 'C0 (active)', 'percentage-of-incremental-row', 1, 1],
-                    ],
-                }
-                self.assignment[cpu] = {}
-
-            defid = '%s_%s_time' % (orderid, state)
-
-            self.definitions[orderid]['lines'].append(
-                [defid, statename, 'percentage-of-incremental-row', 1, 1]
-            )
-
-            self.assignment[cpu][defid] = '/'.join(path_elem[:-1] + ['time'])
-
-        # Sort order by kernel-specified CPU index
-        self.order.sort(key=lambda x: int(x.split('_')[0][3:]))
-
-        if not self.definitions:
-            self.error("couldn't find cstate stats")
-            return False
-
-        return True
diff --git a/collectors/python.d.plugin/cpuidle/cpuidle.conf b/collectors/python.d.plugin/cpuidle/cpuidle.conf
deleted file mode 100644
index 25f5fed64..000000000
--- a/collectors/python.d.plugin/cpuidle/cpuidle.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# netdata python.d.plugin configuration for cpuidle
-#
-# This file is in YaML format. Generally the format is:
-#
-# name: value
-#
-# There are 2 sections:
-#  - global variables
-#  - one or more JOBS
-#
-# JOBS allow you to collect values from multiple sources.
-# Each source will have its own set of charts.
-#
-# JOB parameters have to be indented (using spaces only, example below).
-
-# ----------------------------------------------------------------------
-# Global Variables
-# These variables set the defaults for all JOBs, however each JOB
-# may define its own, overriding the defaults.
-
-# update_every sets the default data collection frequency.
-# If unset, the python.d.plugin default is used.
-# update_every: 1
-
-# priority controls the order of charts at the netdata dashboard.
-# Lower numbers move the charts towards the top of the page.
-# If unset, the default for python.d.plugin is used.
-# priority: 60000
-
-# penalty indicates whether to apply penalty to update_every in case of failures.
-# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
-# penalty: yes
-
-# autodetection_retry sets the job re-check interval in seconds.
-# The job is not deleted if check fails.
-# Attempts to start the job are made once every autodetection_retry.
-# This feature is disabled by default.
-# autodetection_retry: 0
diff --git a/collectors/python.d.plugin/dns_query_time/dns_query_time.chart.py b/collectors/python.d.plugin/dns_query_time/dns_query_time.chart.py
index 4a5e0e108..47a7d23f6 100644
--- a/collectors/python.d.plugin/dns_query_time/dns_query_time.chart.py
+++ b/collectors/python.d.plugin/dns_query_time/dns_query_time.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: dns_query_time netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from random import choice
diff --git a/collectors/python.d.plugin/elasticsearch/elasticsearch.chart.py b/collectors/python.d.plugin/elasticsearch/elasticsearch.chart.py
index f1ea03fe8..9b3c1284d 100644
--- a/collectors/python.d.plugin/elasticsearch/elasticsearch.chart.py
+++ b/collectors/python.d.plugin/elasticsearch/elasticsearch.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: elastic search node stats netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import json
diff --git a/collectors/python.d.plugin/fail2ban/fail2ban.chart.py b/collectors/python.d.plugin/fail2ban/fail2ban.chart.py
index dfd2feab7..9f5f2dcc4 100644
--- a/collectors/python.d.plugin/fail2ban/fail2ban.chart.py
+++ b/collectors/python.d.plugin/fail2ban/fail2ban.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: fail2ban log netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import re
diff --git a/collectors/python.d.plugin/freeradius/freeradius.chart.py b/collectors/python.d.plugin/freeradius/freeradius.chart.py
index 8563660cc..9022d5e60 100644
--- a/collectors/python.d.plugin/freeradius/freeradius.chart.py
+++ b/collectors/python.d.plugin/freeradius/freeradius.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: freeradius netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import re
diff --git a/collectors/python.d.plugin/haproxy/haproxy.chart.py b/collectors/python.d.plugin/haproxy/haproxy.chart.py
index d97d28d2b..8df712943 100644
--- a/collectors/python.d.plugin/haproxy/haproxy.chart.py
+++ b/collectors/python.d.plugin/haproxy/haproxy.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: haproxy netdata python.d module
-# Author: l2isbad, ktarasz
+# Author: ilyam8, ktarasz
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from collections import defaultdict
diff --git a/collectors/python.d.plugin/hddtemp/hddtemp.chart.py b/collectors/python.d.plugin/hddtemp/hddtemp.chart.py
index 810aaacc9..b5aaaeb39 100644
--- a/collectors/python.d.plugin/hddtemp/hddtemp.chart.py
+++ b/collectors/python.d.plugin/hddtemp/hddtemp.chart.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: hddtemp netdata python.d module
 # Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 
diff --git a/collectors/python.d.plugin/icecast/icecast.chart.py b/collectors/python.d.plugin/icecast/icecast.chart.py
index 40eaf89b9..e56e506e3 100644
--- a/collectors/python.d.plugin/icecast/icecast.chart.py
+++ b/collectors/python.d.plugin/icecast/icecast.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: icecast netdata python.d module
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import json
diff --git a/collectors/python.d.plugin/isc_dhcpd/isc_dhcpd.chart.py b/collectors/python.d.plugin/isc_dhcpd/isc_dhcpd.chart.py
index bbe7a9369..a29439251 100644
--- a/collectors/python.d.plugin/isc_dhcpd/isc_dhcpd.chart.py
+++ b/collectors/python.d.plugin/isc_dhcpd/isc_dhcpd.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: isc dhcpd lease netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
diff --git a/collectors/python.d.plugin/linux_power_supply/Makefile.inc b/collectors/python.d.plugin/linux_power_supply/Makefile.inc
deleted file mode 100644
index 1864ba524..000000000
--- a/collectors/python.d.plugin/linux_power_supply/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# install these files
-dist_python_DATA       += linux_power_supply/linux_power_supply.chart.py
-dist_pythonconfig_DATA += linux_power_supply/linux_power_supply.conf
-
-# do not install these files, but include them in the distribution
-dist_noinst_DATA       += linux_power_supply/README.md linux_power_supply/Makefile.inc
-
diff --git a/collectors/python.d.plugin/linux_power_supply/README.md b/collectors/python.d.plugin/linux_power_supply/README.md
deleted file mode 100644
index f5b05d199..000000000
--- a/collectors/python.d.plugin/linux_power_supply/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Linux power supply
-
-> THIS MODULE IS OBSOLETE.
-> USE THE [PROC PLUGIN](../../proc.plugin) - IT IS MORE EFFICIENT
-
----
-
-This module monitors variosu metrics reported by power supply drivers
-on Linux.  This allows tracking and alerting on things like remaining
-battery capacity.
-
-Depending on the uderlying driver, it may provide the following charts
-and metrics:
-
-1. Capacity: The power supply capacity expressed as a percentage.
-  * capacity\_now
-
-2. Charge: The charge for the power supply, expressed as microamphours.
-  * charge\_full\_design
-  * charge\_full
-  * charge\_now
-  * charge\_empty
-  * charge\_empty\_design
-
-3. Energy: The energy for the power supply, expressed as microwatthours.
-  * energy\_full\_design
-  * energy\_full
-  * energy\_now
-  * energy\_empty
-  * energy\_empty\_design
-
-2. Voltage: The voltage for the power supply, expressed as microvolts.
-  * voltage\_max\_design
-  * voltage\_max
-  * voltage\_now
-  * voltage\_min
-  * voltage\_min\_design
-
-### configuration
-
-Sample:
-
-```yaml
-battery:
-  supply: 'BAT0'
-  charts: 'capacity charge energy voltage'
-```
-
-The `supply` key specifies the name of the power supply device to monitor.
-You can use `ls /sys/class/power_supply` to get a list of such devices
-on your system.
-
-The `charts` key is a space separated list of which charts to try
-to display.  It defaults to trying to display everything.
-
-### notes
-
-* Most drivers provide at least the first chart.  Battery powered ACPI
-compliant systems (like most laptops) provide all but the third, but do
-not provide all of the metrics for each chart.
-
-* Current, energy, and voltages are reported with a _very_ high precision
-by the power\_supply framework.  Usually, this is far higher than the
-actual hardware supports reporting, so expect to see changes in these
-charts jump instead of scaling smoothly.
-
-* If `max` or `full` attribute is defined by the driver, but not a
-corresponding `min or `empty` attribute, then netdata will still provide
-the corresponding `min` or `empty`, which will then always read as zero.
-This way, alerts which match on these will still work.
-
----
-
-[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fpython.d.plugin%2Flinux_power_supply%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/python.d.plugin/linux_power_supply/linux_power_supply.chart.py b/collectors/python.d.plugin/linux_power_supply/linux_power_supply.chart.py
deleted file mode 100644
index 71d834e5d..000000000
--- a/collectors/python.d.plugin/linux_power_supply/linux_power_supply.chart.py
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- coding: utf-8 -*-
-# Description: Linux power_supply netdata python.d module
-# Author: Austin S. Hemmelgarn (Ferroin)
-
-import os
-import platform
-
-from bases.FrameworkServices.SimpleService import SimpleService
-
-# Everything except percentages is reported as µ units.
-PRECISION = 10 ** 6
-
-# A priority of 90000 places us next to the other PSU related stuff.
-PRIORITY = 90000
-
-# We add our charts dynamically when we probe for the device attributes,
-# so these are empty by default.
-ORDER = []
-
-CHARTS = {}
-
-
-def get_capacity_chart(syspath):
-    # Capacity is measured in percent.  We track one value.
-    options = [None, 'Capacity', '%', 'power_supply', 'power_supply.capacity', 'line']
-    lines = list()
-    attr_now = 'capacity'
-    if get_sysfs_value(os.path.join(syspath, attr_now)) is not None:
-        lines.append([attr_now, attr_now, 'absolute', 1, 1])
-        return {'capacity': {'options': options, 'lines': lines}}, [attr_now]
-    else:
-        return None, None
-
-
-def get_generic_chart(syspath, name, unit, maxname, minname):
-    # Used to generate charts for energy, charge, and voltage.
-    options = [None, name.title(), unit, 'power_supply', 'power_supply.{0}'.format(name), 'line']
-    lines = list()
-    attrlist = list()
-    attr_max_design = '{0}_{1}_design'.format(name, maxname)
-    attr_max = '{0}_{1}'.format(name, maxname)
-    attr_now = '{0}_now'.format(name)
-    attr_min = '{0}_{1}'.format(name, minname)
-    attr_min_design = '{0}_{1}_design'.format(name, minname)
-    if get_sysfs_value(os.path.join(syspath, attr_now)) is not None:
-        lines.append([attr_now, attr_now, 'absolute', 1, PRECISION])
-        attrlist.append(attr_now)
-    else:
-        return None, None
-    if get_sysfs_value(os.path.join(syspath, attr_max)) is not None:
-        lines.insert(0, [attr_max, attr_max, 'absolute', 1, PRECISION])
-        lines.append([attr_min, attr_min, 'absolute', 1, PRECISION])
-        attrlist.append(attr_max)
-        attrlist.append(attr_min)
-    elif get_sysfs_value(os.path.join(syspath, attr_min)) is not None:
-        lines.append([attr_min, attr_min, 'absolute', 1, PRECISION])
-        attrlist.append(attr_min)
-    if get_sysfs_value(os.path.join(syspath, attr_max_design)) is not None:
-        lines.insert(0, [attr_max_design, attr_max_design, 'absolute', 1, PRECISION])
-        lines.append([attr_min_design, attr_min_design, 'absolute', 1, PRECISION])
-        attrlist.append(attr_max_design)
-        attrlist.append(attr_min_design)
-    elif get_sysfs_value(os.path.join(syspath, attr_min_design)) is not None:
-        lines.append([attr_min_design, attr_min_design, 'absolute', 1, PRECISION])
-        attrlist.append(attr_min_design)
-    return {name: {'options': options, 'lines': lines}}, attrlist
-
-
-def get_charge_chart(syspath):
-    # Charge is measured in microamphours.  We track up to five
-    # attributes.
-    return get_generic_chart(syspath, 'charge', 'µAh', 'full', 'empty')
-
-
-def get_energy_chart(syspath):
-    # Energy is measured in microwatthours.  We track up to five
-    # attributes.
-    return get_generic_chart(syspath, 'energy', 'µWh', 'full', 'empty')
-
-
-def get_voltage_chart(syspath):
-    # Voltage is measured in microvolts. We track up to five attributes.
-    return get_generic_chart(syspath, 'voltage', 'µV', 'min', 'max')
-
-
-# This is a list of functions for generating charts.  Used below to save
-# a bit of code (and to make it a bit easier to add new charts).
-GET_CHART = {
-    'capacity': get_capacity_chart,
-    'charge': get_charge_chart,
-    'energy': get_energy_chart,
-    'voltage': get_voltage_chart
-}
-
-
-# This opens the specified file and returns the value in it or None if
-# the file doesn't exist.
-def get_sysfs_value(filepath):
-    try:
-        with open(filepath, 'r') as datasource:
-            return int(datasource.read())
-    except (OSError, IOError):
-        return None
-
-
-class Service(SimpleService):
-    def __init__(self, configuration=None, name=None):
-        SimpleService.__init__(self, configuration=configuration, name=name)
-        self.definitions = dict()
-        self.order = list()
-        self.attrlist = list()
-        self.supply = self.configuration.get('supply', None)
-        if self.supply is not None:
-            self.syspath = '/sys/class/power_supply/{0}'.format(self.supply)
-        self.types = self.configuration.get('charts', 'capacity').split()
-
-    def check(self):
-        if platform.system() != 'Linux':
-            self.error('Only supported on Linux.')
-            return False
-        if self.supply is None:
-            self.error('No power supply specified for monitoring.')
-            return False
-        if not self.types:
-            self.error('No attributes requested for monitoring.')
-            return False
-        if not os.access(self.syspath, os.R_OK):
-            self.error('Unable to access {0}'.format(self.syspath))
-            return False
-        return self.create_charts()
-
-    def create_charts(self):
-        chartset = set(GET_CHART).intersection(set(self.types))
-        if not chartset:
-            self.error('No valid attributes requested for monitoring.')
-            return False
-        charts = dict()
-        attrlist = list()
-        for item in chartset:
-            chart, attrs = GET_CHART[item](self.syspath)
-            if chart is not None:
-                charts.update(chart)
-                attrlist.extend(attrs)
-        if len(charts) == 0:
-            self.error('No charts can be created.')
-            return False
-        self.definitions.update(charts)
-        self.order.extend(sorted(charts))
-        self.attrlist.extend(attrlist)
-        return True
-
-    def _get_data(self):
-        data = dict()
-        for attr in self.attrlist:
-            attrpath = os.path.join(self.syspath, attr)
-            if attr.endswith(('_min', '_min_design', '_empty', '_empty_design')):
-                data[attr] = get_sysfs_value(attrpath) or 0
-            else:
-                data[attr] = get_sysfs_value(attrpath)
-        return data
diff --git a/collectors/python.d.plugin/linux_power_supply/linux_power_supply.conf b/collectors/python.d.plugin/linux_power_supply/linux_power_supply.conf
deleted file mode 100644
index 96eeef44f..000000000
--- a/collectors/python.d.plugin/linux_power_supply/linux_power_supply.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-# netdata python.d.plugin configuration for linux_power_supply
-#
-# This file is in YaML format. Generally the format is:
-#
-# name: value
-#
-# There are 2 sections:
-#  - global variables
-#  - one or more JOBS
-#
-# JOBS allow you to collect values from multiple sources.
-# Each source will have its own set of charts.
-#
-# JOB parameters have to be indented (using spaces only, example below).
-
-# ----------------------------------------------------------------------
-# Global Variables
-# These variables set the defaults for all JOBs, however each JOB
-# may define its own, overriding the defaults.
-
-# update_every sets the default data collection frequency.
-# If unset, the python.d.plugin default is used.
-# update_every: 1
-
-# priority controls the order of charts at the netdata dashboard.
-# Lower numbers move the charts towards the top of the page.
-# If unset, the default for python.d.plugin is used.
-# priority: 60000
-
-# penalty indicates whether to apply penalty to update_every in case of failures.
-# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
-# penalty: yes
-
-# autodetection_retry sets the job re-check interval in seconds.
-# The job is not deleted if check fails.
-# Attempts to start the job are made once every autodetection_retry.
-# This feature is disabled by default.
-# autodetection_retry: 0
-
-# ----------------------------------------------------------------------
-# JOBS (data collection sources)
-#
-# The default JOBS share the same *name*. JOBS with the same name
-# are mutually exclusive. Only one of them will be allowed running at
-# any time. This allows autodetection to try several alternatives and
-# pick the one that works.
-#
-# Any number of jobs is supported.
-#
-# All python.d.plugin JOBS (for all its modules) support a set of
-# predefined parameters. These are:
-#
-# job_name:
-#     name: myname            # the JOB's name as it will appear at the
-#                             # dashboard (by default is the job_name)
-#                             # JOBs sharing a name are mutually exclusive
-#     update_every: 1         # the JOB's data collection frequency
-#     priority: 60000         # the JOB's order on the dashboard
-#     penalty: yes            # the JOB's penalty
-#     autodetection_retry: 0  # the JOB's re-check interval in seconds
-#
-# In addition to the above parameters, linux_power_supply also supports
-# the following extra parameters.
-#
-#     supply: ''              # the name of the power supply to monitor
-#     charts: 'capacity'      # a space separated list of the charts to try
-#                             # and generate valid charts are 'capacity',
-#                             # 'charge', 'current', and 'voltage'
-#
-# Note that linux_power_supply will not automatically detect power
-# supplies in the system, you have to manually specify which ones you
-# want it to monitor.
-#
-# The following config will work to monitor the first battery in most
-# ACPI compliant battery powered systems (such as most laptops).
-#
-# battery:
-#     name: battery
-#     supply: BAT0
diff --git a/collectors/python.d.plugin/litespeed/litespeed.chart.py b/collectors/python.d.plugin/litespeed/litespeed.chart.py
index 9da94213e..4b67ffb8a 100644
--- a/collectors/python.d.plugin/litespeed/litespeed.chart.py
+++ b/collectors/python.d.plugin/litespeed/litespeed.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: litespeed netdata python.d module
-# Author: Ilya Maschenko (l2isbad)
+# Author: Ilya Maschenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import glob
diff --git a/collectors/python.d.plugin/mdstat/Makefile.inc b/collectors/python.d.plugin/mdstat/Makefile.inc
deleted file mode 100644
index 5125a271b..000000000
--- a/collectors/python.d.plugin/mdstat/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# install these files
-dist_python_DATA       += mdstat/mdstat.chart.py
-dist_pythonconfig_DATA += mdstat/mdstat.conf
-
-# do not install these files, but include them in the distribution
-dist_noinst_DATA       += mdstat/README.md mdstat/Makefile.inc
-
diff --git a/collectors/python.d.plugin/mdstat/README.md b/collectors/python.d.plugin/mdstat/README.md
deleted file mode 100644
index f88346eec..000000000
--- a/collectors/python.d.plugin/mdstat/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# mdstat
-
-> THIS MODULE IS OBSOLETE.
-> USE THE [PROC PLUGIN](../../proc.plugin) - IT IS MORE EFFICIENT
-
----
-
-Module monitor /proc/mdstat
-
-It produces:
-
-1. **Health** Number of failed disks in every array (aggregate chart).
-
-2. **Disks stats**
- * total (number of devices array ideally would have)
- * inuse (number of devices currently are in use)
-
-3. **Current status**
- * resync in percent
- * recovery in percent
- * reshape in percent
- * check in percent
-
-4. **Operation status** (if resync/recovery/reshape/check is active)
- * finish in minutes
- * speed in megabytes/s
-
-### configuration
-No configuration is needed.
-
----
-
-[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fpython.d.plugin%2Fmdstat%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/python.d.plugin/mdstat/mdstat.chart.py b/collectors/python.d.plugin/mdstat/mdstat.chart.py
deleted file mode 100644
index b7306b6a7..000000000
--- a/collectors/python.d.plugin/mdstat/mdstat.chart.py
+++ /dev/null
@@ -1,205 +0,0 @@
-# -*- coding: utf-8 -*-
-# Description: mdstat netdata python.d module
-# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import re
-
-from collections import defaultdict
-
-from bases.FrameworkServices.SimpleService import SimpleService
-
-MDSTAT = '/proc/mdstat'
-MISMATCH_CNT = '/sys/block/{0}/md/mismatch_cnt'
-
-ORDER = ['mdstat_health']
-
-CHARTS = {
-    'mdstat_health': {
-        'options': [None, 'Faulty Devices In MD', 'failed disks', 'health', 'md.health', 'line'],
-        'lines': []
-    }
-}
-
-RE_DISKS = re.compile(r' (?P<array>[a-zA-Z_0-9]+) : active .+\['
-                      r'(?P<total_disks>[0-9]+)/'
-                      r'(?P<inuse_disks>[0-9]+)\]')
-
-RE_STATUS = re.compile(r' (?P<array>[a-zA-Z_0-9]+) : active .+ '
-                       r'(?P<operation>[a-z]+) =[ ]{1,2}'
-                       r'(?P<operation_status>[0-9.]+).+finish='
-                       r'(?P<finish_in>([0-9.]+))min speed='
-                       r'(?P<speed>[0-9]+)')
-
-
-def md_charts(name):
-    order = [
-        '{0}_disks'.format(name),
-        '{0}_operation'.format(name),
-        '{0}_mismatch_cnt'.format(name),
-        '{0}_finish'.format(name),
-        '{0}_speed'.format(name)
-    ]
-
-    charts = dict()
-    charts[order[0]] = {
-        'options': [None, 'Disks Stats', 'disks', name, 'md.disks', 'stacked'],
-        'lines': [
-            ['{0}_total_disks'.format(name), 'total', 'absolute'],
-            ['{0}_inuse_disks'.format(name), 'inuse', 'absolute']
-        ]
-    }
-
-    charts[order[1]] = {
-        'options': [None, 'Current Status', 'percent', name, 'md.status', 'line'],
-        'lines': [
-            ['{0}_resync'.format(name), 'resync', 'absolute', 1, 100],
-            ['{0}_recovery'.format(name), 'recovery', 'absolute', 1, 100],
-            ['{0}_reshape'.format(name), 'reshape', 'absolute', 1, 100],
-            ['{0}_check'.format(name), 'check', 'absolute', 1, 100],
-        ]
-    }
-
-    charts[order[2]] = {
-        'options': [None, 'Mismatch Count', 'unsynchronized blocks', name, 'md.mismatch_cnt', 'line'],
-        'lines': [
-            ['{0}_mismatch_cnt'.format(name), 'count', 'absolute']
-        ]
-    }
-
-    charts[order[3]] = {
-        'options': [None, 'Approximate Time Until Finish', 'seconds', name, 'md.rate', 'line'],
-        'lines': [
-            ['{0}_finish_in'.format(name), 'finish in', 'absolute', 1, 1000]
-        ]
-    }
-
-    charts[order[4]] = {
-        'options': [None, 'Operation Speed', 'KB/s', name, 'md.rate', 'line'],
-        'lines': [
-            ['{0}_speed'.format(name), 'speed', 'absolute', 1, 1000]
-        ]
-    }
-
-    return order, charts
-
-
-class MD:
-    def __init__(self, raw_data):
-        self.name = raw_data['array']
-        self.d = raw_data
-
-    def data(self):
-        rv = {
-            'total_disks': self.d['total_disks'],
-            'inuse_disks': self.d['inuse_disks'],
-            'health': int(self.d['total_disks']) - int(self.d['inuse_disks']),
-            'resync': 0,
-            'recovery': 0,
-            'reshape': 0,
-            'check': 0,
-            'finish_in': 0,
-            'speed': 0,
-        }
-
-        v = read_lines(MISMATCH_CNT.format(self.name))
-        if v:
-            rv['mismatch_cnt'] = v
-
-        if self.d.get('operation'):
-            rv[self.d['operation']] = float(self.d['operation_status']) * 100
-            rv['finish_in'] = float(self.d['finish_in']) * 1000 * 60
-            rv['speed'] = float(self.d['speed']) * 1000
-
-        return dict(('{0}_{1}'.format(self.name, k), v) for k, v in rv.items())
-
-
-class Service(SimpleService):
-    def __init__(self, configuration=None, name=None):
-        SimpleService.__init__(self, configuration=configuration, name=name)
-        self.order = ORDER
-        self.definitions = CHARTS
-        self.mds = list()
-
-    @staticmethod
-    def get_mds():
-        raw = read_lines(MDSTAT)
-
-        if not raw:
-            return None
-
-        return find_mds(raw)
-
-    def get_data(self):
-        """
-        Parse data from _get_raw_data()
-        :return: dict
-        """
-        mds = self.get_mds()
-
-        if not mds:
-            return None
-
-        data = dict()
-        for md in mds:
-            if md.name not in self.mds:
-                self.mds.append(md.name)
-                self.add_new_md_charts(md.name)
-            data.update(md.data())
-        return data
-
-    def check(self):
-        if not self.get_mds():
-            self.error('Failed to read data from {0} or there is no active arrays'.format(MDSTAT))
-            return False
-        return True
-
-    def add_new_md_charts(self, name):
-        order, charts = md_charts(name)
-
-        self.charts['mdstat_health'].add_dimension(['{0}_health'.format(name), name])
-
-        for chart_name in order:
-            params = [chart_name] + charts[chart_name]['options']
-            dims = charts[chart_name]['lines']
-
-            chart = self.charts.add_chart(params)
-            for dim in dims:
-                chart.add_dimension(dim)
-
-
-def find_mds(raw_data):
-    data = defaultdict(str)
-    counter = 1
-
-    for row in (elem.strip() for elem in raw_data):
-        if not row:
-            counter += 1
-            continue
-        data[counter] = ' '.join([data[counter], row])
-
-    mds = list()
-
-    for v in data.values():
-        m = RE_DISKS.search(v)
-
-        if not m:
-            continue
-
-        d = m.groupdict()
-
-        m = RE_STATUS.search(v)
-        if m:
-            d.update(m.groupdict())
-
-        mds.append(MD(d))
-
-    return sorted(mds, key=lambda md: md.name)
-
-
-def read_lines(path):
-    try:
-        with open(path) as f:
-            return f.readlines()
-    except (IOError, OSError):
-        return None
diff --git a/collectors/python.d.plugin/mdstat/mdstat.conf b/collectors/python.d.plugin/mdstat/mdstat.conf
deleted file mode 100644
index c72b63835..000000000
--- a/collectors/python.d.plugin/mdstat/mdstat.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# netdata python.d.plugin configuration for mdstat
-#
-# This file is in YaML format. Generally the format is:
-#
-# name: value
-#
-
-# ----------------------------------------------------------------------
-# Global Variables
-# These variables set the defaults for all JOBs, however each JOB
-# may define its own, overriding the defaults.
-
-# update_every sets the default data collection frequency.
-# If unset, the python.d.plugin default is used.
-# update_every: 1
-
-# priority controls the order of charts at the netdata dashboard.
-# Lower numbers move the charts towards the top of the page.
-# If unset, the default for python.d.plugin is used.
-# priority: 60000
-
-# penalty indicates whether to apply penalty to update_every in case of failures.
-# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
-# penalty: yes
-
-# autodetection_retry sets the job re-check interval in seconds.
-# The job is not deleted if check fails.
-# Attempts to start the job are made once every autodetection_retry.
-# This feature is disabled by default.
-# autodetection_retry: 0
diff --git a/collectors/python.d.plugin/megacli/megacli.chart.py b/collectors/python.d.plugin/megacli/megacli.chart.py
index e1a05e416..3805a100e 100644
--- a/collectors/python.d.plugin/megacli/megacli.chart.py
+++ b/collectors/python.d.plugin/megacli/megacli.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: megacli netdata python.d module
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 
diff --git a/collectors/python.d.plugin/mongodb/README.md b/collectors/python.d.plugin/mongodb/README.md
index ac8930dd2..3ddf137d7 100644
--- a/collectors/python.d.plugin/mongodb/README.md
+++ b/collectors/python.d.plugin/mongodb/README.md
@@ -156,6 +156,7 @@ Sample:
 ```yaml
 local:
     name : 'local'
+    authdb: 'admin'
     host : '127.0.0.1'
     port : 27017
     user : 'netdata'
diff --git a/collectors/python.d.plugin/mongodb/mongodb.chart.py b/collectors/python.d.plugin/mongodb/mongodb.chart.py
index 92740ff86..ee32593c2 100644
--- a/collectors/python.d.plugin/mongodb/mongodb.chart.py
+++ b/collectors/python.d.plugin/mongodb/mongodb.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: mongodb netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from copy import deepcopy
@@ -424,6 +424,7 @@ class Service(SimpleService):
         SimpleService.__init__(self, configuration=configuration, name=name)
         self.order = ORDER[:]
         self.definitions = deepcopy(CHARTS)
+        self.authdb = self.configuration.get('authdb', 'admin')
         self.user = self.configuration.get('user')
         self.password = self.configuration.get('pass')
         self.host = self.configuration.get('host', '127.0.0.1')
@@ -707,7 +708,7 @@ class Service(SimpleService):
         try:
             connection = MongoClient(**conn_vars)
             if self.user and self.password:
-                connection.admin.authenticate(name=self.user, password=self.password)
+                getattr(connection, self.authdb).authenticate(name=self.user, password=self.password)
             # elif self.user:
             #     connection.admin.authenticate(name=self.user, mechanism='MONGODB-X509')
             server_status = connection.admin.command('serverStatus')
diff --git a/collectors/python.d.plugin/mongodb/mongodb.conf b/collectors/python.d.plugin/mongodb/mongodb.conf
index f69acac79..53858ae2e 100644
--- a/collectors/python.d.plugin/mongodb/mongodb.conf
+++ b/collectors/python.d.plugin/mongodb/mongodb.conf
@@ -66,6 +66,8 @@
 #
 #  in all cases, the following can also be set:
 #
+#     authdb: 'dbname'       # database to authenticate the user against,
+#                            # defaults to "admin".
 #     user: 'username'       # the mongodb username to use
 #     pass: 'password'       # the mongodb password to use
 #
@@ -80,3 +82,11 @@ local:
     name : 'local'
     host : '127.0.0.1'
     port : 27017
+
+# authsample:
+#     name : 'secure'
+#     host : 'mongodb.example.com'
+#     port : 27017
+#     authdb : 'admin'
+#     user : 'monitor'
+#     password : 'supersecret'
diff --git a/collectors/python.d.plugin/mysql/mysql.chart.py b/collectors/python.d.plugin/mysql/mysql.chart.py
index 20d32f81b..eda55cb7f 100644
--- a/collectors/python.d.plugin/mysql/mysql.chart.py
+++ b/collectors/python.d.plugin/mysql/mysql.chart.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: MySQL netdata python.d module
 # Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from bases.FrameworkServices.MySQLService import MySQLService
diff --git a/collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py b/collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py
index 3082fdbe7..6cf35cb13 100644
--- a/collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py
+++ b/collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: nginx_plus netdata python.d module
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import re
diff --git a/collectors/python.d.plugin/ntpd/ntpd.chart.py b/collectors/python.d.plugin/ntpd/ntpd.chart.py
index 5a5477e63..e33332cb3 100644
--- a/collectors/python.d.plugin/ntpd/ntpd.chart.py
+++ b/collectors/python.d.plugin/ntpd/ntpd.chart.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: ntpd netdata python.d module
 # Author: Sven Mäder (rda0)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import struct
diff --git a/collectors/python.d.plugin/nvidia_smi/nvidia_smi.chart.py b/collectors/python.d.plugin/nvidia_smi/nvidia_smi.chart.py
index 7cb816c0d..4dc67f133 100644
--- a/collectors/python.d.plugin/nvidia_smi/nvidia_smi.chart.py
+++ b/collectors/python.d.plugin/nvidia_smi/nvidia_smi.chart.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: nvidia-smi netdata python.d module
 # Original Author: Steven Noonan (tycho)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 
 import subprocess
 import threading
diff --git a/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py b/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py
index dc7a6002e..f094ab7c1 100644
--- a/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py
+++ b/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: openvpn status log netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import re
diff --git a/collectors/python.d.plugin/phpfpm/phpfpm.chart.py b/collectors/python.d.plugin/phpfpm/phpfpm.chart.py
index 70091e233..d0e9960e0 100644
--- a/collectors/python.d.plugin/phpfpm/phpfpm.chart.py
+++ b/collectors/python.d.plugin/phpfpm/phpfpm.chart.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: PHP-FPM netdata python.d module
 # Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import json
diff --git a/collectors/python.d.plugin/postgres/postgres.chart.py b/collectors/python.d.plugin/postgres/postgres.chart.py
index 48880bb08..cd8e78404 100644
--- a/collectors/python.d.plugin/postgres/postgres.chart.py
+++ b/collectors/python.d.plugin/postgres/postgres.chart.py
@@ -23,27 +23,41 @@ DEFAULT_CONNECT_TIMEOUT = 2       # seconds
 DEFAULT_STATEMENT_TIMEOUT = 5000  # ms
 
 
-WAL = 'WAL'
-ARCHIVE = 'ARCHIVE'
-BACKENDS = 'BACKENDS'
-TABLE_STATS = 'TABLE_STATS'
-INDEX_STATS = 'INDEX_STATS'
-DATABASE = 'DATABASE'
-BGWRITER = 'BGWRITER'
-LOCKS = 'LOCKS'
-DATABASES = 'DATABASES'
-STANDBY = 'STANDBY'
-REPLICATION_SLOT = 'REPLICATION_SLOT'
-STANDBY_DELTA = 'STANDBY_DELTA'
-REPSLOT_FILES = 'REPSLOT_FILES'
-IF_SUPERUSER = 'IF_SUPERUSER'
-SERVER_VERSION = 'SERVER_VERSION'
-AUTOVACUUM = 'AUTOVACUUM'
-DIFF_LSN = 'DIFF_LSN'
-WAL_WRITES = 'WAL_WRITES'
+CONN_PARAM_HOST = 'host'
+CONN_PARAM_PORT = 'port'
+CONN_PARAM_DATABASE = 'database'
+CONN_PARAM_USER = 'user'
+CONN_PARAM_PASSWORD = 'password'
+CONN_PARAM_CONN_TIMEOUT = 'connect_timeout'
+CONN_PARAM_STATEMENT_TIMEOUT = 'statement_timeout'
+CONN_PARAM_SSL_MODE = 'sslmode'
+CONN_PARAM_SSL_ROOT_CERT = 'sslrootcert'
+CONN_PARAM_SSL_CRL = 'sslcrl'
+CONN_PARAM_SSL_CERT = 'sslcert'
+CONN_PARAM_SSL_KEY = 'sslkey'
+
+
+QUERY_NAME_WAL = 'WAL'
+QUERY_NAME_ARCHIVE = 'ARCHIVE'
+QUERY_NAME_BACKENDS = 'BACKENDS'
+QUERY_NAME_TABLE_STATS = 'TABLE_STATS'
+QUERY_NAME_INDEX_STATS = 'INDEX_STATS'
+QUERY_NAME_DATABASE = 'DATABASE'
+QUERY_NAME_BGWRITER = 'BGWRITER'
+QUERY_NAME_LOCKS = 'LOCKS'
+QUERY_NAME_DATABASES = 'DATABASES'
+QUERY_NAME_STANDBY = 'STANDBY'
+QUERY_NAME_REPLICATION_SLOT = 'REPLICATION_SLOT'
+QUERY_NAME_STANDBY_DELTA = 'STANDBY_DELTA'
+QUERY_NAME_REPSLOT_FILES = 'REPSLOT_FILES'
+QUERY_NAME_IF_SUPERUSER = 'IF_SUPERUSER'
+QUERY_NAME_SERVER_VERSION = 'SERVER_VERSION'
+QUERY_NAME_AUTOVACUUM = 'AUTOVACUUM'
+QUERY_NAME_DIFF_LSN = 'DIFF_LSN'
+QUERY_NAME_WAL_WRITES = 'WAL_WRITES'
 
 METRICS = {
-    DATABASE: [
+    QUERY_NAME_DATABASE: [
         'connections',
         'xact_commit',
         'xact_rollback',
@@ -59,32 +73,32 @@ METRICS = {
         'temp_bytes',
         'size'
     ],
-    BACKENDS: [
+    QUERY_NAME_BACKENDS: [
         'backends_active',
         'backends_idle'
     ],
-    INDEX_STATS: [
+    QUERY_NAME_INDEX_STATS: [
         'index_count',
         'index_size'
     ],
-    TABLE_STATS: [
+    QUERY_NAME_TABLE_STATS: [
         'table_size',
         'table_count'
     ],
-    WAL: [
+    QUERY_NAME_WAL: [
         'written_wal',
         'recycled_wal',
         'total_wal'
     ],
-    WAL_WRITES: [
+    QUERY_NAME_WAL_WRITES: [
         'wal_writes'
     ],
-    ARCHIVE: [
+    QUERY_NAME_ARCHIVE: [
         'ready_count',
         'done_count',
         'file_count'
     ],
-    BGWRITER: [
+    QUERY_NAME_BGWRITER: [
         'checkpoint_scheduled',
         'checkpoint_requested',
         'buffers_checkpoint',
@@ -94,7 +108,7 @@ METRICS = {
         'buffers_alloc',
         'buffers_backend_fsync'
     ],
-    LOCKS: [
+    QUERY_NAME_LOCKS: [
         'ExclusiveLock',
         'RowShareLock',
         'SIReadLock',
@@ -105,20 +119,20 @@ METRICS = {
         'ShareLock',
         'RowExclusiveLock'
     ],
-    AUTOVACUUM: [
+    QUERY_NAME_AUTOVACUUM: [
         'analyze',
         'vacuum_analyze',
         'vacuum',
         'vacuum_freeze',
         'brin_summarize'
     ],
-    STANDBY_DELTA: [
+    QUERY_NAME_STANDBY_DELTA: [
         'sent_delta',
         'write_delta',
         'flush_delta',
         'replay_delta'
     ],
-    REPSLOT_FILES: [
+    QUERY_NAME_REPSLOT_FILES: [
         'replslot_wal_keep',
         'replslot_files'
     ]
@@ -518,47 +532,47 @@ SELECT
 
 
 def query_factory(name, version=NO_VERSION):
-    if name == BACKENDS:
+    if name == QUERY_NAME_BACKENDS:
         return QUERY_BACKEND[DEFAULT]
-    elif name == TABLE_STATS:
+    elif name == QUERY_NAME_TABLE_STATS:
         return QUERY_TABLE_STATS[DEFAULT]
-    elif name == INDEX_STATS:
+    elif name == QUERY_NAME_INDEX_STATS:
         return QUERY_INDEX_STATS[DEFAULT]
-    elif name == DATABASE:
+    elif name == QUERY_NAME_DATABASE:
         return QUERY_DATABASE[DEFAULT]
-    elif name == BGWRITER:
+    elif name == QUERY_NAME_BGWRITER:
         return QUERY_BGWRITER[DEFAULT]
-    elif name == LOCKS:
+    elif name == QUERY_NAME_LOCKS:
         return QUERY_LOCKS[DEFAULT]
-    elif name == DATABASES:
+    elif name == QUERY_NAME_DATABASES:
         return QUERY_DATABASES[DEFAULT]
-    elif name == STANDBY:
+    elif name == QUERY_NAME_STANDBY:
         return QUERY_STANDBY[DEFAULT]
-    elif name == REPLICATION_SLOT:
+    elif name == QUERY_NAME_REPLICATION_SLOT:
         return QUERY_REPLICATION_SLOT[DEFAULT]
-    elif name == IF_SUPERUSER:
+    elif name == QUERY_NAME_IF_SUPERUSER:
         return QUERY_SUPERUSER[DEFAULT]
-    elif name == SERVER_VERSION:
+    elif name == QUERY_NAME_SERVER_VERSION:
         return QUERY_SHOW_VERSION[DEFAULT]
-    elif name == AUTOVACUUM:
+    elif name == QUERY_NAME_AUTOVACUUM:
         return QUERY_AUTOVACUUM[DEFAULT]
-    elif name == WAL:
+    elif name == QUERY_NAME_WAL:
         if version < 100000:
             return QUERY_WAL[V96]
         return QUERY_WAL[DEFAULT]
-    elif name == ARCHIVE:
+    elif name == QUERY_NAME_ARCHIVE:
         if version < 100000:
             return QUERY_ARCHIVE[V96]
         return QUERY_ARCHIVE[DEFAULT]
-    elif name == STANDBY_DELTA:
+    elif name == QUERY_NAME_STANDBY_DELTA:
         if version < 100000:
             return QUERY_STANDBY_DELTA[V96]
         return QUERY_STANDBY_DELTA[DEFAULT]
-    elif name == REPSLOT_FILES:
+    elif name == QUERY_NAME_REPSLOT_FILES:
         if version < 110000:
             return QUERY_REPSLOT_FILES[V10]
         return QUERY_REPSLOT_FILES[DEFAULT]
-    elif name == DIFF_LSN:
+    elif name == QUERY_NAME_DIFF_LSN:
         if version < 100000:
             return QUERY_DIFF_LSN[V96]
         return QUERY_DIFF_LSN[DEFAULT]
@@ -794,6 +808,7 @@ class Service(SimpleService):
         self.databases_to_poll = configuration.pop('database_poll', None)
         self.configuration = configuration
         self.conn = None
+        self.conn_params = dict()
         self.server_version = None
         self.is_superuser = False
         self.alive = False
@@ -806,26 +821,44 @@ class Service(SimpleService):
     def reconnect(self):
         return self.connect()
 
-    def connect(self):
-        if self.conn:
-            self.conn.close()
-            self.conn = None
-
+    def build_conn_params(self):
         conf = self.configuration
 
         params = {
-            'host': conf.get('host'),
-            'port': conf.get('port', DEFAULT_PORT),
-            'database': conf.get('database'),
-            'user': conf.get('user', DEFAULT_USER),
-            'password': conf.get('password'),
-            'connect_timeout': conf.get('connect_timeout', DEFAULT_CONNECT_TIMEOUT),
+            CONN_PARAM_HOST: conf.get(CONN_PARAM_HOST),
+            CONN_PARAM_PORT: conf.get(CONN_PARAM_PORT, DEFAULT_PORT),
+            CONN_PARAM_DATABASE: conf.get(CONN_PARAM_DATABASE),
+            CONN_PARAM_USER: conf.get(CONN_PARAM_USER, DEFAULT_USER),
+            CONN_PARAM_PASSWORD: conf.get(CONN_PARAM_PASSWORD),
+            CONN_PARAM_CONN_TIMEOUT: conf.get(CONN_PARAM_CONN_TIMEOUT, DEFAULT_CONNECT_TIMEOUT),
             'options': '-c statement_timeout={0}'.format(
-                conf.get('statement_timeout', DEFAULT_STATEMENT_TIMEOUT)),
+                conf.get(CONN_PARAM_STATEMENT_TIMEOUT, DEFAULT_STATEMENT_TIMEOUT)),
         }
 
+        # https://www.postgresql.org/docs/current/libpq-ssl.html
+        ssl_params = dict(
+            (k, v) for k, v in {
+                CONN_PARAM_SSL_MODE: conf.get(CONN_PARAM_SSL_MODE),
+                CONN_PARAM_SSL_ROOT_CERT: conf.get(CONN_PARAM_SSL_ROOT_CERT),
+                CONN_PARAM_SSL_CRL: conf.get(CONN_PARAM_SSL_CRL),
+                CONN_PARAM_SSL_CERT: conf.get(CONN_PARAM_SSL_CERT),
+                CONN_PARAM_SSL_KEY: conf.get(CONN_PARAM_SSL_KEY),
+            }.items() if v)
+
+        if CONN_PARAM_SSL_MODE not in ssl_params and len(ssl_params) > 0:
+            raise ValueError("mandatory 'sslmode' param is missing, please set")
+
+        params.update(ssl_params)
+
+        return params
+
+    def connect(self):
+        if self.conn:
+            self.conn.close()
+            self.conn = None
+
         try:
-            self.conn = psycopg2.connect(**params)
+            self.conn = psycopg2.connect(**self.conn_params)
             self.conn.set_isolation_level(extensions.ISOLATION_LEVEL_AUTOCOMMIT)
             self.conn.set_session(readonly=True)
         except OperationalError as error:
@@ -841,8 +874,14 @@ class Service(SimpleService):
             self.error("'python-psycopg2' package is needed to use postgres module")
             return False
 
+        try:
+            self.conn_params = self.build_conn_params()
+        except ValueError as error:
+            self.error('error on creating connection params : {0}', error)
+            return False
+
         if not self.connect():
-            self.error('failed to connect to {0}'.format(hide_password(self.configuration)))
+            self.error('failed to connect to {0}'.format(hide_password(self.conn_params)))
             return False
 
         try:
@@ -904,51 +943,51 @@ class Service(SimpleService):
     def check_queries(self):
         cursor = self.conn.cursor()
 
-        self.server_version = detect_server_version(cursor, query_factory(SERVER_VERSION))
+        self.server_version = detect_server_version(cursor, query_factory(QUERY_NAME_SERVER_VERSION))
         self.debug('server version: {0}'.format(self.server_version))
 
-        self.is_superuser = check_if_superuser(cursor, query_factory(IF_SUPERUSER))
+        self.is_superuser = check_if_superuser(cursor, query_factory(QUERY_NAME_IF_SUPERUSER))
         self.debug('superuser: {0}'.format(self.is_superuser))
 
-        self.databases = discover(cursor, query_factory(DATABASES))
+        self.databases = discover(cursor, query_factory(QUERY_NAME_DATABASES))
         self.debug('discovered databases {0}'.format(self.databases))
         if self.databases_to_poll:
             to_poll = self.databases_to_poll.split()
             self.databases = [db for db in self.databases if db in to_poll] or self.databases
 
-        self.secondaries = discover(cursor, query_factory(STANDBY))
+        self.secondaries = discover(cursor, query_factory(QUERY_NAME_STANDBY))
         self.debug('discovered secondaries: {0}'.format(self.secondaries))
 
         if self.server_version >= 94000:
-            self.replication_slots = discover(cursor, query_factory(REPLICATION_SLOT))
+            self.replication_slots = discover(cursor, query_factory(QUERY_NAME_REPLICATION_SLOT))
             self.debug('discovered replication slots: {0}'.format(self.replication_slots))
 
         cursor.close()
 
     def populate_queries(self):
-        self.queries[query_factory(DATABASE)] = METRICS[DATABASE]
-        self.queries[query_factory(BACKENDS)] = METRICS[BACKENDS]
-        self.queries[query_factory(LOCKS)] = METRICS[LOCKS]
-        self.queries[query_factory(BGWRITER)] = METRICS[BGWRITER]
-        self.queries[query_factory(DIFF_LSN, self.server_version)] = METRICS[WAL_WRITES]
-        self.queries[query_factory(STANDBY_DELTA, self.server_version)] = METRICS[STANDBY_DELTA]
+        self.queries[query_factory(QUERY_NAME_DATABASE)] = METRICS[QUERY_NAME_DATABASE]
+        self.queries[query_factory(QUERY_NAME_BACKENDS)] = METRICS[QUERY_NAME_BACKENDS]
+        self.queries[query_factory(QUERY_NAME_LOCKS)] = METRICS[QUERY_NAME_LOCKS]
+        self.queries[query_factory(QUERY_NAME_BGWRITER)] = METRICS[QUERY_NAME_BGWRITER]
+        self.queries[query_factory(QUERY_NAME_DIFF_LSN, self.server_version)] = METRICS[QUERY_NAME_WAL_WRITES]
+        self.queries[query_factory(QUERY_NAME_STANDBY_DELTA, self.server_version)] = METRICS[QUERY_NAME_STANDBY_DELTA]
 
         if self.do_index_stats:
-            self.queries[query_factory(INDEX_STATS)] = METRICS[INDEX_STATS]
+            self.queries[query_factory(QUERY_NAME_INDEX_STATS)] = METRICS[QUERY_NAME_INDEX_STATS]
         if self.do_table_stats:
-            self.queries[query_factory(TABLE_STATS)] = METRICS[TABLE_STATS]
+            self.queries[query_factory(QUERY_NAME_TABLE_STATS)] = METRICS[QUERY_NAME_TABLE_STATS]
 
         if self.is_superuser:
-            self.queries[query_factory(ARCHIVE, self.server_version)] = METRICS[ARCHIVE]
+            self.queries[query_factory(QUERY_NAME_ARCHIVE, self.server_version)] = METRICS[QUERY_NAME_ARCHIVE]
 
             if self.server_version >= 90400:
-                self.queries[query_factory(WAL, self.server_version)] = METRICS[WAL]
+                self.queries[query_factory(QUERY_NAME_WAL, self.server_version)] = METRICS[QUERY_NAME_WAL]
 
             if self.server_version >= 100000:
-                self.queries[query_factory(REPSLOT_FILES, self.server_version)] = METRICS[REPSLOT_FILES]
+                self.queries[query_factory(QUERY_NAME_REPSLOT_FILES, self.server_version)] = METRICS[QUERY_NAME_REPSLOT_FILES]
 
         if self.server_version >= 90400:
-            self.queries[query_factory(AUTOVACUUM)] = METRICS[AUTOVACUUM]
+            self.queries[query_factory(QUERY_NAME_AUTOVACUUM)] = METRICS[QUERY_NAME_AUTOVACUUM]
 
     def create_dynamic_charts(self):
         for database_name in self.databases[::-1]:
diff --git a/collectors/python.d.plugin/postgres/postgres.conf b/collectors/python.d.plugin/postgres/postgres.conf
index cde698f3c..4c4d5d1af 100644
--- a/collectors/python.d.plugin/postgres/postgres.conf
+++ b/collectors/python.d.plugin/postgres/postgres.conf
@@ -68,8 +68,15 @@
 #     password            : 'example_pass'
 #     host                : 'localhost'
 #     port                : 5432
-#     connect_timeout     : 2     # in seconds, default is 2
-#     statement_timeout   : 2000  # in ms, default is 2000
+#     connect_timeout     : 2                  # in seconds, default is 2
+#     statement_timeout   : 2000               # in ms, default is 2000
+#
+# SSL connection parameters (https://www.postgresql.org/docs/current/libpq-ssl.html)
+#     sslmode             : mode               # one of [disable, allow, prefer, require, verify-ca, verify-full]
+#     sslrootcert         : path/to/rootcert   # the location of the root certificate file
+#     sslcrl              : path/to/crl        # the location of the CRL file
+#     sslcert             : path/to/cert       # the location of the client certificate file
+#     sslkey              : path/to/key        # the location of the client key file
 #
 # Additionally, the following options allow selective disabling of charts
 #
diff --git a/collectors/python.d.plugin/powerdns/powerdns.chart.py b/collectors/python.d.plugin/powerdns/powerdns.chart.py
index 6e5b42a76..bcf9f0d2d 100644
--- a/collectors/python.d.plugin/powerdns/powerdns.chart.py
+++ b/collectors/python.d.plugin/powerdns/powerdns.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: powerdns netdata python.d module
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # Author: Luke Whitworth
 # SPDX-License-Identifier: GPL-3.0-or-later
 
diff --git a/collectors/python.d.plugin/python.d.conf b/collectors/python.d.plugin/python.d.conf
index c65ba4fd2..f52606c59 100644
--- a/collectors/python.d.plugin/python.d.conf
+++ b/collectors/python.d.plugin/python.d.conf
@@ -36,8 +36,6 @@ apache_cache: no
 # ceph: yes
 chrony: no
 # couchdb: yes
-# cpufreq: yes
-# cpuidle: yes
 # dns_query_time: yes
 # dnsdist: yes
 # dockerd: yes
@@ -60,10 +58,8 @@ gunicorn_log: no
 # icecast: yes
 # ipfs: yes
 # isc_dhcpd: yes
-# linux_power_supply: yes
 # litespeed: yes
 logind: no
-# mdstat: yes
 # megacli: yes
 # memcached: yes
 # mongodb: yes
diff --git a/collectors/python.d.plugin/python.d.plugin b/collectors/python.d.plugin/python.d.plugin
deleted file mode 100644
index 48535f53e..000000000
--- a/collectors/python.d.plugin/python.d.plugin
+++ /dev/null
@@ -1,721 +0,0 @@
-#!/usr/bin/env bash
-'''':; exec "$(command -v python || command -v python3 || command -v python2 ||
-echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # '''
-
-# -*- coding: utf-8 -*-
-# Description:
-# Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-
-import collections
-import copy
-import gc
-import multiprocessing
-import os
-import re
-import sys
-import time
-import threading
-import types
-
-PY_VERSION = sys.version_info[:2]
-
-if PY_VERSION > (3, 1):
-    from importlib.machinery import SourceFileLoader
-else:
-    from imp import load_source as SourceFileLoader
-
-
-ENV_NETDATA_USER_CONFIG_DIR = 'NETDATA_USER_CONFIG_DIR'
-ENV_NETDATA_STOCK_CONFIG_DIR = 'NETDATA_STOCK_CONFIG_DIR'
-ENV_NETDATA_PLUGINS_DIR = 'NETDATA_PLUGINS_DIR'
-ENV_NETDATA_UPDATE_EVERY = 'NETDATA_UPDATE_EVERY'
-
-
-def dirs():
-    user_config = os.getenv(
-        ENV_NETDATA_USER_CONFIG_DIR,
-        '/etc/netdata',
-    )
-    stock_config = os.getenv(
-        ENV_NETDATA_STOCK_CONFIG_DIR,
-        '/usr/lib/netdata/conf.d',
-    )
-    modules_user_config = os.path.join(user_config, 'python.d')
-    modules_stock_config = os.path.join(stock_config, 'python.d')
-
-    modules = os.path.abspath(
-        os.getenv(
-            ENV_NETDATA_PLUGINS_DIR,
-            os.path.dirname(__file__),
-        ) + '/../python.d'
-    )
-    pythond_packages = os.path.join(modules, 'python_modules')
-
-    return collections.namedtuple(
-        'Dirs',
-        [
-            'user_config',
-            'stock_config',
-            'modules_user_config',
-            'modules_stock_config',
-            'modules',
-            'pythond_packages',
-        ]
-    )(
-        user_config,
-        stock_config,
-        modules_user_config,
-        modules_stock_config,
-        modules,
-        pythond_packages,
-    )
-
-
-DIRS = dirs()
-
-sys.path.append(DIRS.pythond_packages)
-
-
-from bases.collection import safe_print
-from bases.loggers import PythonDLogger
-from bases.loaders import load_config
-
-try:
-    from collections import OrderedDict
-except ImportError:
-    from third_party.ordereddict import OrderedDict
-
-
-END_TASK_MARKER = None
-
-IS_ATTY = sys.stdout.isatty()
-
-PLUGIN_CONF_FILE = 'python.d.conf'
-
-MODULE_SUFFIX = '.chart.py'
-
-OBSOLETED_MODULES = (
-    'apache_cache',        # replaced by web_log
-    'cpuidle',             # rewritten in C
-    'cpufreq',             # rewritten in C
-    'gunicorn_log',        # replaced by web_log
-    'linux_power_supply',  # rewritten in C
-    'nginx_log',           # replaced by web_log
-    'mdstat',              # rewritten in C
-    'sslcheck',            # memory leak bug https://github.com/netdata/netdata/issues/5624
-)
-
-
-AVAILABLE_MODULES = [
-    m[:-len(MODULE_SUFFIX)] for m in sorted(os.listdir(DIRS.modules))
-    if m.endswith(MODULE_SUFFIX) and m[:-len(MODULE_SUFFIX)] not in OBSOLETED_MODULES
-]
-
-PLUGIN_BASE_CONF = {
-    'enabled': True,
-    'default_run': True,
-    'gc_run': True,
-    'gc_interval': 300,
-}
-
-JOB_BASE_CONF = {
-    'update_every': os.getenv(ENV_NETDATA_UPDATE_EVERY, 1),
-    'priority': 60000,
-    'autodetection_retry': 0,
-    'chart_cleanup': 10,
-    'penalty': True,
-    'name': str(),
-}
-
-
-class HeartBeat(threading.Thread):
-    def __init__(self, every):
-        threading.Thread.__init__(self)
-        self.daemon = True
-        self.every = every
-
-    def run(self):
-        while True:
-            time.sleep(self.every)
-            if IS_ATTY:
-                continue
-            safe_print('\n')
-
-
-def load_module(name):
-    abs_path = os.path.join(DIRS.modules, '{0}{1}'.format(name, MODULE_SUFFIX))
-    module = SourceFileLoader(name, abs_path)
-    if isinstance(module, types.ModuleType):
-        return module
-    return module.load_module()
-
-
-def multi_path_find(name, paths):
-    for path in paths:
-        abs_name = os.path.join(path, name)
-        if os.path.isfile(abs_name):
-            return abs_name
-    return ''
-
-
-Task = collections.namedtuple(
-    'Task',
-    [
-        'module_name',
-        'explicitly_enabled',
-    ],
-)
-
-Result = collections.namedtuple(
-    'Result',
-    [
-        'module_name',
-        'jobs_configs',
-    ],
-)
-
-
-class ModuleChecker(multiprocessing.Process):
-    def __init__(
-            self,
-            task_queue,
-            result_queue,
-    ):
-        multiprocessing.Process.__init__(self)
-        self.log = PythonDLogger()
-        self.log.job_name = 'checker'
-        self.task_queue = task_queue
-        self.result_queue = result_queue
-
-    def run(self):
-        self.log.info('starting...')
-        HeartBeat(1).start()
-        while self.run_once():
-            pass
-        self.log.info('terminating...')
-
-    def run_once(self):
-        task = self.task_queue.get()
-
-        if task is END_TASK_MARKER:
-            self.task_queue.task_done()
-            self.result_queue.put(END_TASK_MARKER)
-            return False
-
-        result = self.do_task(task)
-        if result:
-            self.result_queue.put(result)
-        self.task_queue.task_done()
-
-        return True
-
-    def do_task(self, task):
-        self.log.info("{0} : checking".format(task.module_name))
-
-        # LOAD SOURCE
-        module = Module(task.module_name)
-        try:
-            module.load_source()
-        except Exception as error:
-            self.log.warning("{0} : error on loading source : {1}, skipping module".format(
-                task.module_name,
-                error,
-            ))
-            return None
-        else:
-            self.log.info("{0} : source successfully loaded".format(task.module_name))
-
-        if module.is_disabled_by_default() and not task.explicitly_enabled:
-            self.log.info("{0} : disabled by default".format(task.module_name))
-            return None
-
-        # LOAD CONFIG
-        paths = [
-            DIRS.modules_user_config,
-            DIRS.modules_stock_config,
-        ]
-
-        conf_abs_path = multi_path_find(
-            name='{0}.conf'.format(task.module_name),
-            paths=paths,
-        )
-
-        if conf_abs_path:
-            self.log.info("{0} : found config file '{1}'".format(task.module_name, conf_abs_path))
-            try:
-                module.load_config(conf_abs_path)
-            except Exception as error:
-                self.log.warning("{0} : error on loading config : {1}, skipping module".format(
-                    task.module_name, error))
-                return None
-        else:
-            self.log.info("{0} : config was not found in '{1}', using default 1 job config".format(
-                task.module_name, paths))
-
-        # CHECK JOBS
-        jobs = module.create_jobs()
-        self.log.info("{0} : created {1} job(s) from the config".format(task.module_name, len(jobs)))
-
-        successful_jobs_configs = list()
-        for job in jobs:
-            if job.autodetection_retry() > 0:
-                successful_jobs_configs.append(job.config)
-                self.log.info("{0}[{1}]: autodetection job, will be checked in main".format(task.module_name, job.name))
-                continue
-
-            try:
-                job.init()
-            except Exception as error:
-                self.log.warning("{0}[{1}] : unhandled exception on init : {2}, skipping the job)".format(
-                    task.module_name, job.name, error))
-                continue
-
-            try:
-                ok = job.check()
-            except Exception as error:
-                self.log.warning("{0}[{1}] : unhandled exception on check : {2}, skipping the job".format(
-                    task.module_name, job.name, error))
-                continue
-
-            if not ok:
-                self.log.info("{0}[{1}] : check failed, skipping the job".format(task.module_name, job.name))
-                continue
-
-            self.log.info("{0}[{1}] : check successful".format(task.module_name, job.name))
-
-            job.config['autodetection_retry'] = job.config['update_every']
-            successful_jobs_configs.append(job.config)
-
-        if not successful_jobs_configs:
-            self.log.info("{0} : all jobs failed, skipping module".format(task.module_name))
-            return None
-
-        return Result(module.source.__name__, successful_jobs_configs)
-
-
-class JobConf(OrderedDict):
-    def __init__(self, *args):
-        OrderedDict.__init__(self, *args)
-
-    def set_defaults_from_module(self, module):
-        for k in [k for k in JOB_BASE_CONF if hasattr(module, k)]:
-            self[k] = getattr(module, k)
-
-    def set_defaults_from_config(self, module_config):
-        for k in [k for k in JOB_BASE_CONF if k in module_config]:
-            self[k] = module_config[k]
-
-    def set_job_name(self, name):
-        self['job_name'] = re.sub(r'\s+', '_', name)
-
-    def set_override_name(self, name):
-        self['override_name'] = re.sub(r'\s+', '_', name)
-
-    def as_dict(self):
-        return copy.deepcopy(OrderedDict(self))
-
-
-class Job:
-    def __init__(
-            self,
-            service,
-            module_name,
-            config,
-    ):
-        self.service = service
-        self.config = config
-        self.module_name = module_name
-        self.name = config['job_name']
-        self.override_name = config['override_name']
-        self.wrapped = None
-
-    def init(self):
-        self.wrapped = self.service(configuration=self.config.as_dict())
-
-    def check(self):
-        return self.wrapped.check()
-
-    def post_check(self, min_update_every):
-        if self.wrapped.update_every < min_update_every:
-            self.wrapped.update_every = min_update_every
-
-    def create(self):
-        return self.wrapped.create()
-
-    def autodetection_retry(self):
-        return self.config['autodetection_retry']
-
-    def run(self):
-        self.wrapped.run()
-
-
-class Module:
-    def __init__(self, name):
-        self.name = name
-        self.source = None
-        self.config = dict()
-
-    def is_disabled_by_default(self):
-        return bool(getattr(self.source, 'disabled_by_default', False))
-
-    def load_source(self):
-        self.source = load_module(self.name)
-
-    def load_config(self, abs_path):
-        self.config = load_config(abs_path) or dict()
-
-    def gather_jobs_configs(self):
-        job_names = [v for v in self.config if isinstance(self.config[v], dict)]
-
-        if len(job_names) == 0:
-            job_conf = JobConf(JOB_BASE_CONF)
-            job_conf.set_defaults_from_module(self.source)
-            job_conf.update(self.config)
-            job_conf.set_job_name(self.name)
-            job_conf.set_override_name(job_conf.pop('name'))
-            return [job_conf]
-
-        configs = list()
-        for job_name in job_names:
-            raw_job_conf = self.config[job_name]
-            job_conf = JobConf(JOB_BASE_CONF)
-            job_conf.set_defaults_from_module(self.source)
-            job_conf.set_defaults_from_config(self.config)
-            job_conf.update(raw_job_conf)
-            job_conf.set_job_name(job_name)
-            job_conf.set_override_name(job_conf.pop('name'))
-            configs.append(job_conf)
-
-        return configs
-
-    def create_jobs(self, jobs_conf=None):
-        return [Job(self.source.Service, self.name, conf) for conf in jobs_conf or self.gather_jobs_configs()]
-
-
-class JobRunner(threading.Thread):
-    def __init__(self, job):
-        threading.Thread.__init__(self)
-        self.daemon = True
-        self.wrapped = job
-
-    def run(self):
-        self.wrapped.run()
-
-
-class PluginConf(dict):
-    def __init__(self, *args):
-        dict.__init__(self, *args)
-
-    def is_module_enabled(self, module_name, explicit):
-        if module_name in self:
-            return self[module_name]
-        if explicit:
-            return False
-        return self['default_run']
-
-
-class Plugin:
-    def __init__(
-            self,
-            min_update_every=1,
-            modules_to_run=tuple(AVAILABLE_MODULES),
-    ):
-        self.log = PythonDLogger()
-        self.config = PluginConf(PLUGIN_BASE_CONF)
-        self.task_queue = multiprocessing.JoinableQueue()
-        self.result_queue = multiprocessing.JoinableQueue()
-        self.min_update_every = min_update_every
-        self.modules_to_run = modules_to_run
-        self.auto_detection_jobs = list()
-        self.tasks = list()
-        self.results = list()
-        self.checked_jobs = collections.defaultdict(list)
-        self.runs = 0
-
-    @staticmethod
-    def shutdown():
-        safe_print('DISABLE')
-        exit(0)
-
-    def run(self):
-        jobs = self.create_jobs()
-        if not jobs:
-            return
-
-        for job in self.prepare_jobs(jobs):
-            self.log.info('{0}[{1}] : started in thread'.format(job.module_name, job.name))
-            JobRunner(job).start()
-
-        self.serve()
-
-    def enqueue_tasks(self):
-        for task in self.tasks:
-            self.task_queue.put(task)
-        self.task_queue.put(END_TASK_MARKER)
-
-    def dequeue_results(self):
-        while True:
-            result = self.result_queue.get()
-            self.result_queue.task_done()
-            if result is END_TASK_MARKER:
-                break
-            self.results.append(result)
-
-    def load_config(self):
-        paths = [
-            DIRS.user_config,
-            DIRS.stock_config,
-        ]
-
-        self.log.info("checking for config in {0}".format(paths))
-        abs_path = multi_path_find(name=PLUGIN_CONF_FILE, paths=paths)
-        if not abs_path:
-            self.log.warning('config was not found, using defaults')
-            return True
-
-        self.log.info("config found, loading config '{0}'".format(abs_path))
-        try:
-            config = load_config(abs_path) or dict()
-        except Exception as error:
-            self.log.error('error on loading config : {0}'.format(error))
-            return False
-
-        self.log.info('config successfully loaded')
-        self.config.update(config)
-        return True
-
-    def setup(self):
-        self.log.info('starting setup')
-        if not self.load_config():
-            return False
-
-        if not self.config['enabled']:
-            self.log.info('disabled in configuration file')
-            return False
-
-        for mod in self.modules_to_run:
-            if self.config.is_module_enabled(mod, False):
-                task = Task(mod, self.config.is_module_enabled(mod, True))
-                self.tasks.append(task)
-            else:
-                self.log.info("{0} : disabled in configuration file".format(mod))
-
-        if not self.tasks:
-            self.log.info('no modules to run')
-            return False
-
-        worker = ModuleChecker(self.task_queue, self.result_queue)
-        self.log.info('starting checker process ({0} module(s) to check)'.format(len(self.tasks)))
-        worker.start()
-
-        # TODO: timeouts?
-        self.enqueue_tasks()
-        self.task_queue.join()
-        self.dequeue_results()
-        self.result_queue.join()
-        self.task_queue.close()
-        self.result_queue.close()
-        self.log.info('stopping checker process')
-        worker.join()
-
-        if not self.results:
-            self.log.info('no modules to run')
-            return False
-
-        self.log.info("setup complete, {0} active module(s) : '{1}'".format(
-            len(self.results),
-            [v.module_name for v in self.results])
-        )
-
-        return True
-
-    def create_jobs(self):
-        jobs = list()
-        for result in self.results:
-            module = Module(result.module_name)
-            try:
-                module.load_source()
-            except Exception as error:
-                self.log.warning("{0} : error on loading module source : {1}, skipping module".format(
-                    result.module_name, error))
-                continue
-
-            module_jobs = module.create_jobs(result.jobs_configs)
-            self.log.info("{0} : created {1} job(s)".format(module.name, len(module_jobs)))
-            jobs.extend(module_jobs)
-
-        return jobs
-
-    def prepare_jobs(self, jobs):
-        prepared = list()
-
-        for job in jobs:
-            check_name = job.override_name or job.name
-            if check_name in self.checked_jobs[job.module_name]:
-                self.log.info('{0}[{1}] : already served by another job, skipping the job'.format(
-                    job.module_name, job.name))
-                continue
-
-            try:
-                job.init()
-            except Exception as error:
-                self.log.warning("{0}[{1}] : unhandled exception on init : {2}, skipping the job".format(
-                    job.module_name, job.name, error))
-                continue
-
-            self.log.info("{0}[{1}] : init successful".format(job.module_name, job.name))
-
-            try:
-                ok = job.check()
-            except Exception as error:
-                self.log.warning("{0}[{1}] : unhandled exception on check : {2}, skipping the job".format(
-                    job.module_name, job.name, error))
-                continue
-
-            if not ok:
-                self.log.info('{0}[{1}] : check failed'.format(job.module_name, job.name))
-                if job.autodetection_retry() > 0:
-                    self.log.info('{0}[{1}] : will recheck every {2} second(s)'.format(
-                        job.module_name, job.name, job.autodetection_retry()))
-                    self.auto_detection_jobs.append(job)
-                continue
-
-            self.log.info('{0}[{1}] : check successful'.format(job.module_name, job.name))
-
-            job.post_check(int(self.min_update_every))
-
-            if not job.create():
-                self.log.info('{0}[{1}] : create failed'.format(job.module_name, job.name))
-
-            self.checked_jobs[job.module_name].append(check_name)
-            prepared.append(job)
-
-        return prepared
-
-    def serve(self):
-        gc_run = self.config['gc_run']
-        gc_interval = self.config['gc_interval']
-
-        while True:
-            self.runs += 1
-
-            # threads: main + heartbeat
-            if threading.active_count() <= 2 and not self.auto_detection_jobs:
-                return
-
-            time.sleep(1)
-
-            if gc_run and self.runs % gc_interval == 0:
-                v = gc.collect()
-                self.log.debug('GC collection run result: {0}'.format(v))
-
-            self.auto_detection_jobs = [job for job in self.auto_detection_jobs if not self.retry_job(job)]
-
-    def retry_job(self, job):
-        stop_retrying = True
-        retry_later = False
-
-        if self.runs % job.autodetection_retry() != 0:
-            return retry_later
-
-        check_name = job.override_name or job.name
-        if check_name in self.checked_jobs[job.module_name]:
-            self.log.info("{0}[{1}]: already served by another job, give up on retrying".format(
-                job.module_name, job.name))
-            return stop_retrying
-
-        try:
-            ok = job.check()
-        except Exception as error:
-            self.log.warning("{0}[{1}] : unhandled exception on recheck : {2}, give up on retrying".format(
-                job.module_name, job.name, error))
-            return stop_retrying
-
-        if not ok:
-            self.log.info('{0}[{1}] : recheck failed, will retry in {2} second(s)'.format(
-                job.module_name, job.name, job.autodetection_retry()))
-            return retry_later
-        self.log.info('{0}[{1}] : recheck successful'.format(job.module_name, job.name))
-
-        if not job.create():
-            return stop_retrying
-
-        job.post_check(int(self.min_update_every))
-        self.checked_jobs[job.module_name].append(check_name)
-        return stop_retrying
-
-
-def parse_cmd():
-    opts = sys.argv[:][1:]
-    debug = False
-    trace = False
-    update_every = 1
-    modules_to_run = list()
-
-    v = next((opt for opt in opts if opt.isdigit() and int(opt) >= 1), None)
-    if v:
-        update_every = v
-        opts.remove(v)
-    if 'debug' in opts:
-        debug = True
-        opts.remove('debug')
-    if 'trace' in opts:
-        trace = True
-        opts.remove('trace')
-    if opts:
-        modules_to_run = list(opts)
-
-    return collections.namedtuple(
-        'CMD',
-        [
-            'update_every',
-            'debug',
-            'trace',
-            'modules_to_run',
-        ],
-    )(
-        update_every,
-        debug,
-        trace,
-        modules_to_run,
-    )
-
-
-def main():
-    cmd = parse_cmd()
-    logger = PythonDLogger()
-
-    if cmd.debug:
-        logger.logger.severity = 'DEBUG'
-    if cmd.trace:
-        logger.log_traceback = True
-
-    logger.info('using python v{0}'.format(PY_VERSION[0]))
-
-    unknown_modules = set(cmd.modules_to_run) - set(AVAILABLE_MODULES)
-    if unknown_modules:
-        logger.error('unknown modules : {0}'.format(sorted(list(unknown_modules))))
-        safe_print('DISABLE')
-        return
-
-    plugin = Plugin(
-        cmd.update_every,
-        cmd.modules_to_run or AVAILABLE_MODULES,
-    )
-
-    HeartBeat(1).start()
-
-    if not plugin.setup():
-        safe_print('DISABLE')
-        return
-
-    plugin.run()
-    logger.info('exiting from main...')
-    plugin.shutdown()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/ExecutableService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/ExecutableService.py
index 72f9ff714..f63cb7c2f 100644
--- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/ExecutableService.py
+++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/ExecutableService.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description:
 # Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/LogService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/LogService.py
index 82c8d7d95..a55e33f52 100644
--- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/LogService.py
+++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/LogService.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description:
 # Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from glob import glob
diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/MySQLService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/MySQLService.py
index a09041ca4..354d09ad8 100644
--- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/MySQLService.py
+++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/MySQLService.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description:
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from sys import exc_info
diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SimpleService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SimpleService.py
index 4c1d6ba64..088bf119e 100644
--- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SimpleService.py
+++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SimpleService.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description:
 # Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 
diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SocketService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SocketService.py
index f5e6380b8..c8b2724da 100644
--- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SocketService.py
+++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/SocketService.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description:
 # Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import socket
diff --git a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/UrlService.py b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/UrlService.py
index 011efff9e..1e87c9948 100644
--- a/collectors/python.d.plugin/python_modules/bases/FrameworkServices/UrlService.py
+++ b/collectors/python.d.plugin/python_modules/bases/FrameworkServices/UrlService.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description:
 # Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import urllib3
diff --git a/collectors/python.d.plugin/python_modules/bases/charts.py b/collectors/python.d.plugin/python_modules/bases/charts.py
index 0a0719056..008ebe24e 100644
--- a/collectors/python.d.plugin/python_modules/bases/charts.py
+++ b/collectors/python.d.plugin/python_modules/bases/charts.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description:
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from bases.collection import safe_print
diff --git a/collectors/python.d.plugin/python_modules/bases/collection.py b/collectors/python.d.plugin/python_modules/bases/collection.py
index 7a3390bc6..4c25aafd5 100644
--- a/collectors/python.d.plugin/python_modules/bases/collection.py
+++ b/collectors/python.d.plugin/python_modules/bases/collection.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description:
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
diff --git a/collectors/python.d.plugin/python_modules/bases/loaders.py b/collectors/python.d.plugin/python_modules/bases/loaders.py
index d8b2ec815..095f3a3b1 100644
--- a/collectors/python.d.plugin/python_modules/bases/loaders.py
+++ b/collectors/python.d.plugin/python_modules/bases/loaders.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description:
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 
diff --git a/collectors/python.d.plugin/python_modules/bases/loggers.py b/collectors/python.d.plugin/python_modules/bases/loggers.py
index aaf974952..9bf2e086b 100644
--- a/collectors/python.d.plugin/python_modules/bases/loggers.py
+++ b/collectors/python.d.plugin/python_modules/bases/loggers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description:
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import logging
diff --git a/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py b/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py
index a8f72592f..d947121d6 100644
--- a/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py
+++ b/collectors/python.d.plugin/rabbitmq/rabbitmq.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: rabbitmq netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from json import loads
diff --git a/collectors/python.d.plugin/redis/redis.chart.py b/collectors/python.d.plugin/redis/redis.chart.py
index 9dbb2c164..40ccb5274 100644
--- a/collectors/python.d.plugin/redis/redis.chart.py
+++ b/collectors/python.d.plugin/redis/redis.chart.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: redis netdata python.d module
 # Author: Pawel Krupa (paulfantom)
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import re
diff --git a/collectors/python.d.plugin/rethinkdbs/rethinkdbs.chart.py b/collectors/python.d.plugin/rethinkdbs/rethinkdbs.chart.py
index da2f26f4a..ee2fb68b3 100644
--- a/collectors/python.d.plugin/rethinkdbs/rethinkdbs.chart.py
+++ b/collectors/python.d.plugin/rethinkdbs/rethinkdbs.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: rethinkdb netdata python.d module
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 try:
diff --git a/collectors/python.d.plugin/smartd_log/smartd_log.chart.py b/collectors/python.d.plugin/smartd_log/smartd_log.chart.py
index 871025a47..fe1d6324b 100644
--- a/collectors/python.d.plugin/smartd_log/smartd_log.chart.py
+++ b/collectors/python.d.plugin/smartd_log/smartd_log.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: smart netdata python.d module
-# Author: l2isbad, vorph1
+# Author: ilyam8, vorph1
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
diff --git a/collectors/python.d.plugin/tor/tor.chart.py b/collectors/python.d.plugin/tor/tor.chart.py
index dd61e6e9e..c6378ba5c 100644
--- a/collectors/python.d.plugin/tor/tor.chart.py
+++ b/collectors/python.d.plugin/tor/tor.chart.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: adaptec_raid netdata python.d module
 # Author: Federico Ceratto <federico.ceratto@gmail.com>
-# Author: Ilya Mashchenko (l2isbad)
+# Author: Ilya Mashchenko (ilyam8)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 
diff --git a/collectors/python.d.plugin/varnish/varnish.chart.py b/collectors/python.d.plugin/varnish/varnish.chart.py
index da6781576..70af50ccb 100644
--- a/collectors/python.d.plugin/varnish/varnish.chart.py
+++ b/collectors/python.d.plugin/varnish/varnish.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description:  varnish netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import re
diff --git a/collectors/python.d.plugin/web_log/web_log.chart.py b/collectors/python.d.plugin/web_log/web_log.chart.py
index 992790462..6d6a261c4 100644
--- a/collectors/python.d.plugin/web_log/web_log.chart.py
+++ b/collectors/python.d.plugin/web_log/web_log.chart.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Description: web log netdata python.d module
-# Author: l2isbad
+# Author: ilyam8
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import bisect
diff --git a/collectors/python.d.plugin/web_log/web_log.conf b/collectors/python.d.plugin/web_log/web_log.conf
index 0ac17f665..220b7c283 100644
--- a/collectors/python.d.plugin/web_log/web_log.conf
+++ b/collectors/python.d.plugin/web_log/web_log.conf
@@ -117,6 +117,21 @@
 #  custom_log_format:
 #     pattern: '(?P<vhost>[a-zA-Z\d.-_]+) (?P<port>\d+) (?P<address>[\da-f.:]+) \[.*\] "(?P<method>[A-Z]+)[^"]*" (?P<code>[1-9]\d{2}) (?P<bytes_sent>\d+) (?P<resp_length>\d+) (?P<resp_time>\d+)'
 
+# in nginx: ($host or $http_host give the hostname, $server_port the port number)
+#   log_format netdatavhost '$host $server_port $remote_addr - $remote_user [$time_local] '
+#                      '"$request" $status $body_bytes_sent '
+#                      '$request_length $request_time $upstream_response_time '
+#                      '"$http_referer" "$http_user_agent"';
+#
+#   access_log /var/log/nginx/access.log netdatavhost;
+#
+#   be aware that the access_log directive in a server{} block overwrites the one in http{}, if your vhosts have individual log
+#   files, you have to specify the general netdata log in each vhost as a second access_log statement.
+#
+# and in this file in nginx_log section, add :
+#  custom_log_format:
+#     pattern: '(?P<vhost>[a-zA-Z\d.-_\[\]]+) (?P<port>\d+) (?P<address>[\da-f.:]+) .* "(?P<method>[A-Z]+)[^"]*" (?P<code>[1-9]\d{2}) (?P<bytes_sent>\d+) (?P<resp_length>\d+) (?P<resp_time>\d+)'
+
 # ----------------------------------------------------------------------
 # AUTO-DETECTION JOBS
 # only one of them per web server will run (when they have the same name)