Skip switching to the multi-threaded zimon port automatically

Author: Helene

source/confParser.py

@@ -95,7 +95,10 @@ def parse_cmd_args(argv):
                         help='Host name or ip address of the ZIMon collector (Default: 127.0.0.1) \
                         NOTE: Per default ZIMon does not accept queries from remote machines. \
                         To run the bridge from outside of the ZIMon collector, you need to modify ZIMon queryinterface settings (\'ZIMonCollector.cfg\')')
-    parser.add_argument('-P', '--serverPort', action="store", type=int, default=9084, help='ZIMon collector port number (Default: 9084)')
+    parser.add_argument('-P', '--serverPort', action="store", type=int, choices=[9084, 9094], default=9084, 
+                        help='ZIMon collector port number (Default: 9084) \
+                        NOTE: In some environments, for better bridge performance the usage of the multi-threaded port 9094 could be helpful.\
+                        In this case make sure the \'query2port = \"9094\"\' is enabled in the ZIMon queryinterface settings (\'ZIMonCollector.cfg\')')
     parser.add_argument('-l', '--logPath', action="store", default="/var/log/ibm_bridge_for_grafana", help='location path of the log file (Default: /var/log/ibm_bridge_for_grafana')
     parser.add_argument('-f', '--logFile', action="store", default="zserver.log", help='Name of the log file (Default: zserver.log')
     parser.add_argument('-c', '--logLevel', action="store", type=int, default=logging.INFO, help='log level 10 (DEBUG), 20 (INFO), 30 (WARN), 40 (ERROR) (Default: 20)')

source/zimonGrafanaIntf.py

@@ -556,21 +556,21 @@ def configureLogging(logPath, logfile, loglevel):
 
 def validateCollectorConf(args, logger):
 
-    if not (args.get('server') == 'localhost') and not (args.get('server') == '127.0.0.1'):
-        try:
-            s = socket.socket()
-            s.connect((args.get('server'), args.get('serverPort')))
-            print(MSG['CollectorConnInfo'])
-        finally:
-            s.close()
-    else:
+    # if not (args.get('server') == 'localhost') and not (args.get('server') == '127.0.0.1'):
+    try:
+        s = socket.socket()
+        s.connect((args.get('server'), args.get('serverPort')))
+        print(MSG['CollectorConnInfo'])
+    finally:
+        s.close()
+    # else:
         # get queryport
-        foundPorts = SensorConfig.getCollectorPorts(logger)
-        if foundPorts and str(args.get('serverPort')) not in foundPorts:
-            raise Exception("Invalid serverPort specified. Try with: %s" % str(foundPorts))
-        elif foundPorts[1] and not (args.get('serverPort') == int(foundPorts[1])):
-            args['serverPort'] = int(foundPorts[1])
-            logger.info(MSG['Query2port'].format(args['serverPort']))
+        # foundPorts = SensorConfig.getCollectorPorts(logger)
+        # if foundPorts and str(args.get('serverPort')) not in foundPorts:
+        #    raise Exception("Invalid serverPort specified. Try with: %s" % str(foundPorts))
+        #elif foundPorts[1] and not (args.get('serverPort') == int(foundPorts[1])):
+        #    args['serverPort'] = int(foundPorts[1])
+        #    logger.info(MSG['Query2port'].format(args['serverPort']))
 
 
 def updateCherrypyConf(args):