mgr/cephadm/nvmeof: Add Prometheus filds to NVMeOF spec file.

Fixes: https://tracker.ceph.com/issues/72142
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit 324bd5b0d5ebd8c86113bb7f1bf4be29fc9aba8a)

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 735979a548f091bddcf89891200f527db1fe2cc2..0d48efd11f1fd5aa2a5f167081d931e920a99a21 100644 (file)
--- 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 1792aee31e6979ceba65851417b07038c39918ac..33f27c29f814a72e4c0e077e6fec546d7d761da6 100644 (file)
--- 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 381f12bfb6a7235ad49bb169f5f4c8da80363c9e..60488847a0ff7aad2d6e714999c4bbc6cc9089c7 100644 (file)
--- 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