Merge pull request #304 from Helene/opentsdb24_raw_data

Allow to query raw counters with OpenTSDB version 24

Author: Helene

source/opentsdb.py

@@ -163,7 +163,7 @@ def build_collector(self, jreq: dict) -> SensorCollector:
         if 'arrays' in jreq:
             args['dpsArrays'] = jreq['arrays']
 
-        args['rawData'] = q.get('explicitTags', False)
+        args['rawData'] = q.get('explicitTags', False) or q.get('isCounter', False)
 
         args['sensor'] = sensor
         args['period'] = period

tests/test_opentsdb.py

@@ -104,6 +104,57 @@ def query_arrays_setup():
             }
 
 
+def query_raw_data_setup():
+    global jreq, jreq1, jreq2, jreq3, jreq4
+
+    jreq = {'start': 1739214930519, 'end': 1739215230519, 'arrays': True,
+            'inputQuery': {'aggregator': 'noop', 'downsample': '1m-avg',
+                           'filters': [
+                               {'filter': 'scale-11', 'groupBy': False,
+                                'tagk': 'node', 'type': 'pm_filter'
+                                }],
+                           'metric': 'cpu_system', 'index': 0,
+                           'shouldComputeRate': False, 'isCounter': False
+                           }
+            }
+    jreq1 = {'start': 1739214930519, 'end': 1739215230519, 'arrays': True,
+             'inputQuery': {'aggregator': 'noop', 'downsample': '1m-avg',
+                            'filters': [
+                                {'filter': 'scale-11', 'groupBy': False,
+                                 'tagk': 'node', 'type': 'pm_filter'
+                                 }],
+                            'metric': 'cpu_system', 'index': 0,
+                            'shouldComputeRate': True, 'isCounter': False
+                            }
+             }
+    jreq2 = {'start': 1739214930519, 'end': 1739215230519, 'arrays': True,
+             'inputQuery': {'aggregator': 'noop', 'downsample': '1m-avg',
+                            'filters': [
+                                {'filter': 'scale-11', 'groupBy': False,
+                                 'tagk': 'node', 'type': 'pm_filter'
+                                 }],
+                            'metric': 'cpu_system', 'index': 0,
+                            'shouldComputeRate': True, 'isCounter': True
+                            }
+             }
+    jreq3 = {'start': 1746277483949, 'end': None,
+             'inputQuery': {'aggregator': 'noop', 'downsampleAggregator': 'avg',
+                            'downsampleFillPolicy': 'none',
+                            'metric': 'cpu_contexts',
+                            'disableDownsampling': True,
+                            'explicitTags': True, 'index': 0
+                            }
+             }
+    jreq4 = {'start': 1746277483949, 'end': None,
+             'inputQuery': {'aggregator': 'noop', 'downsampleAggregator': 'avg',
+                            'downsampleFillPolicy': 'none',
+                            'metric': 'cpu_contexts',
+                            'disableDownsampling': True,
+                            'explicitTags': False, 'index': 0
+                            }
+             }
+
+
 @with_setup(my_setup)
 def test_case01():
     ts = TimeSeries(col3, dps2, filtersMap, labels)
@@ -195,3 +246,27 @@ def test_case07():
         assert 'node' in resp[0].get('tags')
         assert isinstance(resp[0].get('dps'), list)
         assert len(resp[0].get('dps')) == 0
+
+
+@with_setup(query_raw_data_setup)
+def test_case08():
+    q = jreq.get('inputQuery')
+    args = {}
+    args['rawData'] = q.get('explicitTags', False) or q.get('isCounter', False)
+    assert args.get('rawData') == False
+    q1 = jreq1.get('inputQuery')
+    args1 = {}
+    args1['rawData'] = q1.get('explicitTags', False) or q1.get('isCounter', False)
+    assert args1.get('rawData') == False
+    q2 = jreq2.get('inputQuery')
+    args2 = {}
+    args2['rawData'] = q2.get('explicitTags', False) or q2.get('isCounter', False)
+    assert args2.get('rawData') == True
+    q3 = jreq3.get('inputQuery')
+    args3 = {}
+    args3['rawData'] = q3.get('explicitTags', False) or q3.get('isCounter', False)
+    assert args3.get('rawData') == True
+    q4 = jreq4.get('inputQuery')
+    args4 = {}
+    args4['rawData'] = q4.get('explicitTags', False) or q4.get('isCounter', False)
+    assert args4.get('rawData') == False