Added fill previous to queries so that graphite calculations do not break due to gaps in influxdb data caused by finer group by interval than data sampling rate. Updated tests to reflect this.

Author: Dan

influxgraph/classes/finder.py

@@ -382,7 +382,7 @@ def _gen_influxdb_query(self, start_time, end_time, paths, interval):
             aggregation_func, field, field) for field in fields])
         query = 'select %s from %s where (time > %ds and time <= %ds) ' % (
             query_fields, measurement, start_time, end_time,)
-        group_by = ' GROUP BY time(%ss)' % (interval,)
+        group_by = ' GROUP BY time(%ss) fill(previous)' % (interval,)
         if tags:
             _queries = []
             _query = query

influxgraph/classes/reader.py

@@ -81,7 +81,7 @@ def fetch(self, start_time, end_time):
                                'unit_is_ms',
                                'what_is_query_individual_duration'])
         _query = 'select %s(value) as value from "%s" where (time > %ds and ' \
-            'time <= %ds) GROUP BY time(%ss)' % (
+            'time <= %ds) GROUP BY time(%ss) fill(previous)' % (
                 aggregation_func, self.path, start_time, end_time, interval,)
         logger.debug("fetch() path=%s querying influxdb query: '%s'",
                      self.path, _query)

tests/test_influxdb_integration.py

@@ -42,7 +42,7 @@ def setup_db(self):
         self.assertTrue(self.client.write_points(data))
 
     def setUp(self):
-        self.step, self.num_datapoints, self.db_name = 60, 2, 'integration_test'
+        self.step, self.num_datapoints, self.db_name = 60, 31, 'integration_test'
         self.start_time, self.end_time = (datetime.datetime.utcnow() - datetime.timedelta(hours=1)), \
           datetime.datetime.utcnow()
         self.steps = int(round((int(self.end_time.strftime("%s")) - \

tests/test_influxdb_templates_integration.py

@@ -36,7 +36,7 @@ def setUp(self):
         self.measurements = ['cpu', 'memory', 'load', 'iops']
         self.graphite_series = ["%s" % (".".join(
             [self.tags[p] for p in self.paths] + [m])) for m in self.measurements]
-        self.step, self.num_datapoints, self.db_name = 60, 2, 'integration_test'
+        self.step, self.num_datapoints, self.db_name = 60, 31, 'integration_test'
         self.start_time, self.end_time = (datetime.datetime.utcnow() - datetime.timedelta(hours=1)), \
           datetime.datetime.utcnow()
         self.steps = int(round((int(self.end_time.strftime("%s")) - \