doc/cephfs: repairing inaccessible FSes

Add a procedure to doc/cephfs/troubleshooting.rst that explains how to
restore access to FileSystems that became inaccessible after
post-Nautilus upgrades. The procedure included here was written by Harry
G Coin, and merely lightly edited by me. I include him here as a
"co-author", but it should be noted that he did the heavy lifting on
this.

See the email thread here for more context:
https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/message/HS5FD3QFR77NAKJ43M2T5ZC25UYXFLNW/

Co-authored-by: Harry G Coin <hgcoin@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>

Merge pull request #51252 from rhcs-dashboard/fix-pg-imbalancy-quincy

quincy: mgr/dashboard: fix CephPGImbalance alert

Reviewed-by: Avan Thakkar <athakkar@redhat.com>

Merge pull request #51358 from rhcs-dashboard/wip-59655-quincy

quincy: mgr/dashboard: bump moment from 2.29.3 to 2.29.4 in /src/pybind/mgr/dashboard/frontend

Reviewed-by: Pegonzal <NOT@FOUND>

mgr/dashboard: bump moment in /src/pybind/mgr/dashboard/frontend

Bumps [moment](https://github.com/moment/moment) from 2.29.3 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.3...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 9e8245e328e56755f13bffbec4b0740850696f94)

Merge pull request #51149 from rhcs-dashboard/wip-59466-quincy

quincy: mgr/dashboard: skip Create OSDs step in Cluster expansion

Reviewed-by: Avan Thakkar <athakkar@redhat.com>

Merge pull request #51112 from rhcs-dashboard/wip-59459-quincy

quincy: mgr/dashboard: expose more grafana configs in service form

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #51350 from zdover23/wip-doc-2023-05-05-backport-51348-to-quincy

quincy: doc: Use `ceph osd crush tree` command to display weight set weights

doc: Use `ceph osd crush tree` command to display weight set weights

The previous `ceph osd tree` doesn't show pool-defined weight-sets as the above documentation suggests.

Signed-off-by: James Lakin <james@jameslakin.co.uk>
(cherry picked from commit 15c3d72a43a37798de823b26f1429f7776f67aaa)

Merge pull request #51325 from rhcs-dashboard/wip-59623-quincy

quincy: mgr/dashboard: fix the rbd mirroring configure check

Reviewed-by: Avan Thakkar <athakkar@redhat.com>

Merge pull request #51338 from zdover23/wip-doc-2023-05-04-backport-51292-to-quincy

quincy: doc/rados: edit stretch-mode.rst

doc/rados: edit stretch-mode.rst

Edit "Stretch Mode Limitations" (renamed "Limitations of Stretch Mode"
in this commit) in doc/rados/operations/stretch-mode.rst.

Co-authored-by: Greg Farnum <gfarnum@redhat.com>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 410e2a181c3247d13a1b20d80c4bcbbc1a5f84da)

Merge pull request #51335 from ljflores/wip-59625-quincy

quincy: mgr: add urllib3==1.26.15 to mgr/requirements.txt

mgr: add urllib3==1.26.15 to mgr/requirements.txt

We do not depend on any particular version of
urllib3, but as a workaround to the incompatibility
of urllib3 constraints between kubernetes and
requests, we need to pin it temporarily to
the version both are happy with.

Fixes: https://tracker.ceph.com/issues/59591
Signed-off-by: Laura Flores <lflores@redhat.com>
(cherry picked from commit 80d460005e44649191aa862fa78bd278644b5237)

Merge pull request #51210 from guits/wip-59257-quincy

quincy: ceph-volume: fix drive-group issue that expects the batch_args to be a string

Merge pull request #51206 from guits/wip-59518-quincy

quincy: ceph-volume: fix batch refactor issue

Merge pull request #51195 from guits/wip-59524-quincy

quincy: ceph-volume: quick fix in zap.py

mgr/dashboard: fix the rbd mirroring configure check

In one-way mirroring, the condition we are checking now for configuring
the mirroring will fail because only one cluster needs to have the
mirror daemon present. Thus even if mirroring is successfuly happening
the page won't load. For now relaxing the rule until we find a better
api call to check for the status

Fixes: https://tracker.ceph.com/issues/59573
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 09de6be991c4240065bf5774e798b3d274443cff)

Merge pull request #51310 from zdover23/wip-doc-2023-05-02-backport-51133-to-quincy

quincy: doc/mgr: update prompts in prometheus.rst

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

doc/mgr: update prompts in prometheus.rst

Update prompts in prometheus.rst so that they're unselectable.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 5a90d64b343f158d43397c70c267deb4e7ef0e00)

Merge pull request #51306 from zdover23/wip-doc-2023-05-02-backport-51299-to-quincy

quincy: doc/radosgw: rabbitmq - push-endpoint edit

doc/radosgw: rabbitmq - push-endpoint edit

Remove a note that directed users to change "push-endpoint" (with a
hyphen) to "push_endpoint" (with an underscore) when using rabbitmq.

Re: https://github.com/ceph/ceph/pull/48486#issuecomment-1529925389

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit e4b35de2abf00d514c76f77645c587c562bab05d)

Merge pull request #51303 from zdover23/wip-doc-2023-05-02-backport-51296-to-quincy

quincy: doc/rados: edit stretch-mode.rst

doc/rados: edit stretch-mode.rst

Refine and supplement the introductory and explanatory text at the top
of the /doc/rados/operations/stretch-mode.rst file.

Co-authored-by: Josh Durgin <jdurgin@redhat.com>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit b642900abc57302e62a5064dba510c3cc5743ac0)

Merge pull request #51290 from zdover23/wip-doc-2023-04-30-backport-51285-to-quincy

quincy: doc/rados: edit stretch-mode procedure

doc/rados: edit stretch-mode procedure

Edit the "stretch mode" section in doc/rados/operations/stretch-mode.rst
so that the procedure is formatted as a procedure and the sentences
correctly have heads.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit a19ff7a5ea9bbd24365648a90abfa1b720c5b231)

Merge pull request #51287 from zdover23/wip-doc-2023-04-29-backport-51276-to-quincy

quincy: docs: Update the Prometheus endpoint info

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

docs: Update the Prometheus endpoint info

This patch just tidies up some of the links and adds
an example showing how the http_sd_configs option
may be used.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 690d34ab08f22cd988828aa2097531627000907e)

Merge pull request #51273 from zdover23/wip-doc-2023-04-28-backport-51271-to-quincy

quincy: doc/rados: m-config-ref: edit "background"

doc/rados: m-config-ref: edit "background"

Edit the "Background" section of doc/rados/monitor/config-ref.rst

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 9223863fc83095def59b416bf70f9a828a701ccc)

mgr/dashboard: fix CephPGImbalance alert

Fixes: https://tracker.ceph.com/issues/55568
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 8b5c4d27c20bce82bb46064a2cd2928a0736e6cd)

Merge pull request #51240 from zdover23/wip-doc-2023-04-27-backport-51154-to-quincy

quincy: doc/rados/ops: edit user-management.rst (3 of x)

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>

doc/rados/ops: edit user-management.rst (3 of x)

Line-edit doc/rados/user-management.rst (3 of x).

https://tracker.ceph.com/issues/58485

Follows https://github.com/ceph/ceph/pull/51140.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 97b751ed8f8917f9d4d9cbca03f224e6518836ef)

Merge pull request #51156 from zdover23/wip-doc-2023-04-20-backport-51140-to-quincy

quincy: doc/rados: edit user-management (2 of x)

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>

Merge pull request #51236 from zdover23/wip-doc-2023-04-27-backport-51204-to-quincy

quincy: doc/cephfs: explain cephfs data and metadata set

doc/cephfs: explain cephfs data and metadata set

Explain how to set application metadata for the CephFS data pool and the
CephFS metadata pool.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 9152f9700420f9735533f276559af87dff97bd75)

Merge pull request #51221 from zdover23/wip-doc-2023-04-26-backport-51193-to-quincy

quincy: doc/start: rewrite intro paragraph

doc/start: rewrite intro paragraph

Rewrite the first paragraph in doc/start/intro.rst.

Signed-off-by: Zac Dover <zac.dover@proton.me>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit bea01d5f1469030253a3403dbb9e2c9fa97806ac)

Merge PR #51029 into quincy

* refs/pull/51029/head:
Revert "qa/fs/mixed-clients: specify distros for tests"

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #50783 into quincy

* refs/pull/50783/head:
tools/cephfs: include lost+found in scan_links

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #50779 into quincy

* refs/pull/50779/head:
mds: add config to decide whether to mark dentry bad
qa: add missing scan_links step for data scan recovery
qa/tasks/cephfs: test damage to dentry's first is caught
qa/tasks/cephfs: use rank_asok and allow specifying rank
qa/tasks: allow specifying timeout command prefix to ceph
mds: provide test configs for creating first corruption
mds: catch damage to dentry's first field
mds: add debugging for pre_cow_old_inode
mds: cleanup code
mds: check for some dentry damage in scrub
mds: remove unused method
mds: note damaged dentry with first gt last
mds: cluster log scrub failure for dirfrag
mds: mark dirfrag good if repaired
mds: only dump past_parent_snap if non-empty

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #50777 into quincy

* refs/pull/50777/head:
log: fix stderr handling on Windows
log: add tests for stderr writes to fifos
log: use non-blocking atomic writes to stderr fifos
log: invalidate m_fd on close
log: reorg header

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #50774 into quincy

* refs/pull/50774/head:
qa: ignore expected scrub error

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #50772 into quincy

* refs/pull/50772/head:
qa: output higher debugging for cephfs-journal-tool/cephfs-data-scan

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #50768 into quincy

* refs/pull/50768/head:
qa: ignore MDS_TRIM warnings when osd thrashing

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #50767 into quincy

* refs/pull/50767/head:
qa: simplify and use correct recovery procedure
doc: update alternate meta pool recovery
tools/cephfs/DataScan: add debugging for directory injection

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge PR #50766 into quincy

* refs/pull/50766/head:
qa: cleanup volumes on unwind

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #51164 from rhcs-dashboard/wip-59501-quincy

quincy: mgr/dashboard: hide notification on force promote

Reviewed-by: Avan Thakkar <athakkar@redhat.com>

ceph-volume: fix drive-group issue

The drive-group expects the batch_args to be a string,
however in the current version it is passed as a list
of one element, thus calling the first item of the list solves the issue.

Fixes: https://tracker.ceph.com/issues/59203
Signed-off-by: Mohan Sharma <mohan7427@gmail.com>
(cherry picked from commit 7602a99f7a1308c684a7c1d619bb6d9f09c79af9)

ceph-volume: fix batch refactor regression

This makes sure `ceph-volume lvm batch` will recreate the db device
with the right size when coming from a cluster deployed prior to 14.2.13

Fixes: https://tracker.ceph.com/issues/59442
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 98c68f2c8f648a5b9faac295999de212d362744d)

ceph-volume: quick fix in zap.py

`api.get_single_pv(filters={'lv_uuid': lv.lv_uuid})` needs to be called
only if `--destroy` is passed in order to remove vg and pv when there's
nothing left.

With old deployments, it is possible that a lv_uuid matches more than 1
PV.
Given that `get_single_pv()` is only needed when `--destroy` is passed,
let's move this call where it is actually needed.

This makes `ceph-volume lvm zap` fail even though

Fixes: https://tracker.ceph.com/issues/59210
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit a666f700f16937565484dffc90713f6c04d76313)

Merge pull request #51182 from zdover23/wip-doc-2023-04-23-backport-51177-to-quincy

quincy: doc/start: edit first 150 lines of documenting-ceph

Merge pull request #51185 from zdover23/wip-doc-2023-04-23-backport-51178-to-quincy

quincy: Wip doc 2023 04 23 backport 51178 to quincy

doc/glossary: add "Placement Groups" definition

Add a definition of "Placement Groups" to the Glossary.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 9f37ea651f9ee2c51e0705b9b58ed356f1bc56e6)

doc/start: edit first 50 lines of documenting-ceph

Edit the first 150 lines of doc/start/documenting-ceph.rst. This is part
of an initiative to harvest the fruits of Cephalocon 2023, at which
documentation proved to be in demand to a surprising degree.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit dd37f94aa4f1de947b1eaf5d82cc529925f5823e)

Merge pull request #51124 from zdover23/wip-doc-2023-04-17-backport-49762-to-quincy

quincy: vstart: fix text format

mgr/dashboard: hide notification on force promote

Fixes: https://tracker.ceph.com/issues/59500
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
(cherry picked from commit abe1e5101cae0fc98ad9c6c404c6f7ce97a42137)

doc/rados: edit user-management (2 of x)

Line-edit doc/rados/user-management.rst (2 of x). Some internal
references had to be removed, but these will be repaired when the next
part of this file is updated in a future PR.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit e3575bb72f307a27d49fedf3692ca661e3d613a5)

mgr/dashboard: skip Create OSDs step in Cluster expansion

Its to ensure OSDs are not deployed on all hosts because that would make
the host draining impossible

Fixes: https://tracker.ceph.com/issues/59457
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 0f6d23a7aa024495a79cdedc80f7a00902115b6b)

Merge pull request #51119 from rhcs-dashboard/wip-59464-quincy

quincy: mgr/dashboard: remove unncessary hyperlink in landing page

Reviewed-by: Pegonzal <NOT@FOUND>

vstart: fix text format

Signed-off-by: Rongqi Sun <sunrongqi@huawei.com>
(cherry picked from commit 57dc8ce51602543d42a2f82cb829eda1c231b434)

mgr/dashboard: remove unncessary hyperlink in landing page

Fixes: https://tracker.ceph.com/issues/59462
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 7e7da955445ecf37bc43fc296298bd91d0d8a140)

Merge pull request #51079 from rhcs-dashboard/wip-59451-quincy

quincy: mgr/dashboard: fix cephadm e2e expression changed error

Reviewed-by: Aashish Sharma <aasharma@redhat.com>

Merge pull request #51117 from zdover23/wip-doc-2023-04-17-backport-51114-to-quincy

quincy: doc/radosgw: format part of s3select

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

doc/radosgw: format part of s3select

Partially format the 'Basic Workflow' section's introduction and 'Basic Functionalities' subsection in s3select. Nothing else is being fixed.

Signed-off-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
(cherry picked from commit 13cf134c0610509da52aa68e11e26f0740002bde)

mgr/dashboard: expose more grafana configs in service form

Show the grafana_port and initial_admin_password in the form but disable
the password field in the edit option

Fixes: https://tracker.ceph.com/issues/58016
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 6987191377e5ca623563ae851d87e0961416e3f4)

Merge pull request #51108 from zdover23/wip-doc-2023-04-16-backport-51099-to-quincy

quincy: doc/dev: format command in cephfs-mirroring

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

Merge pull request #51097 from zdover23/wip-doc-2023-04-16-backport-51062-to-quincy

quincy: doc/glossary: add "Hybrid Storage"

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

Merge pull request #51093 from zdover23/wip-doc-2023-04-16-backport-51091-to-quincy

quincy: doc/mgr/prometheus: fix confval reference

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

doc/dev: format command in cephfs-mirroring

Correctly format a command in doc/dev/cephfs-mirroring/#creating-users.

Reported by casanlin@init7.net at
https://pad.ceph.com/p/Report_Documentation_Bugs

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 408219bfca6b1e698229967e76d22d10028b7c20)

Merge pull request #51105 from zdover23/wip-doc-2023-04-16-backport-51103-to-quincy

quincy: doc/radosgw: format part of s3select

Reviewed-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>

doc/radosgw: format part of s3select

Format the first section of s3select. Nothing else is being fixed.

Signed-off-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
(cherry picked from commit a6a84471a7af154e7ccc93f51df2fc9744dc606c)

doc/glossary: add "Hybrid Storage"

Add "Hybrid Storage" to the glossary.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit dc8148d0727b307fb3baa30baf9dfee9bf8a247e)

doc/mgr/prometheus: fix confval reference

Signed-off-by: Piotr Parczewski <piotr@stackhpc.com>
(cherry picked from commit b9b75dafe248e07b21f2958023697397094cc537)

Merge pull request #51088 from zdover23/wip-doc-2023-04-15-backport-51086-to-quincy

quincy: doc/rados/ops: remove ceph-medic from monitoring

doc/rados/ops: remove ceph-medic from monitoring

Remove mention of ceph-medic from doc/rados/operations/monitoring.rst,
because it is no longer supported.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 42cd28a2a639e68a44838ae4e7f875cb6bd5d97b)

mgr/dashboard: fix cephadm e2e expression changed error

tried to fix this issue from the daemon component sometime ago several
times but it didn't work. So force ignoring the error

Fixes: https://tracker.ceph.com/issues/59444
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit f7e29e5ab85fabcf2524656bb456a2955fa8608d)

Merge pull request #51076 from aaSharma14/wip-59448-quincy

quincy: mgr/dashboard: Fix rbd snapshot creation

Reviewed-by: Nizamudeen A <nia@redhat.com>

mgr/dashboard: fix rbd mirror snapshot creation

There are two types of snapshots that can be created on a snapshot based mirroring image - Normal Snapshot(same as journal based snapshot) and Nirror Image Snapshot. Till now Dashboard allowed only Mirror image snapshot, this PR intends to enable both the types

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 5ea4171ae3d2a28efbe20b825602eff1429ef92d)

Merge pull request #51072 from zdover23/wip-doc-2023-04-14-backport-50166-to-quincy

quincy: doc/rgw: refine "Setting a Zonegroup"

doc/rgw: refine "Setting a Zonegroup"

Streamline the "Setting a Zonegroup" section by separating out the
necessary prerequisite reading from the procedure itself.

I also corrected a typo in the word "following" in an unrelated section.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 6e6010a31352ecce2c4c0fdd6ed11fba43165b6b)

Merge pull request #51064 from zdover23/wip-doc-2023-04-13-backport-50713-to-quincy

quincy: doc/glossary: improve "CephX" entry

doc/glossary: improve "CephX" entry

Improve the glossary entry for "CephX".

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 02e3a5cb763987eeaee2dd1a7543d2762aaad7fe)

Merge pull request #51057 from rhcs-dashboard/wip-59435-quincy

quincy: mgr/dashboard: rbd-mirror force promotion

Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #50897 from adk3798/wip-58996-quincy

quincy: mgr/cephadm: add commands to set services to managed/unmanaged

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

mgr/dashboard: rbd-mirror force promotion

resolves: https://tracker.ceph.com/issues/59327
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
(cherry picked from commit 9696b6a04830297c23c4cccd6e7c225f183ba0b2)

Revert "qa/fs/mixed-clients: specify distros for tests"

This reverts commit 3731fc7779e80bdfe234fec4dae21cfe46c3f193.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #51036 from zdover23/wip-doc-2023-04-12-backport-50993-to-quincy

quincy: doc/rados/operations: edit monitoring.rst

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

Merge pull request #50995 from guits/cv-bkp-50473-quincy

ceph-volume: update the OS before deploying Ceph (quincy)

Merge pull request #51011 from rhcs-dashboard/wip-59421-quincy

quincy: mgr/dashboard: fix eviction of all FS clients

Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #51007 from rhcs-dashboard/wip-59401-quincy

quincy: mgr/dashboard: fix create osd default selected as recommended not working

Reviewed-by: Aashish Sharma <aasharma@redhat.com>

doc/rados/operations: edit monitoring.rst

Line-edit the final third of doc/rados/operations/monitoring.rst.

Follows https://github.com/ceph/ceph/pull/50834.

https://tracker.ceph.com/issues/58485

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit b9ccad80608953fc0af779e8cad93971d47649b6)

Merge pull request #50906 from adk3798/wip-59315-quincy

quincy: mgr/cephadm: use a dedicated cephadm tmp dir to copy remote files

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #50905 from adk3798/wip-59308-quincy

quincy: cephadm: using ip instead of short hostname for prometheus urls

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>

Merge pull request #50903 from adk3798/wip-59238-quincy

quincy: mgr/cephadm: increasing container stop timeout for OSDs

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #50902 from adk3798/wip-59236-quincy

quincy: cephadm: mount host /etc/hosts for daemon containers in podman deployments

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>

Merge pull request #50901 from adk3798/wip-59235-quincy

quincy: mgr/cephadm: add more aggressive force flag for host maintenance enter

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>

Merge pull request #50900 from adk3798/wip-59234-quincy

quincy: mgr/cephadm: handle HostConnectionError when checking for valid addr

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #50899 from adk3798/wip-59182-quincy

quincy: mgr/orchestrator: fix device size in `orch device ls` output

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>

Merge pull request #50898 from adk3798/wip-58997-quincy

quincy: mgr/cephadm: make upgrade respect use_repo_digest

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

mgr/cephadm: add commands to set services to managed/unmanaged

Fixes: https://tracker.ceph.com/issues/58713
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit b0d8c0846cbe0ebae69dbdeb3f2982213ab56a58)

Conflicts:
src/pybind/mgr/orchestrator/module.py