Merge pull request #54090 from ClickHouse/remove-current-status

Remove CurrentStatusInfo
ClickHouse · Sep 26, 2023 · 29d3b34 · 29d3b34
2 parents d781ee3 + 5b4033e
commit 29d3b34
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 271 deletions.
diff --git a/programs/diagnostics/testdata/configs/xml/config.xml b/programs/diagnostics/testdata/configs/xml/config.xml
@@ -760,27 +760,6 @@
     </graphite>
     -->
 
-    <!-- Serve endpoint for Prometheus monitoring. -->
-    <!--
-        endpoint - mertics path (relative to root, statring with "/")
-        port - port to setup server. If not defined or 0 than http_port used
-        metrics - send data from table system.metrics
-        events - send data from table system.events
-        asynchronous_metrics - send data from table system.asynchronous_metrics
-        status_info - send data from different component from CH, ex: Dictionaries status
-    -->
-    <!--
-    <prometheus>
-        <endpoint>/metrics</endpoint>
-        <port>9363</port>
-
-        <metrics>true</metrics>
-        <events>true</events>
-        <asynchronous_metrics>true</asynchronous_metrics>
-        <status_info>true</status_info>
-    </prometheus>
-    -->
-
     <!-- Query log. Used only for queries with setting log_queries = 1. -->
     <query_log>
         <!-- What table to insert data. If table is not exist, it will be created.

diff --git a/programs/diagnostics/testdata/configs/yaml/config.yaml b/programs/diagnostics/testdata/configs/yaml/config.yaml
@@ -638,7 +638,6 @@ default_session_timeout: 60
 # metrics - send data from table system.metrics
 # events - send data from table system.events
 # asynchronous_metrics - send data from table system.asynchronous_metrics
-# status_info - send data from different component from CH, ex: Dictionaries status
 
 # prometheus:
 #     endpoint: /metrics
@@ -647,7 +646,6 @@ default_session_timeout: 60
 #     metrics: true
 #     events: true
 #     asynchronous_metrics: true
-#     status_info: true
 
 # Query log. Used only for queries with setting log_queries = 1.
 query_log:

diff --git a/programs/diagnostics/testdata/configs/yandex_xml/config.xml b/programs/diagnostics/testdata/configs/yandex_xml/config.xml
@@ -760,27 +760,6 @@
     </graphite>
     -->
 
-    <!-- Serve endpoint for Prometheus monitoring. -->
-    <!--
-        endpoint - mertics path (relative to root, statring with "/")
-        port - port to setup server. If not defined or 0 than http_port used
-        metrics - send data from table system.metrics
-        events - send data from table system.events
-        asynchronous_metrics - send data from table system.asynchronous_metrics
-        status_info - send data from different component from CH, ex: Dictionaries status
-    -->
-    <!--
-    <prometheus>
-        <endpoint>/metrics</endpoint>
-        <port>9363</port>
-
-        <metrics>true</metrics>
-        <events>true</events>
-        <asynchronous_metrics>true</asynchronous_metrics>
-        <status_info>true</status_info>
-    </prometheus>
-    -->
-
     <!-- Query log. Used only for queries with setting log_queries = 1. -->
     <query_log>
         <!-- What table to insert data. If table is not exist, it will be created.

diff --git a/programs/server/config.xml b/programs/server/config.xml
@@ -969,7 +969,6 @@
         metrics - send data from table system.metrics
         events - send data from table system.events
         asynchronous_metrics - send data from table system.asynchronous_metrics
-        status_info - send data from different component from CH, ex: Dictionaries status
     -->
     <!--
     <prometheus>
@@ -979,7 +978,6 @@
         <metrics>true</metrics>
         <events>true</events>
         <asynchronous_metrics>true</asynchronous_metrics>
-        <status_info>true</status_info>
     </prometheus>
     -->
 

diff --git a/programs/server/config.yaml.example b/programs/server/config.yaml.example
@@ -639,7 +639,6 @@ default_session_timeout: 60
 # metrics - send data from table system.metrics
 # events - send data from table system.events
 # asynchronous_metrics - send data from table system.asynchronous_metrics
-# status_info - send data from different component from CH, ex: Dictionaries status
 
 # prometheus:
 #     endpoint: /metrics
@@ -648,7 +647,6 @@ default_session_timeout: 60
 #     metrics: true
 #     events: true
 #     asynchronous_metrics: true
-#     status_info: true
 
 # Query log. Used only for queries with setting log_queries = 1.
 query_log:

diff --git a/src/Common/StatusInfo.cpp b/src/Common/StatusInfo.cpp
diff --git a/src/Common/StatusInfo.h b/src/Common/StatusInfo.h
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
@@ -1,15 +1,13 @@
 #include "ExternalLoader.h"
 
 #include <mutex>
-#include <pcg_random.hpp>
 #include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/Config/AbstractConfigurationComparison.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ThreadPool.h>
 #include <Common/randomSeed.h>
 #include <Common/setThreadName.h>
-#include <Common/StatusInfo.h>
 #include <Common/scope_guard_safe.h>
 #include <Common/logger_useful.h>
 #include <base/chrono_io.h>
@@ -18,12 +16,6 @@
 #include <unordered_set>
 
 
-namespace CurrentStatusInfo
-{
-    extern const Status DictionaryStatus;
-}
-
-
 namespace DB
 {
 namespace ErrorCodes
@@ -1145,7 +1137,6 @@ class ExternalLoader::LoadingDispatcher : private boost::noncopyable
         if (info && (info->loading_id == loading_id))
         {
             info->loading_id = info->state_id;
-            CurrentStatusInfo::set(CurrentStatusInfo::DictionaryStatus, name, static_cast<Int8>(info->status()));
         }
         min_id_to_finish_loading_dependencies.erase(std::this_thread::get_id());
 
@@ -1307,7 +1298,6 @@ scope_guard ExternalLoader::addConfigRepository(std::unique_ptr<IExternalLoaderC
     return [this, ptr, name]()
     {
         config_files_reader->removeConfigRepository(ptr);
-        CurrentStatusInfo::unset(CurrentStatusInfo::DictionaryStatus, name);
         reloadConfig(name);
     };
 }

diff --git a/src/Server/PrometheusMetricsWriter.cpp b/src/Server/PrometheusMetricsWriter.cpp
@@ -1,7 +1,6 @@
 #include "PrometheusMetricsWriter.h"
 
 #include <IO/WriteHelpers.h>
-#include <Common/StatusInfo.h>
 #include <regex>    /// TODO: this library is harmful.
 #include <algorithm>
 
@@ -51,7 +50,6 @@ PrometheusMetricsWriter::PrometheusMetricsWriter(
     , send_events(config.getBool(config_name + ".events", true))
     , send_metrics(config.getBool(config_name + ".metrics", true))
     , send_asynchronous_metrics(config.getBool(config_name + ".asynchronous_metrics", true))
-    , send_status_info(config.getBool(config_name + ".status_info", true))
 {
 }
 
@@ -120,42 +118,6 @@ void PrometheusMetricsWriter::write(WriteBuffer & wb) const
             writeOutLine(wb, key, value.value);
         }
     }
-
-    if (send_status_info)
-    {
-        for (size_t i = 0, end = CurrentStatusInfo::end(); i < end; ++i)
-        {
-            std::lock_guard lock(CurrentStatusInfo::locks[static_cast<CurrentStatusInfo::Status>(i)]);
-            std::string metric_name{CurrentStatusInfo::getName(static_cast<CurrentStatusInfo::Status>(i))};
-            std::string metric_doc{CurrentStatusInfo::getDocumentation(static_cast<CurrentStatusInfo::Status>(i))};
-
-            convertHelpToSingleLine(metric_doc);
-
-            if (!replaceInvalidChars(metric_name))
-                continue;
-            std::string key{current_status_prefix + metric_name};
-
-            writeOutLine(wb, "# HELP", key, metric_doc);
-            writeOutLine(wb, "# TYPE", key, "gauge");
-
-            for (const auto & value: CurrentStatusInfo::values[i])
-            {
-                for (const auto & enum_value: CurrentStatusInfo::getAllPossibleValues(static_cast<CurrentStatusInfo::Status>(i)))
-                {
-                    DB::writeText(key, wb);
-                    DB::writeChar('{', wb);
-                    DB::writeText(key, wb);
-                    DB::writeChar('=', wb);
-                    writeDoubleQuotedString(enum_value.first, wb);
-                    DB::writeText(",name=", wb);
-                    writeDoubleQuotedString(value.first, wb);
-                    DB::writeText("} ", wb);
-                    DB::writeText(value.second == enum_value.second, wb);
-                    DB::writeChar('\n', wb);
-                }
-            }
-        }
-    }
 }
 
 }
diff --git a/src/Server/PrometheusMetricsWriter.h b/src/Server/PrometheusMetricsWriter.h
@@ -27,12 +27,10 @@ class PrometheusMetricsWriter
     const bool send_events;
     const bool send_metrics;
     const bool send_asynchronous_metrics;
-    const bool send_status_info;
 
     static inline constexpr auto profile_events_prefix = "ClickHouseProfileEvents_";
     static inline constexpr auto current_metrics_prefix = "ClickHouseMetrics_";
     static inline constexpr auto asynchronous_metrics_prefix = "ClickHouseAsyncMetrics_";
-    static inline constexpr auto current_status_prefix = "ClickHouseStatusInfo_";
 };
 
 }
diff --git a/tests/integration/test_config_xml_full/configs/config.xml b/tests/integration/test_config_xml_full/configs/config.xml
@@ -674,27 +674,6 @@
     </graphite>
     -->
 
-    <!-- Serve endpoint for Prometheus monitoring. -->
-    <!--
-        endpoint - mertics path (relative to root, statring with "/")
-        port - port to setup server. If not defined or 0 than http_port used
-        metrics - send data from table system.metrics
-        events - send data from table system.events
-        asynchronous_metrics - send data from table system.asynchronous_metrics
-        status_info - send data from different component from CH, ex: Dictionaries status
-    -->
-    <!--
-    <prometheus>
-        <endpoint>/metrics</endpoint>
-        <port>9363</port>
-
-        <metrics>true</metrics>
-        <events>true</events>
-        <asynchronous_metrics>true</asynchronous_metrics>
-        <status_info>true</status_info>
-    </prometheus>
-    -->
-
     <!-- Query log. Used only for queries with setting log_queries = 1. -->
     <query_log>
         <!-- What table to insert data. If table is not exist, it will be created.

diff --git a/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.reference b/tests/queries/0_stateless/02390_prometheus_ClickHouseStatusInfo_DictionaryStatus.reference