From: Adam King <47704447+adk3798@users.noreply.github.com> Date: Mon, 13 Jan 2025 18:07:50 +0000 (-0500) Subject: Merge pull request #60888 from ShwetaBhosale1/fix_issue_69070_only_bind_ports_on_netw... X-Git-Tag: testing/wip-vshankar-testing-20250115.164543-debug~24 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=868c90b548360fe2ea9167cb324c800322db3a1f;p=ceph-ci.git Merge pull request #60888 from ShwetaBhosale1/fix_issue_69070_only_bind_ports_on_network_parameter_spec_for_alertmanager mgr/cephadm: Add only_bind_ports_on_network spec parameter for Alertmanager Reviewed-by: Adam King --- 868c90b548360fe2ea9167cb324c800322db3a1f diff --cc src/cephadm/cephadmlib/daemons/monitoring.py index 9a9402632b0,4820b533be0..4ba00daaefb --- a/src/cephadm/cephadmlib/daemons/monitoring.py +++ b/src/cephadm/cephadmlib/daemons/monitoring.py @@@ -86,14 -99,9 +92,9 @@@ class Monitoring(ContainerDaemonForm) ], }, 'alertmanager': { - 'image': DEFAULT_ALERTMANAGER_IMAGE, + 'image': DefaultImages.ALERTMANAGER.image_ref, 'cpus': '2', 'memory': '2GB', - 'args': [ - '--cluster.listen-address=:{}'.format( - port_map['alertmanager'][1] - ), - ], 'config-json-files': [ 'alertmanager.yml', ],