]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #60888 from ShwetaBhosale1/fix_issue_69070_only_bind_ports_on_netw...
authorAdam King <47704447+adk3798@users.noreply.github.com>
Mon, 13 Jan 2025 18:07:50 +0000 (13:07 -0500)
committerGitHub <noreply@github.com>
Mon, 13 Jan 2025 18:07:50 +0000 (13:07 -0500)
mgr/cephadm: Add only_bind_ports_on_network spec parameter for Alertmanager

Reviewed-by: Adam King <adking@redhat.com>
1  2 
src/cephadm/cephadmlib/daemons/monitoring.py
src/pybind/mgr/cephadm/tests/test_services.py
src/python-common/ceph/deployment/service_spec.py

index 9a9402632b0a67c42adc2434c132de05d95a0561,4820b533be02ff7fc733f932806a3ae4895dbca5..4ba00daaefb8a1efefffb299edb72a7f22b7a35d
@@@ -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',
              ],