Merge pull request ceph#58440 from jmolmo/tls_4_exporter

exporter: Added https(TLSv13) support

Reviewed-by: Ernesto Puerta <[email protected]>
Reviewed-by: Avan Thakkar <[email protected]>

Author: rkachach

src/common/options/ceph-exporter.yaml.in

@@ -25,6 +25,20 @@ options:
   default: 9926
   services:
   - ceph-exporter
+- name: exporter_cert_file
+  type: str
+  level: advanced
+  desc: Certificate file for TLS.
+  default:
+  services:
+  - ceph-exporter
+- name: exporter_key_file
+  type: str
+  level: advanced
+  desc: Key certificate file for TLS.
+  default:
+  services:
+  - ceph-exporter
 - name: exporter_prio_limit
   type: int
   level: advanced

src/exporter/CMakeLists.txt

@@ -1,10 +1,12 @@
 set(exporter_srcs
   ceph_exporter.cc
   DaemonMetricCollector.cc
-  http_server.cc
+  web_server.cc
   util.cc
   )
 add_executable(ceph-exporter ${exporter_srcs})
 target_link_libraries(ceph-exporter
-  global-static ceph-common)
+  global-static
+  ceph-common
+  OpenSSL::SSL)
 install(TARGETS ceph-exporter DESTINATION bin)

src/exporter/ceph_exporter.cc

@@ -1,7 +1,7 @@
 #include "common/ceph_argparse.h"
 #include "common/config.h"
 #include "exporter/DaemonMetricCollector.h"
-#include "exporter/http_server.h"
+#include "exporter/web_server.h"
 #include "global/global_init.h"
 #include "global/global_context.h"
 
@@ -18,6 +18,8 @@ static void usage() {
                "  --sock-dir:     The path to ceph daemons socket files dir\n"
                "  --addrs:        Host ip address where exporter is deployed\n"
                "  --port:         Port to deploy exporter on. Default is 9926\n"
+               "  --cert-file:    Path to the certificate file to use https\n"
+               "  --key-file:     Path to the certificate key file to use https\n"
                "  --prio-limit:   Only perf counters greater than or equal to prio-limit are fetched. Default: 5\n"
                "  --stats-period: Time to wait before sending requests again to exporter server (seconds). Default: 5s"
             << std::endl;
@@ -48,6 +50,10 @@ int main(int argc, char **argv) {
       cct->_conf.set_val("exporter_addr", val);
     } else if (ceph_argparse_witharg(args, i, &val, "--port", (char *)NULL)) {
       cct->_conf.set_val("exporter_http_port", val);
+    } else if (ceph_argparse_witharg(args, i, &val, "--cert-file", (char *)NULL)) {
+      cct->_conf.set_val("exporter_cert_file", val);
+    } else if (ceph_argparse_witharg(args, i, &val, "--key-file", (char *)NULL)) {
+      cct->_conf.set_val("exporter_key_file", val);
     } else if (ceph_argparse_witharg(args, i, &val, "--prio-limit", (char *)NULL)) {
       cct->_conf.set_val("exporter_prio_limit", val);
     } else if (ceph_argparse_witharg(args, i, &val, "--stats-period", (char *)NULL)) {
@@ -58,7 +64,7 @@ int main(int argc, char **argv) {
   }
   common_init_finish(g_ceph_context);
 
-  boost::thread server_thread(http_server_thread_entrypoint);
+  boost::thread server_thread(web_server_thread_entrypoint);
   DaemonMetricCollector &collector = collector_instance();
   collector.main();
   server_thread.join();