43
43
44
44
class MetadataHandler ():
45
45
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 ):
47
47
self .__qh = None
48
48
self .__sensorsConf = None
49
49
self .__metaData = None
@@ -52,6 +52,7 @@ def __init__(self, logger, server, port, apiKeyName, apiKeyValue, includeDiskDat
52
52
self .port = port
53
53
self .apiKeyName = apiKeyName
54
54
self .apiKeyValue = apiKeyValue
55
+ self .caCertPath = caCertPath
55
56
self .includeDiskData = includeDiskData
56
57
self .sleepTime = sleepTime or 60
57
58
@@ -60,7 +61,7 @@ def __init__(self, logger, server, port, apiKeyName, apiKeyValue, includeDiskDat
60
61
@property
61
62
def qh (self ):
62
63
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 )
64
65
return self .__qh
65
66
66
67
@property
@@ -611,7 +612,8 @@ def main(argv):
611
612
logger .info ("%s" , MSG ['BridgeVersionInfo' ].format (__version__ ))
612
613
logger .details ('zimonGrafanaItf invoked with parameters:\n %s' , "\n " .join ("{}={}" .format (k , v ) for k , v in args .items () if not k == 'apiKeyValue' ))
613
614
# 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 ))
615
617
except (AttributeError , TypeError , ValueError ) as e :
616
618
logger .details ('%s' , MSG ['IntError' ].format (str (e )))
617
619
logger .error (MSG ['MetaError' ])
0 commit comments