Skip to content

Commit dc23153

Browse files
committed
enable ca verification for server connections based on provided config
1 parent 0ee4ff7 commit dc23153

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

source/zimonGrafanaIntf.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
class MetadataHandler():
4545

46-
def __init__(self, logger, server, port, apiKeyName, apiKeyValue, includeDiskData=False, sleepTime=None):
46+
def __init__(self, logger, server, port, apiKeyName, apiKeyValue, caCertPath=False, includeDiskData=False, sleepTime=None):
4747
self.__qh = None
4848
self.__sensorsConf = None
4949
self.__metaData = None
@@ -52,6 +52,7 @@ def __init__(self, logger, server, port, apiKeyName, apiKeyValue, includeDiskDat
5252
self.port = port
5353
self.apiKeyName = apiKeyName
5454
self.apiKeyValue = apiKeyValue
55+
self.caCertPath = caCertPath
5556
self.includeDiskData = includeDiskData
5657
self.sleepTime = sleepTime or 60
5758

@@ -60,7 +61,7 @@ def __init__(self, logger, server, port, apiKeyName, apiKeyValue, includeDiskDat
6061
@property
6162
def qh(self):
6263
if not self.__qh:
63-
self.__qh = QueryHandler(self.server, self.port, self.logger, self.apiKeyName, self.apiKeyValue)
64+
self.__qh = QueryHandler(self.server, self.port, self.logger, self.apiKeyName, self.apiKeyValue, self.caCertPath)
6465
return self.__qh
6566

6667
@property
@@ -611,7 +612,8 @@ def main(argv):
611612
logger.info("%s", MSG['BridgeVersionInfo'].format(__version__))
612613
logger.details('zimonGrafanaItf invoked with parameters:\n %s', "\n".join("{}={}".format(k, v) for k, v in args.items() if not k == 'apiKeyValue'))
613614
# logger.details('zimonGrafanaItf invoked with parameters:\n %s', "\n".join("{}={}".format(k, type(v)) for k, v in args.items()))
614-
mdHandler = MetadataHandler(logger, args.get('server'), args.get('serverPort'), args.get('apiKeyName'), resolveAPIKeyValue(args.get('apiKeyValue')), args.get('includeDiskData'), args.get('retryDelay', None))
615+
mdHandler = MetadataHandler(logger, args.get('server'), args.get('serverPort'), args.get('apiKeyName'), resolveAPIKeyValue(args.get('apiKeyValue')),
616+
args.get('caCertPath'), args.get('includeDiskData'), args.get('retryDelay', None))
615617
except (AttributeError, TypeError, ValueError) as e:
616618
logger.details('%s', MSG['IntError'].format(str(e)))
617619
logger.error(MSG['MetaError'])

0 commit comments

Comments
 (0)