opentsdb_arrays_true

Signed-off-by: hwassman <[email protected]>

Author: Helene

source/collector.py

@@ -205,7 +205,7 @@ def _get_sensor_labels(self):
 
 @classattributes(dict(metricsaggr=None, filters=None, grouptags=None,
                       start='', end='', nsamples=0, duration=0,
-                      dsBucketSize=0, dsOp='', rawData=False),
+                      dsBucketSize=0, dsOp='', rawData=False, dpsArrays=False),
                  ['sensor', 'period'])
 class QueryPolicy(object):
 
@@ -372,10 +372,16 @@ def _collect(self):
                 list(self.request.metricsaggr.keys())[0]))
             rows = res.downsampleResults(self.dsInterval, self.request.dsOp)
 
-        columnValues = defaultdict(dict)
-        for row in rows:
-            for value, columnInfo in zip(row.values, res.columnInfos):
-                columnValues[columnInfo][row.tstamp] = value
+        if self.request.dpsArrays:
+            columnValues = defaultdict(list)
+            for row in rows:
+                for value, columnInfo in zip(row.values, res.columnInfos):
+                    columnValues[columnInfo].append([row.tstamp, value])
+        else:   
+            columnValues = defaultdict(dict)
+            for row in rows:
+                for value, columnInfo in zip(row.values, res.columnInfos):
+                    columnValues[columnInfo][row.tstamp] = value
 
         for columnInfo, dps in columnValues.items():
             ts = TimeSeries(columnInfo, dps, self.filtersMap, self.labels)

source/opentsdb.py

@@ -27,7 +27,9 @@
 from collections import defaultdict
 from collector import SensorCollector, QueryPolicy
 from utils import getTimeMultiplier, execution_time, cond_execution_time
-from typing import List
+from typing import List, TypeVar
+
+T = TypeVar('T', dict, list)
 
 
 class OpenTsdbApi(object):
@@ -158,6 +160,9 @@ def build_collector(self, jreq: dict) -> SensorCollector:
                 args['filters'] = filters
                 args['grouptags'] = grouptags
 
+        if 'arrays' in jreq:
+            args['dpsArrays'] = jreq['arrays']
+
         args['rawData'] = q.get('explicitTags', False)
 
         args['sensor'] = sensor
@@ -379,7 +384,7 @@ def GET(self, **params):
     @cherrypy.config(**{'tools.json_in.force': False})
     @cherrypy.tools.json_in()  # @UndefinedVariable
     @cherrypy.tools.json_out()  # @UndefinedVariable
-    def POST(self):
+    def POST(self,**params):
         ''' Process POST. tools.json_in.force is set to False for
         compatability between versions of grafana < 3 and version 3.'''
 
@@ -399,6 +404,9 @@ def POST(self):
                 self.logger.error(MSG['QueryError'].format('empty'))
                 raise cherrypy.HTTPError(400, ERR[400])
 
+            if params and params.get('arrays') == 'true':
+                jreq['arrays'] = True
+
             return self.query(jreq)
 
     def OPTIONS(self):
@@ -446,7 +454,7 @@ def __init__(self, inputQuery, showQuery=False,
         self.tags = tags or defaultdict(list)
         self.aggregatedTags = aggrTags or []
 
-    def to_dict(self, dps: dict = None):
+    def to_dict(self, dps: T = None):
         ''' Converts the SingleTimeSeriesResponse object to dict. '''
         res = self.__dict__
         # Since a single Timeseries might have a huge number of datapoints (dps),