diff --git a/Framework/include/QualityControl/InfrastructureGenerator.h b/Framework/include/QualityControl/InfrastructureGenerator.h index 2f6a8bcc4f..e08e24b1c2 100644 --- a/Framework/include/QualityControl/InfrastructureGenerator.h +++ b/Framework/include/QualityControl/InfrastructureGenerator.h @@ -145,7 +145,8 @@ class InfrastructureGenerator std::string taskName, size_t numberOfLocalMachines, double cycleDurationSeconds, - std::string mergingMode); + std::string mergingMode, + std::string monitoringUrl); static vector generateCheckRunners(framework::WorkflowSpec& workflow, std::string configurationSource); static void generateAggregator(framework::WorkflowSpec& workflow, std::string configurationSource, vector& checkRunnerOutputs); static void generatePostProcessing(framework::WorkflowSpec& workflow, std::string configurationSource); diff --git a/Framework/src/InfrastructureGenerator.cxx b/Framework/src/InfrastructureGenerator.cxx index e64c59fe98..6135586fa7 100644 --- a/Framework/src/InfrastructureGenerator.cxx +++ b/Framework/src/InfrastructureGenerator.cxx @@ -198,7 +198,8 @@ o2::framework::WorkflowSpec InfrastructureGenerator::generateRemoteInfrastructur generateMergers(workflow, taskName, numberOfLocalMachines, taskConfig.get("cycleDurationSeconds"), - taskConfig.get("mergingMode", "delta")); + taskConfig.get("mergingMode", "delta"), + config->get("qc.config.monitoring.url")); } else if (taskConfig.get("location") == "remote") { @@ -352,7 +353,7 @@ void InfrastructureGenerator::generateLocalTaskRemoteProxy(framework::WorkflowSp void InfrastructureGenerator::generateMergers(framework::WorkflowSpec& workflow, std::string taskName, size_t numberOfLocalMachines, double cycleDurationSeconds, - std::string mergingMode) + std::string mergingMode, std::string monitoringUrl) { Inputs mergerInputs; for (size_t id = 1; id <= numberOfLocalMachines; id++) { @@ -373,8 +374,9 @@ void InfrastructureGenerator::generateMergers(framework::WorkflowSpec& workflow, mergerConfig.inputObjectTimespan = { (mergingMode.empty() || mergingMode == "delta") ? InputObjectsTimespan::LastDifference : InputObjectsTimespan::FullHistory }; mergerConfig.publicationDecision = { PublicationDecision::EachNSeconds, cycleDurationSeconds }; mergerConfig.mergedObjectTimespan = { MergedObjectTimespan::FullHistory, 0 }; - // for now one merger should be enough, multiple layers to be supported later + // for now one merger should be enough, multiple layers will be supported later mergerConfig.topologySize = { TopologySize::NumberOfLayers, 1 }; + mergerConfig.monitoringUrl = monitoringUrl; mergersBuilder.setConfig(mergerConfig); mergersBuilder.generateInfrastructure(workflow); diff --git a/Framework/test/testSharedConfig.json b/Framework/test/testSharedConfig.json index 5033cccae2..5d61a819b8 100644 --- a/Framework/test/testSharedConfig.json +++ b/Framework/test/testSharedConfig.json @@ -11,6 +11,9 @@ "Activity": { "number": "42", "type": "2" + }, + "monitoring": { + "url": "infologger:///debug?qc" } }, "tasks": {