Added test case for and updated reading influx values for multiple target series and no templates - resolves #18

Author: Dan

influxgraph/utils.py

@@ -179,7 +179,7 @@ def _retrieve_field_data(infl_data, path_measurements, measurement,
     if 'value' in  path_measurements[measurement]['fields']:
         _data[metric] = [d['value']
                          for d in infl_data.get_points(measurement)]
-    # Retrieve non value named field data
+    # Retrieve non value named field data with fields from path_measurements
     _retrieve_named_field_data(infl_data, path_measurements,
                                 measurement, _data)
 
@@ -190,18 +190,14 @@ def read_influxdb_values(influxdb_data, paths, path_measurements):
         influxdb_data = [influxdb_data]
     m_path_ind = 0
     seen_measurements = ()
-    for path_ind, infl_data in enumerate(influxdb_data):
-        # Where multiple measurements are queried we have multiple keys
-        # per result set - path index should be result set index
-        # plus measurement key index within result set
-        # unless we have a path_measurements index from template
-        # configuration
-        for key_ind, infl_keys in enumerate(infl_data.keys()):
+    for infl_data in influxdb_data:
+        for infl_keys in infl_data.keys():
             measurement = infl_keys[0]
             if not path_measurements:
-                metric = paths[path_ind + key_ind]
-                _data[metric] = [d['value']
-                                 for d in infl_data.get_points(measurement)]
+                if not measurement in paths:
+                    continue
+                _data[measurement] = [d['value']
+                                      for d in infl_data.get_points(measurement)]
                 continue
             if measurement not in seen_measurements:
                 seen_measurements = set(tuple(seen_measurements) + (measurement,))

tests/test_influxdb_integration.py

@@ -7,6 +7,7 @@
 import time
 import json
 from gzip import GzipFile
+from random import randint
 
 from influxdb import InfluxDBClient
 import influxdb.exceptions
@@ -34,10 +35,10 @@ def setup_db(self):
             "tags": {},
             "time": _time,
             "fields": {
-                "value": 1,
+                "value": self.series_values[i],
                 }
             }
-            for series in self.series
+            for i, series in enumerate(self.series)
             for _time in [
                 (self.end_time - datetime.timedelta(minutes=30)).strftime("%Y-%m-%dT%H:%M:%SZ"),
                 (self.end_time - datetime.timedelta(minutes=2)).strftime("%Y-%m-%dT%H:%M:%SZ"),
@@ -72,6 +73,7 @@ def setUp(self):
                        'integration_test.agg_path.last',
                        'integration_test.agg_path.sum',
                        ]
+        self.series_values = [randint(1,100) for _ in self.series]
         self.setup_db()
         self.finder = influxgraph.InfluxDBFinder(self.config)
 
@@ -108,6 +110,19 @@ def test_configured_deltas(self):
                         msg="Expected exactly %s data points - got %s instead" % (
                             3601, len(data[self.series1])))
 
+    def test_multi_series_data(self):
+        reader = influxgraph.InfluxDBReader(InfluxDBClient(
+            database=self.db_name), '', influxgraph.utils.NullStatsd())
+        nodes = [influxgraph.classes.leaf.InfluxDBLeafNode(path, reader)
+                 for path in self.series]
+        _, data = self.finder.fetch_multi(nodes,
+                                          int(self.start_time.strftime("%s")),
+                                          int(self.end_time.strftime("%s")))
+        self.assertEqual(len(data), len(self.series))
+        for i, node in enumerate(nodes):
+            self.assertTrue(node.path in data)
+            self.assertTrue(data[node.path][-1] == self.series_values[i])
+
     def test_find_branch(self):
         """Test getting branch of metric path"""
         query = Query('fakeyfakeyfakefake')
@@ -170,7 +185,7 @@ def test_find_series_wildcard(self):
         self.assertTrue(self.metric_prefix in nodes,
                         msg="Node list does not contain prefix '%s' - %s" % (
                             self.metric_prefix, nodes))
-    
+
     def test_find_series_glob_expansion(self):
         """Test finding metric prefix by glob expansion"""
         query = Query('{%s}' % (self.metric_prefix))
@@ -286,6 +301,7 @@ def test_multi_fetch_data(self):
         self.assertTrue(len(datapoints) == self.num_datapoints,
                         msg="Expected %s datapoints - got %s" % (
                             self.num_datapoints, len(datapoints),))
+        self.assertTrue(datapoints[-1] == self.series_values[0])
 
     def test_single_fetch_data(self):
         """Test single fetch data for a series by name"""
@@ -337,14 +353,15 @@ def test_multi_fetch_data_multi_series(self):
                           int(self.end_time.strftime("%s")),
                          self.step),
                          msg="Time info and step do not match our requested values")
-        for series in [self.series1, self.series2]:
+        for i, series in enumerate([self.series1, self.series2]):
             self.assertTrue(self.steps == len(data[series]),
                             msg="Expected %s datapoints, got %s instead" % (
                                 self.steps, len(data[series]),))
             datapoints = [v for v in data[series] if v]
             self.assertTrue(len(datapoints) == self.num_datapoints,
                             msg="Expected %s datapoints for series %s - got %s" % (
                                 self.num_datapoints, series, len(datapoints),))
+            self.assertTrue(datapoints[-1] == self.series_values[i])
 
     def test_get_non_existant_series(self):
         """Test single fetch data for a series by name"""
@@ -395,7 +412,7 @@ def test_multi_fetch_data_multi_series_configured_aggregation_functions(self):
         self.assertTrue(nodes[0].path in data,
                         msg="Did not get data for requested series %s - got data for %s" % (
                             nodes[0].path, data.keys(),))
-        for suffix in ['min', 'max', 'last', 'sum']:
+        for i, suffix in enumerate(['min', 'max', 'last', 'sum']):
             series = self.metric_prefix + ".agg_path.%s" % (suffix,)
             nodes = list(self.finder.find_nodes(Query(series)))
             time_info, data = self.finder.fetch_multi(nodes,
@@ -404,6 +421,7 @@ def test_multi_fetch_data_multi_series_configured_aggregation_functions(self):
             self.assertTrue(series in data,
                             msg="Did not get data for requested series %s - got data for %s" % (
                                 series, data.keys(),))
+            self.assertTrue(data[series][-1] == self.series_values[i-4])
 
     def test_memcache_configuration_off_by_default(self):
         self.assertFalse(self.finder.memcache)