From 83bd15adedb1564d9fd28333201e25b0d3accccc Mon Sep 17 00:00:00 2001 From: Gil Bregman Date: Tue, 15 Jul 2025 17:52:12 +0300 Subject: [PATCH] mgr/cephadm/nvmeof: Add Prometheus filds to NVMeOF spec file. Fixes: https://tracker.ceph.com/issues/72142 Signed-off-by: Gil Bregman (cherry picked from commit 324bd5b0d5ebd8c86113bb7f1bf4be29fc9aba8a) --- .../cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 | 2 ++ src/pybind/mgr/cephadm/tests/test_services.py | 2 ++ src/python-common/ceph/deployment/service_spec.py | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 index 735979a548f0..0d48efd11f1f 100644 --- a/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 +++ b/src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2 @@ -17,6 +17,8 @@ enable_prometheus_exporter = {{ spec.enable_prometheus_exporter }} prometheus_exporter_ssl = False prometheus_port = {{ spec.prometheus_port }} prometheus_stats_interval = {{ spec.prometheus_stats_interval }} +prometheus_startup_delay = {{ spec.prometheus_startup_delay }} +prometheus_connection_list_cache_expiration = {{ spec.prometheus_connection_list_cache_expiration }} verify_nqns = {{ spec.verify_nqns }} verify_keys = {{ spec.verify_keys }} verify_listener_ip = {{ spec.verify_listener_ip }} diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index 1792aee31e69..33f27c29f814 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -366,6 +366,8 @@ enable_prometheus_exporter = True prometheus_exporter_ssl = False prometheus_port = 10008 prometheus_stats_interval = 10 +prometheus_startup_delay = 240 +prometheus_connection_list_cache_expiration = 60 verify_nqns = True verify_keys = True verify_listener_ip = True diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py index 381f12bfb6a7..60488847a0ff 100644 --- a/src/python-common/ceph/deployment/service_spec.py +++ b/src/python-common/ceph/deployment/service_spec.py @@ -1394,6 +1394,8 @@ class NvmeofServiceSpec(ServiceSpec): enable_prometheus_exporter: Optional[bool] = True, prometheus_port: Optional[int] = 10008, prometheus_stats_interval: Optional[int] = 10, + prometheus_startup_delay: Optional[int] = 240, + prometheus_connection_list_cache_expiration: Optional[int] = 60, bdevs_per_cluster: Optional[int] = None, flat_bdevs_per_cluster: Optional[int] = None, cluster_connections: Optional[int] = None, @@ -1503,6 +1505,11 @@ class NvmeofServiceSpec(ServiceSpec): self.prometheus_port = prometheus_port or 10008 #: ``prometheus_stats_interval`` Prometheus get stats interval self.prometheus_stats_interval = prometheus_stats_interval + #: ``prometheus_startup_delay`` Prometheus startup delay, in seconds + self.prometheus_startup_delay = prometheus_startup_delay + #: ``prometheus_connection_list_cache_expiration`` Expiration time of connection list cache + self.prometheus_connection_list_cache_expiration = \ + prometheus_connection_list_cache_expiration #: ``verify_nqns`` enables verification of subsystem and host NQNs for validity self.verify_nqns = verify_nqns #: ``verify_keys`` enables verification of PSJ and DHCHAP keys in the gateway -- 2.47.3