Skip to content

GitLab

Commit b07598c8 authored by Alessio Netti's avatar Alessio Netti
Browse files

Data analytics framework merge

parents 0b0635f1 a59764f7
Expand all Hide whitespace changes
Inline Side-by-side
Makefile
View file @ b07598c8
...@@ -15,12 +15,13 @@ include $(DCDBCOREPATH)/common.mk ...@@ -15,12 +15,13 @@ include $(DCDBCOREPATH)/common.mk
VERSION = $(shell git describe --long|sed 's/-\([0-9]*\)/.\1/') VERSION = $(shell git describe --long|sed 's/-\([0-9]*\)/.\1/')
CXXFLAGS = -std=c++11 -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG -DBOOST_NETWORK_ENABLE_HTTPS -O2 -g -Wall -Wno-unused-function -Wno-deprecated-declarations -Wno-unused-variable -DBOOST_LOG_DYN_LINK -I$(DCDBBASEPATH)/dcdb/include -I$(DCDBDEPLOYPATH)/include -I$(DCDBDEPSPATH)/cpp-netlib-0.12.0-final/deps/asio/asio/include -DVERSION=\"$(VERSION)\" CXXFLAGS = -std=c++11 -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG -DBOOST_NETWORK_ENABLE_HTTPS -O2 -g -Wall -Wno-unused-function -Wno-unused-local-typedef -Wno-deprecated-declarations -Wno-unused-variable -DBOOST_LOG_DYN_LINK -I$(DCDBBASEPATH)/dcdb/include -I$(DCDBDEPLOYPATH)/include -I$(DCDBDEPSPATH)/cpp-netlib-0.12.0-final/deps/asio/asio/include -DVERSION=\"$(VERSION)\"
LIBS = -L../deps/mosquitto_build/lib -L$(DCDBDEPLOYPATH)/lib/ -ldl -lmosquitto -lboost_system -lboost_thread -lboost_log_setup -lboost_log -lboost_regex -lpthread -lcrypto -lssl -lcppnetlib-server-parsers -lcppnetlib-uri -rdynamic LIBS = -L../deps/mosquitto_build/lib -L$(DCDBDEPLOYPATH)/lib/ -ldl -lmosquitto -lboost_system -lboost_thread -lboost_log_setup -lboost_log -lboost_regex -lpthread -lcrypto -lssl -lcppnetlib-server-parsers -lcppnetlib-uri -rdynamic
OBJS = src/dcdbpusher.o src/Configuration.o src/MQTTPusher.o src/HttpsServer.o OBJS = src/dcdbpusher.o src/Configuration.o src/MQTTPusher.o src/HttpsServer.o src/analytics/AnalyticsManager.o src/analytics/SensorNavigator.o
PLUGINS = procfs pdu sysfs ipmi bacnet snmp gpfsmon tester PLUGINS = procfs pdu sysfs ipmi bacnet snmp gpfsmon tester
ANALYZERS = average
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
BACNET_PORT = bsd BACNET_PORT = bsd
LIBEXT = dylib LIBEXT = dylib
...@@ -33,30 +34,31 @@ else ...@@ -33,30 +34,31 @@ else
PLUGINFLAGS = -fPIC PLUGINFLAGS = -fPIC
endif endif
PLUGIN_LIBS = $(foreach p,$(PLUGINS),libdcdbplugin_$(p).$(LIBEXT)) PLUGIN_LIBS = $(foreach p,$(PLUGINS),libdcdbplugin_$(p).$(LIBEXT))
ANALYZER_LIBS = $(foreach p,$(ANALYZERS),libdcdbanalyzer_$(p).$(LIBEXT))
$(TARGET): $(foreach f,$(DISTFILESPATHS),$(DCDBDEPSPATH)/$(f)/.installed) $(OBJS) $(TARGET): $(foreach f,$(DISTFILESPATHS),$(DCDBDEPSPATH)/$(f)/.installed) $(OBJS)
$(CXX) -o $(TARGET) $(OBJS) $(LIBS) $(CXX) -o $(TARGET) $(OBJS) $(LIBS)
all: $(TARGET) $(PLUGIN_LIBS) all: $(TARGET) $(PLUGIN_LIBS) $(ANALYZER_LIBS)
debug: CXXFLAGS += -DDEBUG debug: CXXFLAGS += -DDEBUG
debug: all debug: all
clean: clean:
rm -f $(PLUGIN_LIBS) $(TARGET) $(shell find -name "*.o") rm -f $(PLUGIN_LIBS) $(ANALYZER_LIBS) $(TARGET) $(shell find -name "*.o")
$(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/.installed: $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/.patched $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/.installed: $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/.patched
@echo "" @echo ""
@echo "Building BACNet-Stack..." @echo "Building BACNet-Stack..."
cd $(@D) && BACNET_PORT=$(BACNET_PORT) MAKE_DEFINE=-fpic make -j $(MAKETHREADS) library && \ cd $(@D) && BACNET_PORT=$(BACNET_PORT) MAKE_DEFINE=-fpic make -j $(MAKETHREADS) library && \
install $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/lib/libbacnet.a /$(DCDBDEPLOYPATH)/lib/ && touch $(@) install $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/lib/libbacnet.a /$(DCDBDEPLOYPATH)/lib/ && touch $(@)
$(DCDBDEPSPATH)/freeipmi-$(FREEIPMI_VERSION)/.installed: $(DCDBDEPSPATH)/freeipmi-$(FREEIPMI_VERSION)/.patched $(DCDBDEPSPATH)/freeipmi-$(FREEIPMI_VERSION)/.installed: $(DCDBDEPSPATH)/freeipmi-$(FREEIPMI_VERSION)/.patched
@echo "" @echo ""
@echo "Building FreeIPMI library..." @echo "Building FreeIPMI library..."
cd $(@D) && ./configure --prefix=$(DCDBDEPLOYPATH) --without-argp cd $(@D) && ./configure --prefix=$(DCDBDEPLOYPATH) --without-argp
cd $(@D) && make -j $(MAKETHREADS) && make install && touch $(@) cd $(@D) && make -j $(MAKETHREADS) && make install && touch $(@)
$(DCDBDEPSPATH)/net-snmp-$(NET-SNMP_VERSION)/.installed: $(DCDBDEPSPATH)/net-snmp-$(NET-SNMP_VERSION)/.patched $(DCDBDEPSPATH)/net-snmp-$(NET-SNMP_VERSION)/.installed: $(DCDBDEPSPATH)/net-snmp-$(NET-SNMP_VERSION)/.patched
@echo "" @echo ""
@echo "Building net-SNMP library..." @echo "Building net-SNMP library..."
cd $(@D) && ./configure --prefix=$(DCDBDEPLOYPATH) --with-default-snmp-version=3 --with-sys-contact= --with-sys-location= --with-logfile=none --with-persistent-directory=$(DCDBDEPLOYPATH)/var/net-snmp --disable-embedded-perl --disable-perl-cc-checks --without-perl-modules --disable-agent --disable-applications --disable-manuals --disable-scripts --disable-mibs cd $(@D) && ./configure --prefix=$(DCDBDEPLOYPATH) --with-default-snmp-version=3 --with-sys-contact= --with-sys-location= --with-logfile=none --with-persistent-directory=$(DCDBDEPLOYPATH)/var/net-snmp --disable-embedded-perl --disable-perl-cc-checks --without-perl-modules --disable-agent --disable-applications --disable-manuals --disable-scripts --disable-mibs
...@@ -67,16 +69,19 @@ $(OBJS) : %.o : %.cpp ...@@ -67,16 +69,19 @@ $(OBJS) : %.o : %.cpp
install_lib: $(PLUGIN_LIBS) install_lib: $(PLUGIN_LIBS)
install $^ $(DCDBDEPLOYPATH)/lib/ install $^ $(DCDBDEPLOYPATH)/lib/
install_conf: $(foreach p,global $(PLUGINS),config/$(p).conf) install_analyzer: $(ANALYZER_LIBS)
install $^ $(DCDBDEPLOYPATH)/lib/
install_conf: $(foreach p,global $(PLUGINS) $(ANALYZERS),config/$(p).conf)
install -m 644 $^ $(DCDBDEPLOYPATH)/etc/ install -m 644 $^ $(DCDBDEPLOYPATH)/etc/
install: $(TARGET) install_lib install: $(TARGET) install_lib install_analyzer
install $(TARGET) $(DCDBDEPLOYPATH)/bin/ install $(TARGET) $(DCDBDEPLOYPATH)/bin/
@echo "Done with installation." @echo "Done with installation."
@echo "=====================================" @echo "====================================="
@echo "To copy the configuration files type:" @echo "To copy the configuration files type:"
@echo " > make install_conf" @echo " > make install_conf"
src/Sensor.o: CXXFLAGS+= $(PLUGINFLAGS) src/Sensor.o: CXXFLAGS+= $(PLUGINFLAGS)
src/SensorGroup.o: CXXFLAGS+= $(PLUGINFLAGS) src/SensorGroup.o: CXXFLAGS+= $(PLUGINFLAGS)
src/sensors/%.o: CXXFLAGS+= $(PLUGINFLAGS) -I$(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/include -I$(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/ports/$(BACNET_PORT) src/sensors/%.o: CXXFLAGS+= $(PLUGINFLAGS) -I$(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/include -I$(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/ports/$(BACNET_PORT)
...@@ -86,28 +91,31 @@ libdcdbplugin_sysfs.$(LIBEXT): src/sensors/sysfs/SysfsSensorGroup.o src/sensors/ ...@@ -86,28 +91,31 @@ libdcdbplugin_sysfs.$(LIBEXT): src/sensors/sysfs/SysfsSensorGroup.o src/sensors/
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex
libdcdbplugin_perfevent.$(LIBEXT): src/sensors/perfevent/PerfSensorGroup.o src/sensors/perfevent/PerfeventConfigurator.o libdcdbplugin_perfevent.$(LIBEXT): src/sensors/perfevent/PerfSensorGroup.o src/sensors/perfevent/PerfeventConfigurator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex
libdcdbplugin_ipmi.$(LIBEXT): src/sensors/ipmi/IPMISensorGroup.o src/sensors/ipmi/IPMIHost.o src/sensors/ipmi/IPMIConfigurator.o libdcdbplugin_ipmi.$(LIBEXT): src/sensors/ipmi/IPMISensorGroup.o src/sensors/ipmi/IPMIHost.o src/sensors/ipmi/IPMIConfigurator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lfreeipmi -lboost_regex $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex -lfreeipmi
libdcdbplugin_pdu.$(LIBEXT): src/sensors/pdu/PDUSensorGroup.o src/sensors/pdu/PDUUnit.o src/sensors/pdu/PDUConfigurator.o libdcdbplugin_pdu.$(LIBEXT): src/sensors/pdu/PDUSensorGroup.o src/sensors/pdu/PDUUnit.o src/sensors/pdu/PDUConfigurator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lcrypto -lssl -lboost_log -lboost_system $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lcrypto -lssl -lboost_log -lboost_regex -lboost_system
libdcdbplugin_bacnet.$(LIBEXT): src/sensors/bacnet/BACnetSensorGroup.o src/sensors/bacnet/BACnetClient.o src/sensors/bacnet/BACnetConfigurator.o libdcdbplugin_bacnet.$(LIBEXT): src/sensors/bacnet/BACnetSensorGroup.o src/sensors/bacnet/BACnetClient.o src/sensors/bacnet/BACnetConfigurator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lbacnet $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex -lbacnet
libdcdbplugin_snmp.$(LIBEXT): src/sensors/snmp/SNMPSensorGroup.o src/sensors/snmp/SNMPConnection.o src/sensors/snmp/SNMPConfigurator.o libdcdbplugin_snmp.$(LIBEXT): src/sensors/snmp/SNMPSensorGroup.o src/sensors/snmp/SNMPConnection.o src/sensors/snmp/SNMPConfigurator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lnetsnmp -lnetsnmpagent $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex -lnetsnmp -lnetsnmpagent
libdcdbplugin_procfs.$(LIBEXT): src/sensors/procfs/ProcfsSensorGroup.o src/sensors/procfs/ProcfsParser.o src/sensors/procfs/ProcfsConfigurator.o libdcdbplugin_procfs.$(LIBEXT): src/sensors/procfs/ProcfsSensorGroup.o src/sensors/procfs/ProcfsParser.o src/sensors/procfs/ProcfsConfigurator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex
libdcdbplugin_tester.$(LIBEXT): src/sensors/tester/TesterSensorGroup.o src/sensors/tester/TesterConfigurator.o libdcdbplugin_tester.$(LIBEXT): src/sensors/tester/TesterSensorGroup.o src/sensors/tester/TesterConfigurator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex
libdcdbplugin_gpfsmon.$(LIBEXT): src/sensors/gpfsmon/GpfsmonSensorGroup.o src/sensors/gpfsmon/GpfsmonConfigurator.o libdcdbplugin_gpfsmon.$(LIBEXT): src/sensors/gpfsmon/GpfsmonSensorGroup.o src/sensors/gpfsmon/GpfsmonConfigurator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex
#libdcdbplugin_opa.$(LIBEXT): src/sensors/opa/OpaSensorGroup.o src/sensors/opa/OpaConfigurator.o #libdcdbplugin_opa.$(LIBEXT): src/sensors/opa/OpaSensorGroup.o src/sensors/opa/OpaConfigurator.o
# $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lopamgt -libverbs -libumad -lssl # $(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex -lopamgt -libverbs -libumad -lssl
libdcdbanalyzer_average.$(LIBEXT): src/analytics/analyzers/average/AverageAnalyzer.o src/analytics/analyzers/average/AverageConfigurator.o src/analytics/SensorNavigator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex
config/average.conf 0 → 100644
View file @ b07598c8
global {
mqttPrefix /FF112233445566778899AAB
}
template_average def1 {
interval 1000
minValues 3
mqttPart FF0
duplicate false
streaming true
}
average avg1 {
default def1
mqttPart FF0
mqttStart 00
input {
sensor "<unit>col_user"
sensor "<unit-1>MemFree"
}
output {
sensor "<unit, filter cpu250>sum" {
mqttsuffix 76
}
sensor "<unit, filter cpu250>max" {
mqttsuffix 77
}
sensor "<unit, filter cpu250>avg" {
mqttsuffix 78
}
}
}
average avg2 {
default def1
interval 1500
mqttPart FF1
mqttStart 00
input {
sensor "<unit>col_user"
sensor "<unit - 1>MemFree"
}
output {
sensor "<unit - 1>sum" {
mqttsuffix 76
}
sensor "<unit - 1>max" {
mqttsuffix 77
}
sensor "<unit - 1>avg" {
mqttsuffix 78
}
}
}
average avg3 {
default def1
interval 1500
mqttPart FF2
mqttStart 00
input {
all-recursive
}
output {
sensor "<unit - 1>sumall" {
mqttsuffix 80
}
sensor "<unit - 1>maxall" {
mqttsuffix 81
}
sensor "<unit - 1>avgall" {
mqttsuffix 82
}
}
}
config/global.conf
View file @ b07598c8
...@@ -59,3 +59,7 @@ plugins { ...@@ -59,3 +59,7 @@ plugins {
} }
} }
analyzerPlugins {
}
src/Configuration.cpp
View file @ b07598c8
...@@ -26,6 +26,7 @@ Configuration::Configuration(const std::string& cfgFilePath) : ...@@ -26,6 +26,7 @@ Configuration::Configuration(const std::string& cfgFilePath) :
//set default values for global variables //set default values for global variables
_global.qosLevel = 1; _global.qosLevel = 1;
_global.daemonize = 0; _global.daemonize = 0;
_global.hierarchy = "";
_global.brokerHost = ""; _global.brokerHost = "";
_global.brokerPort = 1883; _global.brokerPort = 1883;
_global.threads = 1; _global.threads = 1;
...@@ -84,6 +85,8 @@ bool Configuration::readGlobal() { ...@@ -84,6 +85,8 @@ bool Configuration::readGlobal() {
} }
} else if (boost::iequals(global.first, "sensorpattern")) { } else if (boost::iequals(global.first, "sensorpattern")) {
_global.pluginSettings.sensorPattern = global.second.data(); _global.pluginSettings.sensorPattern = global.second.data();
} else if (boost::iequals(global.first, "hierarchy")) {
_global.hierarchy = global.second.data();
} else if (boost::iequals(global.first, "tempdir")) { } else if (boost::iequals(global.first, "tempdir")) {
_global.pluginSettings.tempdir = global.second.data(); _global.pluginSettings.tempdir = global.second.data();
if (_global.pluginSettings.tempdir[_global.pluginSettings.tempdir.length()-1] != '/') { if (_global.pluginSettings.tempdir[_global.pluginSettings.tempdir.length()-1] != '/') {
...@@ -340,7 +343,7 @@ bool Configuration::checkMqtt(const std::string& mqtt) { ...@@ -340,7 +343,7 @@ bool Configuration::checkMqtt(const std::string& mqtt) {
return false; return false;
} }
auto returnIt = _mqttTopics.insert(mqtt); auto returnIt = _mqttTopics.insert(str);
if (!returnIt.second) { if (!returnIt.second) {
LOG(error) << "MQTT-Topic \"" << mqtt << "\" used twice!"; LOG(error) << "MQTT-Topic \"" << mqtt << "\" used twice!";
return false; return false;
......
src/Configuration.h
View file @ b07598c8
...@@ -15,18 +15,19 @@ ...@@ -15,18 +15,19 @@
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
#include "includes/PluginDefinitions.h" #include "includes/PluginDefinitions.h"
typedef struct { typedef struct {
int daemonize; int daemonize;
int brokerPort; int brokerPort;
int qosLevel; int qosLevel;
std::string brokerHost; std::string brokerHost;
uint32_t threads; std::string hierarchy;
unsigned int maxMsgNum; uint32_t threads;
boost::log::trivial::severity_level logLevelFile; unsigned int maxMsgNum;
boost::log::trivial::severity_level logLevelCmd; boost::log::trivial::severity_level logLevelFile;
pluginSettings_t pluginSettings; boost::log::trivial::severity_level logLevelCmd;
restAPISettings_t restAPISettings; pluginSettings_t pluginSettings;
} global_t; restAPISettings_t restAPISettings;
} global_t;
/** /**
* Class responsible of reading the global configuration as well as loading and invoking required dynamic libraries. * Class responsible of reading the global configuration as well as loading and invoking required dynamic libraries.
...@@ -84,7 +85,7 @@ public: ...@@ -84,7 +85,7 @@ public:
* @return The boost::log severity level * @return The boost::log severity level
*/ */
boost::log::trivial::severity_level translateLogLevel(int logLevel); boost::log::trivial::severity_level translateLogLevel(int logLevel);
/** /**
* Check if the mqtt-suffix is already in use. * Check if the mqtt-suffix is already in use.
* @param mqtt The MQTT-suffix to check * @param mqtt The MQTT-suffix to check
......
src/HttpsServer.cpp
View file @ b07598c8
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <string> #include <string>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/info_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/split.hpp>
#define LOGH(sev) LOG(sev) << "HttpsServer: " #define LOGH(sev) LOG(sev) << "HttpsServer: "
...@@ -104,22 +104,25 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser ...@@ -104,22 +104,25 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser
if (method == "GET") { if (method == "GET") {
if (pathStrs[0] == "help") { if (pathStrs[0] == "help") {
response = "dcdbpusher RESTful API cheatsheet:\n" response = "dcdbpusher RESTful API cheatsheet:\n"
" -GET: /help This help message\n" " -GET: /help This help message\n"
" /plugins List of currently loaded plugins (Discovery)\n" " /analytics/help\n"
" /[plugin]/sensors\n" " An help message for data analytics commands\n"
" List of currently running sensors which belong\n" " /plugins List of currently loaded plugins (Discovery)\n"
" to the specified plugin (Discovery)\n" " /[plugin]/sensors\n"
" /[plugin]/[sensor]/avg?interval=[timeInSec]\n" " List of currently running sensors which belong\n"
" Average of last sensor readings from the last\n" " to the specified plugin (Discovery)\n"
" [interval] seconds or of all cached readings\n" " /[plugin]/[sensor]/avg?interval=[timeInSec]\n"
" if no interval is given\n" " Average of last sensor readings from the last\n"
" -PUT: /[plugin]/[start|stop|reload]\n" " [interval] seconds or of all cached readings\n"
" Start/stop the sensors of the plugin or\n" " if no interval is given\n"
" reload the plugin configuration\n" " -PUT: /[plugin]/[start|stop|reload]\n"
"\n" " Start/stop the sensors of the plugin or\n"
"All resources have to be prepended by host:port and need at\n" " reload the plugin configuration\n"
"least the query ?authkey=[token] at the end. Multiple queries\n" "\n";
"need to be separated by semicolons(';')\n"; //"All resources have to be prepended by host:port and need at\n"
//"least the query ?authkey=[token] at the end. Multiple queries\n"
//"need to be separated by semicolons(';')\n";
response += _httpsServer._manager->restCheatSheet;
} else { } else {
//first check permission //first check permission
if (!_httpsServer.check_authkey(auth_value, permission::GETReq)) { if (!_httpsServer.check_authkey(auth_value, permission::GETReq)) {
...@@ -127,15 +130,33 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser ...@@ -127,15 +130,33 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser
connection->set_status(server::connection::unauthorized); connection->set_status(server::connection::unauthorized);
goto error; goto error;
} }
if (pathStrs[0] == "plugins") { //Managing REST GET commands to the data analytics framework
if(pathStrs[0] == "analytics") {
try {
restResponse_t reply = _httpsServer._manager->REST(pathStrs, queries, method, _httpsServer._io);
data << reply.data;
response = reply.response;
} catch(const std::invalid_argument &e) {
LOGH(warning) << e.what();
connection->set_status(server::connection::bad_request);
goto error;
} catch(const std::domain_error &e) {
response = e.what();
connection->set_status(server::connection::not_found);
} catch(const std::exception &e) {
LOGH(warning) << e.what();
connection->set_status(server::connection::internal_server_error);
goto error;
}
} else if (pathStrs[0] == "plugins") {
if (json) { if (json) {
boost::property_tree::ptree root, plugins; boost::property_tree::ptree root, plugins;
for(auto& p : _httpsServer._plugins) { for(auto& p : _httpsServer._plugins) {
plugins.put(p.id, ""); plugins.put(p.id, "");
} }
root.add_child("plugins", plugins); root.add_child("plugins", plugins);
boost::property_tree::write_info(data, root); boost::property_tree::write_json(data, root, true);
} else { } else {
for(auto& p : _httpsServer._plugins) { for(auto& p : _httpsServer._plugins) {
data << p.id << "\n"; data << p.id << "\n";
...@@ -148,16 +169,16 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser ...@@ -148,16 +169,16 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser
connection->set_status(server::connection::bad_request); connection->set_status(server::connection::bad_request);
goto error; goto error;
} }
if (pathStrs[1] == "sensors") { if (pathStrs[1] == "sensors") {
response = "Plugin not found!"; response = "Plugin not found!";
connection->set_status(server::connection::not_found); connection->set_status(server::connection::not_found);
for(auto& p : _httpsServer._plugins) { for(auto& p : _httpsServer._plugins) {
if (p.id == pathStrs[0]) { if (p.id == pathStrs[0]) {
if (json) { if (json) {
boost::property_tree::ptree root, sensors; boost::property_tree::ptree root, sensors;
for(auto g : p.configurator->getSensorGroups()) { for(auto g : p.configurator->getSensorGroups()) {
boost::property_tree::ptree group; boost::property_tree::ptree group;
for(auto s : g->getSensors()) { for(auto s : g->getSensors()) {
...@@ -166,7 +187,7 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser ...@@ -166,7 +187,7 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser
sensors.add_child(g->getGroupName(), group); sensors.add_child(g->getGroupName(), group);
} }
root.add_child(p.id, sensors); root.add_child(p.id, sensors);
boost::property_tree::write_info(data, root); boost::property_tree::write_json(data, root, true);
} else { } else {
for(auto g : p.configurator->getSensorGroups()) { for(auto g : p.configurator->getSensorGroups()) {
for(auto s : g->getSensors()) { for(auto s : g->getSensors()) {
...@@ -180,23 +201,23 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser ...@@ -180,23 +201,23 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser
} }
} }
} else { } else {
if (pathStrs.size() < 3) { if (pathStrs.size() < 3) {
LOGH(warning) << "Received malformed request: No third path part"; LOGH(warning) << "Received malformed request: No third path part";
connection->set_status(server::connection::bad_request); connection->set_status(server::connection::bad_request);
goto error; goto error;
} }
if (pathStrs[2] != "avg") { if (pathStrs[2] != "avg") {
LOGH(warning) << "Unknown action " << pathStrs[2] << " requested"; LOGH(warning) << "Unknown action " << pathStrs[2] << " requested";
connection->set_status(server::connection::not_supported); connection->set_status(server::connection::not_supported);
goto error; goto error;
} }
std::string sensor = pathStrs[1]; std::string sensor = pathStrs[1];
std::string action = pathStrs[2]; std::string action = pathStrs[2];
uint64_t time = 0; uint64_t time = 0;
for (auto& p : queries) { for (auto& p : queries) {
if (p.first == "interval") { if (p.first == "interval") {
time = getTimestamp(); time = getTimestamp();
...@@ -205,15 +226,17 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser ...@@ -205,15 +226,17 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser
} }
//process actual request //process actual request
bool found = false;
response = "Plugin not found!"; response = "Plugin not found!";
connection->set_status(server::connection::not_found); connection->set_status(server::connection::not_found);
for(auto& p : _httpsServer._plugins) { for(auto& p : _httpsServer._plugins) {
if (p.id == pathStrs[0]) { if (p.id == pathStrs[0]) {
response = "Sensor not found!"; response = "Sensor not found!";
for(const auto& g : p.configurator->getSensorGroups()) { for(const auto& g : p.configurator->getSensorGroups()) {
for(const auto& s : g->getSensors()) { for(const auto& s : g->getSensors()) {
if (s->getName() == sensor) { if (s->getName() == sensor) {
found = true;
response = pathStrs[0] + "::" + sensor + _httpsServer.calcAvg(*s, time); response = pathStrs[0] + "::" + sensor + _httpsServer.calcAvg(*s, time);
connection->set_status(server::connection::ok); connection->set_status(server::connection::ok);
break; break;
...@@ -222,86 +245,145 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser ...@@ -222,86 +245,145 @@ void HttpsServer::requestHandler::operator()(server::request const &request, ser
} }
} }
} }
if(!found) {
for(auto& p : _httpsServer._manager->getPlugins())
if (p.id == pathStrs[0]) {
response = "Sensor not found!";
for(const auto& a : p.configurator->getAnalyzers())
if(a->getStreaming())
for(const auto& u : a->getUnits())
for (const auto& s : u->getBaseOutputs())
if (s->getName() == sensor) {
found = true;
response = pathStrs[0] + "::" + sensor + _httpsServer.calcAvg(*s, time);
connection->set_status(server::connection::ok);
break;
}
}
}
} }
} }
} }
} else if (method == "PUT") { } else if (method == "PUT") {