From 4816a7c40057ab44461be28f4bd1b419fece12d5 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Thu, 9 Feb 2023 15:03:59 +0800 Subject: [PATCH] fix tls ipv6 metric (#6736) (#6783) close pingcap/tiflash#6734 --- dbms/src/Server/MetricsPrometheus.cpp | 32 ++++++++++++++++++++------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dbms/src/Server/MetricsPrometheus.cpp b/dbms/src/Server/MetricsPrometheus.cpp index c195722e2fd..78a4af15197 100644 --- a/dbms/src/Server/MetricsPrometheus.cpp +++ b/dbms/src/Server/MetricsPrometheus.cpp @@ -1,4 +1,4 @@ -// Copyright 2022 PingCAP, Ltd. +// Copyright 2023 PingCAP, Ltd. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -103,7 +103,7 @@ class MetricHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory std::shared_ptr getHTTPServer( const TiFlashSecurityConfig & security_config, const std::weak_ptr & collectable, - const String & metrics_port) + const String & address) { Poco::Net::Context::Ptr context = new Poco::Net::Context( Poco::Net::Context::TLSV1_2_SERVER_USE, @@ -125,8 +125,7 @@ std::shared_ptr getHTTPServer( Poco::Net::SecureServerSocket socket(context); Poco::Net::HTTPServerParams::Ptr http_params = new Poco::Net::HTTPServerParams; - - Poco::Net::SocketAddress addr("0.0.0.0", std::stoi(metrics_port)); + Poco::Net::SocketAddress addr = Poco::Net::SocketAddress(address); socket.bind(addr, true); socket.listen(); auto server = std::make_shared(new MetricHandlerFactory(collectable), socket, http_params); @@ -136,6 +135,17 @@ std::shared_ptr getHTTPServer( constexpr Int64 MILLISECOND = 1000; constexpr Int64 INIT_DELAY = 5; +namespace +{ +inline bool isIPv6(const String & input_address) +{ + if (input_address.empty()) + return false; + char str[INET6_ADDRSTRLEN]; + return inet_pton(AF_INET6, input_address.c_str(), str) == 1; +} +} // namespace + MetricsPrometheus::MetricsPrometheus( Context & context, const AsynchronousMetrics & async_metrics_, @@ -202,17 +212,23 @@ MetricsPrometheus::MetricsPrometheus( if (conf.hasOption(status_metrics_port) || !conf.hasOption(status_metrics_addr)) { auto metrics_port = conf.getString(status_metrics_port, DB::toString(DEFAULT_METRICS_PORT)); + auto listen_host = conf.getString("listen_host", "0.0.0.0"); + String addr; + if (isIPv6(listen_host)) + addr = "[" + listen_host + "]:" + metrics_port; + else + addr = listen_host + ":" + metrics_port; if (security_config.has_tls_config) { - server = getHTTPServer(security_config, tiflash_metrics.registry, metrics_port); + server = getHTTPServer(security_config, tiflash_metrics.registry, addr); server->start(); - LOG_INFO(log, "Enable prometheus secure pull mode; Metrics Port = {}", metrics_port); + LOG_INFO(log, "Enable prometheus secure pull mode; Listen Host = {}, Metrics Port = {}", listen_host, metrics_port); } else { - exposer = std::make_shared(metrics_port); + exposer = std::make_shared(addr); exposer->RegisterCollectable(tiflash_metrics.registry); - LOG_INFO(log, "Enable prometheus pull mode; Metrics Port = {}", metrics_port); + LOG_INFO(log, "Enable prometheus pull mode; Listen Host = {}, Metrics Port = {}", listen_host, metrics_port); } } else