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:24 +0100
Message-Id: <1422146246-11197-8-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 08/10] collectd: add support for syslog 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/syslog.conf | 6 ++++++
 rules/collectd.in                  | 8 ++++++++
 rules/collectd.make                | 7 ++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 generic/etc/collectd.d/syslog.conf

diff --git a/generic/etc/collectd.d/syslog.conf b/generic/etc/collectd.d/syslog.conf
new file mode 100644
index 0000000..bd78ae0
--- /dev/null
+++ b/generic/etc/collectd.d/syslog.conf
@@ -0,0 +1,6 @@
+LoadPlugin syslog
+
+<Plugin syslog>
+  LogLevel info
+</Plugin>
+
diff --git a/rules/collectd.in b/rules/collectd.in
index 7d2d090..a93fc56 100644
--- a/rules/collectd.in
+++ b/rules/collectd.in
@@ -11,6 +11,14 @@ menuconfig COLLECTD
 
 if COLLECTD
 
+comment "Logging Plugins"
+
+config COLLECTD_SYSLOG
+	bool
+	prompt "syslog"
+	help
+	  Syslog support for collectd.
+
 comment "Write Plugins"
 
 config COLLECTD_RRDTOOL
diff --git a/rules/collectd.make b/rules/collectd.make
index ed5b5c5..6b90bb7 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -134,7 +134,7 @@ COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-snmp \
 	--disable-statsd \
 	--disable-swap \
-	--disable-syslog \
+	--$(call ptx/endis, PTXCONF_COLLECTD_SYSLOG)-syslog \
 	--disable-table \
 	--disable-tail \
 	--disable-tail_csv \
@@ -203,6 +203,11 @@ ifdef PTXCONF_COLLECTD_RRDTOOL
 	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/rrdtool.conf)
 endif
 
+ifdef PTXCONF_COLLECTD_SYSLOG
+	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/lib/collectd/syslog.so)
+	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.d/syslog.conf)
+endif
+
 	@$(call install_finish, collectd)
 
 	@$(call touch)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de