mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 07/10] collectd: add support for rrdtool plugin
Date: Sun, 25 Jan 2015 01:37:23 +0100	[thread overview]
Message-ID: <1422146246-11197-7-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/rrdtool.conf | 10 ++++++++++
 rules/collectd.in                   | 13 +++++++++++++
 rules/collectd.make                 | 10 +++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 generic/etc/collectd.d/rrdtool.conf

diff --git a/generic/etc/collectd.d/rrdtool.conf b/generic/etc/collectd.d/rrdtool.conf
new file mode 100644
index 0000000..1f1190e
--- /dev/null
+++ b/generic/etc/collectd.d/rrdtool.conf
@@ -0,0 +1,10 @@
+LoadPlugin rrdtool
+
+<Plugin rrdtool>
+  DataDir "/var/lib/collectd/rrd"
+  CreateFilesAsync false
+  CacheTimeout 120
+  CacheFlush 900
+  WritesPerSecond 50
+</Plugin>
+
diff --git a/rules/collectd.in b/rules/collectd.in
index c5a29d0..7d2d090 100644
--- a/rules/collectd.in
+++ b/rules/collectd.in
@@ -2,9 +2,22 @@
 
 menuconfig COLLECTD
 	tristate
+	select RRDTOOL if COLLECTD_RRDTOOL
 	prompt "collectd                      "
 	help
 	  collectd is a daemon which collects system performance statistics
 	  periodically and provides mechanisms to store the values in a
 	  variety of ways, for example in RRD files.
 
+if COLLECTD
+
+comment "Write Plugins"
+
+config COLLECTD_RRDTOOL
+	bool
+	prompt "rrdtool"
+	help
+	  With the RRDtool plugin, collectd writes values into a
+	  round-robin database, using librrd.
+
+endif
diff --git a/rules/collectd.make b/rules/collectd.make
index e2268ae..ed5b5c5 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -127,7 +127,7 @@ COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-redis \
 	--disable-routeros \
 	--disable-rrdcached \
-	--disable-rrdtool \
+	--$(call ptx/endis, PTXCONF_COLLECTD_RRDTOOL)-rrdtool \
 	--disable-sensors \
 	--disable-serial \
 	--disable-sigrok \
@@ -195,6 +195,14 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD
 		/etc/systemd/system/multi-user.target.wants/collectd.service \
 	)
 endif
+
+	# Plugins
+
+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)
+endif
+
 	@$(call install_finish, collectd)
 
 	@$(call touch)
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

  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 ` Robert Schwebel [this message]
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 ` [ptxdist] [PATCH 10/10] collectd: add support for logfile plugin Robert Schwebel

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-7-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