From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
From: Robert Schwebel <r.schwebel@pengutronix.de>
Date: Thu,  5 Feb 2015 14:18:16 +0100
Message-Id: <1423142299-31018-2-git-send-email-r.schwebel@pengutronix.de>
In-Reply-To: <1423142299-31018-1-git-send-email-r.schwebel@pengutronix.de>
References: <1423142299-31018-1-git-send-email-r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCHv4 2/5] collectd: add support for rrdtool 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>
---
Changes since v3:
* none

Changes since v2:
* none

Changes since v1:
* use modern enable/disable method, similar to gstreamer

 generic/etc/collectd.d/rrdtool.conf | 10 ++++++++++
 rules/collectd.in                   | 13 +++++++++++++
 rules/collectd.make                 |  3 ++-
 3 files changed, 25 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 855cfef..37bfef0 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -29,6 +29,8 @@ COLLECTD_LICENSE	:= GPL2
 # Prepare
 # ----------------------------------------------------------------------------
 
+COLLECTD_ENABLE-$(PTXCONF_COLLECTD_RRDTOOL)	+= rrdtool
+
 #
 # autoconf
 #
@@ -127,7 +129,6 @@ COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	--disable-redis \
 	--disable-routeros \
 	--disable-rrdcached \
-	--disable-rrdtool \
 	--disable-sensors \
 	--disable-serial \
 	--disable-sigrok \
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de