1 files changed, 35 insertions, 15 deletions
diff --git a/doc/cephadm/services/monitoring.rst b/doc/cephadm/services/monitoring.rst
index a0187363b5e..ef987fd7bd3 100644
--- a/doc/cephadm/services/monitoring.rst
+++ b/doc/cephadm/services/monitoring.rst
@@ -173,24 +173,22 @@ the [ceph-users] mailing list in April of 2024. The thread can be viewed here:
 ``var/lib/ceph/{FSID}/cephadm.{DIGEST}``, where ``{DIGEST}`` is an alphanumeric
 string representing the currently-running version of Ceph.
 
-To see the default container images, run a command of the following form:
+To see the default container images, run below command:
 
 .. prompt:: bash #
 
-   grep -E "DEFAULT*IMAGE" /var/lib/ceph/{FSID}/cephadm.{DIGEST}
+   cephadm list-images
 
-::
-
-   DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.51.0'
-   DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:2.9.5'    
-   DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:2.9.5'    
-   DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.7.0'    
-   DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.27.0'   
-   DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:10.4.0'
 
 Default monitoring images are specified in
-``/src/cephadm/cephadmlib/constants.py`` and in
-``/src/pybind/mgr/cephadm/module.py``.
+``/src/python-common/ceph/cephadm/images.py``.
+
+
+.. autoclass:: ceph.cephadm.images.DefaultImages
+   :members:
+   :undoc-members:
+   :exclude-members: desc, image_ref, key
+
 
 Using custom images
 ~~~~~~~~~~~~~~~~~~~
@@ -304,14 +302,24 @@ Option names
 """"""""""""
 
 The following templates for files that will be generated by cephadm can be
-overridden. These are the names to be used when storing with ``ceph config-key
-set``:
+overridden. These are the names to be used when storing with ``ceph config-key set``:
 
 - ``services/alertmanager/alertmanager.yml``
+- ``services/alertmanager/web.yml``
 - ``services/grafana/ceph-dashboard.yml``
 - ``services/grafana/grafana.ini``
+- ``services/ingress/haproxy.cfg``
+- ``services/ingress/keepalived.conf``
+- ``services/iscsi/iscsi-gateway.cfg``
+- ``services/mgmt-gateway/external_server.conf``
+- ``services/mgmt-gateway/internal_server.conf``
+- ``services/mgmt-gateway/nginx.conf``
+- ``services/nfs/ganesha.conf``
+- ``services/node-exporter/web.yml``
+- ``services/nvmeof/ceph-nvmeof.conf``
+- ``services/oauth2-proxy/oauth2-proxy.conf``
 - ``services/prometheus/prometheus.yml``
-- ``services/prometheus/alerting/custom_alerts.yml``
+- ``services/prometheus/web.yml``
 - ``services/loki.yml``
 - ``services/promtail.yml``
 
@@ -319,9 +327,21 @@ You can look up the file templates that are currently used by cephadm in
 ``src/pybind/mgr/cephadm/templates``:
 
 - ``services/alertmanager/alertmanager.yml.j2``
+- ``services/alertmanager/web.yml.j2``
 - ``services/grafana/ceph-dashboard.yml.j2``
 - ``services/grafana/grafana.ini.j2``
+- ``services/ingress/haproxy.cfg.j2``
+- ``services/ingress/keepalived.conf.j2``
+- ``services/iscsi/iscsi-gateway.cfg.j2``
+- ``services/mgmt-gateway/external_server.conf.j2``
+- ``services/mgmt-gateway/internal_server.conf.j2``
+- ``services/mgmt-gateway/nginx.conf.j2``
+- ``services/nfs/ganesha.conf.j2``
+- ``services/node-exporter/web.yml.j2``
+- ``services/nvmeof/ceph-nvmeof.conf.j2``
+- ``services/oauth2-proxy/oauth2-proxy.conf.j2``
 - ``services/prometheus/prometheus.yml.j2``
+- ``services/prometheus/web.yml.j2``
 - ``services/loki.yml.j2``
 - ``services/promtail.yml.j2``