From: Zac Dover <zac.dover@proton.me>
Date: Sat, 4 May 2024 12:37:40 +0000 (+1000)
Subject: Merge pull request #57239 from zdover23/wip-doc-2024-05-02-cephadm-services-monitorin... 
X-Git-Tag: v17.2.8~366
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74074ebcdc292bd4a8f6c9f576fd98cfa1f067c6;p=ceph.git

Merge pull request #57239 from zdover23/wip-doc-2024-05-02-cephadm-services-monitoring-quincy

quincy: doc/cephadm: Quincy default images procedure

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Adam King <adking@redhat.com>
---

74074ebcdc292bd4a8f6c9f576fd98cfa1f067c6
diff --cc doc/cephadm/services/monitoring.rst
index ae4c97626d4,1d232848fc9..f8f00c79c8c
--- a/doc/cephadm/services/monitoring.rst
+++ b/doc/cephadm/services/monitoring.rst
@@@ -125,40 -125,42 +125,74 @@@ example spec file
      spec:
        port: 4200
  
+ .. _cephadm_default_images:
+ 
+ Default images
+ ~~~~~~~~~~~~~~
+ 
+ 
+ ``cephadm`` stores a local copy of the ``cephadm`` binary in
+ ``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:
+ 
+ .. prompt:: bash #
+ 
+    grep -E "_IMAGE" /var/lib/ceph/{FSID}/cephadm.{DIGEST}
+ 
+ ::
+ 
+    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``.
+ 
+ *The information in this section was developed by Eugen Block in a thread on
+ the [ceph-users] mailing list in April of 2024. The thread can be viewed here:*
+ `[ceph-users] discussion about default monitoring images
+ <https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/QGC66QIFBKRTPZAQMQEYFXOGZJ7RLWBN/>`_.
+ 
  .. _cephadm_monitoring-images:
  
 +.. _cephadm_default_images:
 +
 +Default images
 +~~~~~~~~~~~~~~
 +
 +*The information in this section was developed by Eugen Block in a thread on
 +the [ceph-users] mailing list in April of 2024. The thread can be viewed here:
 +``https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/QGC66QIFBKRTPZAQMQEYFXOGZJ7RLWBN/``.*
 +
 +``cephadm`` stores a local copy of the ``cephadm`` binary in
 +``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:
 +
 +.. prompt:: bash #
 +
 +   grep -E "DEFAULT*IMAGE" /var/lib/ceph/{FSID}/cephadm.{DIGEST}
 +
 +::
 +
 +   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``.
 +
  Using custom images
  ~~~~~~~~~~~~~~~~~~~