]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #60915 from Kushal-deb/fix-issue-2313279
authorAdam King <47704447+adk3798@users.noreply.github.com>
Wed, 5 Feb 2025 15:13:40 +0000 (10:13 -0500)
committerGitHub <noreply@github.com>
Wed, 5 Feb 2025 15:13:40 +0000 (10:13 -0500)
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>
1  2 
src/pybind/mgr/cephadm/services/monitoring.py

index ced3c5c2d42ba210c923b5043f2e6b46f737dac5,8cdad5e7f5d20150e0160fce4dd6cd3efed282a8..dfd9317b5229581cb0f14ca79e85547883f8794d
@@@ -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, \