Skip to content

Commit 4ffc0de

Browse files
committed
mgr/cephadm: adding description to hashed dependencies for debugging
Added brief descriptions to credential dependencies to improve readability of debug logs. Signed-off-by: Redouane Kachach <[email protected]>
1 parent 3dea1b5 commit 4ffc0de

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/pybind/mgr/cephadm/services/monitoring.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def get_dependencies(cls, mgr: "CephadmOrchestrator",
113113
# in case security is enabled we have to reconfig when prom user/pass changes
114114
prometheus_user, prometheus_password = mgr._get_prometheus_credentials()
115115
if security_enabled and prometheus_user and prometheus_password:
116-
deps.append(f'{utils.md5_hash(prometheus_user + prometheus_password)}')
116+
deps.append(f'cred:{utils.md5_hash(prometheus_user + prometheus_password)}')
117117

118118
# adding a dependency for mgmt-gateway because the usage of url_prefix relies on its presence.
119119
# another dependency is added for oauth-proxy as Grafana login is delegated to this service when enabled.
@@ -314,7 +314,7 @@ def get_dependencies(cls, mgr: "CephadmOrchestrator",
314314
if security_enabled:
315315
alertmanager_user, alertmanager_password = mgr._get_alertmanager_credentials()
316316
if alertmanager_user and alertmanager_password:
317-
alertmgr_cred_hash = f'{utils.md5_hash(alertmanager_user + alertmanager_password)}'
317+
alertmgr_cred_hash = f'cred:{utils.md5_hash(alertmanager_user + alertmanager_password)}'
318318
deps.append(alertmgr_cred_hash)
319319

320320
if not mgmt_gw_enabled:
@@ -661,9 +661,9 @@ def get_dependencies(cls, mgr: "CephadmOrchestrator",
661661
alertmanager_user, alertmanager_password = mgr._get_alertmanager_credentials()
662662
prometheus_user, prometheus_password = mgr._get_prometheus_credentials()
663663
if prometheus_user and prometheus_password:
664-
deps.append(f'{utils.md5_hash(prometheus_user + prometheus_password)}')
664+
deps.append(f'prom-cred:{utils.md5_hash(prometheus_user + prometheus_password)}')
665665
if alertmanager_user and alertmanager_password:
666-
deps.append(f'{utils.md5_hash(alertmanager_user + alertmanager_password)}')
666+
deps.append(f'alert-cred:{utils.md5_hash(alertmanager_user + alertmanager_password)}')
667667

668668
# Adding other services as deps (with corresponding justification):
669669
# ceph-exporter: scraping target

0 commit comments

Comments
 (0)