doc/rados: s/cepgsqlite/cephsqlite/

As stated in the commit-message line, this corrects the typo "cepg" to
the correct string "ceph".

This typo was discovered by https://github.com/test-erik and this was
brought to our attention way back in
https://github.com/ceph/ceph/pull/50420.

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

Merge pull request #57095 from cbodley/wip-rgw-cache-size-squid

squid: rgw: increase default metadata cache size for accounts

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

Merge pull request #57058 from cbodley/wip-65640-squid

squid: rgw/account: add bucket_quota to RGWAccountInfo

Reviewed-by: Oguzhan Ozmen <oozmen@bloomberg.net>

Merge pull request #57208 from zdover23/wip-doc-2024-05-02-backport-57148-to-squid

squid: doc/cephadm: add default monitor images

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

Merge pull request #56946 from aaSharma14/wip-64791-squid

squid: mgr/dashboard: Allow the user to add the access/secret key on zone edit and not on zone creation

Reviewed-by: afreen23 <NOT@FOUND>

doc/cephadm: add default monitor images

Add a list of default monitor images to the documentation. This commit
is made in response to a request from Eugen Block, and is made using the
information developed by Mr Block here:
https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/QGC66QIFBKRTPZAQMQEYFXOGZJ7RLWBN/.

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

Merge pull request #56790 from ronen-fr/wip-rf-56389-to-squid

squid: osd/scrub: remove detection & handling of reservation timeouts from the code

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

Merge pull request #56777 from ronen-fr/wip-rf-56459-squid

squid: osd/scrub:  implement reservation state as a ReplicaActive flag
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #56903 from adk3798/wip-65417-squid

squid: cephadm: fix host-maintenance command always exiting with a failure

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

Merge pull request #56900 from adk3798/wip-65381-squid

squid: mgr/cephadm: pass daemon's current image when reconfiguring

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

Merge pull request #57156 from zdover23/wip-doc-2024-04-30-backport-57154-to-squid

squid: doc/rados/operations: rephrase OSDs peering

Merge pull request #57159 from zdover23/wip-doc-2024-04-30-backport-57153-to-squid

squid: doc/man/8/radosgw-admin: add get lifecycle command

doc/man/8/radosgw-admin: add get lifecycle command

Signed-off-by: rkhudov <rhudov@gmail.com>
(cherry picked from commit 04393ec3c1a12d6a9405272ab2cffe9dfa67aa92)

doc/rados/operations: rephrase OSDs peering

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

Merge pull request #56412 from zdover23/wip-doc-2024-03-23-backport-56379-to-squid

squid: doc/install: fix typos in openEuler-installation doc

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

Merge pull request #57140 from zdover23/wip-doc-2024-04-30-backport-57136-to-squid

squid: doc/radosgw: disambiguate version-added remarks

doc/radosgw: disambiguate version-added remarks

Rewrite two sentences so that they explain precisely what was added to
Ceph and when it was added to Ceph.

This commit is made in response to a request made by Dr Per Mildner on
https://pad.ceph.com/p/Report_Documentation_Bugs.

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

Merge pull request #56497 from adk3798/wip-65124-squid

squid: mgr/cephadm: add some NVMEof gateway fields to be configurable by cephadm

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

Merge pull request #57121 from zdover23/wip-doc-2024-04-29-backport-57119-to-squid

squid: doc/cephfs: edit front matter in client-auth.rst

doc/cephfs: edit front matter in client-auth.rst

Clarify the front matter in doc/cephfs/client-auth.rst.

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

Merge pull request #57108 from zdover23/wip-doc-2024-04-27-backport-57105-to-squid

squid: doc/mgr: explain error message - dashboard.rst

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

doc/mgr: explain error message - dashboard.rst

Explain that an error message received in response to
"redirect_resolve_ip_addr True" might be caused by having an
insufficiently recent release of Ceph running in your cluster.

Fixes: https://tracker.ceph.com/issues/61312
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 78545030761330c44168dbb3f8d1e4c3c9a9a3bd)

rgw: increase default metadata cache size for accounts

account users will put some extra pressure on the metadata cache,
because each request has to load metadata for the account and zero
or more groups, in addition to the user's access key and user metadata

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 451e03782e95dfd5b26aacb0d131126260b83d37)

Merge pull request #57078 from adk3798/squid-cephadm-no-downgrade

squid: doc/cephadm: remove downgrade reference from upgrade docs

Reviewed-by: Zac Dover <zac.dover@proton.me>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/cephadm: remove downgrade reference from upgrade docs

This has been in here for years, but cephadm will block
attempted upgrades to lower versions and we generally
don't want people to think this is supported or safe.

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

Merge pull request #56528 from adk3798/squid-mypy-bump

squid: python: mypy version bump

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

Merge pull request #56899 from adk3798/wip-65378-squid

squid: mgr/cephadm: make client-keyring deploying ceph.conf optional

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

Merge pull request #56715 from adk3798/squid-test-cephadm-correct-bootstrap-image

squid: qa/cephadm: use squid image as default for test_cephadm workunit

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

Merge pull request #56527 from adk3798/squid-tox-default-envs

squid: python: allow unit tests to use tox default envs

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

mgr/cephadm: some changes to nvmeof conf file defaults
Fixes https://tracker.ceph.com/issues/65566

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit da2d088c1319e980b5202fb65326e78daa014063)

python-common/ceph/deployment: some changes to nvmeof conf file defaults
Fixes https://tracker.ceph.com/issues/65566

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit c2aa1fcaf2d43a55953c77b991f688f4b060cd5e)

mgr/cephadm: make enable_monitor_client configurable for nvmeof

Currently, the mon client work is not merged on main, but our
default nvmeof container will attempt to make use of it by default,
causing it to crash. This makes it configurable and defaults the
behavior to false. That can be changed once the work is actually
present in main.

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

python-common/ceph/deployment: add nvmeof configuration fields
Fixes https://tracker.ceph.com/issues/65259

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit 187baffd56fde2499109e779b3dacd9fa4d52ecf)

mgr/cephadm: add some NVMEof gateway fields to be configurable by cephadm
Fixes https://tracker.ceph.com/issues/65259

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit aa4adf97f6daec0a85b042a1591a6cc7ac137d14)

mgr/cephadm: add nvmeof configuration fields

Fixes: https://tracker.ceph.com/issues/64821
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit a16ac81c43be884f2dd7fc8b0566be5aa35b7ace)

Conflicts:
src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
src/pybind/mgr/cephadm/tests/test_services.py

python-common/ceph/deployment: add nvmeof configuration fields

Fixes: https://tracker.ceph.com/issues/64821
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit 86a592730b09ab2cfaf4100907366050c932f30a)

Merge pull request #57072 from zdover23/wip-doc-2024-04-24-backport-57051-to-squid

squid: doc/rados: remove dual-stack docs

doc/rados: remove dual-stack docs

Remove references to dual-stack mode in
doc/rados/configuration/network-config-ref.rst and
doc/rados/configuration/msgr2.rst. This feature seems to have been
planned but never to have been completely implemented.

See the tracker issue listed below for an email exchange detailing the
confusion caused by the presence in the documentation of this
now-removed information.

Fixes: https://tracker.ceph.com/issues/65631
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit c65d2056c27d75f91af44e004d8defe7ffbf5fc8)

osd/scrub: remove scrbcnt_resrv_timed_out perf counter

as the code that updates it, following a reservation timeout,
was removed.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 7eb287280e64b48447fe95875debc69e907fb7b7)

osd/scrub: remove osd_scrub_reservation_timeout config option

following the removal of the reservation timeout handling code.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 2836805cfe9572b2e4c934716dc0967d9cdbfdc9)

osd/scrub: remove detection & handling of reservation timeouts

as no timeout can be set for reserver-based (queued)
reservation requests.

Fixes: https://tracker.ceph.com/issues/65044
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit e8db183ce4f1c6db34129cc1c8c57912643d1ace)
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

Merge pull request #57054 from rhcs-dashboard/wip-65255-squid

squid: mgr/dashboard: start using alertmanager v2

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

rgw: apply default quota config on account creation

add new default quota config options for accounts analogous to
rgw_user_default_quota_max_objects/size. apply the default bucket quota
config options as-is

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 9ed8263edff7e87907bf24b054e5c7144c194dbe)

rgw/account: add bucket_quota to RGWAccountInfo

support bucket quotas per account the same way as for user

Fixes: https://tracker.ceph.com/issues/65551
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b9677714b2a57e4f97ff87c9d654f4dddae3c2b2)

Merge pull request #57047 from zdover23/wip-doc-2024-04-23-backport-57032-to-squid

squid: doc/rados: fix outdated value for ms_bind_port_max

mgr/dashboard: start using alertmanager v2

I was looking into sorting the alerts and saw there is an api v2 for
alertmanager which also has an endpoint like `alerts/groups` which might
be something that is useful for us.

Refer: https://github.com/prometheus/alertmanager/blob/main/api/v2/openapi.yaml

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

 Conflicts:
src/pybind/mgr/dashboard/controllers/prometheus.py
  - don't add the endpoint apart from the get_alertgroup one

doc/rados: fix outdated value for ms_bind_port_max

The highest port number used by OSD or MDS daemons was increased from
7300 to 7568 in [1] but the documentation still refers to 7300 in
multiple locations.

[1] https://github.com/ceph/ceph/pull/42210

Fixes: https://tracker.ceph.com/issues/65609
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
(cherry picked from commit 23d2740241af2118652fef6e7d6a286f338a18f2)

Merge pull request #57039 from zdover23/wip-doc-2024-04-23-backport-57022-to-squid

squid: doc/rados: remove redundant pg repair commands

Merge pull request #56958 from cbodley/wip-64552-squid

squid: rgw/http/client-side: disable curl path normalization

Reviewed-by: Oguzhan Ozmen <oozmen@bloomberg.net>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #56960 from cbodley/wip-65353-squid

squid: rgwlc: check for no-bucket at bucket_lc_process() preamble

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

Merge pull request #56959 from cbodley/wip-64496-squid

squid: rgw: invalidate and retry keystone admin token

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

doc/rados: remove redundant pg repair commands

Incorporate the material in /doc/rados/operations/pg-repair into
/doc/rados/troubleshooting/troubleshooting-pg. Remove
/doc/rados/operations/pg-repair from the documentation. Redirect all
links to the old location to the new location.

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

Merge pull request #57026 from zdover23/wip-doc-2024-04-22-backport-57016-to-squid

squid: doc/rados: add bucket rename command

Merge pull request #57023 from zdover23/wip-doc-2024-04-22-backport-56962-to-squid

squid: doc/radosgw: use 'confval' directive for reshard config options

doc/rados: add bucket rename command

Add "ceph osd crush rename bucket" command. This commit is made in
response to a request from Michele Giacomoli.

Fixes: https://tracker.ceph.com/issues/65599
Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 1030b572fa1680792b4c5843a6cf517bd31511ae)

doc/radosgw: use 'confval' directive for reshard config options

this will render the config options with their descriptions/defaults
taken directly from common/options/rgw.yaml.in

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 50ebbc538c02352950d9c04e8b41b2d88701c552)

Merge pull request #56999 from rhcs-dashboard/wip-65581-squid

squid: mgr/dashboard: pin xmlsec to 1.3.13

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: rishabh-d-dave <NOT@FOUND>

Merge pull request #57017 from zdover23/wip-doc-2024-04-21-backport-56904-to-squid

squid: doc/security: update CVE list

doc/security: update CVE list

Update the list of CVEs in doc/security/cves.rst.

Co-authored-by: Ilya Dryomov <idryomov@redhat.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8381259a46fbd04218946b67e73e140cb054e3d8)

Merge pull request #57007 from zdover23/wip-doc-2024-04-20-backport-56996-to-squid

squid: doc/dev: repair broken image

doc/dev: repair broken image

Replace the ".. graphviz" directive with an ".. image" directive that
correctly displays an image where previously an unusably zoomed-in image
appeared.

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

Merge pull request #56992 from rosinL/wip-65577-squid

squid: install-deps: save and restore user's XDG_CACHE_HOME

qa/vstart_runner: increase timeout for vstart.sh command

Since the timeout bug was fixed (https://tracker.ceph.com/issues/65533)
"Ceph API tests" sometimes fails because vstart.sh command had to be
aborted due to timeout.

Currently, "timeout" is set to 300 seconds which sometimes is not enough
for vstart.sh to run successfully for "Ceph API tests" CI job. 180
seconds usually suffices for vstart.sh to run successfully when used for
CephFS.

Increase value of "timeout" to avoid such failures on "Ceph API tests" CI.

Fixes: https://tracker.ceph.com/issues/65565
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit f779b428689ea245aa0c978732c468860520c609)
(cherry picked from commit 5a8a9df401663ca48b0031104d00ea0e4b636165)

 Conflicts:
qa/tasks/vstart_runner.py
  - accept the incoming changes

mgr/dashboard: pin xmlsec to 1.3.13

xmlsec is an inner dependency used by python3-saml. A newer release of
it broke the import.
https://github.com/xmlsec/python-xmlsec/issues/314

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

install-deps: save and restore user's XDG_CACHE_HOME

Since ccache 4.0, ccache use $XDG_CACHE_HOME/ccache to keep compile cache
if XDG_CACHE_HOME is set. In this case $XDG_CACHE_HOME is overwrite,
ccache will use $XDG_CACHE_HOME/ccache(ccache will create the dir if not exsit) to
store compile cache, but $XDG_CACHE_HOME will be removed next round running,
leading to ccache contests are always removed. So save and restore user's XDG_CACHE_HOME.

Fixes: https://tracker.ceph.com/issues/65175
Signed-off-by: luo rixin <luorixin@huawei.com>
(cherry picked from commit a17342147d4411211ecf646730987d2633dabb6e)

Merge pull request #56676 from cbodley/wip-squid-dencoder

squid: dencoder: update ceph-object-corpus submodule for 18.2.0 coverage

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

Merge pull request #56814 from Matan-B/wip-65306-squid

squid: osd/SnapMapper: fix _lookup_purged_snap

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

Merge pull request #56697 from NitzanMordhai/wip-65312-squid

squid: cls/cas/cls_cas_internal: Initialize 'hash' value before decoding

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

Merge pull request #56482 from ronen-fr/wip-65072-squid

squid: osd/scrub: no "slow response" warning for queued reservations

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

Merge pull request #56474 from amathuria/wip-65140-squid

squid: osd: Change PG Deletion cost for mClock

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

Merge pull request #56457 from ljflores/wip-65117-squid

squid: qa/workunits: opt in to new collection after upgrade from reef to main

Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>

Merge pull request #56432 from Matan-B/wip-65097-squid

squid: mon/OSDMonitor: fix rmsnap command

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

Merge pull request #56671 from batrick/wip-65295-squid

squid: mds: skip sr moves when target is an unlinked dir

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

Merge pull request #56665 from batrick/wip-65106-squid

squid: qa/cephfs: add probabilistic ignorelist for pg_health

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

Merge pull request #56663 from batrick/wip-65275-squid

squid:  mds: some request errors come from errno.h rather than fs_types.h

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

Merge pull request #56945 from afreen23/wip-65542-squid

squid: mgr/dashboard: Support Description and AccountId in rgw roles

Reviewed-by: ivoalmeida <NOT@FOUND>

Merge pull request #56967 from zdover23/wip-doc-2024-04-18-backport-56879-to-squid

squid: doc/cephfs: improve ceph-fuse command

doc/cephfs: improve ceph-fuse command

Instruct readers to use "mkdir /mnt/cephfs1" to create a mountpoint
before using "ceph-fuse" to mount a filesystem, if "/mnt/cephfs1"
doesn't already exist. cf.
https://github.com/ceph/ceph/pull/56831#discussion_r1561102227

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

Merge pull request #56949 from cbodley/wip-65543-squid

squid: rgw: increase log level on abort_early

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

rgwlc: check for no-bucket at bucket_lc_process() preamble

Avoids trivial segfault deferencing the bucket pointer.

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

rgw: invalidate and retry keystone admin token

We validate client tokens against the Keystone API by
sending our own "admin token" that is allowed to lookup
client tokens.

This "admin token" is cached and upon checking the cache
we verify the expiration on the token before using it but
we have no logic to invalidate the cache if the response
from the Keystone API says that the "admin token" is invalid.

Since we don't invalidate it and it still has not expired
it will stay in our cache and continue to cause Swift API
requests for clients to be dropped because of the invalid
admin token, until service is restarted, admin token is
expired (which it can already be) or until
the whole cache is dropped or TokenCache::invalidate()
called on the admin token.

There is probably multiple places in Keystone where it
invalidates tokens, but one example where the "admin token"
would be invalidated and return  HTTP 401 status code is if
the user that is configured in rgw_keystone_admin_user has
it's password changed (even if it's the same password as the
current one) then Keystone will invalidate it's cache and
invalidated existing tokens even if they have not expired yet.

Fixes: https://tracker.ceph.com/issues/64094
Signed-off-by: Tobias Urdin <tobias.urdin@binero.se>
(cherry picked from commit df23e4b2ea4f8647271a9ce541a1fdbc4d9fe4a6)

rgw/http/client-side: disable curl path normalization

test_multi.py:test_object_sync is updated to reproduce the issue.
Without the fix, objects "." and ".." are not replicated and the test
fails (times out).

Fixes: https://tracker.ceph.com/issues/64366
Signed-off-by: Oguzhan Ozmen <oozmen@bloomberg.net>
(cherry picked from commit b4b1868a0047890ada2c8b39c3a932ae51255714)

rgw: increase log level on abort_early

The function is typically invoked on client errors like NoSuchBucket. Logging these errors with level 1 may initially suggest a significant issue, when in fact it's just a client error. Consider raising the logging level to 20 for better clarity.

Fixes: https://tracker.ceph.com/issues/65469
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 302e3c459acdffe51fb73e902f2b3c828faa23e0)

mgr/cephadm: pass daemon's current image when reconfiguring

Important to note here is that a reconfig will rewrite
the config files of the daemon and restart it, but not
rewrite the unit files. This lead to a bug where the
grafana image we used between the quincy and squid release
used different UIDs internally, which caused us to rewrite
the config files as owned by a UID that worked with the
new image but did not work with the image still specified
in the unit.run file. This meant the grafana daemon was down
from a bit after the mgr upgrade until the end
of the upgrade when we redeploy all the monitoring images.

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

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

mgr/dashboard: Allow the user to add the access/secret key on zone edit
and not on zone creation

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

mgr/dashboard: Support Description and AccountId in rgw roles

Fixes https://tracker.ceph.com/issues/65506

Rgw roles list page is crashing due to these new fields coming from api but not supported in dashboard frontend.

This will also fix failing CI tests.

Signed-off-by: Afreen <afreen23.git@gmail.com>
(cherry picked from commit bfa85ecd8a3799143b6afbac2a302e4d6b3b4a24)

Merge pull request #56920 from afreen23/wip-65505-squid

squid: mgr/dashboard: Move features to advanced section and expand by default rbd config section

Reviewed-by: ivoalmeida <NOT@FOUND>

Merge pull request #56902 from adk3798/wip-65415-squid

squid: cephadm: add idmap.conf to nfs sample file

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

Merge pull request #56901 from adk3798/wip-65382-squid

squid: mgr/cephadm: Allows enabling NFS Ganesha NLM

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

Merge pull request #56898 from adk3798/squid-cephadm-smb-backport

squid: cephadm: add a new SMB service to the mgr module

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

Merge pull request #56897 from adk3798/squid-cephadm-log-only-match

squid: qa/cephadm: only fail on CEPHADM_ error in logs

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

Merge pull request #56826 from NitzanMordhai/wip-65414-squid

squid: suites/rados/cephadm: adding OSD_DOWN to the log-ignorelist

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

Merge pull request #56769 from adk3798/squid-node-proxy-service-size

squid: mgr/cephadm: fix node-proxy service size

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

Merge pull request #56768 from adk3798/squid-no-osd-upgrade

squid: mgr/cephadm: handle setting required osd release with no OSDs during upgrade

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

Merge pull request #56491 from adk3798/wip-64990-squid

squid: cephadm: fix `cephadm shell --name <daemon-name>` for stopped/failed daemon

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

Merge pull request #56488 from adk3798/squid-rgw-bootstrap-hostname

squid: mgr/cephadm: update rgw zonegroup w/ zonegroup_hostnames from rgw spec

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

Merge pull request #56301 from adk3798/squid-only-bind-to-network

squid: mgr/cephadm: allow grafana and prometheus to only bind to specific network

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

Merge pull request #56820 from cbodley/wip-65411-squid

squid: qa/rgw: barbican uses branch stable/2023.1

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #56918 from rhcs-dashboard/wip-65501-squid

squid: mgr/dashboard: remove minutely from retention

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

Merge pull request #56824 from soumyakoduri/squid

[Squid] rgw/cloud: Handle RGWRESTStreamS3PutObj initialization failures

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