From 1558b79c160e204ac4ce127734c8aac453fcf665 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 12 Jun 2018 16:38:51 -0400 Subject: [PATCH] Sparkd promethius metrics --- src/server/sparkd/cmds/Run.cpp | 6 +- src/server/sparkd/http/WebServer.cpp | 22 ++++-- src/server/sparkd/http/WebServer.h | 3 +- src/server/sparkd/metrics/metrics.cpp | 61 +++++++++++++++++ src/server/sparkd/metrics/metrics.h | 72 ++++++++++++++++++++ src/server/sparkd/metrics/system_metrics.cpp | 35 ++++++++++ src/server/sparkd/metrics/system_metrics.h | 9 +++ 7 files changed, 201 insertions(+), 7 deletions(-) create mode 100644 src/server/sparkd/metrics/metrics.cpp create mode 100644 src/server/sparkd/metrics/metrics.h create mode 100644 src/server/sparkd/metrics/system_metrics.cpp create mode 100644 src/server/sparkd/metrics/system_metrics.h diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index c86a44fc4..5580254ee 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -16,6 +16,8 @@ #include "server/sparkd/persistence/PersistenceServiceServer.h" #include "server/sparkd/support/ErrorReportService.h" #include "server/sparkd/http/WebServer.h" +#include "server/sparkd/metrics/metrics.h" +#include "server/sparkd/metrics/system_metrics.h" #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/user/UserServiceServer.h" @@ -37,7 +39,9 @@ int Run::execute(std::vector const &) { qbus::Quickbus quickbus(qb_cfg); api::ServiceContext sc(&quickbus); - http::SparkWebServer webserver(sc, ports.config_port()); + metrics::MetricsContainer stats; + metrics::publish_system_metrics(stats); + http::SparkWebServer webserver(sc, stats, ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); user::UserServiceServer login_server(sc); diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index 82b38bd35..1fd553db8 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -49,15 +49,17 @@ namespace http { std::string _www; std::string _conf; const api::ServiceContext& _ctx; + const metrics::MetricsContainer& _metrics; - ServerState(const api::ServiceContext& ctx, int port) : + ServerState(const api::ServiceContext& ctx, const metrics::MetricsContainer& metrics, int port) : _m(), _dispatcher(utils::Dispatcher::get_named("Webserver")), _session(), _server(), _port(port), _www(), - _ctx(ctx) + _ctx(ctx), + _metrics(metrics) { _www = os::sparkdata_path("www"); _conf = os::sparkdata_path("conf"); @@ -139,6 +141,13 @@ namespace http { con->set_status(websocketpp::http::status_code::ok); } + void return_metrics(connection_ptr& con) { + std::stringstream ss; + _metrics.print(ss); + con->set_body(ss.str()); + con->set_status(websocketpp::http::status_code::ok); + } + void directory_index(connection_ptr& con, const std::string& resource, const boost::filesystem::path& path) { // directory listing std::string body = "\n"; @@ -221,10 +230,13 @@ namespace http { void on_http(connection_hdl hdl) { auto con = _server.get_con_from_hdl(hdl); auto resource = strip_query_str(con->get_resource()); - LOG(Api,Info, "REQUEST: {}", resource); + LOG(Api,Info, "HTTP GET: {}", resource); if (boost::iequals(resource, "/config/.all")) { return_dotall(con); } + else if (boost::iequals(resource, "/metrics")) { + return_metrics(con); + } else if (boost::iequals(resource, "/bts_installer.exe") && boost::filesystem::is_regular_file(_www+"/bts_installer.exe")) { return_bts_installer(con); } @@ -258,8 +270,8 @@ namespace http { -SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, int port) : - _me(std::make_shared(ctx, port)) +SparkWebServer::SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, int port) : + _me(std::make_shared(ctx, metrics, port)) { } diff --git a/src/server/sparkd/http/WebServer.h b/src/server/sparkd/http/WebServer.h index 6a707c878..1d118f3b9 100644 --- a/src/server/sparkd/http/WebServer.h +++ b/src/server/sparkd/http/WebServer.h @@ -1,5 +1,6 @@ #pragma once #include "lib/api/public/ServiceContext.h" +#include "server/sparkd/metrics/metrics.h" #include namespace bts { @@ -10,7 +11,7 @@ namespace http { class SparkWebServer { std::shared_ptr _me; public: - SparkWebServer(const api::ServiceContext& ctx, int port); + SparkWebServer(const api::ServiceContext& ctx, metrics::MetricsContainer& metrics, int port); }; }} \ No newline at end of file diff --git a/src/server/sparkd/metrics/metrics.cpp b/src/server/sparkd/metrics/metrics.cpp new file mode 100644 index 000000000..cb17bd792 --- /dev/null +++ b/src/server/sparkd/metrics/metrics.cpp @@ -0,0 +1,61 @@ +#include "metrics.h" +#include +#include + +using std::vector; +using std::shared_ptr; + +namespace bts { +namespace metrics { + +Metric::Metric(const std::string& cname, const std::vector