mgr/alerts: Add Date header to mails sent by alerts module

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

mgr/alerts: Generate Message-Id for mails sent by alerts module

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

Merge pull request #46113 from Matan-B/wip-55513-quincy

quincy: mount/conf: Fix IPv6 parsing

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #45871 from idryomov/wip-stretch-last-force-resend-quincy

quincy: mon/OSDMonitor: properly set last_force_op_resend in stretch mode

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #46287 from zdover23/wip-doc-tracker-55676-backport-quincy

quincy: doc/dev: update basic-workflow.rst

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

doc/dev: update basic-workflow.rst

This PR updates the basic-workflow.rst file
to serve the needs of people in 2022 who were not
present at jump street.

The text has been refined up to the section called
"Integration Tests" (non-inclusive).

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit a227e4007a5ce66b63e42facf97f89655edf2169)

Merge pull request #45814 from p-se/wip-55222-quincy

quincy: mgr/dashboard: Compare values of MTU alert by device

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #46220 from rhcs-dashboard/wip-55600-quincy

quincy: mgr/dashboard: introduce memory and cpu usage for daemons

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: rkachach <NOT@FOUND>

Merge pull request #46229 from rhcs-dashboard/wip-55416-quincy

quincy: mgr/dashboard: fix wrong pg status processing

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

mgr/dashboard: fix wrong pg status processing

Fixes: https://tracker.ceph.com/issues/54481
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 206dd9d4a71a70c46972597a838fda05ceec03da)

mgr/dashboard: fix linting errors and add test

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/services.po.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.html
     - Neglecting e2e changes as they aren't adopted fully to master yet- no regression. Adopting daemon-list html with master.

mgr/dashboard: introduce memory and cpu usage for daemons

Fixes: https://tracker.ceph.com/issues/55218
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Co-authored-by: Aashish Sharma <aasharma@redhat.com>
Introducing 2 new columns in Cluster->Host->Daemons table for Memory and CPU usage.

(cherry picked from commit 263940502bdd9858c97923f394cd3d918e86e921)

Merge pull request #46156 from nmshelke/wip-55413-quincy

quincy: mds: add a perf counter to record slow replies

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

Merge pull request #46147 from neesingh-rh/wip-55540-quincy

quincy: cephfs-top: Multiple filesystem support

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

Merge pull request #45994 from nmshelke/wip-55376-quincy

quincy: mgr/volumes: set, get, list and remove metadata of subvolume

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

Merge pull request #45939 from nmshelke/wip-55039-quincy

quincy: ceph-fuse: ignore fuse mount failure if path is already mounted

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

Merge pull request #46144 from cbodley/wip-55545

quincy: cmake/rgw: add missing dependency on Arrow::Arrow

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

Merge pull request #46041 from cbodley/wip-55458

quincy: rgw: RGWCoroutine::set_sleeping() checks for null stack

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

Merge pull request #46038 from cbodley/wip-55455

quincy: rgw: OpsLogFile::stop() signals under mutex

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

Merge pull request #45679 from rhcs-dashboard/wip-54587-quincy

quincy: mgr/dashboard: highlight the search text in cluster logs

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

Merge pull request #45957 from votdev/wip-55379-quincy

quincy: mgr/dashboard: Imrove error message of '/api/grafana/validation' API endpoint

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

Merge pull request #45862 from rhcs-dashboard/wip-55274-quincy

quincy: mgr/dashboard: datatable in Cluster Host page hides wrong column on selection

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

Merge pull request #45867 from votdev/wip-55275-quincy

quincy: mgr/dashboard: RGW users and buckets tables are empty if the selected gateway is down

Reviewed-by: Sarthak0702 <NOT@FOUND>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>

Merge pull request #45619 from votdev/wip-55007-quincy

quincy: mgr/dashboard: Language dropdown box is partly hidden on login page

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

Merge pull request #46055 from adk3798/quincy-backport-april

quincy: Cephadm Batch Backport April

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #46061 from ljflores/wip-55439-quincy

quincy: osd: return appropriate error if the object is not manifest

Reviewed-by: Myoungwon Oh <omwmw@sk.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #45624 from ljflores/wip-55047-quincy

quincy: test: fix TierFlushDuringFlush to wait until dedup_tier is set on base pool

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Myoungwon Oh <omwmw@sk.com>

mds: add a perf counter to record slow replies

Though we have MDS_HEALTH_SLOW_METADATA_IO and MDS_HEALTH_SLOW_REQUEST health alert, but those are not
precise nor accumulated. With slow reply counter compared to reply counter, we can find out the ratio
of slow requests through perf dump.

Fixes: https://tracker.ceph.com/issues/55126
Signed-off-by: haoyixing <haoyixing@kuaishou.com>
(cherry picked from commit e8e3b307c87dc9eec2d087b396c0e7a0248b4f1d)

Merge pull request #46116 from zdover23/wip-doc-pr-46109-backport-to-quincy

Wip doc pr 46109 backport to quincy

qa: test for verification of client metrics and metadata.

Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit 9855e15de2af20be49079271af23f7bfe24d56c4)

mgr/stats: fetches client_metadata for multiple filesystems.

Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit 5a1c4875c1b95248c050fb1f6aff48af4553156d)

cmake/rgw: add missing dependency on Arrow::Arrow

when WITH_SYSTEM_ARROW is disabled, BuildArrow.cmake creates an
Arrow::Parquet target that depends on Arrow::Arrow:

  target_link_libraries(Arrow::Parquet INTERFACE Arrow::Arrow)

but when WITH_SYSTEM_ARROW is enabled, the targets we get from
find_package() do not carry this dependency. so rgw's cmake needs to
depend on both targets

Fixes: https://tracker.ceph.com/issues/55420
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 3f12d21418963f2a33b124185a2842a9c39e9cfa)

Merge pull request #45700 from tserong/wip-55100-quincy

quincy: ceph.spec.in: Use libthrift-devel on SUSE distros

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #46075 from bluikko/patch-5

doc/mgr/dashboard: Fix typo and double slash missing from URL

mgr/cephadm: retry mgr fail over in case of transient failure

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

Apply sysctl.d migration from /usr/lib to /etc
A fix regarding the SYSCTL_DIR location (#53130) requires to migrate
sysctl.d/*.conf files from /usr/lib to /etc.
Signed-off-by: Lukas Mayer <lmayer@wind.gmbh>
(cherry picked from commit a167a27f30536958e0f2c513d351642e81ba06d5)

Fix sysctl.d location FHS compliance
This fixes #53130
Containers should not write to '/usr/lib'.
That location could be read-only or overwritten.
Signed-off-by: Lukas Mayer <lmayer@wind.gmbh>
(cherry picked from commit 77afa812ea8b7e1e802246e4aa3a31e7b644a502)

cephadm: add comment explaining docker.io grep test

Add a comment explain this docker.io grep count test, since it's
difficult to understand the purpose from simply reading the code.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 14c5538a311542e1466a9426c35108ce3e394338)

cephadm: pass "--security-opt label=disable" to node-exporter container

in order to support setting '--path.procfs=/host/proc','--path.sysfs=/host/sys',
'--path.rootfs=/rootfs' for node-exporter we need to disable selinux separation
between the node-exporter container and the host to avoid selinux denials

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

cephadm: Specify proc/sys path for node-exporter to use

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

mgr/cephadm: offline host watcher

To be able to detect if certain offline hosts go
offline quicker. Could be useful for the NFS
HA feature as this requires moving nfs daemons from
offline hosts within 90 seconds.

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

mgr/cephadm: fallback to normal sorted if cannot import natsorted
Fixes: https://tracker.ceph.com/issues/55113
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 19c07de8207de5038df6f510a3c2ff41b10f7e08)

mgr/cephadm: Reschedule nfs daemons from offline hosts

In order to improve nfs availability, if there are other
hosts we can place an nfs daemon on or if there is a host
with a lower rank nfs daemon when a higher rank one is on
an offline host, we should reschedule the nfs daemons

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

mgr/cephadm: fixing natsort dependencies on debian

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit dadbd7299640b50949c4f5f37509831ee4824937)

Conflicts:
debian/control

mgr/cephadm: Adding support for natural sorting
Fixes: https://tracker.ceph.com/issues/54026
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 28314cebef328a1e822dbc4c348995433af25fc2)

mgr/cephadm: fix cephadm errors

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

mgr/dashboard: fixing cephadm errors

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

mgr/cephadm: adding loki and promtail monitoring services testing

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit cf2734a74cde261d7c44830c8668622901ed18cc)

mgr/cephadm: fix loki grpc port and liniting errors

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit a25738e49030ae77a105ea244843a7ab0b83aee6)

mgr/dashboard: add grps port to loki

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
Co-authored-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit f0fa000edc8af2896f66a5a95ec3e5f06cedf8e4)

mgr/dashboard: add Loki to grafana datasources

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Co-authored-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 66b2f03e8a028dd692ec95a0f97f3183a4bc8b56)

 mgr/cephadm: introducing orch apply daemon promtail

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Co-authored-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit b576d95f8cf288cb9ca242375a99b6bc460ecb8b)

Conflicts:
src/cephadm/cephadm

mgr/cephadm: introducing orch apply daemon loki

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 5dc96cb62165109338e6e13a259e5e6dc2b5a8ce)

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

mgr/cephadm: introduce loki and promtail containers

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit ddccfdb5aa108631a6ce0bc9435a4ded1c12af7f)

Conflicts:
src/cephadm/cephadm

mgr/cephadm: fixing call method timeout handling
Fixes: https://tracker.ceph.com/issues/55265
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 55d42d0c31a5414cb2beac9273faa7123efb8709)

mgr/cephadm: Adding support to store ceph conf per cluster fsid
Fixes: https://tracker.ceph.com/issues/55185
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 2ea76173a163a93bbfbf69d0faa732d46eaf05ba)

qa/suites/orch/cephadm: stop upgrade tests if failures are seen

Otherwise the tests may run forever. This was already done for
mds upgrade sequence, justadding it in the other two places here

Related to: https://tracker.ceph.com/issues/53939

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

mgr/cephadm: fixing logging output for rm-cluster operation
Fixes: https://tracker.ceph.com/issues/51671
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 9756e3bf8ce6976d12245e1e6724838b03d70135)

mgr/cephadm: do not add _admin label when no-minimize-config is provided
Fixes: https://tracker.ceph.com/issues/52727
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 01c8999d0354a71a7ef8526aab9b39e30d67c1bb)

mgr/cephadm: fixing upgrade candidate verions listing
Fixes: https://tracker.ceph.com/issues/53527
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 671442c4b445c4a0547978a6298645a5c2f5725f)

mgr/cephadm: Using '.ID' instead of '.Id' which is only supported by podman

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 6e7c0488389e7e8b85f0dbd6b71c8627a44b349e)

mgr/cephadm: Adding image tag and date to cephadm startup messages
Fixes: https://tracker.ceph.com/issues/55008
Fixes: https://tracker.ceph.com/issues/54373
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 92ecb58d46b6f75265a664f3165f4b3a0dd4993a)

mgr/cephadm: allow setting insecure_skip_verify for alertmanager

Add a "secure" parameter to alertmanager spec that will cause it
to deploy alertmanagers with insecure_skip_verify as true or false
depending on the value given for "secure".

NOTE: alertmanager must still be reconfigured after applying a yaml
with this option changed.

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

cephadm: avoid crashing on expected non-zero exit

- Avoid crashing when a call out to an external program expectedly does
  not return exit status zero.

There are programs that communicate other information than error/no
error through exit status. E.g. `systemctl status` will return different
exit codes depending on the actual status of the units in question.
In cases where this is expected crashing with a RuntimeError exception
is inappropriate and should be avoided.

Fixes: https://tracker.ceph.com/issues/55117
Signed-off-by: Moritz Röhrich <moritz.rohrich@suse.com>
(cherry picked from commit a02be6f22fa18094cd8758700ab74581b6ce1701)

mgr/cephadm: skip loopback devices when gathering facts
Fixes: https://tracker.ceph.com/issues/53528
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit a9eec9e3a7a53bd63d3bf9ced96e224fb752d9f7)

ceph cephadm set-user does not reflect the user change in ssh-config

Fixes: https://tracker.ceph.com/issues/54618
Signed-off-by: Teoman ONAY <tonay@redhat.com>
(cherry picked from commit 071f72a734ce207e5cb2ff6d3d996e45396f5c7a)

mgr/cephadm: Adding cephadm networking configuration checks+refactoring
Fixes: https://tracker.ceph.com/issues/55174
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit e0bafe6b1da104782b29edf7035d7bc93f89e12f)

mgr/cephadm: Making default cephadm shell cmd easier
Fixes: https://tracker.ceph.com/issues/52042
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit dc201197639dcab471611ac3c4fefda74a74a94f)

cephadm: show error message if private registry credentials not provided

Raise UnauthorizedRegistryError in `_pull_image` if user tries to pull from a private registry without authentication, handle error in `command_bootstrap`, `commond_adopt`, `command_pull`

Fixes: https://tracker.ceph.com/issues/55015
Signed-off-by: Melissa Li <melissali@redhat.com>
(cherry picked from commit 4de0803ba893abf341ab634d1382208370de7c98)

mgr/cephadm: improving logging to send errors to stderr
Fixes: https://tracker.ceph.com/issues/47905
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 7f09307a614b313908a545a1d26e28e3e704e321)

mgr/cephadm: support non-root ssh-user w permissions

Restructured code, so that in case of non-root, the resulting file will
be created with permissions set to the ssh-user. This allows the
subsequent scp to be able to write the file. The remaining code kept the
same, so that file permissions are restored to the expected ones, but
just runs after the scp.

Fixes: https://tracker.ceph.com/issues/54620
Signed-off-by: Christoph Glaubitz <c.glaubitz@syseleven.de>
(cherry picked from commit 452e52a7e39409e3409d59940133333416b830bc)

mgr/cephadm: fixing public network conf parsing
Fixes: https://tracker.ceph.com/issues/55132
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 3ef6341e8ef5fe6a01f15c847f6bc9e2205d4d97)

ceph-volume/tests: reject loop devices in lvm.conf

The current task doesn't works (typo?).
Otherwise api/lvm.py can't work properly, functions such as
`get_single_lv()` and many other don't return the expected results.
Indeed, lvm is confused because of the nvme_loop setup.

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

ceph-volume: do not leave pv when zapping osds

when zapping a device and no vg/lv are left, the pv should be
removed too.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 7f007e7fc75b4d6e7465c684f7e5b2458883dcc5)

orchestrator: support complex osd creation

This adds the support of complex OSD creation with command
`orch daemon add osd`.
Any argument supported by `DriveGroupSpec()` can be passed on the command line.

Usage:
```
ceph orch daemon add osd host:data_devices=device1,device2,db_devices=device3,osds_per_device=2,...
```

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 8aa2f4745adff0ba3c7a0731cf48ccc1c85b33f3)

DriveSelection: skip unavailable devices

Cephadm shouldn't try to deploy a disk reported as unavailable by ceph-volume.
The idea here is to check the rejection reason so we can still use DB devices
in case of OSD replacement.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 3a88547559769f4dd438f6557cef22ef9004fa2a)

ceph-volume: various fixes in arg_validators

if a device with an FS is passed, ceph-volume should abort
the OSD creation.

Fixes: https://tracker.ceph.com/issues/54535
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 9f4b830dcfb45eda81eabf18a8461ac4e1bf642e)

doc/cephadm: fix a typo

s/osd_crush_choose_leaf_type/osd_crush_chooseleaf_type

```
[ceph: root@adm-1 /]# ceph config set global osd_crush_choose_leaf_type 0
Error EINVAL: unrecognized config option 'osd_crush_choose_leaf_type'
[ceph: root@adm-1 /]# ceph config set global osd_crush_chooseleaf_type 0
[ceph: root@adm-1 /]#
```

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

ceph-volume/tests: speed up tox tests

Let's use `--numprocesses=auto` in order to speed up the unit tests execution.

See the difference, without `--numprocesses=auto`:
```

... omitted output ...

real    1m22.884s
user    0m23.003s
sys     0m20.504s
```

with `--numprocesses=auto`:

```

... omitted output ...

real    0m18.767s
user    0m33.056s
sys     0m23.244s
```

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

mgr/cephadm: generate one c-v raw prepare cmd per data device in raw mode

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

mgr/cephadm: check spec host when adding osd
Fixes: https://tracker.ceph.com/issues/47872
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit b87c966697d36ef51f1e62425d77200667e651ae)

mgr/cephadm: adding HostSpec validation
Fixes: https://tracker.ceph.com/issues/54342
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 15ba147a2a4cae8ca69437382136d328a1f416f2)

mgr/cephadm: Show warning when user provides --fsid option
Fixes: https://tracker.ceph.com/issues/50804
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 8780aa04651fa2cddeec1d9d2dfcf4e08412d4ce)

doc/cephadm/operations.rst: fix typos

Signed-off-by: wangyunqing <wangyunqing@inspur.com>
(cherry picked from commit 92eb799a952db4f2fe2290aef56d2f66b8f64802)

mgr/cephadm: fixing prometheus port handling
Fixes: https://tracker.ceph.com/issues/51072
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 8eb1397d77dace25f387e88137a1807993a0796d)

mgr/cephadm: checking service name before removal
Fixes: https://tracker.ceph.com/issues/54503
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit b26c114c8456941d6cccf7d4355445f21cb373a7)

cephadm: respect --skip-firewalld flag

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

cephadm: verify config file exists when inferring it

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

python-common/drive_group: add extra_container_args to supported features

Should have been added when extending extra container args
to all the services but was missed

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

mgr/cephadm: add keep-alive requests to ssh connections

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

doc: Add note to osds_per_device description about dual-actuator devices

This commit adds information about using dual-actuator devices with the
osds_per_device drive group option, letting users know they can create
an OSD for each actuator by setting this value to 2 in the drive group
they're using to apply OSDs to the device.

Signed-off-by: Joseph Sawaya <jsawaya@redhat.com>
(cherry picked from commit 882fc277189acd0f528dfb271268474a06d373a7)

doc/cephadm/adoption.rst: fix typos

Signed-off-by: wangyunqing <wangyunqing@inspur.com>
(cherry picked from commit e4db28f6b294909e0f177e82dbda8cfcc8129846)

mgr/cephadm: fixing MDSSpec ctr
Fixes issue: https://tracker.ceph.com/issues/54487

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit eb4e3f2494e8706cbf5f7c60a37dcb13bca0d83f)

qa/tasks/cephfs: increase timeout in test_nfs.py

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 44ad552093b4f0dc21563dd9f804974ade239440)

mgr/cephadm: block draining last _admin host

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

mgr/cephadm: block removing last instance of _admin label

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

cephadm/box: default add hosts

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit dd1b5eb38ce891c9d0786b48c42152c6cade9b62)

mgr/cephadm: extend extra_container_args to other service types

Otherwise, without this change, this can only be used for mgr,
mon and crash (daemons without their own service spec class)

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

cephadm: still set container_image when --no-assimilate-config is provided

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

mgr/cephadm: reduce log level for asyncssh error messages

Fixes: https://tracker.ceph.com/issues/54132
Signed-off-by: Melissa Li <melissali@redhat.com>
(cherry picked from commit 95d5db0f4297286c420057ac10f1b63d3116eace)