From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 10/10] collectd: add support for logfile plugin
Date: Sun, 25 Jan 2015 01:37:26 +0100 [thread overview]
Message-ID: <1422146246-11197-10-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1422146246-11197-1-git-send-email-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
prev parent reply other threads:[~2015-01-25 0:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-25 0:37 [ptxdist] [PATCH 01/10] rrdtool: version bump 1.4.7 -> 1.4.9 Robert Schwebel
2015-01-25 0:37 ` [ptxdist] [PATCH 02/10] rrdtool: audit configure options Robert Schwebel
2015-01-26 14:12 ` Michael Olbrich
2015-01-25 0:37 ` [ptxdist] [PATCH 03/10] rrdtool: fix libxml2 handling Robert Schwebel
2015-01-26 15:53 ` Michael Olbrich
2015-01-26 16:07 ` Uwe Kleine-König
2015-01-25 0:37 ` [ptxdist] [PATCH 04/10] rrdtool: make graph functionality optional Robert Schwebel
2015-01-26 15:57 ` Michael Olbrich
2015-01-25 0:37 ` [ptxdist] [PATCH 05/10] rrdtool: install multithreaded library Robert Schwebel
2015-01-25 0:37 ` [ptxdist] [PATCH 06/10] collectd: add base functionality Robert Schwebel
2015-01-27 7:31 ` Michael Olbrich
2015-01-27 10:01 ` Robert Schwebel
2015-01-27 10:17 ` Michael Olbrich
2015-01-25 0:37 ` [ptxdist] [PATCH 07/10] collectd: add support for rrdtool plugin Robert Schwebel
2015-01-25 0:37 ` [ptxdist] [PATCH 08/10] collectd: add support for syslog plugin Robert Schwebel
2015-01-25 0:37 ` [ptxdist] [PATCH 09/10] collectd: add support for cpu plugin Robert Schwebel
2015-01-25 0:37 ` Robert Schwebel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422146246-11197-10-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox