Merge pull request #50135 from zdover23/wip-doc-2023-02-16-backport-50120-to-pacific

pacific: doc/glossary: add "realm" to glossary

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>

Merge pull request #49233 from Matan-B/wip-58144-pacific

pacific: mon/MonCommands: Support dump_historic_slow_ops

Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>

Merge pull request #48846 from nkshirsagar/wip-58007-pacific

pacific: mon: bail from handle_command() if _generate_command_map() fails

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

Merge pull request #48804 from tserong/wip-57996-pacific

pacific: ceph-crash: drop privleges to run as "ceph" user, rather than root (CVE-2022-3650)

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

Merge pull request #49503 from rhcs-dashboard/wip-58270-pacific

pacific: mgr/dashboard: add tooltip mirroring pools table

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

Merge pull request #49869 from guits/wip-58575-pacific

pacific: ceph-volume: fix a bug in lsblk_all()

Merge pull request #50140 from zdover23/wip-doc-2023-02-16-backport-50138-to-pacific

pacific: doc/rgw: refine "Realms" section

doc/rgw: refine "Realms" section

Make various syntactical and semantic improvements to "Realms" section.

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

Merge pull request #50137 from zdover23/wip-doc-2023-02-16-backport-50119-to-pacific

pacific: doc/rgw: s/[Zz]one [Gg]roup/zonegroup/g

doc/rgw: s/[Zz]one [Gg]roup/zonegroup/g

Change all instances of "Zone Group" and "Zone group" and "zone group"
to "Zonegroup" or "zonegroup".

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

doc/glossary: add "realm" to glossary

Add the term "Realm" to the glossary, and link to the section in the RGW
documentation that provides more information about realms.

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

Merge pull request #50118 from zdover23/wip-doc-2023-02-15-backport-50108-to-pacific

pacific: doc/rgw: refine "Multi-site Config Ref" (1 of x)

doc/rgw: refine "Multi-site Config Ref" (1 of x)

Refine the syntax (and in some cases, the semantics) of the English in
"Multi-site Configuration Reference" in doc/radosgw/multisite.rst. This
is a long section, so more PRs are likely.

https://tracker.ceph.com/issues/58632

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Co-authored-by: Casey Bodley <cbodley@redhat.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 2d45a4e5e087cfd64d9e3cb5f346d24452a8742f)

Merge pull request #50116 from cityofships/pacific_backport

pacific: doc/ceph-volume: fix cephadm references

doc/ceph-volume: fix cephadm references

Signed-off-by: Piotr Parczewski <piotr@stackhpc.com>
(cherry picked from commit 2104d9ffdaaacb5ee0e1a0374baeac77a00bd677)

Merge pull request #50094 from zdover23/wip-doc-2023-02-13-backport-50086-to-pacific

pacific: doc/rgw: "Migrating Single Site to Multi-Site"

doc/rgw: "Migrating Single Site to Multi-Site"

Refine "Migrating Single-site System to Multi-site" in
doc/radosgw/multisite.rst.

https://tracker.ceph.com/issues/58632

Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Co-authored-by: Anthonh D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 40c82f8ef679ed6c5182765b3bf4d6e61ed2e66d)

Merge pull request #50079 from zdover23/wip-doc-2023-02-12-backport-50077-to-pacific

pacific: doc/rgw: refine "Failover and Disaster Recovery"

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

doc/rgw: refine "Failover and Disaster Recovery"

English grammar and syntax pass for "Failover and Disaster Recovery" in
doc/radosgw/multisite.rst.

https://tracker.ceph.com/issues/58632

Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 815359800c6885c5fd7a9dbc27e1c29295d5dbe3)

Merge pull request #50069 from zdover23/wip-doc-2023-02-10-backport-50063-to-pacific

pacific: doc/cephfs: add note about CephFS extended attributes and getfattr

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

Merge pull request #50075 from zdover23/wip-doc-2023-02-11-backport-50066-to-pacific

pacific: doc/rgw: refine "Configuring Secondary Zones"

doc/rgw: refine "Configuring Secondary Zones"

English grammar and syntax pass (and some pragmatics, too, where I had
enough understanding to be helpful that way) for "Configuring Secondary
Zones" in doc/radosgw/multisite.rst.

https://tracker.ceph.com/issues/58632

Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 2c6f0ab5387dca9c4c7b09dfbc8cb3c6be1c6dab)

Merge pull request #50044 from aaSharma14/wip-58665-pacific

pacific: mgr/dashboard: Replace vonage-status-panel with native grafana stat panel

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

doc/cephfs: add note about CephFS extended attributes and getfattr

Supersedes https://github.com/ceph/ceph/pull/50060

Add a note on the fact that CephFS extended attributes are not printed
by "getfattr /some/cephfs/dir/ -d -m -" even when the CephFS directory
has some extended attributes set on it.

https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/6ENI42ZMHTTP2OONBRD7FDP7LQBC4P2E/

Primary Author: Rishabh Dave <ridave@redhat.com>
Co-author: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 7f23dde6bec3ef75777438f5ae16347609ca0bf4)

Merge pull request #49915 from adk3798/wip-58444-pacific

pacific: qa/tasks/cephadm.py: fix pulling cephadm from git.ceph.com

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

mgr/dashboard: Replace vonage-status-panel with native grafana stat panel

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

Merge PR #50034 into pacific

* refs/pull/50034/head:
doc: document debugging for libcephsqlite

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #50032 from zdover23/wip-doc-2023-02-09-backport-50030-to-pacific

pacific: doc/rgw: refine multisite to "config 2ndary zones"

doc: document debugging for libcephsqlite

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

doc/rgw: refine multisite to "config 2ndary zones"

Refine the English in doc/radosgw/multisite.rst up to (but not
including) "Configure Secondary Zones".

https://tracker.ceph.com/issues/58632

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

Merge pull request #50026 from zdover23/wip-doc-2023-02-08-backport-50022-to-pacific

pacific: doc/radosgw: refine "Maintenance" in multisite.rst

doc/rgw: fixup (squash later)

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

doc/radosgw: refine "Maintenance" in multisite.rst

Refine the text in the "Maintenance" section of
doc/radosgw/multisite.rst.

https://tracker.ceph.com/issues/58632

Co-authored-by: Cole Mitchell <cole.mitchell@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 85816fbca068b740362e2faaf13dc601cdd68c1c)

Merge pull request #49988 from pdvian/wip-58638-pacific

pacific: mon: Fix condition to check for ceph version mismatch

Merge pull request #49454 from guits/wip-58279-pacific

pacific: ceph-volume: fix a bug in get_all_devices_vgs()

Merge pull request #49928 from adk3798/wip-58567-pacific

pacific: mgr/cephadm: call iscsi post_remove from serve loop

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #49926 from adk3798/wip-58556-pacific

pacific: mgr/cephadm: fix removing offline hosts with ingress daemons

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #49919 from adk3798/wip-58206-pacific

pacific: mgr/cephadm: don't say migration in progress if migration current > migration last

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

Merge pull request #49918 from adk3798/wip-58202-pacific

pacific: mgr/cephadm: specify ports for iscsi

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

Merge pull request #49916 from adk3798/wip-58175-pacific

pacific: mgr/cephadm: fix check for if devices have changed

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #49285 from adk3798/wip-58148-pacific

pacific: mgr/cephadm: some master -> main cleanup

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

Merge pull request #50009 from zdover23/wip-doc-2023-02-07-backport-49994-to-pacific

pacific: doc/rgw: refine ~50-~140 of multisite.rst

doc/rgw: refine ~50-~140 of multisite.rst

Remove pleonasm from approximately line 50 to line 140 of
doc/rgw/multisite.rst.

Follows https://github.com/ceph/ceph/pull/49993.

https://tracker.ceph.com/issues/58632

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 805a9baeeaaa78aa2bb6f472526cc35361c75456)

Merge pull request #49996 from zdover23/wip-doc-2023-02-06-backport-49993-to-pacific

pacific: doc/rgw: refine 1-50 of multisite.rst

doc/rgw: refine 1-50 of multisite.rst

Refine the English in the first fifty lines of multisite.rst. This is
part of a project whose goal is the creation of a document that will
impart a good aerial view of RGW to a first-time reader in the minimum
number of words.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 6721196ff129b00d9dea3515fbaaacde8f84eaea)

mon: Fix condition to check for ceph version mismatch

MON fails to send MMgrUpdate to the MGR to update
DaemonState with correct metadata information due to
incorrect conditional check. Send MMgrUpdate to MGR
if we observe ceph version mismatch after an election
is over.

Fixes: https://tracker.ceph.com/issues/57678
Signed-off-by: Prashant D <pdhange@redhat.com>
(cherry picked from commit 5dc0d6f7f299cc7af0c243ba67036b075f4b72af)

Merge pull request #49983 from zdover23/wip-doc-2023-02-03-backport-49981-to-pacific

pacific: doc/rgw: refine "Zones" in multisite.rst

doc/rgw: refine "Zones" in multisite.rst

Clean up the English under the section called "Zones". Part of a larger
project aimed at giving the reader more understanding earlier in the
documentation of how buckets and zones and zone groups and endpoints
work.

https://tracker.ceph.com/issues/58632

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

mgr/cephadm: specify ports for iscsi

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

Merge pull request #49949 from zdover23/wip-doc-2023-02-01-backport-49946-to-pacific

pacific: doc/cephadm: grammar / syntax in install.rst

doc/cephadm: grammar / syntax in install.rst

Signed-off-by: Piotr Parczewski <piotr@stackhpc.com>
(cherry picked from commit 4cc3cb9cd007c293bf61d20c05b960be2d4cd4fd)

Merge pull request #49933 from zdover23/wip-doc-2023-01-31-backport-49913-to-pacific

pacific: doc: add the damage types that scrub can repair

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>

doc: add the damage types that scrub can repair

Fixes: https://tracker.ceph.com/issues/51459
Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit 87215ab3e4af1ca313376d901f285ed6348b8433)

mgr/cephadm: call iscsi post_remove from server loop

If we call it directly during a synchronous command
from the command line it never returns.

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

mgr/cephadm: fix removing offline hosts with ingress daemons

We need to convert the daemon type to service type here
or we'll try to access the "haproxy" or "keepalived" index
of the cephadm_services dictionary, which doesn't have those
keys (but does have an "ingress" key)

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

mgr/cephadm: don't say migration in progress if migration current > migration last

We risk ending up in an endless busy loop accomplishing
nothing otherwise.

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

mgr/cephadm: fix check for if devices have changed

Directly comparing the dicts doesn't work since the
"created" field was added in. We should instead make use
of the existing Devices equality function.

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

Conflicts:
src/pybind/mgr/cephadm/tests/test_cephadm.py

qa/tasks/cephadm.py: fix pulling cephadm from git.ceph.com

The old way of using the git archive doesn't seem
to work anymore so trying another approach

Was getting "fatal: operation not supported by protocol"
when trying the git archive

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

Conflicts:
qa/tasks/cephadm.py

Merge pull request #49911 from zdover23/wip-doc-2023-01-30-special-order-backport-49908-to-pacific

pacific: doc/dev: backport 49908 to P (Upgrade Testing Docs)

doc/dev: backport 49908 to P (Upgrade Testing Docs)

Backport https://github.com/ceph/ceph/pull/49908 to Pacific.

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

Merge pull request #49899 from zdover23/wip-doc-2023-01-27-backport-49897-to-pacific

pacific: doc/rados/operations: Fix double prompt

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>

doc/rados/operations: Fix double prompt

In monitoring.rst a double prompt was rendered, one non-selectable and one selectable. Remove the selectable prompt.

Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>
(cherry picked from commit 7d7282c7bdf0396f9a192badeedf66976fa01e5e)

Merge pull request #49893 from zdover23/wip-doc-2023-01-27-backport-49890-to-pacific

pacific: doc/dev: use underscores in config vars

Merge pull request #49896 from zdover23/wip-doc-2023-01-27-backport-49894-to-pacific

pacific: doc/rados/operations: Fix indentation

ceph-crash: log warning if crash directory unreadable

This is to aid in debugging in case crashes aren't posted as expected
(see https://tracker.ceph.com/issues/58098 for discussion).

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit d139f6d112e6118f0f458dbfff9550b3ce312d20)

qa/workunits/rados/test_crash: chown crash files to ceph user

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

doc/rados/operations: Fix indentation

Fix invalid indentation that caused indentation to be rendered wrong in control.rst.

Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>
(cherry picked from commit f2e19d39ed303c700c6aab206a1c000c5731baeb)

doc/dev: use underscores in config vars

Use underscores instead of spaces in config vars in ceph_krb_auth.rst.

Signed-off-by: Ville Ojamo <14869000+bluikko@users.noreply.github.com>
(cherry picked from commit ed88f7f378fcb70be57351271aa19b30f81555d4)

Merge pull request #49852 from ceph/pacific-release

v16.2.11

Merge pull request #49875 from zdover23/wip-doc-2023-01-26-backport-49873-to-pacific

pacific: doc/dev: add Slack to Dev Guide essentials

doc/dev: add Slack to Dev Guide essentials

Add Ceph's Slack to doc/developer_guide/essentials.rst.

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

ceph-volume: fix a bug in lsblk_all()

Rook has a specific use case where devices are copied in /mnt

If the basename (in /mnt) is different from the original device name,
then the current logic can't match it.

The idea is to append the device to the `lsblk` command and return
the result.

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

16.2.11

Signed-off-by: Ceph Release Team <ceph-maintainers@ceph.io>

Merge pull request #48933 from s0nea/wip-58042-pacific

pacific: ceph-mixing: fix ceph_hosts variable

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

Merge pull request #49833 from zdover23/wip-doc-2023-01-23-backport-49778-to-pacific

pacific: doc/rados: refine ceph-conf.rst

Merge pull request #49822 from zdover23/wip-doc-2023-01-21-backport-49820-to-pacific

pacific: doc/rados: refine pool-pg-config-ref.rst

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

doc/rados: refine ceph-conf.rst

Correct grammar and usage in ceph-conf.rst.

https://tracker.ceph.com/issues/58485

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

Merge pull request #49520 from rhcs-dashboard/wip-58319-pacific

pacific: mgr/prometheus: expose daemon health metrics

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

doc/rados: refine pool-pg-config-ref.rst

Remove pleonasm.

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

Merge pull request #49805 from idryomov/wip-doc-exclusive-lock-transitions-pacific

pacific: doc/rbd/rbd-exclusive-locks: warn about automatic lock transitions

Reviewed-by: Ramana Raja <rraja@redhat.com>

doc/rbd/rbd-exclusive-locks: warn about automatic lock transitions

A lot of people aren't aware of automatic lock transitions and
wrongfully assume that exclusive lock means that the image remains
locked for as long as the client is running.  Redo the explanation
and add a warning.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 2af7252b332c17e3ad8a363f13e2404d1276e2bd)

doc/rbd/rbd-exclusive-locks: don't mention "profile rbd" requirement twice

It's (much better) described in the Blocklisting section.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit c966ea99bc5d6fb6e4a3dc41becedb62efa4dd74)

Merge pull request #49793 from zdover23/wip-doc-2023-01-20-backport-49764-to-pacific

pacific: doc/ceph-volume: refine encryption.rst

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

doc/ceph-volume: refine encryption.rst

Improve the word choice and grammar of
doc/ceph-volume/lvm/encryption.rst.

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

Merge pull request #49786 from rhcs-dashboard/wip-58502-pacific

pacific: mgr/prometheus: export zero valued pg state metrics

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

mgr/prometheus: export zero valued pg state metrics

Fixes: https://tracker.ceph.com/issues/58471
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
As per the Prometheus documentation, omitting zero metrics is not a best practice. The metric value for all PG_STATES should be initialized to zero.

(cherry picked from commit 17d1ecc914b2fe6c5d9e8045a999985988c39447)

Merge pull request #49782 from zdover23/wip-doc-2023-01-19-backport-49780-to-pacific

pacific: doc/install: link to "cephadm installing ceph"

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>

doc/install: link to "cephadm installing ceph"

Link to "Installing Ceph" in the cephadm documentation instead of (as
was the case before this commit) to the cephadm overview page. Anyone
who clicks on the "cephadm" link in the context of the
doc/install/index.rst page is more likely to expect installation
instructions than to expect an explanation of what cephadm is.

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

Merge pull request #49758 from zdover23/wip-doc-2023-01-16-backport-49747-to-pacific

pacific: doc/ceph-volume: update LUKS docs

doc/ceph-volume: update LUKS docs

Remove references that claim that Ceph uses only LUKS version 1.

https://tracker.ceph.com/issues/58354

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

Merge pull request #49752 from zdover23/wip-doc-2023-01-16-backport-49745-to-pacific

pacific: doc/start: add RST escape character rules for bold

Merge pull request #49750 from zdover23/wip-doc-2023-01-16-backport-49716-to-pacific

pacific: doc/rbd: format iscsi-initiator-linux.rbd better

doc/start: add RST escape character rules for bold

Explain how to escape the bold notation (**) within words in RST.

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

doc/rbd: format iscsi-initiator-linux.rbd better

Add prompts and clean up the lists in doc/rbd/iscsi-initiator-linux.rbd.

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

Merge pull request #49739 from zdover23/wip-doc-2023-01-14-backport-49736-to-pacific

pacific: doc/dev: add git branch management commands

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>

doc/dev: add git branch management commands

Add git branch deleting and search commands to the "Basic Workflow" page
of the Developer Guide.

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

Merge pull request #49695 from Matan-B/wip-matanb-pacific-mgr-packaging

pacific: mgr/prometheus: use vendored "packaging" instead

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

Merge pull request #49718 from zdover23/wip-doc-2023-01-11-backport-49715-to-pacific

pacific: doc/cephadm: s/osd/OSD/ where appropriate

doc/cephadm: s/osd/OSD/ where appropriate

Capitalize the initialization "OSD" where it occurs in natural language
in cephadm/host-management.rst. This PR answers a request made by
Anthony D'Atri and seconded by Cole Mitchell in https://github.com/ceph/ceph/pull/49699#discussion_r1066171002.

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

mgr/prometheus: use vendored "packaging" instead

backport of: cf6089200d96fc56b08ee17a4e31f19823370dc8

Signed-off-by: Matan Breizman <mbreizma@redhat.com>