fix issue in parsing sensor config

Author: Helene

source/messages.py

@@ -42,6 +42,7 @@
        'InconsistentParams': 'Received parameters {} inconsistent with request parameters {}',
        'SensorDisabled': 'Sensor for metric {} is disabled',
        'NoData': 'Empty results received',  # Please check the pmcollector is properly configured and running.
+       'NoSensorConfigData': 'No sensor configuration data parsed',
        'NoDataStartNextAttempt': 'No Metadata results received from the pmcollector. Start retry attempt {} in 60s (MAX_ATTEMPTS_COUNT:{})',
        'BucketsizeChange': 'Based on requested downsample value: {} the bucketsize will be set: {}',
        'BucketsizeToPeriod': 'Bucketsize will be set to sensors period: {}',

source/queryHandler/SensorConfig.py

@@ -50,19 +50,11 @@ def readSensorsConfigFromMMSDRFS(logger=None):
         with open(mmsdrfsFile) as f:
             data = data.join([line.split(":")[4] for line in f if "PERFMONCFG" in line])
     except (Exception, IOError) as error:
-        logger.error("failed trying read %s with reason: %s", mmsdrfsFile, error)
+        logger.details("failed trying read %s with reason: %s", mmsdrfsFile, error)
         return []
 
-    sensors = []
-    sensorsStr = data[data.find("sensors"):data.find("smbstat")]
-    sensorsList = re.findall('(?P<sensor>{.*?})', sensorsStr)
-    for sensorString in sensorsList:
-        sensorAttr = re.findall(r'(?P<name>\w+) = (?P<value>\"[\S]*\"|\d+)', sensorString)
-        d = {}
-        for attr in sensorAttr:
-            d[attr[0]] = attr[1]
-        sensors.append(d)
-    return sensors
+    # parse config file in a list of dictionaries format
+    return parseSensorsConfig(data, logger)
 
 
 def readSensorsConfig(logger=None):
@@ -73,7 +65,7 @@ def readSensorsConfig(logger=None):
         logger = SysmonLogger.getLogger(__name__)
 
     if not os.path.isfile(zimonFile):
-        logger.error("ZiMon sensor configuration file not found (%s) ", zimonFile)
+        logger.details("ZiMon sensor configuration file not found (%s) ", zimonFile)
         print("ZiMon sensor configuration file not found")
         raise OSError(2, 'No such file or directory', zimonFile)
 
@@ -83,19 +75,29 @@ def readSensorsConfig(logger=None):
         with open(zimonFile) as myfile:
             data = myfile.read().replace('\n', '')
     except (Exception, IOError) as error:
-        logger.error("failed trying read %s with reason: %s", zimonFile, error)
+        logger.details("failed trying read %s with reason: %s", zimonFile, error)
         return []
+    # parse config file in a list of dictionaries format
+    return parseSensorsConfig(data, logger)
 
-    sensors = []
-    sensorsStr = data[data.find("sensors"):data.find("smbstat")]
-    sensorsList = re.findall('(?P<sensor>{.*?})', sensorsStr)
-    for sensorString in sensorsList:
-        sensorAttr = re.findall(r'(?P<name>\w+) = (?P<value>\"[\S]*\"|\d+)', sensorString)
-        d = {}
-        for attr in sensorAttr:
-            d[attr[0]] = attr[1]
-        sensors.append(d)
-    return sensors
+
+def parseSensorsConfig(sensorsConfig, logger):
+    """ Returns a list of dicts, describing definitions of sensors """
+    logger.debug("invoke parseSensorsConfig")
+    try:
+        sensors = []
+        sensorsStr = sensorsConfig[sensorsConfig.find("sensors"):sensorsConfig.find("smbstat")]
+        sensorsList = re.findall('(?P<sensor>{.*?})(?:,|$)', sensorsStr)
+        for sensorString in sensorsList:
+            sensorAttr = re.findall(r'(?P<name>\w+) = (?P<value>\"\S*\"|\d+)', sensorString)
+            d = {}
+            for attr in sensorAttr:
+                d[attr[0]] = attr[1]
+            sensors.append(d)
+        return sensors
+    except (Exception, IOError) as error:
+        logger.details("failed parsing sensors config content with reason: %s", error)
+        return []
 
 
 def getCollectorPorts(logger=None):

source/zimonGrafanaIntf.py

@@ -68,6 +68,8 @@ def qh(self):
     def SensorsConfig(self):
         if not self.__sensorsConf or len(self.__sensorsConf) == 0:
             self.__sensorsConf = SensorConfig.readSensorsConfigFromMMSDRFS(self.logger)
+            if not self.__sensorsConf:
+                raise ValueError(MSG['NoSensorConfigData'])
         return self.__sensorsConf
 
     @property
@@ -81,6 +83,8 @@ def __initializeTables(self):
 
         self.__qh = QueryHandler(self.server, self.port, self.logger, self.apiKeyName, self.apiKeyValue)
         self.__sensorsConf = SensorConfig.readSensorsConfigFromMMSDRFS(self.logger)
+        if not self.__sensorsConf:
+            raise ValueError(MSG['NoSensorConfigData'])
         MAX_ATTEMPTS_COUNT = 3
         for attempt in range(1, MAX_ATTEMPTS_COUNT + 1):
             tstart = timer()