From 49b0c0d65b93de2618ed66f71d6cd68d1563f9dc Mon Sep 17 00:00:00 2001 From: Zac Dover Date: Fri, 3 May 2024 15:32:28 +1000 Subject: [PATCH] doc/rados: PR#57022 unfinished business Make the changes suggested by Anthony D'Atri in https://github.com/ceph/ceph/pull/57022. Co-authored-by: Anthony D'Atri Signed-off-by: Zac Dover (cherry picked from commit 93898d80836ac41041f75b5bf5398f9388abb52f) --- doc/cephadm/services/monitoring.rst | 34 +------------------ .../troubleshooting/troubleshooting-pg.rst | 2 +- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/doc/cephadm/services/monitoring.rst b/doc/cephadm/services/monitoring.rst index f8f00c79c8cb9..a4d1ee548724b 100644 --- a/doc/cephadm/services/monitoring.rst +++ b/doc/cephadm/services/monitoring.rst @@ -139,7 +139,7 @@ To see the default container images, run a command of the following form: .. prompt:: bash # - grep -E "_IMAGE" /var/lib/ceph/{FSID}/cephadm.{DIGEST} + grep -E "_IMAGE =" /var/lib/ceph/{FSID}/cephadm.{DIGEST} :: @@ -161,38 +161,6 @@ the [ceph-users] mailing list in April of 2024. The thread can be viewed here:* .. _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 ~~~~~~~~~~~~~~~~~~~ diff --git a/doc/rados/troubleshooting/troubleshooting-pg.rst b/doc/rados/troubleshooting/troubleshooting-pg.rst index 2b82fe440e1d8..a578e8baa9f4b 100644 --- a/doc/rados/troubleshooting/troubleshooting-pg.rst +++ b/doc/rados/troubleshooting/troubleshooting-pg.rst @@ -583,7 +583,7 @@ any mismatch between the checksum of any replica of an object and the checksum of the authoritative copy means that there is an inconsistency. The discovery of these inconsistencies cause a PG's state to be set to ``inconsistent``. -The ``pg repair`` command attempts to fix inconsistencies of various kinds. If +The ``pg repair`` command attempts to fix inconsistencies of various kinds. When ``pg repair`` finds an inconsistent PG, it attempts to overwrite the digest of the inconsistent copy with the digest of the authoritative copy. If ``pg repair`` finds an inconsistent replicated pool, it marks the inconsistent copy -- 2.39.5