mgr/dashboard: fix Cannot read properties of undefined (reading 'filter')

Fixes: https://tracker.ceph.com/issues/57434
Signed-off-by: Nizamudeen A <nia@redhat.com>

Merge pull request #47634 from rhcs-dashboard/kcli-fedora-36

mgr/dashboard: fix "can't read .ssh/known_hosts: No such file or directory

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

Merge pull request #47871 from zdover23/wip-doc-2022-08-30-start-documenting-ceph-branch-name-update

doc/start: update documenting-ceph branch names

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

Merge pull request #47906 from ivancich/wip-bad-move-s3-getobj

rgw: fix bug where variable referenced after data moved out

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>

Merge pull request #47941 from adk3798/tp-no-overwrite-doc2

doc/cephadm: add info about --no-overwrite to note about tuned-profiles

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

doc/cephadm: add info about --no-overwrite to note about tuned-profiles

Follow up to fix to this flag in
https://github.com/ceph/ceph/commit/028cb031ddb72c1f37048c8568ecdf43f5b77b50

Signed-off-by: Adam King <adking@redhat.com>

Merge pull request #47733 from adk3798/prometheus-retention

mgr/cephadm: allow setting prometheus retention time

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

Merge pull request #47815 from rkachach/fix_issue_57032

cephadm/mgr: adding logic to handle --no-overwrite for tuned profiles

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

Merge pull request #47859 from pcuzner/fix-gather-facts-disk-size

cephadm: Fix disk size calculation

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #47882 from rkachach/fix_issue_57060

mgr/cephadm: Fix how we check if a host belongs to public network

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #47904 from cbodley/wip-57329

rgw: avoid use-after-move in RGWDataSyncSingleEntryCR ctor

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #47921 from rkachach/fix_issue_56953

doc/cephadm/services: fix example for specifying rgw placement

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #47388 from ronen-fr/wip-rf-snapper

osd/scrub: verify SnapMapper consistency

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Matan Breizman <mbreizma@redhat.com>

Merge pull request #44589 from xijiacun/lc-transition

rgw: Get canonical storage class when storage class is empty in lifecycle configuration

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

Merge pull request #44610 from xijiacun/append-object

rgw: Use STANDARD storage class in objects appending operation when the

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

Merge pull request #46930 from zealot-xzd/wip-rgw-list-optimization2

rgw: bucket list operation slow down in special scenario

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

Merge pull request #47831 from a16bitsysop/libaio-musl

rgw: rgw_d3n_datacache.cc add check for musl

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #47819 from yehudasa/wip-cloud-sync-fixes

rgw: cloud sync fixes

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

Merge pull request #47527 from shraddhaghatol/shr/etag_cosmetic_change

rgw: Added Cosmetic change in etag of copyObjectResult

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

Merge pull request #47667 from AISHU-Technology/fix-rgw-data-corruption

rgw: fix data corruption due to network jitter

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

Merge pull request #47818 from petrutlucian94/fix_is_err

include: fix IS_ERR on Windows

Merge pull request #47916 from rhcs-dashboard/applitools-master-main

mgr/dashboard: s/master/main in applitools config

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

Merge pull request #47796 from adk3798/test_cephadm_fix

qa/cephadm: remove fsid dir before bootstrap in test_cephadm.sh

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

Merge pull request #47620 from lxbsz/wip-56249

client: stop the remount_finisher thread in the Client::unmount()

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>

Merge pull request #47593 from lxbsz/wip-57126

client: abort the client if we couldn't invalidate dentry caches

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #46988 from rishabh-d-dave/qa-suites-upgraded-client

qa/cephfs: clean up evicted client in 4-compat_client.yaml

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Dhairya Parmar <dparmar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #47919 from SUSE/wip-fix-57390

ceph-dencoder: Add erasure_code to denc-mod-osd's target_link_libraries

Reviewed-by: Kefu Chai <tchaikov@gmail.com>

doc/cephadm/services: fix example for specifying rgw placement
fixes: https://tracker.ceph.com/issues/56953

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

ceph-dencoder: Add erasure_code to denc-mod-osd's target_link_libraries

Fixes: https://tracker.ceph.com/issues/57390
Signed-off-by: Tim Serong <tserong@suse.com>

Merge pull request #47881 from idryomov/wip-57343

test/cli-integration/rbd: iSCSI REST API responses aren't pretty-printed anymore

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

osd/scrub: modify SnapMapper.cc to use ceph::buffer::list

... systematically, over ceph::bufferlist.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

tests/osd: creating a Teuthology test re missing SnapMapper entries

The test (in the standalone/scrub suite) verifies that the scrubber
detects (and issues a cluster-log error) whenever a mapping entry
("SNA_") is missing in the SnapMapper DB.

Specifically, here the entry is corrupted - shortened as per
https://tracker.ceph.com/issues/56147.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

osd/scrub: verify SnapMapper consistency

Whenever the scrubber access the SnapMapper for the snaps of a specific
clone, the mapper will now verify that the snaps have the required
mapping DB entries (the 'SNA_' keys).

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

osd/scrub: move snap_mapper_{fix/op}_t to the Scrub namespace

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

osd/scrub: improve SnapMapper's API used by the scrubber

By:
- defining the interface;
- avoiding 'out' parameters where possible
- (forced to) improved const correctness

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #47847 from xxhdx1985126/wip-simplify-may-interrupt

crimson/common/interrupt_future: simplify may_interrupt

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>

mgr/dashboard: s/master/main in applitools config

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

Merge pull request #47650 from rzarzynski/wip-bug-57119

osd: fix the "heap" admin cmd printing always to error stream

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Prashant D <pdhange@redhat.com>

doc/cephadm: documentation for setting prometheus retention time

Signed-off-by: Adam King <adking@redhat.com>

mgr/cephadm: allow setting prometheus retention time

When we deploy Prometheus server, we don't provide any
ability to define the tsdb retention time - so it defaults to 15d.

This change adds a field that can be passed in a prometheus service
spec that will be passed as an arg to the --storage.tsdb.retention.time
parameter for the prometheus daemon.

Fixes: https://tracker.ceph.com/issues/54308
Signed-off-by: Adam King <adking@redhat.com>

Merge pull request #47817 from rkachach/fix_issue_57304

mgr/cephadm: allow binding to loopback for rgw daemons

Reviewed-by: Adam King <adking@redhat.com>

Merge pull request #47098 from rkachach/fix_issue_56508

mgr/cephadm: Adding logic to store grafana cert/key per node

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Francesco Pantano <fpantano@redhat.com>

Merge pull request #47884 from dang/wip-dang-zipper-invalidate

RGW - Zipper - Pass invaliate down from RadosStore

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

Merge pull request #47631 from guits/bz2112730

ceph-volume: add a retry in util.disk.remove_partition

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

Merge pull request #47665 from adk3798/apply-spec-error-code

cephadm: return nonzero exit code when applying spec fails in bootstrap

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

Merge pull request #47666 from adk3798/offline-no-check

mgr/cephadm: don't try to write client/os tuning profiles to known offline hosts

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

Merge pull request #47763 from phlogistonjohn/jjm-object-format-fixes

pybind/mgr: object_format.py decorator updates & docs

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #47804 from p-se/wip-7294-pse-custom-prometheus-alerts

mgr/dashboard: enable addition of custom Prometheus alerts

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

Merge pull request #47788 from dang/wip-dang-zipper-admin

RGW - Zipper - Remove a number of casts from rgw_admin

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

Merge pull request #47719 from yuvalif/wip-yuval-lua-filter2

rgw/lua: allow read access to object data

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

Merge pull request #47184 from ljflores/wip-telemetry-memory-stats

mgr/telemetry: add `perf_memory_metrics` collection to telemetry

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
Reviewed-by: Kamoltat (Junior) Sirivadhna <ksirivad@redhat.com>

rgw: fix bug where variable referenced after data moved out

Addresses RGWGetObj_ObjStore_S3::override_range_hdr using a variable
for logging after the data had been moved out. This was caught by
coverity.

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

rgw: avoid use-after-move in RGWDataSyncSingleEntryCR ctor

the constructor body below accesses the constructor's 'obligation'
parameter instead of the member variable it was moved into

Fixes: https://tracker.ceph.com/issues/57329
Signed-off-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #47885 from ceph/boost-focal

install-deps: Actually install libboost we built for Jammy

Merge pull request #47886 from ceph/chillout

.github: Give folks 30 seconds to fill out the checklist

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

mgr/dashboard: fix "can't read .ssh/known_hosts: No such file or directory"

Updates the fedora version too

Fixes: https://tracker.ceph.com/issues/57365
Signed-off-by: Nizamudeen A <nia@redhat.com>

Merge pull request #47816 from cyx1231st/wip-seastore-split-trimmer

crimson/os/seastore/async_cleaner: factor out journal trimming implementation

Reviewed-by: Myoungwon Oh <myoungwon.oh@samsung.com>
Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>
Reviewed-by: Zhang Song <zhangsong325@gmail.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

crimson/common/interrupt_future: simplify may_interrupt

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

Merge pull request #47880 from ionutbalutoiu/qa-update-branch-name

qa: update branch name for Windows job

.github: Give folks 30 seconds to fill out the checklist

Otherwise GitHub sends an annoying e-mail right away when you file a PR that doesn't have the checklist filled out.  It's easier IMO to create the PR, then check the boxes instead of putting Xes in brackets while filling out the PR comment.

Signed-off-by: David Galloway <dgallowa@redhat.com>

install-deps: Actually install libboost we built for Jammy

Follow up to https://github.com/ceph/ceph/commit/947ac23979b6c4ba2617090f2d9a36e1f40f60c8

Signed-off-by: David Galloway <dgallowa@redhat.com>

Merge pull request #47856 from idryomov/wip-56154

rbd-mirror: resume pending shutdown on error in snapshot replayer

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

Merge pull request #47835 from idryomov/wip-57317

librbd: use actual monitor addresses when creating a peer bootstrap token

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Christopher Hoffman <choffman@redhat.com>

RGW - Zipper - Pass invaliate down from RadosStore

When we invalidate the state of a RadosObject, we need to also
invalidate it in the ctx for that object.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #47641 from rhcs-dashboard/value-error-centos

install-deps: script exit on "/ValueError" in centos_stream8

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

RGW - Zipper - Remove a number of casts from rgw_admin

There are still a ton of casts to RadosStore in rgw_admin.  Remove the
easy ones.  Many of the rest represent actual operations that are
specific to RadosStore, and need to be split out.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #47673 from rhcs-dashboard/test_rbd_list

mgr/dashboard: ensure rbd image limit 0 returns 0 images

Reviewed-by: Pegonzal <pegonzal@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

qa: update branch name for Windows job

Use `main` instead of `master` in the workunit scripts for the
Windows Teuthology job.

Signed-off-by: Ionut Balutoiu <ibalutoiu@cloudbasesolutions.com>

mgr/cephadm: Fix how we check if a host belongs to public network
Fixes: https://tracker.ceph.com/issues/57060
Signed-off-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #47802 from NitzanMordhai/wip-nitzan-leak-some-memory-with-memory-optimization

common/ceph_context: leak some memory fail to show in valgrind

Reviewed-by: Laura Flores <lflores@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #47829 from tchaikov/wip-cmake-CMP0135

cmake: set CMP0135 policy

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

mgr/cephadm: allow binding to loopback for rgw daemons
Fixes: https://tracker.ceph.com/issues/57304
Signed-off-by: Redouane Kachach <rkachach@redhat.com>

test/cli-integration/rbd: iSCSI REST API responses aren't pretty-printed anymore

See https://github.com/ceph/ceph-iscsi/pull/263 and
https://github.com/pallets/flask/pull/2193.  Flask stopped
pretty-printing by default in 1.0:

  Change the default for JSONIFY_PRETTYPRINT_REGULAR to False.
  json.jsonify returns a compact format by default, and an indented
  format in debug mode.

Fixes: https://tracker.ceph.com/issues/57343
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

Merge pull request #47772 from ivancich/wip-dout_subsys-header

rgw: remove dout_subsys defs from header files

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>

rgw: remove dout_subsys defs from header files

Each compilation unit should be able to define its own dout_subsys
without generating a redefinition warning. When dout_subsys is defined
in header files, it complicates this matter. This commit removes
definitions and header files and makes sure definitions are added to
.cc files as needed.

Additionally, at Adam Emerson's suggestion, use "static constexpr"
rather than "#define" to set "dout_subsys" in a few places as a
reminder to ultimately do it more broadly.

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

Merge pull request #47761 from tchaikov/wip-intarith-bit

include, os: s/ctz/std::countr_zero/

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

cephadm/mgr: adding logic to handle -no-overwrite for tuned profiles
Fixes: https://tracker.ceph.com/issues/57032
Signed-off-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #47830 from tchaikov/wip-fmtlib-v9

common, include, osd: compile with fmt v9

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #44993 from kamoltat/wip-ksirivad-fix-bug-50089

mon/Elector: Added sanity check when pinging a peer monitor

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

doc/start: update documenting-ceph branch names

This PR updates the branch names in the
documenting-ceph.rst file. It gets rid of all references
to the "master" branch, and updates the language to
reflect the state of play in 2022.

inb4: This PR merely removes the most egregious inaccuracies,
the ones that were most readily evident on a cursory perusal.
The full text remains to be carefully read and fitted together
with care.

I had to start somewhere.

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

Merge pull request #47843 from zdover23/wip-doc-2022-08-29-mgr-dashboard-includes-prompt-update

doc/mgr: update prompts in dboard.rst includes

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

Merge pull request #46962 from rhcs-dashboard/auto-coloring-badges-from-color-pool

mgr/dashboard: auto-coloring-badges-component

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: nSedrickm <NOT@FOUND>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #47707 from bosc0/fix_alert

Ceph-mixin: Fix CephNodeNetworkPacket alerts

rbd-mirror: skip setting error code on snapshot replayer shutdown

This is regarding failures in unregister_remote_update_watcher() and
unregister_local_update_watcher().  handle_replay_complete() can't be
called in these cases anymore as it would blindly attempt to unregister
watchers from scratch again.  Dropping handle_replay_complete() calls
there means that these failures would only be logged and would not be
surfaced by snapshot replayer.  But the only caller ignores them
anyway:

  void ImageReplayer<I>::shut_down(int r) {
    ...
    // close the replayer
    if (m_replayer != nullptr) {
      ctx = new LambdaContext([this, ctx](int r) {
        m_replayer->destroy();
        m_replayer = nullptr;
        ctx->complete(0);             <------
      });
      ctx = new LambdaContext([this, ctx](int r) {
        m_replayer->shut_down(ctx);
      });
    }

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

install-deps: script exit on /ValueError: in centos_stream8

this is happening locally as well as in our ceph-dev runs too https://github.com/rhcs-dashboard/ceph-dev/runs/7850564011

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

Merge pull request #47669 from MrFreezeex/jb-path

ceph-mixin: fix PATH issues with jsonnet-bundler

cephadm: Fix disk size calculation

With native 4k sectors, the logical blocksize is set to
4096, which yields a disk size 8x the size of the actual
device. According to kernel source, device size only
uses 512 byte sectors, so the use of logical blocksize
is unnecessary.

Fixes: https://tracker.ceph.com/issues/57335
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>

Merge pull request #47808 from phlogistonjohn/jjm-remove-tox-env-lint

pybind/mgr: tox.ini remove redundant `tox` env

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>

rbd-mirror: resume pending shutdown on error in snapshot replayer

If a shutdown is requested, e.g. by update_pool_replayers() because
remote RADOS instance got blocklisted, and Replayer::shut_down() pends
it on completion of current snapshot sync, it gets stuck if replayer
encounters an error in the interim.  This is particularly likely in the
blocklist case: a higher layer may detect that client got blocklisted
and request a shutdown first, and then when replayer sees EBLOCKLISTED
in turn, it calls handle_replay_complete() -- which does not resume
a pending shutdown.  Because update_pool_replayers() blocks on shutdown
with Mirror::m_lock held, eventually the entire daemon hangs in
perpetuity.

Fixes: https://tracker.ceph.com/issues/56154
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

mgr/dashboard: auto-coloring-badges-component

Signed-off-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>

Merge pull request #47834 from tchaikov/wip-56850

mon/MgrMonitor: do not propose again for "mgr fail"

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

mgr: Fix tox test issue due to PrettyTable update

Since the update of PrettyTable 3.3.0 to 3.4.0 on Aug 25, 2022, three
tests inside tox broke as the new version returns tables slightly
differently.

Alternatively, the tests could be adapted.

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>

mgr/dashboard: enable addition custom Prometheus alerts

Fixes: https://tracker.ceph.com/issues/57294
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>

Merge pull request #47441 from mkogan1/wip-WITH_BOOST_VALGRIND

cmake: set WITH_BOOST_VALGRIND before building boost

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>

Merge pull request #47675 from bosc0/fix_multicluster

ceph-mixin: fix config inheritance

doc/mgr: update prompts in dboard.rst includes

This PR adds unselectable prompts to three files that are
transcluded in the doc/mgr/dashboard.rst file. These three
files are:

 1. debug.inc.rst
 2. feature_toggles.inc.rst
 3. motd.inc.rst

The addition of unselectable prompts to these three files
completes the work begun in PR#47810 (d8064b4), which sought
to bring dashboard.rst into line with the unselectable prompt
standard introduced by Kefu Chai in 2020.

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

Merge pull request #47681 from ronen-fr/wip-rf-delog1

osd/scrub: improving scrub logs
Reviewed-by: Aishwarya Mathuria <amathuri@redhat.com>

Merge pull request #47728 from yuvalif/wip-yuval-cont-lease

rgw/multisite: check for late lease renewals

reviewed-by: cbodley

osd/scrub: reduce the amount of log lines

Following call chains, and removing repeated data.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

common: improving fmtlib handling of ceph::utime_t

1. fixing the output to show local-time instead of UTC format, matching
   operator<<() handling (and all the rest of our logs)
2. adding a 'short' mode (as {:s}) for when, e.g. in most scrub logs,
   we only need 3 digits for the sub-second, and do not need the
   trailing TZ designation.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>