Merge pull request #151 from Helene/orig_counter

Allow to query original counters

Author: Helene

source/collector.py

@@ -167,7 +167,7 @@ def _get_all_filters(self):
 
 @classattributes(dict(metricsaggr=None, filters=None, grouptags=None,
                       start='', end='', nsamples=0, duration=0,
-                      dsBucketSize=0, dsOp=''),
+                      dsBucketSize=0, dsOp='', rowData=False),
                  ['sensor', 'period'])
 class QueryPolicy(object):
 
@@ -182,6 +182,7 @@ def get_zimon_query(self):
         '''Returns zimon query string '''
         query = Query(includeDiskData=self.md.includeDiskData)
         query.normalize_rates = False
+        query.rowData = self.rowData
 
         if not self.metricsaggr and not self.sensor:
             self.logger.error(MSG['QueryError'].

source/opentsdb.py

@@ -134,6 +134,8 @@ def build_collector(self, jreq: dict) -> SensorCollector:
             args['filters'] = filters
             args['grouptags'] = grouptags
 
+        args['rowData'] = q.get('explicitTags', False)
+
         args['sensor'] = sensor
         args['period'] = period
 

source/queryHandler/Query.py

@@ -91,6 +91,7 @@ def __init__(self, metrics=None, bucketsize=1, filters=None, groupby=None, inclu
         self.timeRep = ' now'         # string time representation
         self.measurements = {}
         self.normalize_rates = True
+        self.rowData = False
         self.key = None
         self.sensor = None
 
@@ -199,15 +200,20 @@ def __str__(self):
         else:
             dd = ''
 
+        if self.rowData:
+            raw = '-z'
+        else:
+            raw = ''
+
         if self.sensor is not None:
-            queryString = 'get -j {0} group {1} bucket_size {2} {3}'.format(
-                dd, self.sensor, self.bucket_size, self.timeRep)
+            queryString = 'get -j {0} {1} group {2} bucket_size {3} {4}'.format(
+                dd, raw, self.sensor, self.bucket_size, self.timeRep)
         elif self.key is not None:
-            queryString = 'get -j {0} {1} bucket_size {2} {3}'.format(
-                dd, self.key, self.bucket_size, self.timeRep)
+            queryString = 'get -j {0} {1} {2} bucket_size {3} {4}'.format(
+                dd, raw, self.key, self.bucket_size, self.timeRep)
         else:
-            queryString = 'get -j {0} metrics {1} bucket_size {2} {3}'.format(
-                dd, ','.join(self.metrics), self.bucket_size, self.timeRep)
+            queryString = 'get -j {0} {1} metrics {2} bucket_size {3} {4}'.format(
+                dd, raw, ','.join(self.metrics), self.bucket_size, self.timeRep)
 
         if self.filters:
             queryString += ' from ' + ",".join(self.filters)