Merge PR #67465 into tentacle

* refs/pull/67465/head:
	mgr: isolated CherryPy to prevent global state sharing
	Fix the prometheus module crash

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

diff --cc ceph.spec.in
Simple merge

diff --cc src/pybind/mgr/cephadm/agent.py
index 823ea97648c7f0f6e4c5378f8478ad64d8228e94,1568d003e59dd0a7c3b7935bcd979bbd05e6db3c..4c3bda4ebc9837b387fc1dfc240fc2e3807817e8
--- 1/src/pybind/mgr/cephadm/agent.py
--- 2/src/pybind/mgr/cephadm/agent.py
+++ b/src/pybind/mgr/cephadm/agent.py
@@@ -23,10 -15,9 +15,10 @@@ from mgr_util import test_port_allocati
  from mgr_util import verify_tls_files
  import tempfile
  from cephadm.services.service_registry import service_registry
 +from cephadm.utils import get_node_proxy_status_value
  
  from urllib.error import HTTPError, URLError
- from typing import Any, Dict, List, Set, TYPE_CHECKING, Optional, MutableMapping, IO
+ from typing import Any, Dict, List, Set, TYPE_CHECKING, Optional, MutableMapping, IO, Tuple
  
  if TYPE_CHECKING:
      from cephadm.module import CephadmOrchestrator

diff --cc src/pybind/mgr/dashboard/module.py
Simple merge

diff --cc src/pybind/mgr/dashboard/services/auth/auth.py
Simple merge

diff --cc src/pybind/mgr/dashboard/tools.py
Simple merge

diff --cc src/pybind/mgr/prometheus/module.py
Simple merge