Merge branch 'master' into fix-extra_table_id_column-duration-lm

pingcap · May 18, 2023 · e7433c3 · e7433c3
2 parents 225f237 + f54a1d4
commit e7433c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/dbms/src/Server/MetricsPrometheus.cpp b/dbms/src/Server/MetricsPrometheus.cpp
@@ -267,7 +267,7 @@ MetricsPrometheus::MetricsPrometheus(
             addr = "[" + listen_host + "]:" + metrics_port;
         else
             addr = listen_host + ":" + metrics_port;
-        if (context.getSecurityConfig()->hasTlsConfig())
+        if (context.getSecurityConfig()->hasTlsConfig() && !conf.getBool(status_disable_metrics_tls, false))
         {
             std::vector<std::weak_ptr<prometheus::Collectable>> collectables{tiflash_metrics.registry};
             if (context.getSharedContextDisagg()->isDisaggregatedComputeMode() && context.getSharedContextDisagg()->use_autoscaler)

diff --git a/dbms/src/Server/MetricsPrometheus.h b/dbms/src/Server/MetricsPrometheus.h
@@ -43,6 +43,7 @@ class MetricsPrometheus
     static constexpr auto status_metrics_interval = "status.metrics_interval";
     static constexpr auto status_metrics_addr = "status.metrics_addr";
     static constexpr auto status_metrics_port = "status.metrics_port";
+    static constexpr auto status_disable_metrics_tls = "status.disable_metrics_tls";
 
     void run();