From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Wed, 5 Feb 2025 15:13:40 +0000 (-0500)
Subject: Merge pull request #60915 from Kushal-deb/fix-issue-2313279
X-Git-Tag: v20.0.0~250
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c2dec2e6e4f4e5c80ab85ef23db7430f3c8aa2e;p=ceph.git

Merge pull request #60915 from Kushal-deb/fix-issue-2313279

cephadm: Add pre_remove and ensure deployment values are reset and API settings are updated when  removing Prometheus or Alertmanager daemons

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

9c2dec2e6e4f4e5c80ab85ef23db7430f3c8aa2e
diff --cc src/pybind/mgr/cephadm/services/monitoring.py
index ced3c5c2d42b,8cdad5e7f5d2..dfd9317b5229
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@@ -4,9 -4,10 +4,11 @@@ import o
  import socket
  from typing import List, Any, Tuple, Dict, Optional, cast, TYPE_CHECKING
  import ipaddress
+ import time
+ import requests
  
  from mgr_module import HandleCommandResult
 +from .service_registry import register_cephadm_service
  
  from orchestrator import DaemonDescription
  from ceph.deployment.service_spec import AlertManagerSpec, GrafanaSpec, ServiceSpec, \