From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
From: Robert Schwebel <r.schwebel@pengutronix.de>
Date: Sun, 25 Jan 2015 01:37:26 +0100
Message-Id: <1422146246-11197-10-git-send-email-r.schwebel@pengutronix.de>
In-Reply-To: <1422146246-11197-1-git-send-email-r.schwebel@pengutronix.de>
References: <1422146246-11197-1-git-send-email-r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 10/10] collectd: add support for logfile plugin
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 generic/etc/collectd.d/logfile.conf | 9 +++++++++
 rules/collectd.in                   | 6 ++++++
 rules/collectd.make                 | 7 ++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 generic/etc/collectd.d/logfile.conf

diff --git a/generic/etc/collectd.d/logfile.conf b/generic/etc/collectd.d/logfile.conf
new file mode 100644
index 0000000..2c7549b
--- /dev/null
+++ b/generic/etc/collectd.d/logfile.conf
@@ -0,0 +1,9 @@
+LoadPlugin logfile
+
+<Plugin logfile>
+  LogLevel info
+  File "/var/log/collectd.log"
+  Timestamp true
+  PrintSeverity false
+</Plugin>
+
diff --git a/rules/collectd.in b/rules/collectd.in
index 1039c21..bff2cb5 100644
--- a/rules/collectd.in
+++ b/rules/collectd.in
@@ -13,6 +13,12 @@ if COLLECTD
 
 comment "Logging Plugins"
 
+config COLLECTD_LOGFILE
+	bool
+	prompt "logfile"
+	help
+	  logfile support for collectd.
+
 config COLLECTD_SYSLOG
 	bool
 	prompt "syslog"
diff --git a/rules/collectd.make b/rules/collectd.make
index cc2715c..00c75d4 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -83,7 +83,7 @@ COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-java \
 	--disable-libvirt \
 	--disable-load \
-	--disable-logfile \
+	--$(call ptx/endis, PTXCONF_COLLECTD_LOGFILE)-logfile \
 	--disable-lpar \
 	--disable-lvm \
 	--disable-madwifi \
@@ -203,6 +203,11 @@ ifdef PTXCONF_COLLECTD_CPU
 	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/cpu.conf)
 endif
 
+ifdef PTXCONF_COLLECTD_LOGFILE
+	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/lib/collectd/logfile.so)
+	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/logfile.conf)
+endif
+
 ifdef PTXCONF_COLLECTD_RRDTOOL
 	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/lib/collectd/rrdtool.so)
 	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/rrdtool.conf)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de