fix_203

Signed-off-by: hwassman <[email protected]>

Author: Helene

source/confParser.py

@@ -50,7 +50,7 @@ def checkTLSsettings(args):
             args.get('tlsKeyPath'), args.get('tlsCertFile'))
             ) or (not checkFileExists(
                 args.get('tlsKeyPath'), args.get('tlsKeyFile'))):
-            return False, MSG['CertError']
+            return False, MSG['MissingFileFromPathError']
     return True, ''
 
 
@@ -62,7 +62,7 @@ def checkBasicAuthsettings(args):
     elif args.get('enabled') and ("/" in str(args.get('password')) and not
                                   os.path.isfile(args.get('password'))
                                   ):
-        return False, MSG['FileNotFound'].format(args.get('password'))
+        return False, MSG['FileNotFound'].format("mandatory for basic auth")
     elif args.get('enabled') and "/" not in str(args.get('password')):
         try:
             base64.b64decode(args.get('password'), validate=True)
@@ -87,7 +87,7 @@ def checkAPIsettings(args):
 
 def checkCAsettings(args):
     if args.get('caCertPath') and args['caCertPath'] != False and not (os.path.exists(args['caCertPath'])):
-        return False, MSG['FileNotFound'].format(args.get('caCertPath'))
+        return False, MSG['FileNotFound'].format("mandatory for CA validation")
     return True, ''
 
 

source/messages.py

@@ -31,7 +31,7 @@
        'MissingPortParam': 'Missing applications port configuration, quitting',
        'MissingSSLCert': 'Missing ssl configuration, quitting',
        'KeyPathError': 'KeyPath directory not found, quitting',
-       'CertError': 'Missing certificates in the specified keyPath directory, quitting',
+       'MissingFileFromPathError': 'Missing certificates in the specified keyPath directory, quitting',
        'CollectorErr': 'Failed to initialize connection to pmcollector: {}, quitting',
        'MetaError': 'Metadata could not be retrieved. Check log file for more details, quitting',
        'MetaSuccess': 'Successfully retrieved MetaData',

source/zimonGrafanaIntf.py

@@ -227,7 +227,7 @@ def main(argv):
         logger.details('zimonGrafanaItf invoked with parameters:\n %s',
                        "\n".join("{}={}".format(k, v)
                                  for k, v in args.items() if not
-                                 k == 'apiKeyValue'))
+                                 k in ['apiKeyValue', 'password']))
         mdHandler = MetadataHandler(logger=logger, server=args.get('server'),
                                     port=args.get('serverPort'),
                                     apiKeyName=args.get('apiKeyName'),