mgr/rook: fix listing daemons

Pass the parameters to the `_list_daemons` method explicitly to avoid missing
parameters.

Fixes: https://tracker.ceph.com/issues/47387
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 8098ca765fadce18c3738df04f9eb5ddf786c113)

cephadm: filter dangling images in get_last_local_ceph_image()

if `podman images --filter label=ceph=True --format {{.Repository}} {{.Tag}}`
returns something like following:

```
<none>                <none>
docker.io/ceph/ceph   v15
```

it will end up throwing an error:

```
    r = args.func()
  File "./cephadm", line 1147, in _infer_fsid
    return func()
  File "./cephadm", line 1184, in _infer_config
    return func()
  File "./cephadm", line 1230, in _infer_image
    return func()
  File "./cephadm", line 3283, in command_shell
    make_log_dir(args.fsid)
  File "./cephadm", line 1325, in make_log_dir
    uid, gid = extract_uid_gid()
  File "./cephadm", line 1913, in extract_uid_gid
    raise RuntimeError('uid/gid not found')
RuntimeError: uid/gid not found
```

adding `--filter dangling=false` can help to avoid this.

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

doc/mgr: fix outdated `orch apply` docs.

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

mgr/cephadm: CephadmService.create -> CephadmService.prepare_create

Refactored this to simplify the control flow. It became obvious that

* `CephadmService.make_daemon_spec`
* `CephadmService.prepare_create`
* `CephadmService.generate_config`

are basically the same thing. They're all called directly
before the deployment of a daemon. All of them should be
unified. This PR makes this refactorization simpler

By renaming `create` to `prepare_create`, we make `create`
no longer being the entrypoint to call
`create_daemon`. Thus all the functions above
return some data structures.

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

python-common/deployment: respect existing osds

Fixes: https://tracker.ceph.com/issues/44888
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 6bfc4589f55c76d50cc87f75c4018860167f7708)

mgr/cephadm: allow to map existing daemons to osdspecs

Fixes: https://tracker.ceph.com/issues/44888
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 6a374c583c2963a0bfc28fd6b54f5f91b6f8d26f)

mgr/cephadm: allow iscsi to be named by teuthology

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

qa/cephadm: Also fetch iscsi logs

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

qa/cephadm: Add iSCSI

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

mgr/cephadm: merge update_keyring_caps -> create_keyring

keyring is removed during daemon remove, which obsoletes the need to
update the keyring caps after get-or-create

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

mgr/cephadm: disallow removing the mon keyring

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

mgr/cephadm: remove keyring during daemon post-remove

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

mgr/cephadm: pass `DaemonDescription` during pre/post remove

add more context than simply passing the `daemon_id`

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

mgr/cephadm: add `post_remove` daemon action

invoked after a daemon has been removed

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

mgr/cephadm: make j2 teamplates overwritable

This adds an escape hatch, if the configs generated
by cephadm are not flexible enough.

Downside is obviously that future upgrades might
break the daemons. Use at your own risk.

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

cephadm: remove z option from iSCSI dev and configfs mount

selinux complains if you try to deploy iSCSI with the z option
on the /dev and /sys/kernel/config mounts

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

mgr/cephadm: Call cephadm with --container-image

The kernel treats any process with PID 1 different. Especially
it does not generate a core dump. Call podman / docker with
--init in order to get core dumps.

In addition, we can now properly reap zombies processes.

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

cephadm: Add --container-image

The kernel treats any process with PID 1 different. Especially
it does not generate a core dump. Call podman / docker with
--init in order to get core dumps.

In addition, we can now properly reap zombies processes.

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

mgr/cephadm: introduce `CephService` class

- split the cephx related keyring functions into a `CephService` class
- move _get_config_and_keyring and get_keyring_entity to this new class
- monitoring stack (prom, grafana, etc) have no use for cephx keyrings

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

mgr/cephadm: refactor `get_auth_entity()`

- convert to f-strings
- mgr keyring format is same as osd, mds
- crash client keyring is same as nfs, iscsi, etc

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

mgr/cephadm: use `get_auth_entity()`

- some services have hard-coded auth entity names
- some services are incorrectly using `utils.name_to_config_section()`

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

mgr/cephadm: move `name_to_auth_entity` to `get_auth_entity`

refactor the logic for getting the keyring auth entity from the utils
module into the CephadmService class

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

cephadm: fix iSCSI unit.run file

Current unit.run file generated for iSCSI when using podman
tries to have two containers use the same conmon pidfile and
cidfile for both containers which is invalid
Fixes: https://tracker.ceph.com/issues/47291
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 0d993640af3f3ff9572e62af9811d94a992df0dd)

cephadm: Remove assignment to member variable in ServiceSpecs

Remove unnecessary assignment to member variable 'preview_only', this is done in the constructor of the derived ServiceSpec class.

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

cephadm: unit.run: create /var/run/ceph/$FSID before doing anything else

This ensures the /var/run/ceph/$FSID directory exists before any
other commands are run.

Fixes: https://tracker.ceph.com/issues/47360
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 721b4de3490c739635d8cf6623f36d142acb8fac)

cephadm: log to file

Log configuration improved adding a log file with debug level.

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

python-common: Make HostPlacementSpec.to_json() more friendly

We will now generate

```yaml
placement:
  hosts:
  - ceph-001
```

instead of

```yaml
placement:
  hosts:
  - hostname: ceph-001
    name: ''
    network: ''
```

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

mgr/cephadm: upgrade: Make use of repo_digest

* Automatically convert tags like `:latest` to the digest
* Use the digest instead of the tag

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

qa/cephadm: Add mgr/cephadm/use_repo_digest true to upgrade test

As this is the most interesting test suite

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

mgr/cephadm: convert tags to repo_digest

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

mgr/cephadm: extract set_continer_image(entity, image)

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

cephadm: inspect_image also returns repo_digest

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

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

doc/cephadm: managing ceph.conf

This commit repairs PR#36796, which was about
updating the configuration settings in ceph.conf
without touching the file directly.

That commit wasn't building because of a couple of
back quotes that were touching the word that followed
them. So much like the princess from The Princess and
The Pea is Sphinx. So careful must we always be.

Fixes: https://tracker.ceph.com/issues/47265
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 29e8cbc49b3d904e2cf5d5eb2d632f49ba604052)

python-common: s/unicode/str/

we've dropped python2 support. so it's safe to replace unicde with str.

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

mgr/orchestrator: add test command testcase for "device ls"

Quick test to ensure changes that break wide mode are picked
up

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

mgr/orchestrator: fix typing on lsm_data components

Resolves mypy issues

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

orchestrator: intergrate LSM information with device ls

libstoragemgmt metatdata is now available with ceph-volume,
so this patch reformats the plain text output mode of the
orch device ls command to include device health and LED
states.

In addition ; the headings have been camel cased for readability,
the device size is given in dec (since you buy drives in GB not GiB),
a new wide mode has been added and the default output focuses
on the most frequently referred to fields to keep it brief.

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

cephadm: Change service type to forking via systemd

Using Type=Forking and setting the PIDFile=
directive is the supported configuration for
running podman containers with systemd as it
more accuractely models what is actually
happening. Type=Simple assumes podman is the
direct parent of the container processes which
is not true.

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

Merge pull request #36862 from tspmelo/wip-46091-octopus

octopus: mgr/dashboard: Auto close table column dropdown on click outside

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

Merge pull request #37549 from smithfarm/wip-preextended-release-note-octopus

octopus: doc/PendingReleaseNotes: mention bluefs_preextend_wal_files

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

Merge pull request #37034 from smithfarm/wip-46520-octopus

octopus: mds: do not submit omap_rm_keys if the dir is the basedir of merge

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

Merge pull request #37020 from Vicente-Cheng/wip-46522-octopus

octopus: mds: fix hang issue when accessing a file under a lost parent directory

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

Merge pull request #37017 from Vicente-Cheng/wip-46516-octopus

octopus: cephfs: client: fix directory inode can not call release callback

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

Merge pull request #36813 from smithfarm/wip-47080-octopus

octopus: messages,mds: Fix decoding of enum types on big-endian systems

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

Merge pull request #36713 from kotreshhr/wip-46947-octopus

octopus: qa: Fix traceback during fs cleanup between tests

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

doc/PendingReleaseNotes: mention bluefs_preextend_wal_files

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

Merge pull request #37452 from callithea/wip-47606-octopus

octopus: mgr/dashboard: log in non-admin users successfully if the telemetry notification is shown

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #37217 from callithea/wip-47462-octopus

octopus: mgr: PyModuleRegistry::unregister_client() can run endlessly

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

Merge pull request #37022 from Vicente-Cheng/wip-46524-octopus

octopus: mds: add request to batch_op before taking auth pins and locks

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

Merge pull request #36970 from Vicente-Cheng/wip-46473-octopus

octopus: mds: make threshold for MDS_TRIM configurable

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

Merge pull request #37401 from smithfarm/wip-47644-octopus

octopus: rpm,deb: drop /etc/sudoers.d/cephadm

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #37349 from smithfarm/wip-47346-octopus

octopus: qa/*/mon/mon-last-epoch-clean.sh: mark osd out instead of down

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

Merge pull request #37348 from smithfarm/wip-47251-octopus

octopus: tools/osdmaptool.cc: add ability to clean_temps

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

Merge pull request #37341 from smithfarm/wip-47466-octopus

octopus: common/admin_socket: always validate the parameters

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #37302 from bk201/wip-47192-octopus

octopus: mgr/telemetry: fix device id splitting when anonymizing serial

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>

Merge pull request #37264 from ifed01/wip-ifed-finer-mempool-granularity-octopus

octopus: bluestore: mempool's finer granularity + adding missed structs

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #37257 from smithfarm/wip-47545-octopus

octopus: ceph.spec, debian: add smartmontools, nvme-cli dependencies

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

Merge pull request #37253 from bstillwell/wip-47424-octopus

octopus: compressor: Add a config option to specify Zstd compression level

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

Merge pull request #37412 from jan--f/wip-47649-octopus

octopus: [ceph-volume]: remove unneeded call to get_devices()

Merge pull request #37344 from jan--f/wip-47284-octopus

octopus: ceph-volume: fix journal size argument not work

Merge pull request #36921 from tspmelo/wip-npm-octopus

octopus: mgr/dashboard: Fix npm package's vulnerabilities

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

Merge pull request #37390 from tspmelo/wip-46999-octopus

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #37277 from tspmelo/wip-47559-octopus

octopus: mgr/dashboard: Allow editing iSCSI targets with initiators logged-in

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

mgr/dashboard: check config opt permissions

Getting the user object fails for a non-admin user. Check
the permissions directory if the user is allowed to access the
config options instead.

Fixes: https://tracker.ceph.com/issues/47331
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 0942b022d0515d53e2e8742851b6aeb60f3379f9)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts
- Resolved import conflicts in both files; Resolved TestBed conflict (we have to stick with TestBed.get(); in octopus vs. master
  TestBed.inject(); which is related to Angular 9 being used in master and is not backported to octopus

Merge pull request #37270 from badone/wip-octopus-enable-mgr-client-debug

octopus: qa: Enable debug_client for mgr tests

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

Merge pull request #37422 from tchaikov/octopus-37388

octopus: debian: Add missing Python dependency for ceph-mgr

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #37373 from smithfarm/wip-46350-octopus

octopus: bluestore: remove preextended WAL support.

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

Merge pull request #37347 from smithfarm/wip-47091-octopus

octopus: mon: mark pgtemp messages as no_reply more consistenly in preprocess_…

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

Merge pull request #37032 from smithfarm/wip-47351-octopus

octopus: core: include/encoding: Fix encode/decode of float types on big-endian systems

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

Merge pull request #36945 from vumrao/wip-vumrao-47258

octopus: mon/PGMap: add pg count for pools in the ceph df command

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

Merge pull request #36047 from smithfarm/wip-46479-octopus

octopus: mds: send scrub status to ceph-mgr only when scrub is running

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #37346 from smithfarm/wip-47460-octopus

octopus: qa/workunits/mon: fixed excessively large pool PG count

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

Merge pull request #37343 from smithfarm/wip-47416-octopus

octopus: rbd: include RADOS namespace in krbd symlinks

Merge pull request #37342 from smithfarm/wip-47082-octopus

octopus: rbd-mirror: peer setup can still race and fail creation of peer

Merge pull request #37340 from smithfarm/wip-47412-octopus

octopus: rgw: urlencode bucket name when forwarding request

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

Merge pull request #37339 from smithfarm/wip-47348-octopus

octopus: rgw: Swift API anonymous access should 401

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

Merge pull request #37338 from smithfarm/wip-47321-octopus

octopus: rgw: replace '+' with "%20" in canonical query string for s3 v4 auth.

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

Merge pull request #37336 from smithfarm/wip-47314-octopus

octopus: rgw: radosgw-admin: period pull command is not always a raw_storage_op

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

Merge pull request #37335 from smithfarm/wip-47245-octopus

octopus: rgw: Add bucket name to bucket stats error logging

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

Merge pull request #37208 from smithfarm/wip-46982-octopus

octopus: test/rbd-mirror: pool watcher registration error might result in race

Merge pull request #37180 from callithea/wip-47410-octopus

octopus: mgr: don't update pending service map epoch on receiving map from mon

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #37116 from dillaman/wip-47371-octopus

octopus: librbd: ensure that thread pool lock is held when processing throttled IOs

Merge pull request #36860 from dillaman/wip-46791-octopus

octopus: librbd: handle DNE from immutable-object-cache

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #36691 from smithfarm/wip-46998-octopus

octopus: rgw: s3: mark bucket encryption as not implemented

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

Merge pull request #37405 from rhcs-dashboard/wip-47619-octopus

octopus: mgr/dashboard: fix perf. issue when listing large amounts of buckets

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

Merge pull request #37299 from p-se/wip-47547-octopus

octopus: mgr/dashboard: Fix many-to-many issue in host-details Grafana dashboard

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

os/bluestore: bind attrs to bluestore_cache_meta mempool.

This seems to be a better choice over bluestore_cache_data

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

 Conflicts:
src/os/bluestore/bluestore_types.h
 Caused by the lack of explicit std:: reference in headers - master has
 got this as a part of crimson effort.

os/bluestore: add missing structs to bluestore_cache_other mempool

Fixes: https://tracker.ceph.com/issues/47551
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 4592c5df554190065fa9a994f7b6dc3fed7ea214)

Merge pull request #36991 from s0nea/wip-46407-octopus

octopus: mgr/dashboard: Fix bugs in a unit test and i18n translation

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #36875 from tspmelo/wip-46342-octopus

octopus: mgr/dashboard: Remove useless tab in monitoring/alerts datatable details

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #36705 from ShyamsundarR/wip-47014-octopus

octopus: mon: store mon updates in ceph context for future MonMap instantiation

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #36985 from k0ste/wip-47282-octopus

octopus: prometheus: Properly split the port off IPv6 addresses

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

debian: Add missing Python dependency for ceph-mgr

The file mgr/volumes/fs/operations/pin_util.py imports distutils.util for using
strtobool and thus the python package is required.

Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
(cherry picked from commit 868e708c9e6538684f9b053d44497bba543ea5eb)

Merge pull request #37408 from idryomov/wip-krbd-read-only-override-octopus

octopus: rbd: make common options override krbd-specific options

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

ceph-volume: remove unneeded call to get_devices()

there is no need to probe the device to generate the argparse help
message.

also removing the test on the function as it's not there anymore.

Signed-off-by: Marc Gariepy <gariepy.marc@gmail.com>
Fixes: https://tracker.ceph.com/issues/47502
(cherry picked from commit 5c6f66166a7afad87627032cafdc5c4f11f94eac)

rbd: make common options override krbd-specific options

ceph-csi has added support for passing custom map and unmap options via
mapOptions and unmapOptions storage class parameters.  However, it also
uses --read-only for implementing ROX (ReadOnlyMany) PVs.  If the user
supplies "mapOptions: rw", they will get around the intended read-only
restriction (at least on the block device).

ceph-csi could be patched to use "-o ro", but it actually makes sense
for common options to win over device type-specific equivalents.

Fixes: https://tracker.ceph.com/issues/47625
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit a107c47360ecdb8c09768ca9eab2341100245711)

Conflicts:
src/tools/rbd/action/Kernel.cc [ snapshot quiesce support and
  commit 34f539d8af33 ("rbd: delay parsing of default kernel map
  options") not in octopus ]

mgr/dashboard: fix performance issue when listing large amounts of buckets

Fixes: https://tracker.ceph.com/issues/47543
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 924368e1d0aebcb0d8f9747589d9048414d33080)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts
  - Adapted changes in these files to octopus code.

Merge pull request #36931 from yuriw/wip-yuriw-46529-octopus

octopus: qa/tests: use bionic only for old clients in rados/thrash-old-clients

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

rpm,deb: drop /etc/sudoers.d/cephadm

Current behavior (without this patch) is:

1. cephadm package installs cephadm at /usr/sbin/cephadm
2. cephadm package installs /etc/sudoers.d/cephadm
3. !!! BUT this file refers to a non-existent executable (/usr/bin/cephadm) !!!
4. the PR that introduced this sudoers file (and this discrepancy) was merged in 2019
5. nobody noticed the discrepancy until now

My conclusion: the file /etc/sudoers.d/cephadm is not needed for cephadm to
work.

Fixes: https://tracker.ceph.com/issues/47112
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit c1783d3d8f6fd25817b78ea6f76335347aceb566)

Conflicts:
debian/rules
- octopus does not mention "rbd-nbd_quiesce"

mgr/dashboard: Landing Page improvements

Fixes: https://tracker.ceph.com/issues/42072
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit d66e684b9ec83cca8a58b0a7b8661c568eb0cf6d)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.scss
src/pybind/mgr/dashboard/frontend/src/styles/defaults/_bootstrap-defaults.scss
  this file doesn't exist in octopus, so I moved the code into:
src/pybind/mgr/dashboard/frontend/src/stykes/defaults.scss