Add global parameters for InfluxDB

collectagent/CARestAPI.cpp

@@ -38,13 +38,13 @@
 	  std::placeholders::_3)
 
 CARestAPI::CARestAPI(serverSettings_t settings,
-		     std::map<std::string, influx_t>& influxMap,
+		     influx_t* influxSettings,
                      SensorCache* sensorCache,
 		     SensorDataStore* sensorDataStore,
                      AnalyticsController* analyticsController,
                      SimpleMQTTServer* mqttServer) :
                      RESTHttpsServer(settings),
-                     _influxMap(influxMap),
+                     _influxSettings(influxSettings),
                      _sensorCache(sensorCache),
                      _sensorDataStore(sensorDataStore),
                      _analyticsController(analyticsController),
@@ -163,9 +163,9 @@ void CARestAPI::POST_write(endpointArgs) {
 	boost::smatch m1, m2;
 	if (boost::regex_search(line, m1, r1)) {
 	    std::string measurement = m1[1].str();
-	    auto m = _influxMap.find(measurement);
-	    if (m != _influxMap.end()) {
-		influx_t influx = m->second;
+	    auto m = _influxSettings->measurements.find(measurement);
+	    if (m != _influxSettings->measurements.end()) {
+		influx_measurement_t influx = m->second;
 		
 		// Parse tags into a map
 		std::map<std::string, std::string> tags;
@@ -204,7 +204,7 @@ void CARestAPI::POST_write(endpointArgs) {
 		    for (auto &f: fields) {
 			// If no fields were defined, we take any field
 			if (influx.fields.empty() || (influx.fields.find(f.first) != influx.fields.end())) {
-			    std::string mqttTopic = m->second.mqttPrefix + "/" + tagName + "/" + f.first;
+			    std::string mqttTopic = _influxSettings->mqttPrefix + m->second.mqttPart + "/" + tagName + "/" + f.first;
 			    uint64_t value = 0;
 			    try {
 				value = stoull(f.second);

collectagent/CARestAPI.h

@@ -44,7 +44,7 @@
 class CARestAPI : public RESTHttpsServer {
 public:
     CARestAPI(serverSettings_t settings,
-	      std::map<std::string, influx_t>& influxMap,
+	      influx_t* influxSettings,
               SensorCache* sensorCache,
 	      SensorDataStore* sensorDataStore,
               AnalyticsController* analyticsController,
@@ -203,7 +203,7 @@ private:
     SensorDataStore*     _sensorDataStore;
     AnalyticsController* _analyticsController;
     SimpleMQTTServer*    _mqttServer;
-    std::map<std::string, influx_t> _influxMap;
+    influx_t*            _influxSettings;
 };
 
 #endif /* COLLECTAGENT_CARESTAPI_H_ */

collectagent/collectagent.cpp

@@ -807,11 +807,12 @@ int main(int argc, char* const argv[]) {
 	  LOG(info) << "    Certificate: " << restAPISettings.certificate;
 	  LOG(info) << "    Private key file: " << restAPISettings.privateKey;
 	  
-	  if (config.influxMap.size() > 0) {
+	  if (config.influxSettings.measurements.size() > 0) {
 	      LOG(info) << "InfluxDB Settings:";
-	      for (auto &m: config.influxMap) {
+	      LOG(info) << "    MQTT-Prefix:  " << config.influxSettings.mqttPrefix;
+	      for (auto &m: config.influxSettings.measurements) {
 		  LOG(info) << "    Measurement: " << m.first;
-		  LOG(info) << "        MQTT-Prefix: " << m.second.mqttPrefix;
+		  LOG(info) << "        MQTT-Part:   " << m.second.mqttPart;
 		  LOG(info) << "        Tag:         " << m.second.tag;
 		  if ((m.second.tagRegex.size() > 0) && (m.second.tagSubstitution.size() > 0))
 		  if (m.second.tagSubstitution != "&") {
@@ -855,7 +856,7 @@ int main(int argc, char* const argv[]) {
        * Start the HTTP Server for the REST API
        */
       if (restAPISettings.enabled) {
-          httpsServer = new CARestAPI(restAPISettings, config.influxMap, &mySensorCache, mySensorDataStore, analyticsController, &ms);
+          httpsServer = new CARestAPI(restAPISettings, &config.influxSettings, &mySensorCache, mySensorDataStore, analyticsController, &ms);
           config.readRestAPIUsers(httpsServer);
           httpsServer->start();
           LOG(info) <<  "HTTP Server running...";

collectagent/configuration.cpp

@@ -76,11 +76,13 @@ void Configuration::readAdditionalBlocks(boost::property_tree::iptree& cfg) {
     // ----- READING INFLUXDB LINE PROTOCOL SETTINGS -----
     if (cfg.find("influx") != cfg.not_found()) {
 	BOOST_FOREACH(boost::property_tree::iptree::value_type & global, cfg.get_child("influx")) {
-	    if (boost::iequals(global.first, "measurement")) {
-		influx_t influx;
+	    if (boost::iequals(global.first, "mqttprefix")) {
+		influxSettings.mqttPrefix = MQTTChecker::formatTopic(global.second.data());
+	    } else if (boost::iequals(global.first, "measurement")) {
+		influx_measurement_t measurement;
 		BOOST_FOREACH(boost::property_tree::iptree::value_type &m, global.second) {
 		    if (boost::iequals(m.first, "tag")) {
-			influx.tag = m.second.data();
+			measurement.tag = m.second.data();
 		    } else if (boost::iequals(m.first, "tagfilter")) {
 			//check if input has sed format of "s/.../.../" for substitution
 			boost::regex  checkSubstitute("s([^\\\\]{1})([\\S|\\s]*)\\1([\\S|\\s]*)\\1");
@@ -88,25 +90,25 @@ void Configuration::readAdditionalBlocks(boost::property_tree::iptree& cfg) {
 			
 			if (regex_match(m.second.data(), matchResults, checkSubstitute)) {
 			    //input has substitute format
-			    influx.tagRegex = boost::regex(matchResults[2].str(), boost::regex_constants::extended);
-			    influx.tagSubstitution = matchResults[3].str();
+			    measurement.tagRegex = boost::regex(matchResults[2].str(), boost::regex_constants::extended);
+			    measurement.tagSubstitution = matchResults[3].str();
 			} else {
 			    //input is only a regex
-			    influx.tagRegex = boost::regex(m.second.data(), boost::regex_constants::extended);
-			    influx.tagSubstitution = "&";
+			    measurement.tagRegex = boost::regex(m.second.data(), boost::regex_constants::extended);
+			    measurement.tagSubstitution = "&";
 			}
-		    } else if (boost::iequals(m.first, "mqttprefix")) {
-			influx.mqttPrefix = m.second.data();
+		    } else if (boost::iequals(m.first, "mqttpart")) {
+			measurement.mqttPart = MQTTChecker::formatTopic(m.second.data());
 		    } else if (boost::iequals(m.first, "fields")) {
 			std::stringstream ss(m.second.data());
 			while (ss.good()) {
 			    std::string s;
 			    getline(ss, s, ',');
-			    influx.fields.insert(s);
+			    measurement.fields.insert(s);
 			}
 		    }
 		}
-		influxMap[global.second.data()] = influx;
+		influxSettings.measurements[global.second.data()] = measurement;
 	    }
 	}
     }

collectagent/configuration.h

@@ -65,16 +65,24 @@ public:
     bool debugLog = false;
 };
 
-class influx_t {
+class influx_measurement_t {
 public:
-    influx_t() {}
-    std::string           mqttPrefix;
+    influx_measurement_t() {}
+    std::string           mqttPart;
     std::string           tag;
     boost::regex          tagRegex;
     std::string           tagSubstitution;
     std::set<std::string> fields;
 };
 
+
+class influx_t {
+public:
+    influx_t() {}
+    std::string           mqttPrefix;
+    std::map<std::string, influx_measurement_t> measurements;
+};
+
 /**
  * @brief Class responsible for reading collect agent specific configuration.
  *
@@ -105,7 +113,7 @@ public:
     uint64_t messageThreads = 128;
     uint64_t messageSlots = 16;
     cassandra_t cassandraSettings;
-    std::map<std::string, influx_t> influxMap;
+    influx_t influxSettings;
     
 protected:
     void readAdditionalBlocks(boost::property_tree::iptree& cfg) override;