From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 1 Sep 2012 18:18:05 +0000 (+0000)
Subject: Simplify RRD descriptions.
X-Git-Tag: 0.0.2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de090041d1b3756a5e7972caef196d587333a661;p=collecty.git

Simplify RRD descriptions.
---

diff --git a/collecty/plugins/cpu.py b/collecty/plugins/cpu.py
index a884574..978d8f9 100644
--- a/collecty/plugins/cpu.py
+++ b/collecty/plugins/cpu.py
@@ -110,17 +110,13 @@ class DataSourceCPU(base.DataSource):
 	templates = [GraphTemplateCPU,]
 
 	rrd_schema = [
-		"DS:user:GAUGE:120:0:U",
-		"DS:nice:GAUGE:120:0:U",
-		"DS:sys:GAUGE:120:0:U",
-		"DS:idle:GAUGE:120:0:U",
-		"DS:wait:GAUGE:120:0:U",
-		"DS:irq:GAUGE:120:0:U",
-		"DS:sirq:GAUGE:120:0:U",
-		"RRA:AVERAGE:0.5:1:2160",
-		"RRA:AVERAGE:0.5:5:2016",
-		"RRA:AVERAGE:0.5:15:2880",
-		"RRA:AVERAGE:0.5:60:8760",
+		"DS:user:DERIVE:0:U",
+		"DS:nice:DERIVE:0:U",
+		"DS:sys:DERIVE:0:U",
+		"DS:idle:DERIVE:0:U",
+		"DS:wait:DERIVE:0:U",
+		"DS:irq:DERIVE:0:U",
+		"DS:sirq:DERIVE:0:U",
 	]
 
 	@classmethod
diff --git a/collecty/plugins/entropy.py b/collecty/plugins/entropy.py
index e1b6952..da2076e 100644
--- a/collecty/plugins/entropy.py
+++ b/collecty/plugins/entropy.py
@@ -60,11 +60,7 @@ class DataSourceEntropy(base.DataSource):
 	templates = [GraphTemplateEntropy,]
 
 	rrd_schema = [
-		"DS:entropy:GAUGE:120:0:U",
-		"RRA:AVERAGE:0.5:1:2160",
-		"RRA:AVERAGE:0.5:5:2016",
-		"RRA:AVERAGE:0.5:15:2880",
-		"RRA:AVERAGE:0.5:60:8760",
+		"DS:entropy:GAUGE:0:U",
 	]
 
 	@classmethod
diff --git a/collecty/plugins/loadavg.py b/collecty/plugins/loadavg.py
index 3502eeb..103627f 100644
--- a/collecty/plugins/loadavg.py
+++ b/collecty/plugins/loadavg.py
@@ -76,13 +76,9 @@ class DataSourceLoadAvg(base.DataSource):
 	templates = [GraphTemplateLoadAvg,]
 
 	rrd_schema = [
-		"DS:load1:GAUGE:120:0:U",
-		"DS:load5:GAUGE:120:0:U",
-		"DS:load15:GAUGE:120:0:U",
-		"RRA:AVERAGE:0.5:1:2160",
-		"RRA:AVERAGE:0.5:5:2016",
-		"RRA:AVERAGE:0.5:15:2880",
-		"RRA:AVERAGE:0.5:60:8760",
+		"DS:load1:GAUGE:0:U",
+		"DS:load5:GAUGE:0:U",
+		"DS:load15:GAUGE:0:U",
 	]
 
 	@classmethod
diff --git a/collecty/plugins/memory.py b/collecty/plugins/memory.py
index 64cc820..b9fb197 100644
--- a/collecty/plugins/memory.py
+++ b/collecty/plugins/memory.py
@@ -94,15 +94,11 @@ class DataSourceMemory(base.DataSource):
 	templates = [GraphTemplateMemory,]
 
 	rrd_schema = [
-		"DS:used:GAUGE:120:0:100",
-		"DS:cached:GAUGE:120:0:100",
-		"DS:buffered:GAUGE:120:0:100",
-		"DS:free:GAUGE:120:0:100",
-		"DS:swap:GAUGE:120:0:100",
-		"RRA:AVERAGE:0.5:1:2160",
-		"RRA:AVERAGE:0.5:5:2016",
-		"RRA:AVERAGE:0.5:15:2880",
-		"RRA:AVERAGE:0.5:60:8760",
+		"DS:used:GAUGE:0:100",
+		"DS:cached:GAUGE:0:100",
+		"DS:buffered:GAUGE:0:100",
+		"DS:free:GAUGE:0:100",
+		"DS:swap:GAUGE:0:100",
 	]
 
 	@classmethod