From 208e80034b5ff0aa8e597992bc52ad77621c03b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A6=E4=B8=96=E7=90=A6?= Date: Tue, 22 Oct 2024 10:12:40 +0000 Subject: [PATCH] Merge 'add_log_level_metrics' into 'cnch-dev' feat(clickhousech@m-5371677194): add metric cnch_config_logger_level See merge request: !25858 --- src/Server/ServerPrometheusMetricsWriter.cpp | 5 +++++ src/Server/ServerPrometheusMetricsWriter.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/Server/ServerPrometheusMetricsWriter.cpp b/src/Server/ServerPrometheusMetricsWriter.cpp index f2002f21e1..452aa82ea4 100644 --- a/src/Server/ServerPrometheusMetricsWriter.cpp +++ b/src/Server/ServerPrometheusMetricsWriter.cpp @@ -159,6 +159,11 @@ void ServerPrometheusMetricsWriter::writeConfigMetrics(WriteBuffer & wb) { writeOutLine(wb, key_label, max_concurrent_system_queries); } + else if(metric_name == LOGGER_LEVEL_KEY) + { + const int log_level = getLogger("ServerPrometheusMetricsWriter")->getLevel(); + writeOutLine(wb, key_label, log_level); + } else { LOG_WARNING(getLogger("ServerPrometheusMetricsWriter"), "Unknown config metric found, this should never happen"); diff --git a/src/Server/ServerPrometheusMetricsWriter.h b/src/Server/ServerPrometheusMetricsWriter.h index a3745ef578..2f3164ceee 100644 --- a/src/Server/ServerPrometheusMetricsWriter.h +++ b/src/Server/ServerPrometheusMetricsWriter.h @@ -724,12 +724,14 @@ private: static constexpr auto MAX_CONCURRENT_DEFAULT_QUERIES_KEY = "max_concurrent_default_queries"; static constexpr auto MAX_CONCURRENT_INSERT_QUERIES_KEY = "max_concurrent_insert_queries"; static constexpr auto MAX_CONCURRENT_SYSTEM_QUERIES_KEY = "max_concurrent_system_queries"; + static constexpr auto LOGGER_LEVEL_KEY = "logger_level"; const std::unordered_map config_namedoc_map = { {MAX_CONCURRENT_DEFAULT_QUERIES_KEY, "Total number of maximum concurrent queries of Default type allowed"}, {MAX_CONCURRENT_INSERT_QUERIES_KEY, "Total number of maximum concurrent queries of Insert type allowed"}, {MAX_CONCURRENT_SYSTEM_QUERIES_KEY, "Total number of maximum concurrent queries of System type allowed"}, + {LOGGER_LEVEL_KEY, "Logger level"}, {BUILD_INFO_KEY, "Build info"}, };