Merge branch 'master-pmonmt-ca-config' into 'master'

PerfMonComps: Add a flag to configure the JSON output file name in the CA-based configuration

See merge request !46628

Control/PerformanceMonitoring/PerfMonComps/python/PerfMonCompsConfig.py

@@ -34,6 +34,7 @@ def PerfMonMTSvcCfg(flags, **kwargs):
                       max(1,flags.Concurrency.NumConcurrentEvents))
     kwargs.setdefault("doComponentLevelMonitoring",
                       flags.PerfMon.doFullMonMT)
+    kwargs.setdefault("jsonFileName", flags.PerfMon.OutputJSON)
 
     # Get CA and add the service 
     acc = ComponentAccumulator()

Control/PerformanceMonitoring/PerfMonComps/python/PerfMonConfigFlags.py

@@ -8,5 +8,6 @@ def createPerfMonConfigFlags():
     # Two basic flags for PerfMonMT
     pcf.addFlag('PerfMon.doFastMonMT', False)
     pcf.addFlag('PerfMon.doFullMonMT', False)
+    pcf.addFlag('PerfMon.OutputJSON', 'perfmonmt.json')
     
     return pcf