New upstream version 1.7.0+dfsgupstream/1.7.0+dfsg

1 files changed, 157 insertions, 42 deletions

diff --git a/conf.d/Makefile.in b/conf.d/Makefile.in
index fb05396fb..7a1e300e0 100644
--- a/conf.d/Makefile.in
+++ b/conf.d/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 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.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 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@
@@ -51,10 +95,10 @@ host_triplet = @host@
 @LINUX_TRUE@    $(NULL)
 
 subdir = conf.d
-DIST_COMMON = $(am__dist_healthconfig_DATA_DIST) \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(dist_chartsconfig_DATA) $(dist_config_DATA) \
-	$(dist_nodeconfig_DATA) $(dist_pythonconfig_DATA) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+	$(am__dist_healthconfig_DATA_DIST) $(dist_nodeconfig_DATA) \
+	$(dist_pythonconfig_DATA) $(dist_statsdconfig_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_c___atomic.m4 \
 	$(top_srcdir)/m4/ax_c__generic.m4 $(top_srcdir)/m4/ax_c_lto.m4 \
@@ -70,8 +114,25 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+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
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -101,27 +162,31 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(chartsconfigdir)" \
 	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(healthconfigdir)" \
-	"$(DESTDIR)$(nodeconfigdir)" "$(DESTDIR)$(pythonconfigdir)"
+	"$(DESTDIR)$(nodeconfigdir)" "$(DESTDIR)$(pythonconfigdir)" \
+	"$(DESTDIR)$(statsdconfigdir)"
 am__dist_healthconfig_DATA_DIST = health.d/apache.conf \
 	health.d/backend.conf health.d/bind_rndc.conf \
 	health.d/elasticsearch.conf health.d/fping.conf \
 	health.d/haproxy.conf health.d/ipfs.conf health.d/ipmi.conf \
-	health.d/isc_dhcpd.conf health.d/mdstat.conf \
-	health.d/memcached.conf health.d/mysql.conf \
-	health.d/named.conf health.d/nginx.conf health.d/postgres.conf \
-	health.d/redis.conf health.d/retroshare.conf \
-	health.d/squid.conf health.d/varnish.conf \
-	health.d/web_log.conf health.d/cpu.conf health.d/disks.conf \
-	health.d/entropy.conf health.d/ipc.conf health.d/memory.conf \
-	health.d/net.conf health.d/netfilter.conf health.d/qos.conf \
-	health.d/ram.conf health.d/softnet.conf health.d/swap.conf \
+	health.d/isc_dhcpd.conf health.d/lighttpd.conf \
+	health.d/mdstat.conf health.d/memcached.conf \
+	health.d/mysql.conf health.d/named.conf health.d/mongodb.conf \
+	health.d/nginx.conf health.d/postgres.conf health.d/redis.conf \
+	health.d/retroshare.conf health.d/squid.conf \
+	health.d/varnish.conf health.d/web_log.conf health.d/zfs.conf \
+	health.d/cpu.conf health.d/disks.conf health.d/entropy.conf \
+	health.d/ipc.conf health.d/memory.conf health.d/net.conf \
+	health.d/netfilter.conf health.d/qos.conf health.d/ram.conf \
+	health.d/softnet.conf health.d/swap.conf \
 	health.d/tcp_resets.conf health.d/udp_errors.conf
 DATA = $(dist_chartsconfig_DATA) $(dist_config_DATA) \
 	$(dist_healthconfig_DATA) $(dist_nodeconfig_DATA) \
-	$(dist_pythonconfig_DATA)
+	$(dist_pythonconfig_DATA) $(dist_statsdconfig_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@
@@ -282,6 +347,7 @@ dist_config_DATA = \
 nodeconfigdir = $(configdir)/node.d
 dist_nodeconfig_DATA = \
     node.d/README.md \
+    node.d/fronius.conf.md \
     node.d/named.conf.md \
     node.d/sma_webbox.conf.md \
     node.d/snmp.conf.md \
@@ -293,12 +359,14 @@ dist_pythonconfig_DATA = \
     python.d/apache_cache.conf \
     python.d/bind_rndc.conf \
     python.d/cpufreq.conf \
+    python.d/dns_query_time.conf \
     python.d/dovecot.conf \
     python.d/elasticsearch.conf \
     python.d/example.conf \
     python.d/exim.conf \
     python.d/fail2ban.conf \
     python.d/freeradius.conf \
+    python.d/go_expvar.conf \
     python.d/haproxy.conf \
     python.d/hddtemp.conf \
     python.d/ipfs.conf \
@@ -313,8 +381,10 @@ dist_pythonconfig_DATA = \
     python.d/phpfpm.conf \
     python.d/postfix.conf \
     python.d/postgres.conf \
+    python.d/rabbitmq.conf \
     python.d/redis.conf \
     python.d/retroshare.conf \
+    python.d/samba.conf \
     python.d/sensors.conf \
     python.d/squid.conf \
     python.d/smartd_log.conf \
@@ -328,12 +398,13 @@ dist_healthconfig_DATA = health.d/apache.conf health.d/backend.conf \
 	health.d/bind_rndc.conf health.d/elasticsearch.conf \
 	health.d/fping.conf health.d/haproxy.conf health.d/ipfs.conf \
 	health.d/ipmi.conf health.d/isc_dhcpd.conf \
-	health.d/mdstat.conf health.d/memcached.conf \
-	health.d/mysql.conf health.d/named.conf health.d/nginx.conf \
+	health.d/lighttpd.conf health.d/mdstat.conf \
+	health.d/memcached.conf health.d/mysql.conf \
+	health.d/named.conf health.d/mongodb.conf health.d/nginx.conf \
 	health.d/postgres.conf health.d/redis.conf \
 	health.d/retroshare.conf health.d/squid.conf \
-	health.d/varnish.conf health.d/web_log.conf $(NULL) \
-	$(am__append_1)
+	health.d/varnish.conf health.d/web_log.conf health.d/zfs.conf \
+	$(NULL) $(am__append_1)
 chartsconfigdir = $(configdir)/charts.d
 dist_chartsconfig_DATA = \
     charts.d/apache.conf \
@@ -357,6 +428,11 @@ dist_chartsconfig_DATA = \
     charts.d/squid.conf \
     $(NULL)
 
+statsdconfigdir = $(configdir)/statsd.d
+dist_statsdconfig_DATA = \
+    statsd.d/example.conf \
+    $(NULL)
+
 all: all-am
 
 .SUFFIXES:
@@ -392,8 +468,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-dist_chartsconfigDATA: $(dist_chartsconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(chartsconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(chartsconfigdir)"
 	@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"; \
@@ -410,8 +489,11 @@ uninstall-dist_chartsconfigDATA:
 	dir='$(DESTDIR)$(chartsconfigdir)'; $(am__uninstall_files_from_dir)
 install-dist_configDATA: $(dist_config_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
 	@list='$(dist_config_DATA)'; test -n "$(configdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -428,8 +510,11 @@ uninstall-dist_configDATA:
 	dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
 install-dist_healthconfigDATA: $(dist_healthconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(healthconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(healthconfigdir)"
 	@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"; \
@@ -446,8 +531,11 @@ uninstall-dist_healthconfigDATA:
 	dir='$(DESTDIR)$(healthconfigdir)'; $(am__uninstall_files_from_dir)
 install-dist_nodeconfigDATA: $(dist_nodeconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(nodeconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(nodeconfigdir)"
 	@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"; \
@@ -464,8 +552,11 @@ uninstall-dist_nodeconfigDATA:
 	dir='$(DESTDIR)$(nodeconfigdir)'; $(am__uninstall_files_from_dir)
 install-dist_pythonconfigDATA: $(dist_pythonconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pythonconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pythonconfigdir)"
 	@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"; \
@@ -480,11 +571,32 @@ uninstall-dist_pythonconfigDATA:
 	@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
-TAGS:
+install-dist_statsdconfigDATA: $(dist_statsdconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_statsdconfig_DATA)'; test -n "$(statsdconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(statsdconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(statsdconfigdir)" || 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)$(statsdconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(statsdconfigdir)" || exit $$?; \
+	done
 
-ctags: CTAGS
-CTAGS:
+uninstall-dist_statsdconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_statsdconfig_DATA)'; test -n "$(statsdconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(statsdconfigdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -521,7 +633,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(chartsconfigdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(healthconfigdir)" "$(DESTDIR)$(nodeconfigdir)" "$(DESTDIR)$(pythonconfigdir)"; do \
+	for dir in "$(DESTDIR)$(chartsconfigdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(healthconfigdir)" "$(DESTDIR)$(nodeconfigdir)" "$(DESTDIR)$(pythonconfigdir)" "$(DESTDIR)$(statsdconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -577,7 +689,7 @@ info-am:
 
 install-data-am: install-dist_chartsconfigDATA install-dist_configDATA \
 	install-dist_healthconfigDATA install-dist_nodeconfigDATA \
-	install-dist_pythonconfigDATA
+	install-dist_pythonconfigDATA install-dist_statsdconfigDATA
 
 install-dvi: install-dvi-am
 
@@ -623,25 +735,28 @@ ps-am:
 
 uninstall-am: uninstall-dist_chartsconfigDATA \
 	uninstall-dist_configDATA uninstall-dist_healthconfigDATA \
-	uninstall-dist_nodeconfigDATA uninstall-dist_pythonconfigDATA
+	uninstall-dist_nodeconfigDATA uninstall-dist_pythonconfigDATA \
+	uninstall-dist_statsdconfigDATA
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-dist_chartsconfigDATA install-dist_configDATA \
-	install-dist_healthconfigDATA install-dist_nodeconfigDATA \
-	install-dist_pythonconfigDATA install-dvi install-dvi-am \
+.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_chartsconfigDATA \
+	install-dist_configDATA install-dist_healthconfigDATA \
+	install-dist_nodeconfigDATA install-dist_pythonconfigDATA \
+	install-dist_statsdconfigDATA 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 uninstall uninstall-am \
+	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
+	uninstall-dist_pythonconfigDATA \
+	uninstall-dist_statsdconfigDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.