mgr/dashboard: add required validation for frontend and monitor port

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

Merge pull request #47344 from ceph/quincy-release

v17.2.3

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

Merge pull request #47391 from adk3798/quincy-fix-flake8

quincy: pybind/mgr: fix flake8

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

mgr/cephadm: fix flake8

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit a124f6c47b119a8741f347ea5a809f3fb48d6679)

Merge pull request #44641 from rzarzynski/wip-bs-lazy4freebsd-quincy

quincy: bdev: fix FTBFS on FreeBSD, keep the huge paged read buffers.

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

bdev: fix FTBFS on FreeBSD, keep the huge paged read buffers.

Special thanks to Willem Jan Withagen!

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit d04ea43cfd0a834f470677d17a15d9c9d5c1c2e7)

Merge pull request #47359 from zdover23/wip-doc-2022-07-29-backport-47347-to-quincy

quincy: doc/radosgw: Uppercase s3

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

doc/radosgw: make s3 uppercase

s/s3/S3/

(cherry picked from commit 73f0d5707d275529416d5110160b9ff5ead23d22)

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

17.2.3

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

Merge pull request #47270 from vumrao/wip-vumrao-56702

quincy: libcephsqlite: ceph-mgr crashes when compiled with gcc12

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

libcephsqlite: ceph-mgr crashes when compiled with gcc12

regex in libcephsqlite, when compiled with GCC12 treats '-' as a range
operator resulting in the following error.
"Invalid start of '[x-x]' range in regular expression"

Fixes: https://tracker.ceph.com/issues/55304
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
(cherry picked from commit ac043a09c5ffb4b434b8644920004b3d5b7f9d8c)
(cherry picked from commit 5a10875d4570356afa3af024f63ac229caaa765b)

libcephsqlite: ceph-mgr crashes when compiled with gcc12

regex in libcephsqlite, when compiled with GCC12 treats '-' as a range
operator resulting in the following error.
"Invalid start of '[x-x]' range in regular expression"

Fixes: https://tracker.ceph.com/issues/55304
Signed-off-by: Ganesh Maharaj Mahalingam <ganesh.mahalingam@intel.com>
(cherry picked from commit ac043a09c5ffb4b434b8644920004b3d5b7f9d8c)

Merge pull request #47283 from zdover23/wip-doc-2022-07-27-backport-47082-to-quincy

quincy: doc, crimson: document installing crimson with cephadm

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

doc, crimson: document installing crimson with cephadm

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 60b8348a843ffaaf475453611a8235d6f892093a)

Merge pull request #47222 from ceph/1722

v17.2.2

qa: Remove unused variable

Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit c8416c3f0e15e49dde4b9bca6f732231d9b5d16b)

Merge pull request #46805 from nmshelke/wip-56103-quincy

quincy: mgr/volumes: subvolume ls command crashes if groupname as '_nogroup'

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>

Merge pull request #46804 from nmshelke/wip-56108-quincy

quincy: mgr/volumes: remove incorrect 'size' from output of 'snapshot info'

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #46667 from nmshelke/wip-56013-quincy

quincy: mgr/volumes: subvolumegroup quotas

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #46647 from rhcs-dashboard/wip-54578-quincy

quincy: Add mapping for ernno:13 and adding path in error msg in opendir()/cephfs.pyx

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

Merge pull request #46563 from neesingh-rh/wip-55936-quincy

quincy: client: Inode::hold_caps_until is time from monotonic clock now.

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

Merge pull request #46827 from ceph/quincy-release

v17.2.1

17.2.2

rgw: s3website check for bucket before retargeting

On requesting s3website API without a bucket name it will crash because s->bucket is null

Fixes: https://tracker.ceph.com/issues/56281
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 933dbabb3a2a43fd016bc61cc0ee5e27f7ad32e7)
(cherry picked from commit e2b923600c28626b921107c13e2c12d691eed3f1)

qa: validate subvolume discover on upgrade

Validate subvolume discover on upgrade from
legacy subvolume to v1. The handcrafted
".meta" file on legacy subvolume root should
not be used for any subvolume apis like getpath,
authorize.

Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit fcc118500c545fe6018cd3f2742127b92c657def)
(cherry picked from commit 7e6453d32f78e4a02771396c96dcba472f275135)

mgr/volumes: V2 Fix for test_subvolume_retain_snapshot_invalid_recreate

Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit ac791879096c8a9e5bda4eef69f1269eee819932)

mgr/volumes: Fix subvolume discover during upgrade

Fixes the subvolume discover to use the correct
metadata file after an upgrade from legacy subvolume
to v1. The fix makes sure, it doesn't use the
handcrafted metadata file placed in the subvolume
root of legacy subvolume.

Co-authored-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Co-authored-by: Dan van der Ster <daniel.vanderster@cern.ch>
Co-authored-by: Ramana Raja <rraja@redhat.com>
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 7eba9cab6cfb9a13a84062177d7a0fa228311e13)
(cherry picked from commit 50f4ac7b75185c89ede210b2c975672e8bdd73aa)

Merge pull request #46738 from trociny/wip-56096-quincy

quincy: mgr: relax "pending_service_map.epoch > service_map.epoch" assert

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

Merge pull request #46872 from ronen-fr/wip-rf-46860-quincy

Quincy: osd/scrub: late-arriving reservation grants are not an error

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

Merge pull request #46844 from ronen-fr/wip-rf-46727-quincy

Quincy: osd/scrubber/pg_scrubber.cc: fix bug where scrub machine gets stuck

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

Merge pull request #46689 from sseshasa/wip-56060-quincy

quincy: mon/OSDMonitor: Ensure kvmon() is writeable before handling "osd new" cmd

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

Merge pull request #46498 from ronen-fr/wip-rf-46440-quincy

quincy: osd/scrub: do not start scrubbing if the PG is snap-trimming

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

Merge pull request #47156 from rhcs-dashboard/wip-56616-quincy

quincy: mgr/dashboard: do not recommend throughput for ssd's only cluster

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

mgr/dashboard: do not recommend throughput for ssd's only cluster

This is just a bug fix where we recommend the throughput option even if
there are only ssd's are present in the cluster.

Fixes: https://tracker.ceph.com/issues/56413
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 0f6f79f1d9c716e13f662151459fa107f651f158)

Merge pull request #47094 from rhcs-dashboard/wip-56547-quincy

quincy: mgr/dashboard: don't log tracebacks on 404s

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

Merge pull request #47146 from s0nea/wip-56593-quincy

quincy: mgr/dashboard: prevent alert redirect

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

mgr/dashboard: prevent alert redirect

Prevent Alertmanager alerts from being redirected to the active mgr
dashboard instance. There are two reasons for it:

1. It doesn't bring any additional benefit. The Alertmanager config
   includes all available mgr instances - active and passive ones. In
   case of an alert, it will be sent to all of them. It ensures that
   the active mgr dashboard will receive the alert in any case.
2. The redirect URL includes the mgr IP and NOT the FQDN. This leads
   to issues in environments where an SSL certificate is configured and
   matches the FQDNs, only.

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

Merge pull request #47071 from adk3798/wip-56475-quincy

quincy: cephadm: improve message when removing osd

Merge pull request #46966 from guits/wip-56471-quincy

quincy: ceph-volume: decrease number of `pvs` calls in `lvm list`

Merge pull request #46968 from guits/wip-56471-2-quincy

quincy: ceph-volume: avoid unnecessary subprocess calls

Merge pull request #47072 from adk3798/wip-56474-quincy

quincy: pybind/mgr/cephadm/serve: don't remove ceph.conf which leads to qa failure

Reviewed-by: Dhairya Parmar <dparmar@redhat.com>

Merge pull request #47070 from adk3798/wip-56494-quincy

quincy: mgr/cephadm: limiting ingress/keepalived pass to 8 chars

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

Merge pull request #47123 from zdover23/wip-doc-2022-07-16-backport-47109-to-quincy

quincy: doc/start: update hardware recs

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

Merge pull request #47069 from adk3798/wip-56501-quincy

quincy: ceph.spec: fixing cephadm build deps

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

Merge pull request #47073 from adk3798/wip-56454-quincy

quincy: mgr/cephadm: fixing scheduler consistent hashing

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

Merge pull request #47075 from adk3798/wip-56177-quincy

quincy: mgr/cephadm: use host shortname for osd memory autotuning

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

Merge pull request #47085 from rhcs-dashboard/wip-56545-quincy

quincy: mgr/dashboard: ingress backend service should list all supported services

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

doc/start: update hardware recs

This PR picks up the parts of
https://github.com/ceph/ceph/pull/44466
that were not merged back in January, when that
pull request was raised.

Matters added here:
* improved organzation of matter
* emphasis of IOPs per core over cores per OSD

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

Merge pull request #46954 from idryomov/wip-56387-quincy

quincy: rbd-fuse: librados will filter out -r option from command-line

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

Merge pull request #46910 from idryomov/wip-rbd-deep-copy-progress-quincy

quincy: librbd: update progress for non-existent objects on deep-copy

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

Merge pull request #46814 from idryomov/wip-rbd-mirror-remote-not-primary-quincy

quincy: rbd-mirror: generally skip replay/resync if remote image is not primary

Reviewed-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Reviewed-by: Mykola Golub <mgolub@suse.com>

Merge pull request #46742 from mkogan1/backport-quincy-t54363

quincy: rgwlc: fix segfault resharding during lc

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

Merge pull request #46625 from cfsnyder/wip-55997-quincy

quincy: rgw: reopen ops log file on sighup

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

Merge pull request #46781 from idryomov/wip-rbd-schedule-backports-quincy

quincy: mirror snapshot schedule and trash purge schedule fixes

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>

Merge pull request #46624 from cfsnyder/wip-55999-quincy

quincy: rgw: log access key id in ops logs

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

Merge pull request #46598 from idryomov/wip-qa-rwl-on-tmpfs-quincy

quincy: qa/suites/rbd: place cache file on tmpfs for xfstests

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

Merge pull request #46594 from idryomov/wip-rbd-unlink-newest-snap-at-capacity-quincy

quincy: librbd: unlink newest mirror snapshot when at capacity, bump capacity

Reviewed-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>

Merge pull request #46591 from idryomov/wip-rbd-preserve-non-primary-snap-quincy

quincy: rbd-mirror: don't prune non-primary snapshot when restarting delta sync

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>

Merge pull request #46801 from lxbsz/wip-56106

quincy: qa: wait rank 0 to become up:active state before mounting fuse client

Reviewed-by: Rishabh Dave <ridave@redhat.com>

Merge pull request #46800 from lxbsz/wip-56109

quincy: client: choose auth MDS for getxattr with the Xs caps

Reviewed-by: Rishabh Dave <ridave@redhat.com>

Merge pull request #46697 from NitzanMordhai/wip-54282-quincy

quincy: pybind/mgr: ceph osd status crash with ZeroDivisionError

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

Merge pull request #46681 from lxbsz/wip-56015

Quincy: mds: clear MDCache::rejoin_*_q queues before recovering file inodes

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #46680 from lxbsz/wip-55994

Quincy: client: switch AT_NO_ATTR_SYNC to AT_STATX_DONT_SYNC

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Nikhilkumar Shelke <nshelke@redhat.com>

Merge pull request #46595 from kotreshhr/wip-55926-quincy

quincy: client/fuse: Fix directory DACs overriding for root

Reviewed-by: Rishabh Dave <ridave@redhat.com>

Merge pull request #46566 from vshankar/tr-55933

quincy: mds: do not assert early on when issuing client leases

Reviewed-by: Rishabh Dave <ridave@redhat.com>

Merge pull request #46558 from lxbsz/wip-55934

Quincy:  client: always return ESTALE directly in handle_reply

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kotresh HR <khiremat@redhat.com>

Merge pull request #47102 from adk3798/quincy-osd-removal-docs-update

quincy: doc/cephadm: add note about OSDs being recreated to OSD removal section

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

doc/cephadm: add note about OSDs being recreated to OSD removal section

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

mgr/dashboard: don't log tracebacks on 404s

Currently we're logging tracebacks on expected request errors as 404,
401, etc. This may cause confusion to users, which might think that
something really wrong was happening there.

This should be extended to many DashboardExceptions that simply return
expected HTTP error codes (403, 415, 3xx, etc).

Fixes: https://tracker.ceph.com/issues/55720
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 3928fe91a4b8c313a52e38cab9ba31e54ff1ae51)

mgr/dashboard: ingress backend service should list all supported services

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

Merge pull request #47077 from adk3798/wip-56159-quincy

quincy: doc/cephadm: Add post-upgrade section

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

Merge pull request #47076 from adk3798/wip-56171-quincy

quincy: doc/cephadm: document the new per-fsid cephadm conf location

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

Merge pull request #47074 from adk3798/wip-56437-quincy

quincy: doc/cephadm: enhancing daemon operations documentation

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

Merge pull request #47068 from adk3798/wip-56505-quincy

quincy: doc/cephadm/services: the config section of service specs

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

doc/cephadm: Add post-upgrade section
Fixes: https://tracker.ceph.com/issues/54474
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 49b234ae744dd3a2afc130d9c215f4f00c1ee4b8)

doc/cephadm: document the new per-fsid cephadm conf location
Fixes: https://tracker.ceph.com/issues/55357
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 443f93e95d8068a31526730da0febd692b87b7a5)

mgr/cephadm: use hostname from crush map for osd memory autotuning

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

doc/cephadm: enhancing daemon operations documentation
Fixes: https://tracker.ceph.com/issues/54399
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit df1aaacb7d09322528e42ae90c0d98793e9c254e)

mgr/cephadm: fixing E128 warning

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit e37924c623d797b3118ddd9a804818432a5704dd)

mgr/cephadm: fixing scheduler consistent hashing

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 5d5829cd370e9278cb8b70d6426094e595badb5d)

pybind/mgr/cephadm/serve: don't remove ceph.conf which leads to qa failure

Fixes: https://tracker.ceph.com/issues/56024
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
(cherry picked from commit 6436acc4b51b52635f8fa0e56cd79ba66c028d81)

cephadm: improve message when removing osd

make it clearer that not passing --zap will leave VG/LV, therefore all
LVM metadata associated with the osd being removed from the Ceph cluster.

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

mgr/cephadm: limitting ingress/keepalived pass to 8 chars
Fixes: https://tracker.ceph.com/issues/55491
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 4fe59545ec8a4d7677bb7949ab283acf4b15b6cf)

ceph.spec: fixing cephadm build deps
Fixes: https://tracker.ceph.com/issues/52514
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 2c4b31601f546c8a6b08824d9fcaa3c33f518b74)

doc/cephadm/services: the config section of service specs
Fixes: https://tracker.ceph.com/issues/53997
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit b67bd50a3bb1233973586c4c2eabfb934db2e818)

Merge pull request #46915 from cbodley/wip-55495

quincy: rgw/dbstore: Fix build errors on centos9

Merge pull request #47048 from zdover23/wip-doc-2022-07-12-backport-47045-to-quincy

quincy: doc/dev: s/github/GitHub/ in essentials.rst

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

Merge pull request #47051 from zdover23/wip-doc-2022-07-12-backport-47031-to-quincy

quincy: doc/dev: edit delayed-delete.rst

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

doc/dev: s/github/GitHub/ in essentials.rst

This addresses a typo that Anthony D'Atri pointed out in
PR#47032. It didn't get addressed there, so it's being
addressed here.

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

doc/dev: edit delayed-delete.rst

This PR improves the English in the "CephFS Delayed
Deletion" chapter of the Ceph Internals Guide (which
is stored in the doc/dev/ directory).

There was no pressing need to rewrite this. I just saw
that it could be tightened up, and I had the fifteen
minutes I needed to do it.

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

Merge pull request #47042 from zdover23/wip-doc-2022-07-12-backport-47032-to-quincy

quincy: doc/dev: add Dependabot section to essentials.rst

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

doc/dev: add Dependabot section to essentials.rst

This PR adds a section to the Developer Guide chapter
"Essentials" that explains what Dependabot is. This
section is adapted from an email from Ernesto Puerta
to the CLT that was sent on 08 Jul 2022.

Co-authored-by: Ernesto Puerta <epuertat@redhat.com>>
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 2711e8de80edea121503e022cca37683f8abdfa9)

Merge pull request #47007 from rhcs-dashboard/wip-56126-quincy

quincy: mgr/dashboard: display helpfull message when the iframe-embedded Grafana dashboard failed to load

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: nSedrickm <NOT@FOUND>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #46990 from aaSharma14/wip-56481-quincy

quincy: mgr/dashboard: Improve monitoring tabs content

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

Merge pull request #46790 from adk3798/wip-55951-quincy

quincy: cephadm: preserve cephadm user during RPM upgrade

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

Merge pull request #46339 from zdover23/wip-doc-pr-45209-backport-quincy

quincy: doc/start: alphabetize hardware-recs links

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

Merge pull request #46548 from MrFreezeex/wip-55653-quincy

quincy: ceph-mixin: backport of recent cleanups

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

mgr/dashboard: Dashboard should display some helpful (error) message when the iframe-embedded Grafana dashboard failed to load

This commit adds checks for successful grafana panel loads before displaying dashboards and informs the user if the request is blocked by the browser
Fixes: https://tracker.ceph.com/issues/54206
Signed-off-by: Ngwa Sedrick Meh <nsedrick101@gmail.com>
(cherry picked from commit a4b66efb2a2139bd88a6a088af9bd5e079e46105)

Merge pull request #46935 from zdover23/wip-doc-2022-06-30-backport-46906-to-quincy

quincy: doc/dev: s/the the/the/ in basic-workflow.rst

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

mgr/dashboard: Improve column spacing in alerts tab

This PR intends to fix the column spacing in the alert list in the alerts tab

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