Merge tag 'upstream/1.3.0+dfsg'

Upstream version 1.3.0+dfsg

1 files changed, 162 insertions, 14 deletions

diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in
index 1938bd940..9356f60e2 100644
--- a/conf.d/Makefile.in
+++ b/conf.d/Makefile.in
@@ -80,7 +80,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = conf.d
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(dist_config_DATA)
+	$(dist_chartsconfig_DATA) $(dist_config_DATA) \
+	$(dist_healthconfig_DATA) $(dist_nodeconfig_DATA) \
+	$(dist_pythonconfig_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/configure.ac
@@ -136,8 +138,12 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(configdir)"
-DATA = $(dist_config_DATA)
+am__installdirs = "$(DESTDIR)$(chartsconfigdir)" \
+	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(healthconfigdir)" \
+	"$(DESTDIR)$(nodeconfigdir)" "$(DESTDIR)$(pythonconfigdir)"
+DATA = $(dist_chartsconfig_DATA) $(dist_config_DATA) \
+	$(dist_healthconfig_DATA) $(dist_nodeconfig_DATA) \
+	$(dist_pythonconfig_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -261,6 +267,8 @@ pluginsdir = @pluginsdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+pythondir = @pythondir@
+registrydir = @registrydir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -279,6 +287,54 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 dist_config_DATA = \
 	apps_groups.conf \
 	charts.d.conf \
+	python.d.conf \
+	$(NULL)
+
+chartsconfigdir = $(configdir)/charts.d
+dist_chartsconfig_DATA = \
+	$(NULL)
+
+nodeconfigdir = $(configdir)/node.d
+dist_nodeconfig_DATA = \
+	$(NULL)
+
+pythonconfigdir = $(configdir)/python.d
+dist_pythonconfig_DATA = \
+	python.d/apache.conf \
+	python.d/apache_cache.conf \
+	python.d/cpufreq.conf \
+	python.d/dovecot.conf \
+	python.d/example.conf \
+	python.d/exim.conf \
+	python.d/hddtemp.conf \
+	python.d/ipfs.conf \
+	python.d/memcached.conf \
+	python.d/mysql.conf \
+	python.d/nginx.conf \
+	python.d/nginx_log.conf \
+	python.d/phpfpm.conf \
+	python.d/postfix.conf \
+	python.d/redis.conf \
+	python.d/sensors.conf \
+	python.d/squid.conf \
+	python.d/tomcat.conf \
+	$(NULL)
+
+healthconfigdir = $(configdir)/health.d
+dist_healthconfig_DATA = \
+	health.d/apache.conf \
+	health.d/cpu.conf \
+	health.d/disks.conf \
+	health.d/entropy.conf \
+	health.d/memcached.conf \
+	health.d/named.conf \
+	health.d/net.conf \
+	health.d/nginx.conf \
+	health.d/qos.conf \
+	health.d/ram.conf \
+	health.d/redis.conf \
+	health.d/swap.conf \
+	health.d/squid.conf \
 	$(NULL)
 
 all: all-am
@@ -314,6 +370,27 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+install-dist_chartsconfigDATA: $(dist_chartsconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_chartsconfig_DATA)'; test -n "$(chartsconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(chartsconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(chartsconfigdir)" || 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)$(chartsconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(chartsconfigdir)" || exit $$?; \
+	done
+
+uninstall-dist_chartsconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_chartsconfig_DATA)'; test -n "$(chartsconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(chartsconfigdir)'; $(am__uninstall_files_from_dir)
 install-dist_configDATA: $(dist_config_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(dist_config_DATA)'; test -n "$(configdir)" || list=; \
@@ -335,6 +412,69 @@ uninstall-dist_configDATA:
 	@list='$(dist_config_DATA)'; test -n "$(configdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+install-dist_healthconfigDATA: $(dist_healthconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_healthconfig_DATA)'; test -n "$(healthconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(healthconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(healthconfigdir)" || 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)$(healthconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(healthconfigdir)" || exit $$?; \
+	done
+
+uninstall-dist_healthconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_healthconfig_DATA)'; test -n "$(healthconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(healthconfigdir)'; $(am__uninstall_files_from_dir)
+install-dist_nodeconfigDATA: $(dist_nodeconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_nodeconfig_DATA)'; test -n "$(nodeconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(nodeconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(nodeconfigdir)" || 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)$(nodeconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(nodeconfigdir)" || exit $$?; \
+	done
+
+uninstall-dist_nodeconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_nodeconfig_DATA)'; test -n "$(nodeconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(nodeconfigdir)'; $(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)
 tags TAGS:
 
 ctags CTAGS:
@@ -376,7 +516,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(configdir)"; do \
+	for dir in "$(DESTDIR)$(chartsconfigdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(healthconfigdir)" "$(DESTDIR)$(nodeconfigdir)" "$(DESTDIR)$(pythonconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -430,7 +570,9 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_configDATA
+install-data-am: install-dist_chartsconfigDATA install-dist_configDATA \
+	install-dist_healthconfigDATA install-dist_nodeconfigDATA \
+	install-dist_pythonconfigDATA
 
 install-dvi: install-dvi-am
 
@@ -474,21 +616,27 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_configDATA
+uninstall-am: uninstall-dist_chartsconfigDATA \
+	uninstall-dist_configDATA uninstall-dist_healthconfigDATA \
+	uninstall-dist_nodeconfigDATA uninstall-dist_pythonconfigDATA
 
 .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_configDATA 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_configDATA
+	install-data-am install-dist_chartsconfigDATA \
+	install-dist_configDATA install-dist_healthconfigDATA \
+	install-dist_nodeconfigDATA install-dist_pythonconfigDATA \
+	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_chartsconfigDATA \
+	uninstall-dist_configDATA uninstall-dist_healthconfigDATA \
+	uninstall-dist_nodeconfigDATA uninstall-dist_pythonconfigDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.