Merge pull request #35435 from smithfarm/wip-45580-octopus

octopus: rbd: pybind: RBD.create() method's 'old_format' parameter now defaults to False

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

Merge pull request #35430 from smithfarm/wip-45881-octopus

octopus: rbd-mirror: don't hold (stale) copy of local image journal pointer

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

Merge pull request #35433 from smithfarm/wip-45782-octopus

octopus: rgw: amqp: fix the "routable" delivery mode

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>

Merge pull request #35432 from smithfarm/wip-45777-octopus

octopus: rgw: url: fix amqp urls with vhosts

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>

Merge pull request #35431 from smithfarm/wip-45645-octopus

octopus: rgw: lc: enable thread-parallelism in RGWLC

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

Merge pull request #35434 from smithfarm/wip-45844-octopus

octopus: rgw: gc: Clearing off urgent data in bufferlist, before

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>

Merge pull request #34979 from rhcs-dashboard/wip-45460-octopus

octopus: mgr/test_orchestrator: fix _get_ceph_daemons()

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

Merge pull request #35085 from tspmelo/wip-45539-octopus

octopus: mgr/dashboard: Fix HomeTest setup

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

Merge pull request #35241 from smithfarm/wip-45704-octopus

octopus: cls/queue: fix empty markers when listing entries

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>

Merge pull request #35036 from badone/wip-octopus-fix-ftbfs-rocksdb_env_librados_test

octopus: rocksdb: Update to ceph-octopus-v5.8-1436

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

Merge pull request #35105 from smithfarm/wip-45585-octopus

octopus: doc: drop obsolete cache tier options

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

pybind/rbd: RBD.create() method's 'old_format' parameter now defaults to False

The RBD v1 format has been deprecated for numerous releases and creation of
v1 format images has been disabled since the Mimic release. This fixes
the Python API's image create() method to ensure v2 images are created by
default (and no longer throw an exception that creation of v1 images are
disabled).

Fixes: https://tracker.ceph.com/issues/45504
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 45349355f4b41c6f9de594ef34a8657230113e6b)

cls/rgw_gc: Fixing carriage returns in log statement.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 9a68cddda3f1aa94a7adb415ff186a615fb79fba)

cls/rgw_gc: Clearing off urgent data in bufferlist, before
encoding the updated one.

If this is not done, urgent data keeps getting appended
to the head, finally overwriting queue data that results
in invalid entries.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 182382cf6368eaa6f9d1efbb883ae7813a9bf6d0)

rgw/amqp: fix the "routable" delivery mode

this option was not exposed to the configuration API
however, it was still set, as hardcoded value in the code
(details:
https://www.rabbitmq.com/confirms.html#publisher-confirms)

Fixes: https://tracker.ceph.com/issues/44915
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
(cherry picked from commit 73db460e52717ede87e9c0041d097853fde27721)

rgw/url: fix commensts from review #34717

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
Fixes: https://tracker.ceph.com/issues/45269
(cherry picked from commit 32a93ecf50a236ea654448f761371e7cce89c262)

src/rgw/rgw_url.cc, also cope with a vhost appended to a AMQP-URL

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
Fixes: https://tracker.ceph.com/issues/45269
(cherry picked from commit a984d2a08c013c7cf78a25234d9fafb78c6cdc9a)

rbd-mirror: don't hold (stale) copy of local image journal pointer

The exclusive-lock manages its life cycle and can close the journal
at any point. This can result in rbd-mirror deferencing a freed pointer
or a journal state machine that is in an unexpected state.

Fixes: https://tracker.ceph.com/issues/45803
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 295483fbdc377d633addf5ec8ae2600a741db78c)

Merge pull request #34995 from smithfarm/wip-44986-octopus

octopus: mgr: synchronize ClusterState's health and mon_status.

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

Merge pull request #34822 from votdev/wip-45324-octopus

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

Merge pull request #35247 from rhcs-dashboard/wip-45369-octopus

octopus: mgr/dashboard/grafana: Add rbd-image details dashboard

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #35231 from s0nea/wip-45697-octopus

octopus: mgr/dashboard: replace hard coded telemetry URLs

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>

Merge pull request #34910 from tspmelo/wip-45315-octopus

octopus: mgr/dashboard: Replace Protractor with Cypress

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

Merge pull request #35347 from sebastian-philipp/octopus-backport-35104-35142-34902-35198-35097-35195-35266-35159-35106-35229-35194-3500

octopus: cephadm batch backport June (1)

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

Merge pull request #34881 from hillpd/wip-45357-octopus

octopus: rados: prevent ShardedOpWQ suicide_grace drop when waiting for work.

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

Merge pull request #35134 from shyukri/wip-45481-octopus

octopus: ceph-volume: add ceph.osdspec_affinity tag

mgr/dashboard: Add dashboard to mon_command reference docs

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

Add note warning against the :latest tag.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
Incorporating mgfritch's improvements.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
s/docker/podman/ -- as per mgfritch's suggestion

Signed-off-by: Zac Dover <zac.dover@gmail.com>
s/: latest/:latest/

Signed-off-by: Zac Dover <zac.dover@gmail.com>
s/image ids/image IDs/ -- as per Alex Settle's suggestion.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
Add note warning against the :latest tag.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
s/image ids/image IDs/ -- as per Alex Settle's suggestion.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
Linked to container page from cephadm install page.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
Clarified the note directing readers to the container documentation.

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

qa/tasks/cephadm: Add check fox already set image

Adding a check for already bootstrapped clusters where the image is
already set to avoid overriding it.

Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com>
(cherry picked from commit fabcbeab2c5c8819ce20134fe316e102090dc00f)

mgr: include retval in MonCommandFailed exception

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit c336d603932a808cc8f82dcf5867a1ddb4cf696b)

mgr/cephadm: config service_url in Dashboard for Prometheus and AlertManager

Calling Dashboard's CLI to set service URLs after deploying Prometheus
and AlertManager Daemons.

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

cephadm: Validate bootstrap "--dashboard-{key|crt}" path

Fixes: https://tracker.ceph.com/issues/45696
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 1ceca64d6b285eadb20a6807891aee0c92d04c09)

mgr/cephadm: remove unused imports

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

mgr/cephadm: reformat according to pep8

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

mgr/cephadm: log all args not only in root mode

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

mgr/cephadm: remove unused variable

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

mgr/cephadm: add types to function parameters

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

mgr/cephadm: custom images for monitoring components

Namely,
- Grafana
- Prometheus
- Alertmanager and
- Node exporter.

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

pybind/mgr/cephadm: remove mds auth cap for nfs recovery db cred

There's no reason for this cap to be used for talking to the MDS. The
individual exports have their own caps for talking to the file system.

Fixes: https://tracker.ceph.com/issues/45632
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit dac13abf320810bf4fd6bca653af353df78af48f)

mgr/cephadm: fix host matching when multiple hosts match for in osd
previews

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

cephadm: Alow users to provide ssh config during bootstrap

Custom ssh config can be provided by using the '--ssh-config' option

Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 84c390f07f04396c31471d7871402d3ec6631860)

cephadm: Allow users to provide ssh keys during bootstrap

Fixes: https://tracker.ceph.com/issues/45629
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit ad75937489794fb24dc6da4b975d191eed23db4e)

cephadm: Make ceph-iscsi api user and password mandatory

The api user and password is required in order to use the API so let's
make these mandatory. The `ceph orch daemon add iscsi` now has them
mandatory:

  ceph orch daemon add iscsi <pool> <api_user> <api_password>

If your using apply with a yaml file, the validate_add in the spec now
checks for these too.

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

qa/tasks/mgr: Don't disable cephadm module

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

cephadm: Detect stale and then recreate connections

Currently we make and cache connections to nodes during a check_host.
If a cached connection is disconnect from the other end the remoto
connection object doesn't track this, so further checks to the host
fail.

I have pushed up a PR[0] to remoto to add a `has_connection` method to
their `BaseConnection` class, which we now use in this patch to check to
see if the connection is stale. If it is it is then recreated.

There is some monkey patching happening so we can add the required
`has_connection` to remoto in this patch which we can remove as soon as
the other PR have landed and a new version of remoto is released.

[0] https://github.com/alfredodeza/remoto/pull/56
Fixes: https://tracker.ceph.com/issues/45627
Fixes: https://tracker.ceph.com/issues/45032
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit afabf82395361f5d2209a980578b4b6715d80f3d)

doc: New section in device management

A new section to describe the command used to blink lights in physical devices

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

mgr/dashboard: document Prometheus' security model

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

mgr/orch: add explicit naming tests (MDS / RGW)

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

mgr/orch: fixup chars before hostname without '.' test

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

mgr/orch: allow MDS with explicit naming

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

mgr/orch: allow RGWs with explicit naming

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

qa/cephadm: Add roleless mon names to ctx.cluster.remotes role dict

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

Merge pull request #35343 from sebastian-philipp/octopus-qa-py2-filenotfound

octopus: qa/cephadm: FileNotFoundError doesn't exist in py2

Reviewed-by: Georgios Kyratsas <gkyratsas@suse.com>

Merge pull request #35188 from sebastian-philipp/octopus-backport-34745-34658-34814-34778-34703-34773-34856-34898-34887-34820-34891-3490

octopus: Batch backport May (2)

Reviewed-by: Tim Serong <tserong@suse.com>

qa/cephadm: FileNotFoundError doesn't exist in py2

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

Merge pull request #35246 from yuriw/wip-yuriw-octopus-p2p-octopus

qa/tests: added v15.2.3 to parallel tests

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

Merge pull request #35255 from smithfarm/wip-45578-octopus

octopus: librbd: copy API should not inherit v1 image format by default

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

Merge pull request #35254 from smithfarm/wip-45643-octopus

octopus: rgw/notifications: version id was not sent in versioned buckets

Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>

Merge pull request #34991 from smithfarm/wip-45489-octopus

octopus: rgw: add "rgw-orphan-list" tool and "radosgw-admin bucket radoslist ..."

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

Merge pull request #34538 from smithfarm/wip-45074-octopus

octopus: build/ops: address SElinux denials observed in rgw/multisite test run

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

Merge pull request #35253 from smithfarm/wip-45708-octopus

octopus: mds: preserve ESlaveUpdate logevent until receiving OP_FINISH

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #35252 from smithfarm/wip-45685-octopus

octopus: mds: take xlock in the order requests start locking

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

Merge pull request #35251 from smithfarm/wip-45678-octopus

octopus: cephfs: allow pool names with hyphen and period

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

Merge pull request #35250 from smithfarm/wip-45674-octopus

octopus: qa: use py3 compat list from range

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

Merge branch 'octopus' of https://github.com/ceph/ceph into wip-yuriw-octopus-p2p-octopus
Changed to v15.2.3

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

Merge branch 'octopus-saved' into octopus

15.2.3

bluestore, common/options.cc: disable bluefs_preextend_wal_files

This is a temporary fix for https://tracker.ceph.com/issues/45613
to avoid WAL corruption because of enabling bluefs_preextend_wal_files
and bluefs_buffered_io together.

Fixes: https://tracker.ceph.com/issues/45613
Signed-off-by: Neha Ojha <nojha@redhat.com>

Merge pull request #35260 from sebastian-philipp/octopus-backport-35235

octopus: qa/cephadm: Add local dockerhub mirror

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

qa/cephadm: sudo_write_file doesn't support unicode

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

qa/cephadm: Docker doesn't ship a registries.conf

I guess not using the mirror for docker based tests is ok for now.

For adding docker support, we need to:

1. change the docker config
2. restart the docker daemon

Note that Docker's config only supports to mirror the docker.io registry.

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

qa/cephadm: Add local registry mirror

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

Conflicts:
qa/tasks/cephadm.py
qa/tox.ini

Changes:
  qa/tox.ini converted to py2

Merge pull request #35150 from Vicente-Cheng/wip-45599-octopus

octopus: client: expose Client::ll_register_callback via libcephfs

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

Merge pull request #35148 from Vicente-Cheng/wip-45603-octopus

octopus: mds: Handle blacklisted error in purge queue

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

Merge pull request #35147 from Vicente-Cheng/wip-45601-octopus

octopus: mds: don't shallow copy when decoding xattr map

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

Merge pull request #34999 from smithfarm/wip-45495-octopus

octopus: cephfs: Client: fix Finisher assert failure

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

Merge pull request #34997 from smithfarm/wip-45477-octopus

octopus: client: only set MClientCaps::FLAG_SYNC when flushing dirty auth caps

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

Merge pull request #34996 from smithfarm/wip-45473-octopus

octopus: bash_completion: Do not auto complete obsolete and hidden cmds

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

Merge pull request #34727 from kotreshhr/octopus-ceph-fs-status-output

octopus: mgr/status: Fix "ceph fs status" json format writing to stderr

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

Merge pull request #34509 from smithfarm/wip-45028-octopus

octopus: mds: don't assert empty io context list when shutting down

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

librbd: copy API should not inherit v1 image format by default

When copying from a v1 image, by default the new destination image
would be created using the v1 format. Since the creation of v1 images
is disallowed, this has been updated to default to using the v2
image format.

Fixes: https://tracker.ceph.com/issues/45518
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 69b6d5997e8c6a11739e4d5a32564e61eb2f470f)

rgwlc: permit per-bucket thread parallelism

Introduces type-safe work queues to process lifecycle actions
in parallel.  Currently, optimized for copy avoidance, so limiting
fetch overlap--because rgw_bucket_dir_entry is b.i.g.

Oh, heck.  Open it up.

Define bsf and f in the right order.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 8e00319d1aece2f6d99004d8a53a38ed2e88ea19)

rgwlc: enable thread-parallelism in RGWLC

Allow RGWLC to spawn >1 LCWorker threads, controlled by option
rgw_lc_max_worker (default to 3).

LCWorker parallelism exactly resembles previous cross-instance
parallelism (and extends it), with no new locking.

Replace in-order index shard enumeration (w/random start) with
a number sequence to avoid convoying.

Fixes: https://tracker.ceph.com/issues/43841
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit f31047be46fbe083ffc8954351fe94764a958a3c)

rgw/notifications: version id was not sent in versioned buckets

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
Fixes: https://tracker.ceph.com/issues/45440
(cherry picked from commit 973b0b1ed8767767f0c4446d97248c1b8002f1d3)

mds: preserve ESlaveUpdate::OP_PREPARE logevent before doing commit

Fixes: https://tracker.ceph.com/issues/45024
Signed-off-by: songxinying <songxinying@sensetime.com>
(cherry picked from commit 4940ab62e0d19ce36e53bcc67b2a2161c47f6c6d)

Conflicts:
src/mds/Mutation.h
- where master has "ceph::buffer::list", octopus has "bufferlist"

mds: take xlock in the order requests start locking

this avoid assertion in MutaionImpl::finish_locking()

Fix: https://tracker.ceph.com/issues/45261
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 2e11a35d5b06312e0b2d0aecd83e8eb882ddf719)

cephfs: allow pool names with '-' and '.'

... to be set as pool layouts for files and directories.

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

qa: use py3 compat list from range

Fixes: https://tracker.ceph.com/issues/45590
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 8d51b33e5d70feec3b65ac3eb819a3515befcdac)

rgw: remove unused function obj_force_ns

Removing the function eliminates a compiler warning.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 9a1e89173d398bf6e39a431d4b4ef9ab1f20e2bb)

mgr/dashboard: Remove additional unneeded steps for the metrics calculation

Signed-off-by: Enno Gotthold <egotthold@suse.de>
(cherry picked from commit dfb1e0020ed8130a2276be1ca94d8e7d7f931273)

doc/mgr/prometheus: Change images to rbd-enabled pools

Signed-off-by: Enno Gotthold <egotthold@suse.de>
(cherry picked from commit db76547c8d829e529dcebccde100fca438d64446)

mgr/prometheus: Add config value to honor ceph config in prometheus

Signed-off-by: Enno Gotthold <egotthold@suse.de>
Author: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 6d5f88450e61122016fcf7b6cf9431dc67128d3d)

doc: Add information on how to enable the rbd-images dashboard

Fixes: https://tracker.ceph.com/issues/44623
Signed-off-by: Enno Gotthold <egotthold@suse.de>
In the previous commit (1c52ee2b) the added dashboard will stay empty
until it is manually enabled to display information.

(cherry picked from commit 6386095e51a1d58fa0093d37b26df25c524b72bc)

mgr/dashboard: Add grafana chart for rbd image details

Fixes: https://tracker.ceph.com/issues/44623
Signed-off-by: Enno Gotthold <egotthold@suse.de>
This dashboard will per default be empty as the already existing
dashboard with the summary for all rbd images.

(cherry picked from commit 9707cb30cbbfc0f7c669e19fb9d2482ea422993c)

qa/tests: added v15.2.2 to parallel tests

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

cls/queue: Populating marker correctly in queue_list_entries,
when data is split between two chunks.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit 864ff430f38ea630cbc7ae84695aa2b6cfb47772)

Conflicts:
src/cls/queue/cls_queue_src.cc
- 491be9ab38dc3a428755010d733fb207aa4be613 is not being backported to
  octopus

cls/queue: fix empty markers when listing entries

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
(cherry picked from commit 348044ecf33ceb6e04cf79025b39345e0b5c51c0)

mgr/dashboard: replace hard coded telemetry URLs

Replace the hard coded telemetry URLs by the
actual config option values given by the cluster.

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

cephadm: fixup command_deploy log line

fixup log line to reflect the deploy action
(e.g. deploy, reconfig, redeploy)

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

cephadm: skip `port_in_use` during redeploy

skip the `port_in_use` check during reconfig/redeploy
of the monitoring components and nfs-ganesha

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