doc/cephfs: fix architecture link to correct relative path

Signed-off-by: molpako <35787116+molpako@users.noreply.github.com>
(cherry picked from commit ceeb1ca4b38dc307e493b04a59d5d07fed23971f)

Merge pull request #55541 from rhcs-dashboard/wip-63728-reef

reef: mgr/dashboard: add support for editing and deleting rgw roles

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

Merge pull request #56254 from rhcs-dashboard/wip-64930-reef

reef: mgr/dashboard: ceph authenticate user from fs

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

Merge pull request #56290 from zdover23/wip-doc-2024-03-20-backport-56109-to-reef

reef: doc/cephadm/services: Improve monitoring.rst

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

Merge pull request #56230 from adk3798/reef-docs-typo-replace-osd

reef: doc: cephadm/services/osd: fix typo

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Zac Dover <zac.dover@proton.me>

mgr/dashboard: support rgw roles updating

Right now only the modification of max_session_duration is supported via
the roles update command. To update, we need to use `policy modify`
command which is not added in this PR. That should be done separately

Refer: https://docs.ceph.com/en/latest/radosgw/role/#update-a-role

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

mgr/dashboard: support rgw roles removal

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

doc/cephadm/services: Improve monitoring.rst

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit ead944be18781ddccd52af5aa5cff414d15bb39d)

Merge pull request #55928 from ajarr/wip-64668-reef

reef: qa: add diff-continuous and compare-mirror-image tests to rbd and krbd suites respectively

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #56196 from vshankar/wip-64926-reef

reef: mds: disable `defer_client_eviction_on_laggy_osds' by default

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>

qa/suites: add diff-continuous and compare-mirror-image tests

... to rbd and krbd suites respectively.

This allows the compare-mirror-image tests introduced in ea3a567
to be run against various kernel branches, e.g., testing branch.
And allows diff_continuous test in rbd_suite to run against distro
kernel.

Fixes: https://tracker.ceph.com/issues/64574
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 92b254138dd43755490392ffcf5ebca04872e116)

qa/suites/rbd: rename nbd folder to device folder

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit af43f6162464a20625319a2783a104f7032ba21e)

Merge pull request #55762 from ajarr/wip-64554-reef

reef: qa: Add tests to validate synced images on rbd-mirror

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #56262 from zdover23/wip-doc-2024-03-19-backport-56247-to-reef

reef: docs/rbd: fix typo in arg name

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

docs/rbd: fix typo in arg name

Replace "{image-}" with "{image-id}" in the "rbd trash rm"
command description.

Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit f3eb489520fd4fae057e61275d16c6c8fd596f3f)

docs/rbd: replace introspect with inspect

Replace "introspect" with "inspect" in the rbd basic commands
description.

Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit ebf2f60f784728c04d8ec59015d666bafcef8218)

docs/rbd: typo in "retrieving image information"

Replace "for the image" with "of the image".

Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit 4fd5c134536d652ae1f9e05ecf52cb81adb3b850)

Merge pull request #56256 from zdover23/wip-doc-2024-03-18-backport-56248-to-reef

reef: doc/rbd: minor changes to the rbd man page

doc/rbd: minor changes to the rbd man page

Fixes typos and grammar for some commands. Adds
additional details for some commandds.

Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit 5dcff6a4b8d835fc55e454af977dc5ebad99d37f)

Merge pull request #56252 from guits/wip-64932-reef

reef: node-proxy: fix RedFishClient.logout() method

mgr/dashboard: ceph authenticate user from fs

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

node-proxy: support more Location value formats

After some tests, it turns out that depending on the hardware,
the header 'Location' which is returned by the server after logged can be different.
I could notice the following:

either:

Location: scheme://address:port/redfish/v1/SessionService/Session

or

Location: /redfish/v1/SessionService/Session

a previous tracker [1] was opened because I thought only the first one existed, which is wrong.

Fixes: https://tracker.ceph.com/issues/64951
[1] https://tracker.ceph.com/issues/64894

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit d7ccf26983c41344a12f33b2a30fc79b65cc548f)

node-proxy: fix RedFishClient.logout() method

the endpoint passed down to util.query() is wrong:
is passes the full url (scheme://addr:port/path) where it should only
pass the path. The cause is that RedFishClient.login() basically stores
the value of the Location header in `self.location`.

The consequence of this is that it makes the client unable to properly logout.

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

Merge pull request #56235 from zdover23/wip-doc-2024-03-16-backport-56182-to-reef

reef: doc/glossary: add "librados" entry

doc/glossary: add "librados" entry

Add a "librados" entry to the glossary.

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

Merge pull request #56104 from adk3798/wip-64632-reef

reef: doc: adding documentation for secure monitoring stack configuration

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

Merge pull request #56103 from adk3798/wip-64629-reef

reef: mgr/cephadm: catch CancelledError in asyncio timeout handler

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

Merge pull request #56094 from adk3798/wip-63533-reef

reef: mgr/cephadm: fix reweighting of OSD when OSD removal is stopped

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56029 from asm0deuz/wip-64698-reef

reef: mgr/cephadm: Allow idmap overrides in nfs-ganesha configuration

Reviewed-by: Adam King <adking@redhat.com>

doc: cephadm/services/osd: fix typo

Signed-off-by: Lorenz Bausch <info@lorenzbausch.de>
(cherry picked from commit d513f1ca69d38f0d7eb40a2d68275caed322cc68)

Merge pull request #55915 from mchangir/wip-64223-reef

reef: qa: bump up scrub status command timeout

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

Merge pull request #55829 from kotreshhr/wip-64582-reef

reef: qa: Fix fs/full suite

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

Merge pull request #55746 from lxbsz/wip-64222

reef: qa/tasks/cephfs/test_misc: switch duration to timeout

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

Merge pull request #55743 from lxbsz/wip-64075

reef: mds: just wait the client flushes the snap and dirty buffer

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

Merge pull request #55742 from lxbsz/wip-64045

reef: mds: use explicitly sized types for network and disk encoding

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

Merge pull request #54520 from joscollin/wip-63553-reef

reef: cephfs-top: include the missing fields in --dump output

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

Merge pull request #53893 from rishabh-d-dave/wip-63147-reef

reef: client: append to buffer list to save all result from wildcard command

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

Merge pull request #52581 from rishabh-d-dave/wip-62026-reef

reef: mds: allow all types of mds caps

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

Merge pull request #55716 from cbodley/wip-64540-reef

reef: rgw: RGWSI_SysObj_Cache::remove() invalidates after successful delete

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #56208 from zdover23/wip-doc-2024-03-15-backport-56188-to-reef

reef: doc/rbd: add clone mapping command

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

doc/rbd: add clone mapping command

Add a command that explains how to map a formatted clone when the parent
image and the formatted clone have different encryption types.

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

Merge pull request #55356 from cbodley/wip-64228-reef

reef: rgw/rest: fix url decode of post params for iam/sts/sns

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #56186 from zdover23/wip-doc-2024-03-14-backport-56160-to-reef

reef: doc/rbd: add map information for clone images to rbd-encryption.rst

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

Merge pull request #55197 from rzarzynski/wip-rocksdb-compression-reef

reef: common/options: Set LZ4 compression for bluestore RocksDB.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

mds: disable `defer_client_eviction_on_laggy_osds' by default

This config can result in a single client holding up mds to service
other clients since once a client is deferred from eviction due to
laggy OSD(s), a new clients cap acquire request can be possibly
blocked until the other laggy client resumes operation, i.e., when
the laggy OSD is considered non-laggy anymore.

Disable the config by default till the issue is fixed.

Fixes: http://tracker.ceph.com/issues/64685
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 109de8bdab86e1adaad580d9e7322c18fa01bc09)

Merge pull request #56161 from zdover23/wip-doc-2024-03-13-backport-54173-to-reef

reef: doc/dev: backport zipapp docs to reef

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

qa/workunits/rbd: switch rbd-mirror workunits to bash

By making use of here strings in commit ea3a567f7f03 ("qa/workunits:
make wait_for_status_in_pool_dir() reentrant") we grew a dependency on
bash.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 166a2362378b1ff93e43f483f354c428fd6cef9e)
Signed-off-by: Ramana Raja <rraja@redhat.com>
Conflicts:
qa/workunits/rbd/rbd_mirror_journal.sh
        -  Commit 3fd8a03887354 not backported
           "qa/workunits/rbd: merge journal and snapshot test scripts"

qa: Add tests to validate syncing of images using rbd-mirror

Introduce functional tests to validate that the images under
workloads are correctly mirrored between two clusters using snapshot
based mirroring.

Run workload on a primary image using a krbd or nbd client. Take
mirror snapshots of the image under workload. Unmount the mapped image
and calculate its MD5 checksum before demoting it. After demotion,
wait for the mirror status of the image to be 'up+unknown' in both
the clusters. This is to make sure that the non-primary image in the
other cluster is ready to be promoted. Now promote the non-primary
image in the other cluster. Map the promoted image and calculate its
MD5 checksum. Verify that the checksums of the demoted and promoted
images in the two clusters are the same.

The above test is run as part of two different workunits:
 - a workunit that validates the syncing of multiple mirrored images
   with workloads running on them
 - another workunit that validates the syncing of a single mirrored
   image with workload running on it and the image is set as primary
   alternatively between the two clusters, as it happens during
   failover and failback scenarios.

Fixes: https://tracker.ceph.com/issues/61617
Signed-off-by: Ramana Raja <rraja@redhat.com>
Co-authored-by: Ilya Dryomov <idryomov@redhat.com>
Co-authored-by: Christopher Hoffman <choffman@redhat.com>
(cherry picked from commit b7aae5c3c5a1dd24c4cb7ceb499292af00bae680)

Cherry-pick notes:
- In qa/workunits/rbd/compare_mirror_images.sh, replace
  `wait_for_replaying_status_in_pool_dir` with `wait_for_status_in_pool_dir`
  Commit 3fd8a03 that added `wait_for_replaying_status_in_pool_dir`
  not backported

doc/rbd: add map information for clone images to rbd-encryption.rst

Add information on the arguments required when mapping the
formatted clone of an encrypted parent image.

Co-authored-by: Zac Dover <zac.dover@proton.me>
Signed-off-by: N Balachandran <nibalach@redhat.com>
(cherry picked from commit 7a2e324a6e1c3e145d3b1e04e6f006defbe0e0b4)

Merge pull request #56154 from rhcs-dashboard/wip-64883-reef

reef: mgr/dashboard: fix snap schedule time format

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

mgr/cephadm: catch CancelledError in asyncio timeout handler

Specifically, concurrent.futures.CancelledError. At least on
python 3.9, this error can be raised when certain commands
being run asynchronously fail. Not catching this results in
the whole cephadm module crashing with something like

Traceback (most recent call last):
  File "/usr/share/ceph/mgr/cephadm/utils.py", line 94, in do_work
    return f(*arg)
  File "/usr/share/ceph/mgr/cephadm/serve.py", line 267, in refresh
    r = self._refresh_facts(host)
  File "/usr/share/ceph/mgr/cephadm/serve.py", line 370, in _refresh_facts
    val = self.mgr.wait_async(self._run_cephadm_json(
  File "/usr/share/ceph/mgr/cephadm/module.py", line 671, in wait_async
    return self.event_loop.get_result(coro, timeout)
  File "/usr/share/ceph/mgr/cephadm/ssh.py", line 64, in get_result
    return future.result(timeout)
  File "/lib64/python3.9/concurrent/futures/_base.py", line 444, in result
    raise CancelledError()
concurrent.futures._base.CancelledError

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

Merge pull request #56102 from adk3798/wip-64627-reef

reef: cephadm: create ceph-exporter sock dir if it's not present

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56101 from adk3798/wip-64622-reef

reef: mgr/cephadm is not defining haproxy tcp healthchecks for Ganesha

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56100 from adk3798/wip-64620-reef

reef: cephadm: Add nvmeof to autotuner calculation

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56092 from adk3798/wip-63447-reef

reef: mgr/cephadm: support for removing host entry from crush map during host removal

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

doc/dev: backport zipapp docs to reef

Backport the docs changes in https://github.com/ceph/ceph/pull/54173 to
the Reef release branch. This was not previously done because the docs
changes in PR#54173 were bundled with code changes.

Signed-off-by: Zac Dover <zac.dover@proton.me>

mgr/dashboard: fix snap schedule time format

Fixes: https://tracker.ceph.com/issues/64831
Signed-off-by: Ivo Almeida <ialmeida@redhat.com>
(cherry picked from commit a2942f01ae9bde76c6d562374a0bd8aceeee317e)

Merge pull request #56115 from rhcs-dashboard/wip-64826-reef

reef: mgr/dashboard: fix snap schedule list toggle cols

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

qa/cephadm: adjust host drain test to handle explicit placement warning

Since we're adding a warning if any host is listed explicitly
in the placement of any service when removing the host,
we need to adjust the host drain test that removes a host
without the --force flag to not have the explicit hostname
in the placement for the mon service.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit b4db5e4ffcf0fb345c99986718b16853f76b148a)

mgr/cephadm: warn when draining host explicitly listed in placement

In the case you apply a spec like

```
service_type: node-exporter
placement:
  hosts:
  - host3
```

and then you run `ceph orch host drain host3`, cephadm will remove
the daemon from that host and the placement would now match nothing.

This is definitely an issue that should be able to be bypassed as
it generally isn't serious, but it would be good to let users
know they have the host listed explicitly in placements like this
when they want to drain it.

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

qa/cephadm: test --rm-crush-entry host rm flag in host drain test

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 7870538dc1e19760cd96a3d343ae3d3235f71eb2)

qa/cephadm: add teuthology test for host draining

This was a gap in our testing in general, but I'm
adding it here right now specifically to use it
to test the "--rm-crush-entry" flag in a follow
up commit

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 13f16e8d7bb029980d6688680390521253970e9a)

mgr/cephadm: add --rm-crush-entry flag to host removal

This will tell cephadm to try and remove the
crush bucket for the host at the end of the host
removal process. If this fails, we still consider the
host as having been successfully remove from
cephadm's POV, but the user will get back an error
message telling them we failed to remove the
host from the crush map

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

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

Merge pull request #56108 from adk3798/wip-64635-reef

reef: cephadm/nvmeof: scrape nvmeof prometheus endpoint

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

Merge pull request #56107 from adk3798/wip-64689-reef

reef: mgr/cephadm: fix placement with label and host pattern

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56106 from adk3798/wip-64644-reef

reef: cephadm: remove restriction for crush device classes

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56105 from adk3798/wip-64634-reef

reef: cephadm: rm podman-auth.json if removing last cluster

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56099 from adk3798/wip-64414-reef

reef: cephadm: fix get_version for nvmeof

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56098 from adk3798/wip-63985-reef

reef: orchestrator: Add summary line to orch device ls output

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56097 from adk3798/wip-63984-reef

reef: orchestrator: Fix representation of CPU threads in host ls --detail command

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56096 from adk3798/wip-63817-reef

reef: python-common/drive_selection: fix limit with existing devices

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56095 from adk3798/wip-63815-reef

reef: python-common: fix osdspec_affinity check

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56093 from adk3798/wip-63448-reef

reef: mgr/cephadm: discovery service (port 8765) fails on ipv6 only clusters

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #55957 from adk3798/reef-test-custom-config

reef: qa/cephadm: testing for extra daemon/container features

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56090 from adk3798/wip-63434-reef

reef: mgr/cephadm: update timestamp on repeat daemon/service events

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #56089 from adk3798/wip-63190-reef

reef: mgr/cephadm: make jaeger-collector a dep for jaeger-agent

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #55819 from adk3798/reef-cephadm-nvmeof-log-mount

reef: cephadm: Add mount for nvmeof log location

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #55555 from adk3798/reef-cephadm-asyncio-timeout-fixup

reef: mgr/cephadm: fixups for asyncio based timeout

Reviewed-by: John Mulligan <jmulligan@redhat.com>

Merge pull request #55097 from cbodley/wip-63839-reef

reef: qa: remove vstart runner from radosgw_admin task

Reviewed-by: Yuri Weinstein <yuriw@redhat.com>

Merge pull request #55815 from rhcs-dashboard/wip-64624-reef

reef: mgr/dashboard: fix snap schedule date format

Reviewed-by: Afreen <afreen23.git@gmail.com>

Merge pull request #56127 from adk3798/wip-64836-reef

reef: mgr/dashboard: debugging make check failure

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #56130 from zdover23/wip-doc-2024-03-12-backport-56113-to-reef

reef: doc/cephadm: Improve multiple files

Merge pull request #55969 from galsalomon66/wip-64693-reef

reef: rgw/S3select: remove assert from csv-parser, adding updates

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #55790 from cbodley/wip-64600-reef

reef: test/rgw: increase timeouts in unittest_rgw_dmclock_scheduler

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #55655 from cbodley/wip-64500-reef

reef: rgw/datalog: RGWDataChangesLog::add_entry() uses null_yield

Reviewed-by: Adam Emerson <aemerson@redhat.com>

Merge pull request #55621 from cbodley/wip-64426-reef

reef: rgw/putobj: RadosWriter uses part head object for multipart parts

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #55606 from jzhu116-bloomberg/wip-64448-reef

reef: rgw: do not copy olh attributes in versioning suspended bucket

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #55289 from jzhu116-bloomberg/wip-64088-reef

reef: rgw/lc: do not add datalog/bilog for some lc actions

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #55094 from cbodley/wip-63960-reef

reef: rgw: add headers to guide cache update in 304 response

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #55061 from cbodley/wip-63940-reef

reef: radosgw-admin: 'zone set' won't overwrite existing default-placement

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #54866 from trociny/wip-63777-reef

reef: [rgw][lc][rgw_lifecycle_work_time] adjust timing if the configured end time is less than the start time

Reviewed-by: Casey Bodley <cbodley@redhat.com>

doc/cephadm: Improve multiple files

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 800dd29e60fcd2bcd27db56d3fe45c58ddf10c8a)

mgr/dashboard: debugging make check failure

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 958c60d8a74e3c38abe043e7f2cfbe4224cfb411)

Merge pull request #55931 from ceph/reef-release

v18.2.2

Reviewed-by: Laura Flores <lflores@redhat.com>

Merge pull request #56059 from rhcs-dashboard/wip-64807-reef

reef: mgr/dashboard: add snap schedule M, Y frequencies

Reviewed-by: afreen23 <NOT@FOUND>

mgr/dashboard: fix snap schedule list toggle cols

Added isInvisible property to CdColumnTable interface to hide column
from 'toggle columns' drop down checkboxes.

Fixes: https://tracker.ceph.com/issues/64813
Signed-off-by: Ivo Almeida <ialmeida@redhat.com>
(cherry picked from commit 1b77baea8dd0781fa897ec6c1f1e06c57a265ed7)

Merge pull request #56111 from zdover23/wip-doc-2024-03-11-backport-56091-to-reef

reef: doc/cephadm: improve host-management.rst

doc/cephadm: improve host-management.rst

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit 9fb51bb537e8bd9ea60633091acfc48a58262c3b)

qa/cephadm: don't test certain workunits with agent

There are a handful of workunits that don't work
with or don't make sense with the agent.
The test for the cephadm timeout only works if
the mgr directly runs ceph-volume inventory which
it won't do with the agent present. The adoption
test is just running direct cephadm commands that
are irrelevant to the agent. The test_orch_cli tests
rely on refresh timings that are different with
the agent running, causing spurious failures.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 7953fe1b3920c92c086c981bf4e3d2c41ea7e450)

cephadm/nvmeof: scrape nvmeof prometheus endpoint

Fixes: https://tracker.ceph.com/issues/64536
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 93ec6284fb3002b4778c4e54972ff1d864060922)

Conflicts:
src/cephadm/cephadmlib/constants.py
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
src/pybind/mgr/cephadm/tests/test_services.py

mgr/cephadm: fix placement with label and host pattern

Previously, when both the label and host pattern were
provided, only the label was actually used for the placement

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

cephadm: remove restriction for crush device classes

A restriction has been introduced here (https://github.com/ceph/ceph/commit/6c6cb2f5130dbcf8e42cf03666173948411fc92b) which doesn't let OSDs be created with custom crush device classes.
Crush Device Class is the key that helps the crush distinguish between multiple storage classes, so it must accept any custom names.

Fixes: https://tracker.ceph.com/issues/64382
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 5999196f37bc5cb12de26d5f0aa077229e3ffc42)