doc/mgr: Clean up orchestrator.rst (spell/punct, awkward wording)

Signed-off-by: Dan Mick <dmick@redhat.com>
(cherry picked from commit a2a90542021005622e6a763c4593d2994177f4bd)

mgr/cephadm: PEP8tify services/osd.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1a229055b040f10afd84d036c7acf5cbcc13b1dd)

cephadm: Give better access to the /dev in the iscsi container

In testing it seems the main iscsi container's /dev related volume mount to just
/dev/log is too narrow. And in certain circumstances it needs to access
to see /dev/rbd* devices. Like if using krdb.

This patch volume mounts /dev rather then /dev/log in the main
container, but since this aligns with what we need in the tcmu-runner
container it actaully ends up simplifying the code as well.

Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit 40c0d6821252e8112b655dee67d9d3eb5b7ffbff)

mgr/orchestrator: PEP8tify

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ee634f2921ba0f9083b3778ea5651f52c1ed98f7)

mgr/cephadm: use `check_mon_command` during iscsi config

ensure the mon commands actually succeed

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2e98c8cda49161e66856f0aaf1bfa9ae9a3f3417)

cephadm: infer latest image with a valid tag

Fixes: https://tracker.ceph.com/issues/47134
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d61676f92dc701daeab71bd9d9c35d6cfa9a6434)

mgr/cephadm: use `check_mon_command` util

rather then checking the retval explicitly

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2f7fef134753f880c54027fbe18d4bf7425098fe)

mgr/cephadm: merge NFSGanesha into NFSService class

these two classes really preform the same function

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 82598631c30bf483a5bda285414df7245fe283c1)

mgr/cephadm: use supplied `CephadmDaemonSpec`

69ed3d9cffd refactored `_create_daemon()` which obsoleted any need to
search for the NFSServiceSpec in the SpecStore

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 87ccbad67170a9a0b35776d53826b0a944239cb5)

mgr/cephadm: move NFS config/create func

preserve func order seen in the impl. for the other services

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 170220875d942b6f1678d5a388a19e081251f554)

cephadm: Update error message on host failure

Now the error message explains how to add the ssh key to the not
reachable host

Fixes: https://tracker.ceph.com/issues/46551
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 1bfb044518d8b771c8f6cac2396f636b0cbdf12e)

mgr/cephadm: PEP8tify some tests

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit a385c3cc28188f5a4c85a113086ab11f9cace67c)

cephadm: deploying of monitoring images partially broken

Deployment of monitoring images has been broken in the context of
ceph-salt. Due to the removal of the registries in
/etc/containers/registries.conf, all images need to be provided
qualified.

Fixes: https://tracker.ceph.com/issues/46726
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 658230048bff5907d6dad8e216a540014a0898f1)

cephadm: remove py2 from tox tests

cephadm is dependent on py3, and the presence of py2 in
tox is just going to throw more errors over time as py3
idioms are adopted. py2 is EOL, and older hosts should
have py3 available as an installation option anyway.

This patch just removes py2 from the tox test.

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

mgr/cephadm: PEP8tify cephadmservice.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 56f11c015ad323bb31e9fa372d30541b4b54de41)

cephadm: remove py2 from test_adoption

Since cephadm is py3 based, and py2 is EOL this patch
removes the py2 test iteration from test_adoption.sh

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

cephadm: remove py2 from test stream

Since py2 is EOL, and cephadm requires py3 anyway this
patch removes the py2 test iteration from the functional
testing suite.

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

cephadm: make devices lists more granular in gather-facts

The gather-facts commands returns a list of hdd and flash
devices. This patch changes the list content from being
simple strings representing the disks to a dict, making it
easier to extend in the future.

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

cephadm: add gather-facts to the qa test

Adds a gather-facts invocatio after check-host is run.

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

cephadm: enhance memory and cpu data

Added free/available memory state, and cpu loadavg info

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

cephadm: fixes to address PR requirements

Minor changes to address issues raised in the PR;
- formatting of ipv6 addresses
- missing docstrings
- NIC mtu and speed now int instead of string
- added NIC driver name
- removed discrete JSON method making gather-facts JSON only
- added upper/lower device lists to show NIC relationships
- added hostname to the JSON!
- added selinux/apparmor status
- added timestamp (epoch) for the gather-facts run
- added system uptime (secs)

Closes:

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

cephadm: add gather_facts command

The gather_facts command is intended to provide host
level metadata to the caller, which could then be used
in a number of places: orchestrator inventory, displayed
in the UI etc

Data is extracted mainly from sysfs and /proc

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

mgr/cephadm: PEP8tify schedule.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 83e4559fcef059e8f65b9730b5e1ca7820699ddb)

mgr/cephadm: use raw string during `re.search`

cephadmservice.py:348: DeprecationWarning: invalid escape sequence \:
    port = re.search('\:\d+\/', end_point)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit ed0074da2ca00b3fc1669865667e1090d9676fbe)

qa/tasks/cephadm.py: add ceph logs directory in job's info.yaml

This commit adds the file path of ceph log directories to the job's
info.yaml log file. The motivation behind this is, in case of job
timeout, the logs would still be tranferred to teuthology host
before nuking test machines using these ceph log directory paths in
job's info.yaml log file.

Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>
(cherry picked from commit d2ff5c5eb609eba02e6c966015bb7e1d9b349be4)

Conflicts:
qa/tasks/cephadm.py

CODEOWNERS: Add cephadm man page to @ceph/orchestrators

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f3aed0828b6fa3bc0753892161082cb766ad9866)

doc/man/cephadm: Add missing parameters for `ls`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 20b679a8928767db5b7314a4f017fcf2eb4fbf36)

Merge pull request #36981 from neha-ojha/wip-47297-octopus

octopus: mon/OSDMonitor: only take in osd into consideration when trimming osd…

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

mon/OSDMonitor: only take in osd into consideration when trimming osdmaps

we should not take down osd into consideration when trimming osdmap. in
e62269c892, we decrease the upper bound of range of osdmaps to be trimmed
if the given osd is out. but we should have to decrease it only if the
osd in question is still *in*.

so, in this change, the min_lec is decreased only if the osd in question
is *in*.

Fixes: https://tracker.ceph.com/issues/47290
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 79175740cf2394bba74163ca8a5131419b9641ed)

 Conflicts:
src/mon/OSDMonitor.cc - trivial resolution

Merge pull request #36973 from sebastian-philipp/octopus-mgr-re-add_osd_support

octopus: Revert "mgr/osd_support: remove module and all traces"

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

Revert "mgr/osd_support: remove module and all traces"

This reverts commit a55c1dd0fac826978edf22e448c3456e7634cbc3.

Kept to keep upgrades from older point releases working.
This module can be removed as soon as we no longer
support upgrades from old octopus point releases.

Revert "build/debian: remove osd_support"

This reverts commit 8ff2824beb78dfd03710e94302f038ea70fb4561.

Fixes: https://tracker.ceph.com/issues/47109
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 43f1bdb6ef7d740eda219bac7d0280ed558e319d)

Merge pull request #36786 from callithea/wip-46936-octopus

octopus: mgr: Add missing states to PG_STATES in mgr_module.py.

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

Merge pull request #36795 from ifed01/wip-ifed-simplify-pin-octopus

octopus: os/bluestore: simplify Onode pin/unpin logic

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

Merge pull request #36644 from smithfarm/wip-46471-octopus

octopus: rgw: stop realm reloader before store shutdown

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

Merge pull request #36689 from rhcs-dashboard/wip-46993-octopus

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36587 from tspmelo/wip-46907-octopus

octopus: mgr/dashboard: Extract documentation link to a component

Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36614 from rishabh-d-dave/cv-add-tests-for-new-lvm-functions-o

octopus: ceph-volume: add tests for new functions that run LVM commands

Merge pull request #36608 from rishabh-d-dave/cv-rm-container-classes-o

octopus: ceph-volume: remove container classes from api/lvm.py

Merge pull request #36782 from callithea/wip-46974-octopus

octopus: mgr/dashboard: Strange iSCSI discovery auth behavior

Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36831 from rhcs-dashboard/wip-47155-octopus

octopus: mgr/dashboard: redirect to original URL after successful login

Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36661 from smithfarm/wip-46586-octopus

octopus: doc/rados: Fix osd_scrub_during_recovery default value

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36690 from smithfarm/wip-46996-octopus

octopus: doc/mgr/crash: Add missing command in rm example

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

mgr/dashboard: redirect to original URL after successful login

Fixes: https://tracker.ceph.com/issues/45067
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit b5359a155c6ff7e92ab6c6ed16f7ff9fc76c76ea)
(cherry picked from commit 330c75cb511d61306a8841973f2b18e17893c555)

Merge pull request #36693 from epuertat/wip-47001-octopus

octopus: mgr/dashboard/api: reduce amount of daemon logs

Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #35975 from callithea/wip-46418-octopus

octopus: mgr/dashboard: Hide password notification when expiration date is far

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>

Merge pull request #36789 from rhcs-dashboard/wip-47121-octopus

octopus: mgr/dashboard: remove "This week/month/year" and "Today" time stamps

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #36635 from smithfarm/wip-46957-octopus

octopus: mgr/volumes/nfs: Add interface for adding user defined configuration

Reviewed-by: Varsha Rao <varao@redhat.com>

Merge pull request #36403 from ShyamsundarR/wip-46795-octopus

octopus: client: expose ceph.quota.max_bytes xattr within snapshots

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

Merge pull request #36197 from smithfarm/wip-mds-fix-typo-octopus

octopus: mds/MDSRank: fix typo in "unrecognized"

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

Merge pull request #36195 from smithfarm/wip-46591-octopus

octopus: common:  ignore SIGHUP prior to fork

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

Merge pull request #36126 from ShyamsundarR/wip-46528-octopus

octopus: mgr/volumes: Deprecate protect/unprotect CLI calls for subvolume snapshots

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

Merge pull request #36100 from smithfarm/wip-46536-octopus

octopus: pybind/ceph_volume_client: Fix PEP-8 SyntaxWarning

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

Merge pull request #35962 from smithfarm/wip-46389-octopus

octopus: client: introduce timeout for client shutdown

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

Merge pull request #36621 from smithfarm/wip-46193-octopus

octopus: os/bluestore: fix bluefs log growth

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

mgr/dashboard: remove "This week/month/year" and "Today" time stamps of Grafana in dashboard

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

mgr: Add missing states to PG_STATES in mgr_module.py.

Fixes: https://tracker.ceph.com/issues/46808
Signed-off-by: Harley Gorrell <harley@panix.com>
(cherry picked from commit 5cdadf17d634e1cbd8d2b0be8c9439bc20bdbd13)

mgr/dashboard: Strange iSCSI discovery auth behavior

Disable 'autocomplete' for the user and password form fields.

Fixes: https://tracker.ceph.com/issues/46900
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 4e9c88649de2ac7ea0ad43613fe247f08a623299)

test/store_test: add missing collection reopen

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit aede2d557ab06e21fcb5b56a75cb8fbacd35a4e0)

os/bluestore: modify cache shutdown

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit fafaa0809d4c213923659aacc6f1b6b493157e73)

 Conflicts:
 trivial - src/os/bluestore/BlueStore.h

os/bluestore: fix onode count tracking in cache.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 6a28e7cba2886ff1e1b32c4713ecc472622b9835)

os/bluestore: fix pinned/cached setting in Onode::put/get

This to be squashed with HEAD~2 later, left standalone to ease
reviewing for now.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 0ef5ebcd5df38dab5cf0498ca35ed061a47b07ba)

os/bluestore: get rid off OnodeShardCache::_touch.

Onode pinning does the same for us.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 45b1db15f677b36d971909b406fc2f210a3dca7d)

os/bluestore: simplify Onode pin/unpin logic.

This patch makes in/unpin logic more straightforward and
hopefully safe in multi-threading.

Also it eliminates Onode's pin_list as one doesn't need it to track
pinned Onodes.

OnodeCacheShard reference has been removed from onode too.

cached/pinned flags have been introduced. They're accessed under cache lock
hence original race has been totally addressed.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 3a938749f352ce8e220314da9b6e344e67eaf1fd)

 Conflicts:
 trivial - src/os/bluestore/BlueStore.h

mgr/dashboard: Extract documentation link to a component

Fixes: https://tracker.ceph.com/issues/36565
Fixes: https://tracker.ceph.com/issues/43375
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit e12702a6c71d2050fe3f3991173a60332c5d583a)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-list-helper.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-501/nfs-501.component.ts
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts
        src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.html
        src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.ts
        src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.ts
        src/pybind/mgr/dashboard/frontend/src/app/shared/services/doc.service.spec.ts

rgw: hold reloader using unique_ptr

instead of using optional<> for holding reloader, use unique_ptr<>.
as `RGWRealmReloader` is neither
trivially_copy_{assignable,constructible} nor
is_trivially_move_{assignable, constructible}, because of the `Cond`
member variable. but Clang++ and libc++ still tries to rely on a
delgating copy constructor for constructing the
optional<RGWRealmReloader> instance even the optional object is
created `in_place`.

in this change, to workaround this issue, reloader is instead
constructed using make_unique<>

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 2494ddbef5ad20cdfccf59911fccadb6f9848da0)

rgw: stop realm reloader before store shutdown

otherwise the two could race to destroy the store

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

Merge pull request #36748 from sebastian-philipp/octopus-backport-36371-36446-36349-36463-36444-36426-36447-36373-36492-36497-36538-3645

octopus: cephadm batch backport August (2)

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>

Merge pull request #36668 from smithfarm/wip-46629-octopus

octopus: bluestore: blk:BlockDevice.cc: use pending_aios instead of iovec size as ios num

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36667 from smithfarm/wip-46964-octopus

octopus: mgr: decrease pool stats if pg was removed

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #36666 from smithfarm/wip-46934-octopus

octopus: tools/rados: Set locator key when exporting or importing a pool

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #36665 from smithfarm/wip-46739-octopus

octopus: mon: fix the 'Error ERANGE' message when conf "osd_objectstore" is filestore

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36664 from smithfarm/wip-46722-octopus

octopus: osd/OSD.cc: remove osd_lock for bench

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>

Merge pull request #36663 from smithfarm/wip-46709-octopus

octopus: osd/PeeringState: prevent peer's num_objects going negative

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #36633 from smithfarm/wip-46951-octopus

octopus: monclient: schedule first tick using mon_client_hunt_interval

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #36643 from smithfarm/wip-46931-octopus

octopus: librados: add LIBRADOS_SUPPORTS_GETADDRS support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #36630 from smithfarm/wip-46958-octopus

octopus: mgr/status: metadata is fetched async

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #36611 from tspmelo/wip-46924-octopus

octopus: mgr/dashboard: Unable to edit iSCSI logged-in client

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36577 from callithea/wip-46715-octopus

octopus: mgr/diskprediction_local: Fix array size error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #36717 from smithfarm/wip-47022-octopus

octopus: rbd: librbd: Align rbd_write_zeroes declarations

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #36678 from bk201/wip-46944-octopus

octopus: mgr/dashboard: Fix host attributes like labels are not returned

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #36581 from callithea/wip-46717-octopus

octopus: mgr/prometheus: log time it takes to collect metrics

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>

Merge pull request #36302 from dillaman/wip-46724-octopus

octopus: ceph-iscsi: selinux fixes

Reviewed-by: Nathan Cutler <ncutler@suse.com>

qa/tasks/nfs: Instead of 'orch ls' use 'orch ps'

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 5c4e659067fc2022e1c226bb3c9f72fb2e018b44)

qa/suites/rados/test_orch_cli: Change mds name

As MDS name should not start with numeric digit.

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 572f0aeceb01981cab01423250cf5694404d421a)

qa/tasks/nfs: Delete nfs cluster after exports are created

Fixes: https://tracker.ceph.com/issues/47009
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 049afe5a7e6c3ccfaf29407111ff02d6ca5ee9e3)

mgr/cephadm: use fixed config file path as argument

Fixes other alertmanager containers which do not default to look for a
configuration file in `/etc/alertmanager/alertmanager.yml`.

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit cdd0ba13a5109e4319ffdaff8e8a17212e78dd15)

cephadm: fix custom alertmanager

When alertmanager image has been customized and does not have a
/etc/alertmanager directory, the uid/gid extraction fails. This change
assumes that instead the /etc/prometheus directory exists and can be
used to extract the uid and gid.

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit d218de4cde8d37f7f69a2a2a9474c0ac9afca41d)

cephadm: Allow users to use a custom dashboard ssl port

This modification allows the user to create a new bootstrap cluster using a predefined SSl port for the dashboard.
If firewall is enabled, any new manager daemon deployed in new hosts will take care of open the required ports for all the services enabled in the manager.

Two new parameters for cephadm tool (aka binary or standalone):
Command bootstrap:
--ssl-dashboard-port SSL_DASHBOARD_PORT
                      Port number used to connect with dashboard using SSL
Command deploy:
--tcp-ports TCP_PORTS
                      List of tcp ports to open in the host firewall

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 08c4a53e79a7ed63912f765fbbf86e3364d8f9be)

mgr/cephadm: mgr or mds scale-down should prefer non-active daemons

When removing daemons during a mgr/mds scale-down, prefer to remove
standby daemons so the active daemon is not killed

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

doc/cephadm: remove ssh user limitation troubleshooting

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit b59b480c3d6f0bcceff155c02770acb2ea842561)

python-common: ban paths from non-data-devices

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit ac5839b9f5d4ff2c4269b9da0314837cdafa5360)

docs/mgr: remove traces of ceph orch osd spec

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit f8b8e6f22900848ed12d166592f504e2d6b70554)

mgr/orchestrator: remove traces of ceph orch osd spec

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 4109e981d969c5c61f6dbf66e1e8c3c17724f5f8)

mgr/cephadm: add default osdspec_affinity to module fixture

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit eb1b37cfc34db90db86ef8449f645d5a192656b9)

mgr/cephadm: save osdspec_affinity to dd store

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 0feae8893364729f2e9b9ee9bc53b6eba66cbc10)

mgr/cephadm: add by_type daemon retrieval method

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 1f8965f8cc48c9e901f3531259d446e3d9211135)

mgr/cephadm: also mock `ceph vesions`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1c8cb204ffdb654a2b954a3d39a1c1712c151684)

mgr/cephadm: add test_upgrade.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d71f3b42738eef2d234ec752bc27d3e8e53e744c)

mgr/cephadm/tests: move with_service to fixtures.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 50ecd89d790fb33a7dc297ae1eeb7751dd58cba2)

pybind/mgr: Also mock the config store in pytest

This will be used to dry-run mgr/cephadm/upgrade.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f44c1e71033f8f62e3bca17d274049b858e7b015)