Merging upstream version 1.11.0+dfsg.

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

1 files changed, 95 insertions, 55 deletions

diff --git a/python.d/Makefile.am b/collectors/python.d.plugin/Makefile.am
index a5fcc7394..5f214e436 100644
--- a/python.d/Makefile.am
+++ b/collectors/python.d.plugin/Makefile.am
@@ -1,73 +1,110 @@
-MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 CLEANFILES = \
-    python-modules-installer.sh \
+    python.d.plugin \
     $(NULL)
 
 include $(top_srcdir)/build/subst.inc
-
 SUFFIXES = .in
 
+dist_libconfig_DATA = \
+    python.d.conf \
+    $(NULL)
+
+dist_plugins_SCRIPTS = \
+    python.d.plugin \
+    $(NULL)
+
+dist_noinst_DATA = \
+    python.d.plugin.in \
+    README.md \
+    $(NULL)
+
 dist_python_SCRIPTS = \
-    python-modules-installer.sh \
     $(NULL)
 
 dist_python_DATA = \
-    README.md \
-    apache.chart.py \
-    beanstalk.chart.py \
-    bind_rndc.chart.py \
-    ceph.chart.py \
-    chrony.chart.py \
-    couchdb.chart.py \
-    cpufreq.chart.py \
-    cpuidle.chart.py \
-    dns_query_time.chart.py \
-    dnsdist.chart.py \
-    dovecot.chart.py \
-    elasticsearch.chart.py \
-    example.chart.py \
-    exim.chart.py \
-    fail2ban.chart.py \
-    freeradius.chart.py \
-    go_expvar.chart.py \
-    haproxy.chart.py \
-    hddtemp.chart.py \
-    httpcheck.chart.py \
-    icecast.chart.py \
-    ipfs.chart.py \
-    isc_dhcpd.chart.py \
-    mdstat.chart.py \
-    memcached.chart.py \
-    mongodb.chart.py \
-    mysql.chart.py \
-    nginx.chart.py \
-    nginx_plus.chart.py \
-    nsd.chart.py \
-    ntpd.chart.py \
-    ovpn_status_log.chart.py \
-    phpfpm.chart.py \
-    portcheck.chart.py \
-    postfix.chart.py \
-    postgres.chart.py \
-    powerdns.chart.py \
-    rabbitmq.chart.py \
-    redis.chart.py \
-    retroshare.chart.py \
-    samba.chart.py \
-    sensors.chart.py \
-    springboot.chart.py \
-    squid.chart.py \
-    smartd_log.chart.py \
-    tomcat.chart.py \
-    traefik.chart.py \
-    varnish.chart.py \
-    web_log.chart.py \
     $(NULL)
 
+userpythonconfigdir=$(configdir)/python.d
+dist_userpythonconfig_DATA = \
+    $(top_srcdir)/installer/.keep \
+    $(NULL)
+
+pythonconfigdir=$(libconfigdir)/python.d
+dist_pythonconfig_DATA = \
+    $(top_srcdir)/installer/.keep \
+    $(NULL)
+
+include adaptec_raid/Makefile.inc
+include apache/Makefile.inc
+include beanstalk/Makefile.inc
+include bind_rndc/Makefile.inc
+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
+include dovecot/Makefile.inc
+include elasticsearch/Makefile.inc
+include example/Makefile.inc
+include exim/Makefile.inc
+include fail2ban/Makefile.inc
+include freeradius/Makefile.inc
+include go_expvar/Makefile.inc
+include haproxy/Makefile.inc
+include hddtemp/Makefile.inc
+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
+include monit/Makefile.inc
+include mysql/Makefile.inc
+include nginx/Makefile.inc
+include nginx_plus/Makefile.inc
+include nsd/Makefile.inc
+include ntpd/Makefile.inc
+include ovpn_status_log/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 samba/Makefile.inc
+include sensors/Makefile.inc
+include smartd_log/Makefile.inc
+include spigotmc/Makefile.inc
+include springboot/Makefile.inc
+include squid/Makefile.inc
+include tomcat/Makefile.inc
+include traefik/Makefile.inc
+include unbound/Makefile.inc
+include uwsgi/Makefile.inc
+include varnish/Makefile.inc
+include w1sensor/Makefile.inc
+include web_log/Makefile.inc
+
 pythonmodulesdir=$(pythondir)/python_modules
 dist_pythonmodules_DATA = \
     python_modules/__init__.py \
-    python_modules/base.py \
     $(NULL)
 
 basesdir=$(pythonmodulesdir)/bases
@@ -95,6 +132,9 @@ 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