exporter: ignore mgr perf counters + change port to 9926 + cleanups

Signed-off-by: Avan Thakkar <athakkar@redhat.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 1ae09f0561b20f59a8eddbb88498b985532c694e..032d17dcc03ebb29dcb5f4ab3c50ce3061528954 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -921,7 +921,7 @@ class CephExporter(object):
     entrypoint = '/usr/bin/ceph-exporter'
 
     port_map = {
-        'exporter': 9085,
+        'exporter': 9926,
     }
 
     def __init__(self,
@@ -5172,7 +5172,7 @@ def prepare_ssh(
         cli(['orch', 'apply', 'crash'])
 
     if not ctx.skip_monitoring_stack:
-        for t in ['prometheus', 'grafana', 'node-exporter', 'alertmanager']:
+        for t in ['exporter', 'prometheus', 'grafana', 'node-exporter', 'alertmanager']:
             logger.info('Deploying %s service with default placement...' % t)
             cli(['orch', 'apply', t])
 

diff --git a/src/exporter/DaemonMetricCollector.cc b/src/exporter/DaemonMetricCollector.cc
index eec1603e75185cdb626ffa65a2f58ff6c4ff0a1f..b5b023a448f24ca4b511356df420fb4e403a9adb 100644 (file)
--- a/src/exporter/DaemonMetricCollector.cc
+++ b/src/exporter/DaemonMetricCollector.cc
@@ -71,13 +71,21 @@ void DaemonMetricCollector::send_requests() {
     std::string daemon_name = client.first;
     std::string request("{\"prefix\":\"perf dump\"}");
     std::string response;
-    sock_client.do_request(request, &response);
+    try {
+        sock_client.do_request(request, &response);
+      }
+    catch (const std::exception& e) {
+        std::cout << "culprit: " << daemon_name << std::endl;
+        std::cerr << "Mission abort!!: " << e.what() << std::endl;
+      }
     if (response.size() > 0) {
+      std::cout << "wow: " << daemon_name << std::endl;
       json_object dump = boost::json::parse(response).as_object();
       request = "{\"prefix\":\"perf schema\"}";
       response = "";
       sock_client.do_request(request, &response);
-      json_object schema = boost::json::parse(response).as_object();
+      json_object schema = boost::json::parse(response).as_object();  
+      std::cout << "nice: " << schema << std::endl;
       for (auto perf : schema) {
         std::string perf_group = perf.key().to_string();
         json_object perf_group_object = perf.value().as_object();
@@ -96,11 +104,12 @@ void DaemonMetricCollector::send_requests() {
           std::string labels;
           // Labels
           // FIXME: test this, based on mgr_module perfpath_to_path_labels
-          if (daemon_name.substr(0, 4) == "rgw.") {
+          if (daemon_name.find("rgw") != std::string::npos) {
+            std::cout << "rgw: " << daemon_name << std::endl;
             labels = std::string("instance_id=") + quote(daemon_name.substr(4, std::string::npos));
           } else {
             labels = "ceph_daemon=" + quote(daemon_name);
-            if (daemon_name.substr(0, 11) == "rbd-mirror.") {
+            if (daemon_name.find("rbd-mirror") != std::string::npos) {
               std::regex re("^rbd_mirror_image_([^/]+)/(?:(?:([^/]+)/)?)(.*)\\.(replay(?:_bytes|_latency)?)$");
               std::smatch match;
               if (std::regex_search(daemon_name, match, re) == true) {
@@ -140,13 +149,14 @@ void DaemonMetricCollector::send_requests() {
 }
 
 void DaemonMetricCollector::update_sockets() {
-  std::string path = "/var/run/ceph/";
-  for (const auto & entry : std::filesystem::recursive_directory_iterator(path)) {
+  for (const auto & entry : std::filesystem::recursive_directory_iterator(socketdir)) {
     if (entry.path().extension() == ".asok") {
+      // std::cout << entry.path() << std::endl;
       std::string daemon_socket_name = entry.path().filename().string();
       // remove .asok
       std::string daemon_name = daemon_socket_name.substr(0, daemon_socket_name.size() - 5);
-      if (clients.find(daemon_name) == clients.end()) {
+      if (clients.find(daemon_name) == clients.end() && !(daemon_name.find("mgr") != std::string::npos)) {
+        std::cout << "pathhh: " << entry.path().string() << std::endl;
         AdminSocketClient sock(entry.path().string());
         clients.insert({daemon_name, std::move(sock)});
       }

diff --git a/src/exporter/DaemonMetricCollector.h b/src/exporter/DaemonMetricCollector.h
index 31d34aa7316ee2631c8d4d372d6d4aaef43c9937..4b7af587f072503abefac6b67120159447f995d6 100644 (file)
--- a/src/exporter/DaemonMetricCollector.h
+++ b/src/exporter/DaemonMetricCollector.h
@@ -5,11 +5,14 @@
 #include <map>
 #include <vector>
 
+#include<filesystem>
 #include <string>
 #include <map>
 #include <vector>
 #include <boost/asio.hpp>
 
+namespace fs = std::filesystem;
+
 class DaemonMetricCollector {
  public:
   int i;
@@ -23,6 +26,7 @@ private:
   std::map<std::string, AdminSocketClient> clients;
   std::string metrics;
   int stats_period; // time to wait before sending requests again
+  fs::path socketdir = "/var/run/ceph/";
   void update_sockets();
   void request_loop(boost::asio::deadline_timer &timer);
   void send_requests();

diff --git a/src/exporter/http_server.cc b/src/exporter/http_server.cc
index efe164d14c76edfd30de75a018fe183dcd7cfd07..c5ad93bc0a91658f00631a698fe229d4c6619c9d 100644 (file)
--- a/src/exporter/http_server.cc
+++ b/src/exporter/http_server.cc
@@ -89,7 +89,6 @@ private:
         {
         case http::verb::get:
             response_.result(http::status::ok);
-            response_.set(http::field::server, "Beast");
             create_response();
             break;
 
@@ -111,9 +110,21 @@ private:
     // Construct a response message based on the program state.
     void create_response()
     {
-        if(request_.target() == "/metrics")
+        if (request_.target() == "/") {
+            response_.set(http::field::content_type, "text/html; charset=utf-8");
+            beast::ostream(response_.body())
+                << "<html>\n"
+                <<  "<head><title>Ceph Exporter</title></head>\n"
+                <<  "<body>\n"
+                <<  "<h1>Ceph Exporter</h1>\n"
+
+                <<  "<p><a href='/metrics'>Metrics</a></p>"
+                <<  "</body>\n"
+                <<  "</html>\n";
+        }
+        else if(request_.target() == "/metrics")
         {
-            response_.set(http::field::content_type, "text/plain");
+            response_.set(http::field::content_type, "text/plain; charset=utf-8");
             DaemonMetricCollector &collector = collector_instance();
             std::string metrics = collector.get_metrics();
             beast::ostream(response_.body()) << metrics << std::endl;
@@ -175,7 +186,7 @@ void http_server(tcp::acceptor& acceptor, tcp::socket& socket)
 std::string dns_lookup(std::string hostname) {
     boost::asio::io_service io_service;
     boost::asio::ip::tcp::resolver resolver(io_service);
-    boost::asio::ip::tcp::resolver::query query(hostname, "9085");
+    boost::asio::ip::tcp::resolver::query query(hostname, "9926");
     boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(query);
     boost::asio::ip::tcp::endpoint endpoint = iter->endpoint();
     std::string ip_address = endpoint.address().to_string();
@@ -190,7 +201,7 @@ void http_server_thread_entrypoint() {
 
         std::string ip_address = dns_lookup(hostname);
         auto const address = net::ip::make_address(ip_address);
-        unsigned short port = static_cast<unsigned short>(std::atoi("9085"));
+        unsigned short port = static_cast<unsigned short>(std::atoi("9926"));
 
         net::io_context ioc{1};
 

diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py
index 246da8e39fd06179e3dedaa48355f7f12c6e5199..2b93674a01ce17c12fabd8e6529126c624b5057b 100644 (file)
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@ -277,6 +277,7 @@ class PrometheusService(CephadmService):
         mgr_map = self.mgr.get('mgr_map')
         port = cast(int, self.mgr.get_module_option_ex(
             'prometheus', 'server_port', self.DEFAULT_MGR_PROMETHEUS_PORT))
+        exporter_port = 9926
         deps.append(str(port))
         t = mgr_map.get('services', {}).get('prometheus', None)
         if t:
@@ -286,8 +287,11 @@ class PrometheusService(CephadmService):
             # append the brackets when building the final scrape endpoint
             if '[' in p_result.netloc and ']' in p_result.netloc:
                 mgr_scrape_list.append(f"[{p_result.hostname}]:{port}")
+                mgr_scrape_list.append(f"[{p_result.hostname}]:{exporter_port}")
             else:
                 mgr_scrape_list.append(f"{p_result.hostname}:{port}")
+                mgr_scrape_list.append(f"{p_result.hostname}:{exporter_port}")
+
         # scan all mgrs to generate deps and to get standbys too.
         # assume that they are all on the same port as the active mgr.
         for dd in self.mgr.cache.get_daemons_by_service('mgr'):