From 418174a4837a7d356732ee0b036496ea3cd8ff48 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 27 May 2015 23:02:54 +0000 Subject: [PATCH] Expand RRD files to hold data up to five years --- src/collecty/plugins/base.py | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/collecty/plugins/base.py b/src/collecty/plugins/base.py index 048ebcb..476c134 100644 --- a/src/collecty/plugins/base.py +++ b/src/collecty/plugins/base.py @@ -205,9 +205,12 @@ class Object(object): rrd_schema = None # RRA properties. - rra_types = ["AVERAGE", "MIN", "MAX"] - rra_timespans = [3600, 86400, 604800, 2678400, 31622400] - rra_rows = 2880 + rra_types = ("AVERAGE", "MIN", "MAX") + rra_timespans = ( + ("1m", "10d"), + ("1h", "18M"), + ("1d", "5y"), + ) def __init__(self, plugin, *args, **kwargs): self.plugin = plugin @@ -323,21 +326,9 @@ class Object(object): xff = 0.1 - cdp_length = 0 - for rra_timespan in self.rra_timespans: - if (rra_timespan / self.stepsize) < self.rra_rows: - rra_timespan = self.stepsize * self.rra_rows - - if cdp_length == 0: - cdp_length = 1 - else: - cdp_length = rra_timespan // (self.rra_rows * self.stepsize) - - cdp_number = math.ceil(rra_timespan / (cdp_length * self.stepsize)) - - for rra_type in self.rra_types: - schema.append("RRA:%s:%.10f:%d:%d" % \ - (rra_type, xff, cdp_length, cdp_number)) + for steps, rows in self.rra_timespans: + for type in self.rra_types: + schema.append("RRA:%s:%s:%s:%s" % (type, xff, steps, rows)) return schema -- 2.39.2