Merging upstream version 1.35.0.

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

1 files changed, 0 insertions, 16 deletions

diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
index 38eb90f79..667f1627c 100644
--- a/collectors/python.d.plugin/Makefile.am
+++ b/collectors/python.d.plugin/Makefile.am
@@ -43,41 +43,30 @@ include adaptec_raid/Makefile.inc
 include alarms/Makefile.inc
 include am2320/Makefile.inc
 include anomalies/Makefile.inc
-include apache/Makefile.inc
 include beanstalk/Makefile.inc
 include bind_rndc/Makefile.inc
 include boinc/Makefile.inc
 include ceph/Makefile.inc
 include changefinder/Makefile.inc
 include chrony/Makefile.inc
-include couchdb/Makefile.inc
-include dnsdist/Makefile.inc
-include dns_query_time/Makefile.inc
 include dockerd/Makefile.inc
 include dovecot/Makefile.inc
-include elasticsearch/Makefile.inc
-include energid/Makefile.inc
 include example/Makefile.inc
 include exim/Makefile.inc
 include fail2ban/Makefile.inc
-include freeradius/Makefile.inc
 include gearman/Makefile.inc
 include go_expvar/Makefile.inc
 include haproxy/Makefile.inc
 include hddtemp/Makefile.inc
-include httpcheck/Makefile.inc
 include hpssa/Makefile.inc
 include icecast/Makefile.inc
 include ipfs/Makefile.inc
-include isc_dhcpd/Makefile.inc
 include litespeed/Makefile.inc
 include logind/Makefile.inc
 include megacli/Makefile.inc
 include memcached/Makefile.inc
 include mongodb/Makefile.inc
 include monit/Makefile.inc
-include mysql/Makefile.inc
-include nginx/Makefile.inc
 include nginx_plus/Makefile.inc
 include nvidia_smi/Makefile.inc
 include nsd/Makefile.inc
@@ -85,15 +74,11 @@ include ntpd/Makefile.inc
 include ovpn_status_log/Makefile.inc
 include openldap/Makefile.inc
 include oracledb/Makefile.inc
-include phpfpm/Makefile.inc
-include portcheck/Makefile.inc
 include postfix/Makefile.inc
 include postgres/Makefile.inc
-include powerdns/Makefile.inc
 include proxysql/Makefile.inc
 include puppet/Makefile.inc
 include rabbitmq/Makefile.inc
-include redis/Makefile.inc
 include rethinkdbs/Makefile.inc
 include retroshare/Makefile.inc
 include riakkv/Makefile.inc
@@ -109,7 +94,6 @@ include traefik/Makefile.inc
 include uwsgi/Makefile.inc
 include varnish/Makefile.inc
 include w1sensor/Makefile.inc
-include web_log/Makefile.inc
 include zscores/Makefile.inc
 
 pythonmodulesdir=$(pythondir)/python_modules