add GPFSMmhealth sensor key labels

-backport "Add GPFSMmhealth sensor key identifiers to the Query
API" #242

Author: Helene

source/queryHandler/Query.py

@@ -47,7 +47,8 @@ class Query(object):
                   "gpfs_disk_usage_name", "gpfs_fset_name", "gpfs_fs_name",
                   "mountPoint", "netdev_name", 'diskdev_name', "node", "db_name",
                   "operation", "protocol", "waiters_time_threshold", "export",
-                  "nodegroup", "account", "filesystem", "tct_csap", "tct_operation", "cloud_nodeclass"])
+                  "nodegroup", "account", "filesystem", "tct_csap", "tct_operation", "cloud_nodeclass",
+                  "gpfs_health_component", "gpfs_health_entity"])
 
     DISK_CAP_METRICS = set(["gpfs_disk_disksize", "gpfs_disk_free_fullkb", "gpfs_disk_free_fragkb",
                             "gpfs_pool_disksize", "gpfs_pool_free_fragkb", "gpfs_pool_free_fullkb",
@@ -91,6 +92,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.rawData = False
         self.key = None
         self.sensor = None
 
@@ -188,26 +190,34 @@ def addMeasurement(self, meassure):
     def __str__(self):
         # dd = '-a' if self.includeDiskData else ''
         # Workaround for RTC Defect 280368: Zimon capacity query does not return all results (seen on CNSA)
-        if (self.metrics
-            and any(str(metric) in self.DISK_CAP_METRICS for metric in self.metrics)
-            ) or (self.sensor
-                  and self.sensor in ("GPFSDiskCap", "GPFSPoolCap", "GPFSInodeCap")
-                  ):
-            dd = '-ar'
-        elif self.includeDiskData:
+        dd = ''
+        if self.includeDiskData:
             dd = '-a'
+        if self.metrics:
+            for metric in self.metrics:
+                if any(map(metric.__contains__, self.DISK_CAP_METRICS)):
+                    dd = '-ar'
+                    break
+        elif (self.sensor and self.sensor in ("GPFSDiskCap",
+                                              "GPFSPoolCap",
+                                              "GPFSInodeCap")
+              ):
+            dd = '-ar'
+
+        if self.rawData:
+            raw = '-z'
         else:
-            dd = ''
+            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)