Merge pull request #2 from awegrzyn/update-mon

Compatibility changes to new Configuration and Monitoring

Author: sy-c

cmake/FindConfiguration.cmake

@@ -14,7 +14,7 @@
 include(FindPackageHandleStandardArgs)
 
 # find includes
-find_path(CONFIGURATION_INCLUDE_DIR Configuration.h
+find_path(CONFIGURATION_INCLUDE_DIR ConfigurationInterface.h
            HINTS ${Configuration_ROOT}/include ENV LD_LIBRARY_PATH PATH_SUFFIXES "../include/Configuration" "../../include/Configuration" )
 # Remove the final "Configuration"
 get_filename_component(CONFIGURATION_INCLUDE_DIR ${CONFIGURATION_INCLUDE_DIR} DIRECTORY)

src/ConsumerStats.cxx

@@ -80,7 +80,7 @@ class ConsumerStats: public Consumer {
       const std::string configFile=cfg.getValue<std::string>(cfgEntryPoint + ".monitoringConfig");
       theLog.log("Monitoring enabled - period %ds - using configuration %s",monitoringUpdatePeriod,configFile.c_str());
 
-      monitoringCollector=MonitoringFactory::Create(configFile);
+      monitoringCollector=MonitoringFactory::Get("influxdb-udp://localhost:1234"); // TODO: Set URL from Configuration
       monitoringCollector->addDerivedMetric("readout.BytesTotal", DerivedMetricMode::RATE);
 
       monitoringUpdateTimer.reset(monitoringUpdatePeriod*1000000);