From 1d9f06d4ac9c9af5e04a0f1ca5a4e944dd363047 Mon Sep 17 00:00:00 2001 From: Chris Spiegel Date: Thu, 6 Nov 2025 05:18:26 -0800 Subject: [PATCH] Disable metrics by default --- RELEASE-NOTES.md | 4 ++++ service/OneService.cpp | 11 +++++------ service/README.md | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 5cecf3400..1f3551389 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,6 +1,10 @@ ZeroTier Release Notes ====== +## WORK-IN-PROGRESS + + * Metrics collection is now disabled by default. It can be enabled via the `enableMetrics` setting in `local.conf`. + ## 2025-08-21 -- Version 1.16.0 * License Changes diff --git a/service/OneService.cpp b/service/OneService.cpp index cd275aa23..d207bd495 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -988,7 +988,6 @@ class OneServiceImpl : public OneService { _ports[1] = 0; _ports[2] = 0; - prometheus::simpleapi::saver.set_registry(prometheus::simpleapi::registry_ptr); prometheus::simpleapi::saver.set_delay(std::chrono::seconds(5)); prometheus::simpleapi::saver.set_out_file(_homePath + ZT_PATH_SEPARATOR + "metrics.prom"); @@ -2932,13 +2931,13 @@ class OneServiceImpl : public OneService { } } - bool disableMetrics = OSUtils::jsonBool(settings["disableMetrics"], false); - if (disableMetrics) { - std::shared_ptr registry; - prometheus::simpleapi::saver.set_registry(registry); + bool enableMetrics = OSUtils::jsonBool(settings["enableMetrics"], false); + if (enableMetrics) { + prometheus::simpleapi::saver.set_registry(prometheus::simpleapi::registry_ptr); } else { - prometheus::simpleapi::saver.set_registry(prometheus::simpleapi::registry_ptr); + std::shared_ptr registry; + prometheus::simpleapi::saver.set_registry(registry); } } diff --git a/service/README.md b/service/README.md index 19a3f80b5..3c9c8045a 100644 --- a/service/README.md +++ b/service/README.md @@ -42,7 +42,7 @@ Settings available in `local.conf` (this is not valid JSON, and JSON does not al "bind": [ "ip",... ], /* If present and non-null, bind to these IPs instead of to each interface (wildcard IP allowed) */ "allowTcpFallbackRelay": true|false, /* Allow or disallow establishment of TCP relay connections (true by default) */ "multipathMode": 0|1|2, /* multipath mode: none (0), random (1), proportional (2) */ - "disableMetrics": true|false /* If true, disable the collection of metrics in metrics.prom. */ + "enableMetrics": true|false /* If true, enable the collection of metrics in metrics.prom. */ } } ```