Simplify RRD descriptions.

diff --git a/collecty/plugins/cpu.py b/collecty/plugins/cpu.py
index a88457482758b42bf20154dabfe695a14f2c316f..978d8f91341bfa728e61d2658897cf0ff99e181b 100644 (file)
--- 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 e1b6952e34b106c37c6c9c7c12bfa5465c702214..da2076e41e52786e9d313f10436a63fe406665bc 100644 (file)
--- 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 3502eeb56261018e6b8a7685f25422559f08abb4..103627f6891a129e1e7e41a6fa4004620c3ceec2 100644 (file)
--- 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 64cc820b285a314e373869db7fd6d4fef04295d2..b9fb1979778aff425a79e7c4a1df9ebff1022606 100644 (file)
--- 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