script/build-with-container: lightly organize the distro kind aliases

Do a tiny reorg of the distro kind aliases and container images to keep
the EL distros together and comment out each "section".

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 4430a5ad6be6f26309d5f5bea0e448a4bbd432e1)

script/build-with-container: be consistent with naming in distro kinds

Update the DistroKind enum and related items so that the naming is
applied consistently. That is: the canonical (no pun indented) form
of the name is "<name><version>" and codenames, such as "jammy" or
"bookworm" are aliases. This matches the previously existing code.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit ac11a80a63ab1909fbdf682d830acde96856f502)

src/script: add bookworm to build-with-container.py

..and its friend buildcontainer-setup.sh

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 34b497c2f3652e7d30c7b7476b711fd9f1f4ecac)

build-with-container: ensure npm dir is set up before configure

When the npm cache path option is passed the npm cache dir is passed
to all container `run` commands, ensure the dir has been created
before the first container command (configure) is used.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 79166af192ea0b4b982b56ce521516d5a29e7a0d)

Merge pull request #65816 from Hezko/wip-73400-tentacle

tentacle: mgr/dashboard: raise exception if both size and rbd_image_size are being passed in ns add

Reviewed-by: Afreen Misbah <afreen@ibm.com>

mgr/dashboard: raise exception if both size and rbd_image_size are being passed in ns add

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>
(cherry picked from commit 3ff7d737bb1934dbfe26d86a819727d9456a6da6)

Merge pull request #65647 from rhcs-dashboard/wip-73198-tentacle

tentacle: mgr/dashboard: fix total capacity value in dashboard

Reviewed-by: Ankush Behl <cloudbehl@gmail.com>

Merge pull request #65005 from mchangir/wip-72562-tentacle

tentacle: mgr: avoid explicit dropping of ref

Merge pull request #65336 from abitdrag/wip-72818-tentacle

tentacle: auth: msgr2 can return incorrect allowed_modes through AuthBadMethodFrame

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

Merge pull request #65645 from ceph/wip-yuriw-upgardes-tentacle

qa/tests: added messages to the whitelist

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

qa/upgrade/squid-x: ignore pool quota warnings

Signed-off-by: Laura Flores <lflores@ibm.com>

Merge pull request #65752 from cbodley/wip-72737-tentacle

tentacle: rpm: default to gcc-toolset-13, not just for crimson

ceph.spec.in: use rpm macro for python shebang pathfix

To support EL 10 distros, update the source of the pathfix tool (on EL
9+ distros) and use the macro for updating python shebangs that has been
available since at least EL 9.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit f60065de25322505c3d95a38148f7e7506fe65bc)

rpm: require gcc >= 13.3 regardless of gts_version

when gts_version is not set, bump the required version of gcc-c++ >= 13.3.
move this into a `%if 0%{?gts_version} == 0` block to prevent that from
applying to builds using gts, because the distro probably doesn't
provide a recent enough gcc-c++

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

rpm: remove _lto_cflags logic for older distros

none of these distros are supported anymore. gcc >= 13.3 should resolve
those lto issues

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

rpm: remove special cases for gts_version < 13

now that we no longer set gts_version to 11, remove any special cases
for gts_version < 13

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

rpm: default to gcc-toolset-13, not just for crimson

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

ceph.spec.in: conditionalize crimson gts version on el10

EL10 distros come with GCC 14. When crimson was enabled it was always
trying to set gts_version to 13 (gcc-toolset version). Make the use of
gts version conditional on using el versions lower than 10.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit c91c49282974d051dbd5f954e5b3cc5036de66a7)

valgrind: wildcard glibc version for dlopen() leak suppression

the original suppression for "dlopen@@GLIBC_2.2.5" is very similar to
several later suppressions for "dlopen@@GLIBC_2.34". add a wildcard to
the original suppression so the rest can be removed

this also helps suppress a new leak, seen with gcc-13:
{
   <insert_a_suppression_name_here>
   Memcheck:Leak
   match-leak-kinds: reachable
   fun:malloc
   fun:UnknownInlinedFun
   fun:decompose_rpath
   fun:_dl_map_object
   fun:dl_open_worker_begin
   fun:_dl_catch_exception
   fun:dl_open_worker
   fun:_dl_catch_exception
   fun:_dl_open
   fun:dlopen_doit
   fun:_dl_catch_exception
   fun:_dl_catch_error
   fun:_dlerror_run
   fun:dlopen@@GLIBC_2.34
   fun:_sub_I_65535_0.0
   fun:call_init
   fun:call_init
   fun:_dl_init
   obj:/usr/lib64/ld-linux-x86-64.so.2
   obj:*
   obj:*
   obj:*
   obj:*
   obj:*
   obj:*
   obj:*
}

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

valgrind: update rocksdb ObjectLibrary leak suppression for gcc-13

the suppression for gcc-13 only differs on two lines, so add wildcards
to match either. the diff between the current suppression and the new
one follows:

diff --git a/qa/valgrind.supp b/qa/valgrind.supp
index 926d3d032a8..2f9650029ee 100644
--- a/qa/valgrind.supp
+++ b/qa/valgrind.supp
@@ -592,7 +592,7 @@
         rocksdb ObjectLibrary AddFactoryEntry centos 9 leak
         Memcheck:Leak
         match-leak-kinds: reachable
-        fun:_Znam
+        fun:_Znwm
         fun:UnknownInlinedFun
         fun:UnknownInlinedFun
         fun:UnknownInlinedFun
@@ -601,7 +601,7 @@
         fun:UnknownInlinedFun
         fun:_ZN7rocksdb13ObjectLibrary15AddFactoryEntryEPKcOSt10unique_ptrINS0_5EntryESt14default_deleteIS4_EE
         fun:UnknownInlinedFun
-        fun:_Z41__static_initialization_and_destruction_0ii.constprop.60
+        fun:_Z41__static_initialization_and_destruction_0v.lto_priv.83
         fun:_sub_I_65535_0.0
         fun:__libc_start_main@@GLIBC_2.34
         fun:(below main)

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

rpm: reenable lto for gcc-toolset-13 by requiring 13.3

referenced gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113359
shows that it was resolved for 13.3. reenable lto for gcc-toolset-13 by
requiring 13.3 or later

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

Merge pull request #65696 from adk3798/tentacle-cephadm-support-custom-distro

tentacle: cephadm: support custom distros by falling back to ID_LIKE

Merge pull request #65737 from rhcs-dashboard/wip-73320-tentacle

tentacle: mgr/dashboard : Hide suppressed  alert on landing page

Reviewed-by: Dnyaneshwari <dnyaneshwari@ibm.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@ibm.com>

mgr/dashboard : Hide suppressed  alert on landing page
fixes : https://tracker.ceph.com/issues/72944

Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>
(cherry picked from commit 280d8f66bf811bf6ca05da4703c4fdadcd89504a)

Merge pull request #65493 from rhcs-dashboard/wip-72985-tentacle

tentacle: mgr/dashboard: Group similar alerts

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #65680 from rhcs-dashboard/wip-73227-tentacle

tentacle: mgr/dashboard: Handle pool creation in tiering local storage class creation.

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

mgr/dashboard: Group similar alerts
fixes : https://tracker.ceph.com/issues/72788

Signed-off-by: Abhishek Desai <abhishek.desai1@ibm.com>
(cherry picked from commit cdd74a35103ecea7f8031aed494868fbd618d45b)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.scss
Accept the incoming changes

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts

Merge pull request #65491 from rhcs-dashboard/wip-72986-tentacle

tentacle: mgr/dashboard : Fixed mirrored image usage info bar

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #65490 from rhcs-dashboard/wip-72988-tentacle

tentacle: mgr/dashboard : fix css for carbon input fields

Reviewed-by: Afreen Misbah <afreen@ibm.com>

mgr/dashboard: Local storage class creation via dashboard doesn't handle creation of pool.

Fixes: https://tracker.ceph.com/issues/72569
Signed-off-by: Dnyaneshwari <dtalweka@redhat.com>
mgr/dashboard: handle creation of new pool

Commit includes:
1) Provide link to create a new pool
2) Refactored validation on ACL mapping, removed required validator as default
3) fixed runtime error on console due to ACL length due to which the details section was not opening
4) Used rxjs operators to make API calls and making form ready once all data is available, fixing the form patch issues
5) Refactored some part of code to improve the performance
6) Added zone and pool information in details section for local storage class

Fixes: https://tracker.ceph.com/issues/72569
Signed-off-by: Naman Munet <naman.munet@ibm.com>
(cherry picked from commit 2d0e71c845643a26d4425ddac8ee0ff30153eff2)

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-storage-class-form/rgw-storage-class-form.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts
src/pybind/mgr/dashboard/services/rgw_client.py

Merge pull request #65719 from adk3798/tentacle-cephadm-default-image

tentacle: cephadm: set default image for tentacle release

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

Merge pull request #65679 from Hezko/wip-73256-tentacle

tentacle: mgr/dashboard: fix None force param handling in ns add_host so it won't raise exceptions

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

Merge pull request #65677 from Hezko/wip-73258-tentacle

tentacle: mgr/dashboard: add nsid param to ns add command

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

cephadm: set default image for tentacle release

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

Merge pull request #65678 from Hezko/wip-73257-tentacle

tentacle: mgr/dashboard: --no-group-append default value to False, aligned with old cli"

Reviewed-by: nizamial09 <nia@redhat.com>

Merge pull request #65705 from rhcs-dashboard/wip-73275-tentacle

tentacle: mgr/dashboard: Blank entry for Storage Capacity in dashboard under Cluster > Expand Cluster > Review

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

Merge pull request #65692 from aaSharma14/wip-73273-tentacle

tentacle: ceph-mixin: Update monitoring mixin

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

Merge pull request #65708 from aaSharma14/wip-73292-tentacle

tentacle: monitoring: fix MTU Mismatch alert rule and expr

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

Merge pull request #65672 from rhcs-dashboard/wip-73251-tentacle

tentacle: mgr/dashboard: fix data mismatch in Advance section in Tiering.

Reviewed-by: Afreen Misbah <afreen@ibm.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@ibm.com>

monitoring: fix MTU Mismatch alert rule and expr

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

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts

Merge pull request #65583 from VallariAg/wip-73109-tentacle

tentacle: qa/suites/nvmeof: add upgrade sub-suite

mgr/dashboard: Blank entry for Storage Capacity in dashboard under Cluster > Expand Cluster > Review

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

Signed-off-by: Naman Munet <naman.munet@ibm.com>
(cherry picked from commit a01909e7588c7ff757079475e3ea6f1dc3054db7)

Merge pull request #65587 from adamemerson/wip-perfcounters-unique-string-tentacle

tentacle: common: Allow PerfCounters to return a provided service ID

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

qa/tests: added messages to the whitelist

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

Merge pull request #65478 from pdvian/wip-72911-tentacle

tentacle: osd: stop scrub_purged_snaps() from ignoring osd_beacon_report_interval

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

Merge pull request #65464 from pdvian/wip-72851-tentacle

tentacle: mgr/DaemonState: Minimise time we hold the DaemonStateIndex lock

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

cephadm: support custom distros by falling back to ID_LIKE

This change enables cephadm to work on custom or derivative distributions
that are based on supported distros without requiring code changes for
each new custom/derivative distro.

Signed-off-by: bachmanity1 <bachmanity138@gmail.com>
(cherry picked from commit 35323380403eebe69ad8650a2036afa87569d1a2)

ceph-mixin: reset auto_count to 10

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit ebca859c5d22740678baff0353b39c5642f1eb0b)

ceph-mixin: Update monitoring mixin

Update `rate()` queries to be more accurate. The use of `irate()` leads
to misleading graphs because it only looks at the last 2 samples over
the selected time range step interval. Also use `$__rate_interval`
consistently in order to scale over short and long time ranges.
* Replace `irate()` with `rate()` to avoid sample bias.
* Use `$__rate_interval` consistently.
* Update auto_count/min to provide higher detail graphs.

Fixes: https://tracker.ceph.com/issues/72343
Signed-off-by: SuperQ <superq@gmail.com>
Signed-off-by: Ankush Behl <cloudbehl@gmail.com>
(cherry picked from commit 9c4cd107a41292aba547fdd4a3721cbc554a6b6a)

Merge pull request #65619 from aaSharma14/wip-73166-tentacle

tentacle: mgr/dashboard: fix zone update API forcing STANDARD storage class

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #65622 from aaSharma14/wip-73168-tentacle

tentacle: mgr/dashboard: Allow FQDN in Connect Cluster form -> Cluster API URL

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #65675 from rhcs-dashboard/wip-73234-tentacle

tentacle: mgr/dashboard: FS - Attach Command showing undefined for MountData

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #65601 from kotreshhr/wip-73131-tentacle

tentacle: cephfs-journal-tool: Journal trimming issue

Reviewed-by: Jos Collin <jcollin@redhat.com>

Merge pull request #65670 from aaSharma14/wip-73229-tentacle

tentacle: monitoring: fix "In" OSDs in Cluster-Advanced grafana panel. Also change units from decbytes to bytes wherever used in the panel

Reviewed-by: Afreen Misbah <afreen@ibm.com>

mgr/dashboard: fix None force param handling in ns add_host so it won't raise exceptions

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>
(cherry picked from commit 38f62c4a379bfbe0bc57ebee4fc1aa6661c75dca)

mgr/dashboard: --no-group-append default value to False, aligned with old CLI

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>
(cherry picked from commit 46b74faa763e7894e62558f14f786c870d740b29)

mgr/dashboard: add nsid param to ns add command

Signed-off-by: Tomer Haskalovitch <tomer.haska@ibm.com>
(cherry picked from commit ee37978e7341ad3c29f986f316d89cb76b26efb5)

mgr/dashboard: FS - Attach Command showing undefined for MountData

Fixes: https://tracker.ceph.com/issues/73137
Signed-off-by: Dnyaneshwari Talwekar <dtalwekar@redhat.com>
(cherry picked from commit 50ef955207e7095578dc09820885a3dd0d6b3d52)

mgr/dashboard: fix data mismatch in Advance section in Tiering.

Fixes: https://tracker.ceph.com/issues/72641
Signed-off-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>
(cherry picked from commit 300e5058a5e80f7d679fc1d1c0a646f03c5dcb1b)

Merge pull request #65653 from rhcs-dashboard/wip-73224-tentacle

tentacle: mgr/dashboard: Tiering form - Placement Target in Advanced Section

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #65650 from rhcs-dashboard/wip-73199-tentacle

tentacle: mgr/dashboard:[NFS] add Subvolume Groups and Subvolumes in "Edit NFS Export form"

Reviewed-by: Afreen Misbah <afreen@ibm.com>

monitoring/ceph_mixin: fix Cluster - Advanced OSD grafana panel

1. Fixes the promql expr used to calculate "In" OSDs in
   ceph-cluster-advanced.json.
2. Fixes the color coding for the single state panels used in the OSDs
   grafana panel like "In", "Out" etc

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

Merge pull request #65658 from rhcs-dashboard/wip-73239-tentacle

tentacle: mgr/dashboard: add multiple ceph users deletion

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

Merge pull request #65657 from rhcs-dashboard/wip-73213-tentacle

tentacle: mgr/dashboard: fix smb button and table column

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

mgr/dashboard: add multiple ceph users deletion

Fixes: https://tracker.ceph.com/issues/72752
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@ibm.com>
(cherry picked from commit 14ca16576d16de49c07725fb4b0feb112c8a1a43)

mgr/dashboard: fix SMB custom DNS button and linked_to_cluster col

- The button 'add custom DNS' in smb cluster form should only appear for active directory where is relevant.

- The linked_to_cluster column data is missing from smb standalone

- Some refactoring to remove magic strings and use FormControl for publicAddrs field

Fixes: https://tracker.ceph.com/issues/73096
Signed-off-by: Pedro Gonzalez Gomez <pegonzal@ibm.com>
(cherry picked from commit 9ce943e21558d17b3a214840b39bb57eab0cbd85)

Merge pull request #65292 from adk3798/tentacle-cephadm-build-el10rpm

tentacle: cephadm: fix building rpm-sourced cephadm zippapp on el10

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

Merge pull request #65654 from rhcs-dashboard/wip-73223-tentacle

tentacle: Form retains old data when switching from edit to create

Reviewed-by: Afreen Misbah <afreen@ibm.com>

Merge pull request #65254 from joscollin/wip-72505-tentacle

tentacle: client: fix unmount hang after lookups

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

Merge pull request #65362 from ifed01/wip-ifed-fix-snapdiff-fragment-tent

tentacle: mds: fix snapdiff result fragmentation

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

mgr/dashboard: Form retains old data when switching from edit to create mode

Fixes: https://tracker.ceph.com/issues/72989
Signed-off-by: pujashahu <pshahu@redhat.com>
(cherry picked from commit 918dff407d912b3a5ac068e0050467396668163c)

mgr/dashboard: Tiering form - Placement Target in Advanced Section

Fixes: https://tracker.ceph.com/issues/72545
Signed-off-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>
(cherry picked from commit aa3bb8adddac675ea3c6dcd0bd4e9143743124b8)

mgr/dashboard:[NFS] add Subvolume Groups and Subvolumes in "Edit NFS Export" form

Fixes: https://tracker.ceph.com/issues/72435
Signed-off-by: Dnyaneshwari Talwekar <dtalweka@redhat.com>
(cherry picked from commit aa7a586c5690e26bfc99687a601f8c0c3c221aa7)

mgr/dashboard: fix total capacity value in dashboard

Regression from a different commit
https://github.com/ceph/ceph/commit/2609d4f62e9e3906cf3e3fcc042bfdf0bcc633bf#diff-caee5ab662130fe721d15eca7a6e2dc79b671df025bde3bfd78c3c3ca4c578d1R249

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

Merge pull request #65261 from joscollin/wip-72149-tentacle

tentacle: mon/FSCommands: avoid unreachable code triggering compiler warning

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

mon/FSCommands: avoid unreachable code triggering compiler warning

    In file included from /home/pdonnell/ceph/src/mds/FSMap.h:31,
                     from /home/pdonnell/ceph/src/mon/PaxosFSMap.h:20,
                     from /home/pdonnell/ceph/src/mon/MDSMonitor.h:26,
                     from /home/pdonnell/ceph/src/mon/FSCommands.cc:17:
    /home/pdonnell/ceph/src/mds/MDSMap.h: In member function ‘int FileSystemCommandHandler::set_val(Monitor*, FSMap&, MonOpRequestRef, const cmdmap_t&, std::ostream&, FileSystemCommandHandler::fs_or_fscid, std::string, std::string)’:
    /home/pdonnell/ceph/src/mds/MDSMap.h:223:40: warning: ‘fsp’ may be used uninitialized in this function [-Wmaybe-uninitialized]
      223 |   bool test_flag(int f) const { return flags & f; }
          |                                        ^~~~~
    /home/pdonnell/ceph/src/mon/FSCommands.cc:417:21: note: ‘fsp’ was declared here
      417 |   const Filesystem* fsp;
          |                     ^~~

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit 24acaaf766336466021caadba1facd2901775435)

Merge pull request #65635 from adk3798/tentacle-cephadm-pin-cheroot

tentacle: pybind/mgr: pin cheroot version in requirements-required.txt

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

Merge pull request #65628 from phlogistonjohn/jjm-t-65514

tentacle: build-with-container: add argument groups to organize options

pybind/mgr: pin cheroot version in requirements-required.txt

With python 3.10 (didn't seem to happen with python 3.12) the
pybind/mgr/cephadm/tests/test_node_proxy.py test times out.
This appears to be related to a new release of the cheroot
package and a github issues describing the same problem
we're seeing has been opened by another user
https://github.com/cherrypy/cheroot/issues/769

It is worth noting that the workaround described in that
issue does also work for us. If you add

```
import cheroot
cheroot.server.HTTPServer._serve_unservicable = lambda: None
```

after the existing imports in test_node_proxy.py the
test hanging issue also disappears. Also worth noting the
particular pin of

cheroot~=10.0

was chosen as it matches the existing pin being used
in pybind/mgr/dashboard/constraints.txt

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

Merge pull request #65485 from tobias-urdin/tentacle-rgw-admin-bucket-pagination

tentacle: rgw/admin: Add max-entries and marker to bucket list

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

Merge pull request #65488 from BBoozmen/wip-72970-tentacle

tentacle: RGW: multi object delete op; skip olh update for all deletes but the last one

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

Merge pull request #65594 from adk3798/tentacle-cephadm-nvmeof-stray

tentacle: mgr/cephadm: don't mark nvmeof daemons without pool and group in name as stray

Reviewed-by: Guillaume Abrioux <gabrioux@ibm.com>

build-with-container: add argument groups to organize options

Use the argparse add_argument_group feature to organize the mass of
arguments into more sensible categories. Hopefully, someone reading
over the `--help` output can now more easily see options that
are useful rather than being overwhelmed by a wall of text.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 71a1be4dd0aea004da56c2f518ee70a281a3f7d3)

Merge pull request #65617 from spuiuk/tentacle-doc-provider

tentacle: doc/mgr/smb: document the 'provider' option for smb share

Merge pull request #65259 from joscollin/wip-72284-tentacle

tentacle:  mds: wrong snap check for directory with parent snaps

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

mgr/dashboard: Allow FQDN in Connect Cluster form -> Cluster API URL

Allow the user to enter URL with FQDN in the Cluster API URL filed in
the Connect Cluster form inside Multi-cluster tab.

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

mgr/dashboard: fix zone update API forcing STANDARD storage class

The zone update REST API (`edit_zone`) always attempted to configure a
placement target for the `STANDARD` storage class, even when the request
was intended for a different storage class name.
This caused failures in deployments where `STANDARD` is not defined.

Changes:
Club add placement target and add storage class methods into one single
add_placement_targets_storage_class_zone method which takes the storage
class as a param as well alongside the rest of the placement params.

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

Merge pull request #64885 from vshankar/wip-72391-tentacle

tentacle: mds/MDSDaemon: unlock `mds_lock` while shutting down Beacon and others

Merge pull request #64888 from vshankar/wip-72285-tentacle

tentacle: qa/suites/upgrade: add "Replacing daemon mds" to ignorelist

Merge pull request #64953 from batrick/wip-72514-tentacle

tentacle: mds: skip charmap handler check for MDS requests

Merge pull request #65132 from chrisphoffman/wip-72644-tentacle

tentacle: client: use path supplied in statfs

Merge pull request #65163 from joscollin/wip-72153-tentacle

tentacle: mds: dump export_ephemeral_random_pin as double

Merge pull request #64650 from rishabh-d-dave/wip-72201-tentacle

tentacle: mgr/vol: keep and show clone source info

Merge pull request #65346 from joscollin/wip-72803-tentacle

tentacle: mds: Fix readdir when osd is full.

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

doc/mgr/smb: document the 'provider' option for smb share

Signed-off-by: Sachin Prabhu <sp@spui.uk>
(cherry picked from commit 742659b18a21cd8ccc36a0f0a53bea265a13a541)
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>

Merge pull request #65564 from xhernandez/wip-73075-tentacle

tentacle: Add normalization and casesensitive options to the subvolume group creation command

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

Merge pull request #65262 from joscollin/wip-71831-tentacle

tentacle: mgr/volumes: Keep mon caps if auth key has remaining mds/osd caps

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

Merge pull request #65540 from NitzanMordhai/wip-72996-tentacle

tentacle: qa/workunits/rados: remove cache tier test

Merge pull request #65369 from Naveenaidu/wip-72819-tentacle

tentacle: qa/suites/rados/thrash-old-clients: Add OSD warnings to ignore list

Merge pull request #65213 from ifed01/wip-ifed-discard-threads-better-lifecycle-tent

tentacle: blk/kernel: improve DiscardThread life cycle.

Reviewed-by: YiteGu <yitegu0@gmail.com>