Merge ~blake-rouse/maas:custom-syslog-port into maas:master

[Blake Rouse]

Add ability to change the binding port of the internal syslog services that MAAS runs.

This does not expose this setting over the UI, just like the proxy setting is not exposed. This is more of an advanced configuration and really only needs to be changed if absolutely required.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b custom-syslog-port lp:~blake-rouse/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 01867cf6a86575facbb5923b9694c4be53c609eb

review: Approve

[Mike Pontillo (mpontillo)]

Looks good!

One minor nit below about a test case name.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b custom-syslog-port lp:~blake-rouse/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/3840/consoleText

diff --git a/src/maasserver/compose_preseed.py b/src/maasserver/compose_preseed.py
index 1441a85..ddab084 100644
--- a/src/maasserver/compose_preseed.py
+++ b/src/maasserver/compose_preseed.py
@@ -266,11 +266,14 @@ def get_cloud_init_reporting(request, node, token):
 
 def get_rsyslog_host_port(request, node):
     """Return the rsyslog host and port to use."""
-    syslog = Config.objects.get_config('remote_syslog')
-    if syslog:
-        return syslog
+    configs = Config.objects.get_configs(['remote_syslog', 'maas_syslog_port'])
+    if configs['remote_syslog']:
+        return configs['remote_syslog']
     else:
-        return "%s:%d" % (node.boot_cluster_ip, RSYSLOG_PORT)
+        port = configs['maas_syslog_port']
+        if not port:
+            port = RSYSLOG_PORT
+        return "%s:%d" % (node.boot_cluster_ip, port)
 
 
 def get_system_info():
diff --git a/src/maasserver/forms/settings.py b/src/maasserver/forms/settings.py
index d99152a..bef07ed 100644
--- a/src/maasserver/forms/settings.py
+++ b/src/maasserver/forms/settings.py
@@ -76,10 +76,13 @@ def make_default_osystem_field(*args, **kwargs):
     return field
 
 
-def validate_port(value):
+def validate_port(value, allow_ports=None):
     """Raise `ValidationError` when the value is set to a port number. that is
     either reserved for known services, or for MAAS services to ensure this
     doesn't break MAAS or other applications."""
+    if allow_ports and value in allow_ports:
+        # Value is in the allowed ports override.
+        return
     msg = "Unable to change port number"
     if value > 65535 or value <= 0:
         raise ValidationError(
@@ -96,6 +99,11 @@ def validate_port(value):
             "%s. Port number is reserved for MAAS services." % msg)
 
 
+def validate_syslog_port(value):
+    """A `validate_port` that allows the internal syslog port."""
+    return validate_port(value, allow_ports=[5247])
+
+
 def get_default_usable_osystem(default_osystem):
     """Return the osystem from the clusters that matches the default_osystem.
     """
@@ -121,6 +129,13 @@ def make_maas_proxy_port_field(*args, **kwargs):
         **kwargs)
 
 
+def make_maas_syslog_port_field(*args, **kwargs):
+    """Build and return the maas_syslog_port field."""
+    return forms.IntegerField(
+        validators=[validate_syslog_port],
+        **kwargs)
+
+
 def make_default_distro_series_field(*args, **kwargs):
     """Build and return the default_distro_series field."""
     default_osystem = Config.objects.get_config('default_osystem')
@@ -435,6 +450,17 @@ CONFIG_ITEMS = {
             """),
         }
     },
+    'maas_syslog_port': {
+        'default': 5247,
+        'form': make_maas_syslog_port_field,
+        'form_kwargs': {
+            'label': "Port to bind the MAAS built-in syslog (default: 5247)",
+            'required': False,
+            'help_text': (
+                "Defines the port used to bind the built-in syslog. The "
+                "default port is 5247.")
+        }
+    },
     'network_discovery': {
         'default': 'enabled',
         'form': make_network_discovery_field,
diff --git a/src/maasserver/forms/tests/test_settings.py b/src/maasserver/forms/tests/test_settings.py
index ed8368f..e459493 100644
--- a/src/maasserver/forms/tests/test_settings.py
+++ b/src/maasserver/forms/tests/test_settings.py
@@ -6,6 +6,7 @@
 __all__ = []
 
 from django import forms
+from django.core.exceptions import ValidationError
 from maasserver.forms.settings import (
     CONFIG_ITEMS,
     get_config_doc,
@@ -80,3 +81,14 @@ class TestRemoteSyslogConfigSettings(MAASServerTestCase):
     def test_wraps_ipv6(self):
         field = get_config_field('remote_syslog')
         self.assertEqual('[::ffff]:514', field.clean('::ffff'))
+
+
+class TestMAASSyslogPortConfigSettings(MAASServerTestCase):
+
+    def test_allows_port_5247(self):
+        field = get_config_field('maas_syslog_port')
+        self.assertEqual(5247, field.clean('5247'))
+
+    def test_doesnt_allow_port_5248(self):
+        field = get_config_field('maas_syslog_port')
+        self.assertRaises(ValidationError, field.clean, '5248')
diff --git a/src/maasserver/models/config.py b/src/maasserver/models/config.py
index 8551a81..1c63984 100644
--- a/src/maasserver/models/config.py
+++ b/src/maasserver/models/config.py
@@ -86,6 +86,7 @@ def get_default_config():
         'omapi_key': '',
         # Syslog settings
         'remote_syslog': None,
+        'maas_syslog_port': 5247,
         # Network discovery.
         'network_discovery': 'enabled',
         'active_discovery_interval': int(timedelta(hours=3).total_seconds()),
diff --git a/src/maasserver/preseed.py b/src/maasserver/preseed.py
index e795f96..d4a6eb8 100644
--- a/src/maasserver/preseed.py
+++ b/src/maasserver/preseed.py
@@ -753,9 +753,13 @@ def get_preseed_context(
         rack_controller=rack_controller, default_region_ip=region_ip)
     server_url = request.build_absolute_uri(reverse('machines_handler'))
     metadata_enlist_url = request.build_absolute_uri(reverse('enlist'))
-    syslog = Config.objects.get_config('remote_syslog')
+    configs = Config.objects.get_configs(['remote_syslog', 'maas_syslog_port'])
+    syslog = configs['remote_syslog']
     if not syslog:
-        syslog = '%s:%d' % (server_host, RSYSLOG_PORT)
+        syslog_port = configs['maas_syslog_port']
+        if not syslog_port:
+            syslog_port = RSYSLOG_PORT
+        syslog = '%s:%d' % (server_host, syslog_port)
     return {
         'osystem': osystem,
         'release': release,
diff --git a/src/maasserver/regiondservices/syslog.py b/src/maasserver/regiondservices/syslog.py
index 4da7bc8..6e7ff5b 100644
--- a/src/maasserver/regiondservices/syslog.py
+++ b/src/maasserver/regiondservices/syslog.py
@@ -10,6 +10,7 @@ __all__ = [
 from datetime import timedelta
 
 import attr
+from maasserver.models.config import Config
 from maasserver.models.node import RegionController
 from maasserver.routablepairs import get_routable_address_map
 from maasserver.service_monitor import service_monitor
@@ -78,7 +79,8 @@ class RegionSyslogService(TimerService):
                 # Only a region controller, no need to forward logs.
                 peers = frozenset()
 
-        return _Configuration(peers)
+        port = Config.objects.get_config('maas_syslog_port')
+        return _Configuration(port, peers)
 
     def _maybeApplyConfiguration(self, configuration):
         """Reconfigure the syslog server if the configuration changes.
@@ -116,7 +118,7 @@ class RegionSyslogService(TimerService):
                     'name': hostname,
                 }
                 for hostname, ip in configuration.peers
-            ])
+            ], port=configuration.port)
         d.addCallback(
             callOut, service_monitor.restartService, "syslog_region")
         return d
@@ -134,5 +136,8 @@ class RegionSyslogService(TimerService):
 class _Configuration:
     """Configuration for the region's syslog servers."""
 
+    # Port syslog binds to.
+    port = attr.ib(converter=int)
+
     # Addresses of peer region controller hosts.
     peers = attr.ib(converter=frozenset)
diff --git a/src/maasserver/regiondservices/tests/test_syslog.py b/src/maasserver/regiondservices/tests/test_syslog.py
index 4f35a71..2cdb0f6 100644
--- a/src/maasserver/regiondservices/tests/test_syslog.py
+++ b/src/maasserver/regiondservices/tests/test_syslog.py
@@ -6,6 +6,7 @@
 __all__ = []
 
 from crochet import wait_for
+from maasserver.models.config import Config
 from maasserver.regiondservices import syslog
 from maasserver.service_monitor import service_monitor
 from maasserver.testing.factory import factory
@@ -73,6 +74,9 @@ class TestRegionSyslogService(MAASTransactionServerTestCase):
 
     @transactional
     def make_example_configuration(self):
+        # Set the syslog port.
+        port = factory.pick_port()
+        Config.objects.set_config('maas_syslog_port', port)
         # Populate the database with example peers.
         space = factory.make_Space()
         region, addr4, addr6 = make_region_rack_with_address(space)
@@ -80,7 +84,7 @@ class TestRegionSyslogService(MAASTransactionServerTestCase):
         peer1, addr1_4, addr1_6 = make_region_rack_with_address(space)
         peer2, addr2_4, addr2_6 = make_region_rack_with_address(space)
         # Return the servers and all possible peer IP addresses.
-        return [
+        return port, [
             (peer1, sorted([IPAddress(addr1_4.ip), IPAddress(addr1_6.ip)])[0]),
             (peer2, sorted([IPAddress(addr2_4.ip), IPAddress(addr2_6.ip)])[0]),
         ]
@@ -89,7 +93,7 @@ class TestRegionSyslogService(MAASTransactionServerTestCase):
     @inlineCallbacks
     def test__tryUpdate_updates_syslog_server(self):
         service = syslog.RegionSyslogService(reactor)
-        peers = yield deferToDatabase(self.make_example_configuration)
+        port, peers = yield deferToDatabase(self.make_example_configuration)
         write_config = self.patch_autospec(syslog, "write_config")
         restartService = self.patch_autospec(service_monitor, "restartService")
         yield service._tryUpdate()
@@ -101,7 +105,7 @@ class TestRegionSyslogService(MAASTransactionServerTestCase):
                         'name': node.hostname,
                     }
                     for node, ip in peers
-                ]))))
+                ])), port=port))
         self.assertThat(restartService, MockCalledOnceWith("syslog_region"))
         # If the configuration has not changed then a second call to
         # `_tryUpdate` does not result in another call to `write_config`.
diff --git a/src/maasserver/rpc/boot.py b/src/maasserver/rpc/boot.py
index 7755761..f053b13 100644
--- a/src/maasserver/rpc/boot.py
+++ b/src/maasserver/rpc/boot.py
@@ -296,10 +296,14 @@ def get_config(
         'use_rack_proxy',
         'maas_internal_domain',
         'remote_syslog',
+        'maas_syslog_port',
     ])
 
     # Compute the syslog server.
-    log_host, log_port = local_ip, RSYSLOG_PORT
+    log_host, log_port = local_ip, (
+        configs['maas_syslog_port']
+        if configs['maas_syslog_port']
+        else RSYSLOG_PORT)
     if configs['remote_syslog']:
         log_host, log_port = splithost(configs['remote_syslog'])
         if log_port is None:
diff --git a/src/maasserver/rpc/regionservice.py b/src/maasserver/rpc/regionservice.py
index 7d2c065..41c9a74 100644
--- a/src/maasserver/rpc/regionservice.py
+++ b/src/maasserver/rpc/regionservice.py
@@ -533,6 +533,25 @@ class Region(RPCProtocol):
 
         return deferToDatabase(get_from_db)
 
+    @region.GetSyslogConfiguration.responder
+    def get_syslog_configuration(self, system_id):
+        """Get settings to use for configuring syslog.
+
+        Implementation of
+        :py:class:`~provisioningserver.rpc.region.GetSyslogConfiguration`.
+        """
+        # For consistency `system_id` is passed, but at the moment it is not
+        # used to customise the syslog configuration.
+
+        @transactional
+        def get_from_db():
+            port = Config.objects.get_config('maas_syslog_port')
+            return {
+                'port': port,
+            }
+
+        return deferToDatabase(get_from_db)
+
 
 @inlineCallbacks
 def isLoopbackURL(url):
diff --git a/src/maasserver/rpc/tests/test_boot.py b/src/maasserver/rpc/tests/test_boot.py
index 6bd23bf..29113b6 100644
--- a/src/maasserver/rpc/tests/test_boot.py
+++ b/src/maasserver/rpc/tests/test_boot.py
@@ -182,6 +182,42 @@ class TestGetConfig(MAASServerTestCase):
             "http_boot": True,
         }, config)
 
+    def test__purpose_local_uses_maas_syslog_port(self):
+        syslog_port = factory.pick_port()
+        Config.objects.set_config('maas_syslog_port', syslog_port)
+        rack_controller = factory.make_RackController()
+        local_ip = factory.make_ip_address()
+        remote_ip = factory.make_ip_address()
+        node = self.make_node_with_extra(
+            status=NODE_STATUS.DEPLOYED, netboot=False)
+        node.boot_cluster_ip = local_ip
+        node.osystem = factory.make_name('osystem')
+        node.distro_series = factory.make_name('distro_series')
+        node.save()
+        mac = node.get_boot_interface().mac_address
+        config = get_config(
+            rack_controller.system_id, local_ip, remote_ip, mac=mac,
+            query_count=7)
+        self.assertEquals({
+            "system_id": node.system_id,
+            "arch": node.split_arch()[0],
+            "subarch": node.split_arch()[1],
+            "osystem": node.osystem,
+            "release": node.distro_series,
+            "kernel": '',
+            "initrd": '',
+            "boot_dtb": '',
+            "purpose": 'local',
+            "hostname": node.hostname,
+            "domain": node.domain.name,
+            "preseed_url": ANY,
+            "fs_host": local_ip,
+            "log_host": local_ip,
+            "log_port": syslog_port,
+            "extra_opts": '',
+            "http_boot": True,
+        }, config)
+
     def test__returns_kparams_for_known_node(self):
         rack_controller = factory.make_RackController()
         local_ip = factory.make_ip_address()
diff --git a/src/maasserver/rpc/tests/test_regionservice_calls.py b/src/maasserver/rpc/tests/test_regionservice_calls.py
index 07aced1..523623f 100644
--- a/src/maasserver/rpc/tests/test_regionservice_calls.py
+++ b/src/maasserver/rpc/tests/test_regionservice_calls.py
@@ -84,6 +84,7 @@ from provisioningserver.rpc.region import (
     GetDNSConfiguration,
     GetProxies,
     GetProxyConfiguration,
+    GetSyslogConfiguration,
     GetTimeConfiguration,
     Identify,
     ListNodePowerParameters,
@@ -1430,3 +1431,30 @@ class TestRegionProtocol_GetProxyConfiguration(MAASTransactionServerTestCase):
             'allowed_cidrs': cidrs,
             'prefer_v4_proxy': prefer_v4_proxy,
         }))
+
+
+class TestRegionProtocol_GetSyslogConfiguration(MAASTransactionServerTestCase):
+
+    def test_get_proxy_configuration_is_registered(self):
+        protocol = Region()
+        responder = protocol.locateResponder(
+            GetSyslogConfiguration.commandName)
+        self.assertIsNotNone(responder)
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_returns_syslog_configuration(self):
+
+        def _db_work():
+            port = random.randint(1000, 8000)
+            Config.objects.set_config('maas_syslog_port', port)
+            return port
+
+        port = yield deferToDatabase(_db_work)
+
+        system_id = factory.make_name("id")
+        response = yield call_responder(
+            Region(), GetSyslogConfiguration, {'system_id': system_id})
+        self.assertThat(response, Equals({
+            'port': port,
+        }))
diff --git a/src/maasserver/tests/test_compose_preseed.py b/src/maasserver/tests/test_compose_preseed.py
index 4332a1a..19c6d01 100644
--- a/src/maasserver/tests/test_compose_preseed.py
+++ b/src/maasserver/tests/test_compose_preseed.py
@@ -438,6 +438,27 @@ class TestComposePreseed(MAASServerTestCase):
             remote_syslog,
             preseed['rsyslog']['remotes']['maas'])
 
+    def test_compose_preseed_uses_maas_syslog_port(self):
+        syslog_port = factory.pick_port()
+        Config.objects.set_config('maas_syslog_port', syslog_port)
+        rack_controller = factory.make_RackController(url='')
+        node = factory.make_Node(
+            interface=True, status=NODE_STATUS.COMMISSIONING)
+        nic = node.get_boot_interface()
+        nic.vlan.dhcp_on = True
+        nic.vlan.primary_rack = rack_controller
+        nic.vlan.save()
+        ip_address = factory.make_ipv4_address()
+        node.boot_cluster_ip = ip_address
+        node.save()
+        request = make_HttpRequest()
+        preseed = yaml.safe_load(
+            compose_preseed(
+                request, PRESEED_TYPE.COMMISSIONING, node))
+        self.assertEqual(
+            '%s:%d' % (ip_address, syslog_port),
+            preseed['rsyslog']['remotes']['maas'])
+
     def test_compose_preseed_for_rescue_mode_does_not_include_poweroff(self):
         rack_controller = factory.make_RackController()
         node = factory.make_Node(
diff --git a/src/maasserver/tests/test_preseed.py b/src/maasserver/tests/test_preseed.py
index d77cff7..fe8c571 100644
--- a/src/maasserver/tests/test_preseed.py
+++ b/src/maasserver/tests/test_preseed.py
@@ -470,6 +470,13 @@ class TestPreseedContext(MAASServerTestCase):
         context = get_preseed_context(make_HttpRequest())
         self.assertEquals(remote_syslog, context['syslog_host_port'])
 
+    def test_get_preseed_context_uses_maas_syslog_port(self):
+        syslog_port = factory.pick_port()
+        Config.objects.set_config('maas_syslog_port', syslog_port)
+        context = get_preseed_context(make_HttpRequest())
+        self.assertTrue(
+            context['syslog_host_port'].endswith(':%d' % syslog_port))
+
 
 class TestNodeDeprecatedPreseedContext(
         PreseedRPCMixin, BootImageHelperMixin, MAASTransactionServerTestCase):
diff --git a/src/provisioningserver/rackdservices/external.py b/src/provisioningserver/rackdservices/external.py
index 7590b54..b661409 100644
--- a/src/provisioningserver/rackdservices/external.py
+++ b/src/provisioningserver/rackdservices/external.py
@@ -33,6 +33,7 @@ from provisioningserver.rpc.region import (
     GetControllerType,
     GetDNSConfiguration,
     GetProxyConfiguration,
+    GetSyslogConfiguration,
     GetTimeConfiguration,
 )
 from provisioningserver.service_monitor import service_monitor
@@ -326,12 +327,13 @@ class RackSyslog(RackOnlyExternalService):
         d = maybeDeferred(
             self._getConfiguration,
             config.controller_type,
+            config.syslog_configuration,
             config.connections)
         d.addCallback(self._maybeApplyConfiguration)
         return d
 
     def _getConfiguration(
-            self, controller_type, connections):
+            self, controller_type, syslog_configuration, connections):
         """Return syslog server configuration.
 
         The configuration object returned is comparable with previous and
@@ -341,6 +343,7 @@ class RackSyslog(RackOnlyExternalService):
         forwarders = list(self._genRegionIps(
             connections, bracket_ipv6=True, include_name=True))
         return _SyslogConfiguration(
+            port=syslog_configuration['port'],
             forwarders=forwarders,
             is_region=controller_type["is_region"],
             is_rack=controller_type["is_rack"])
@@ -375,7 +378,8 @@ class RackSyslog(RackOnlyExternalService):
             }
             for name, ip in dict(configuration.forwarders).items()
         ]
-        syslog_config.write_config(False, forwarders=forwarders)
+        syslog_config.write_config(
+            False, forwarders=forwarders, port=configuration.port)
 
 
 class RackExternalService(TimerService):
@@ -424,11 +428,14 @@ class RackExternalService(TimerService):
             GetDNSConfiguration, system_id=client.localIdent)
         proxy_configuration = yield client(
             GetProxyConfiguration, system_id=client.localIdent)
+        syslog_configuration = yield client(
+            GetSyslogConfiguration, system_id=client.localIdent)
         return _Configuration(
             controller_type=controller_type,
             time_configuration=time_configuration,
             dns_configuration=dns_configuration,
             proxy_configuration=proxy_configuration,
+            syslog_configuration=syslog_configuration,
             connections=self._rpc_service.connections
         )
 
@@ -475,6 +482,9 @@ class _Configuration:
     # Proxy configuration for the controller.
     proxy_configuration = attr.ib(converter=dict)
 
+    # Syslog configuration for the controller.
+    syslog_configuration = attr.ib(converter=dict)
+
     # Current RPC connections for the controller.
     connections = attr.ib(converter=dict)
 
@@ -538,6 +548,9 @@ class _ProxyConfiguration:
 class _SyslogConfiguration:
     """Configuration for the rack's syslog server."""
 
+    # Port to run syslog on.
+    port = attr.ib(converter=int)
+
     # Forwards to send the logs to.
     forwarders = attr.ib(converter=frozenset)
 
diff --git a/src/provisioningserver/rackdservices/tests/test_external.py b/src/provisioningserver/rackdservices/tests/test_external.py
index cc54d83..f703d24 100644
--- a/src/provisioningserver/rackdservices/tests/test_external.py
+++ b/src/provisioningserver/rackdservices/tests/test_external.py
@@ -48,18 +48,20 @@ def prepareRegion(
         test, *, is_region=False, is_rack=True,
         servers=None, peers=None, trusted_networks=None,
         proxy_enabled=True, proxy_port=8000, proxy_allowed_cidrs=None,
-        proxy_prefer_v4_proxy=False):
+        proxy_prefer_v4_proxy=False, syslog_port=5247):
     """Set up a mock region controller.
 
     It responds to `GetControllerType`, `GetTimeConfiguration`,
-    `GetDNSConfiguration` and `GetProxyConfiguration`.
+    `GetDNSConfiguration`, `GetProxyConfiguration`, and
+    `GetSyslogConfiguration`.
 
     :return: The running RPC service, and the protocol instance.
     """
     fixture = test.useFixture(MockLiveClusterToRegionRPCFixture())
     protocol, connecting = fixture.makeEventLoop(
         region.GetControllerType, region.GetTimeConfiguration,
-        region.GetDNSConfiguration, region.GetProxyConfiguration)
+        region.GetDNSConfiguration, region.GetProxyConfiguration,
+        region.GetSyslogConfiguration)
     protocol.RegisterRackController.side_effect = always_succeed_with(
         {"system_id": factory.make_name("maas-id")})
     protocol.GetControllerType.side_effect = always_succeed_with(
@@ -80,6 +82,9 @@ def prepareRegion(
         "allowed_cidrs": proxy_allowed_cidrs,
         "prefer_v4_proxy": proxy_prefer_v4_proxy,
     })
+    protocol.GetSyslogConfiguration.side_effect = always_succeed_with({
+        "port": syslog_port,
+    })
 
     def connected(teardown):
         test.addCleanup(teardown)
@@ -706,9 +711,10 @@ class TestRackSyslog(MAASTestCase):
 
     @inlineCallbacks
     def test__getConfiguration_returns_configuration_object(self):
+        port = factory.pick_port()
         is_region, is_rack = factory.pick_bool(), factory.pick_bool()
         rpc_service, protocol = yield prepareRegion(
-            self, is_region=is_region, is_rack=is_rack)
+            self, is_region=is_region, is_rack=is_rack, syslog_port=port)
         forwarders = self.extract_regions(rpc_service)
         service, syslog = self.make_RackSyslog_ExternalService(
             rpc_service, reactor)
@@ -717,18 +723,20 @@ class TestRackSyslog(MAASTestCase):
 
         config = yield service._getConfiguration()
         observed = syslog._getConfiguration(
-            config.controller_type, config.connections)
+            config.controller_type, config.syslog_configuration,
+            config.connections)
 
         self.assertThat(observed, IsInstance(external._SyslogConfiguration))
         self.assertThat(
             observed, MatchesStructure.byEquality(
-                forwarders=forwarders,
+                port=port, forwarders=forwarders,
                 is_region=is_region, is_rack=is_rack))
 
     @inlineCallbacks
     def test__tryUpdate_updates_syslog_server(self):
         self.useFixture(MAASRootFixture())
-        rpc_service, _ = yield prepareRegion(self)
+        port = factory.pick_port()
+        rpc_service, _ = yield prepareRegion(self, syslog_port=port)
         forwarders = self.extract_regions(rpc_service)
         service, _ = self.make_RackSyslog_ExternalService(rpc_service, reactor)
 
@@ -751,7 +759,7 @@ class TestRackSyslog(MAASTestCase):
         self.assertThat(
             write_config,
             MockCalledOnceWith(
-                False, forwarders=expected_forwards))
+                False, forwarders=expected_forwards, port=port))
         self.assertThat(
             service_monitor.restartService, MockCalledOnceWith("syslog_rack"))
         # If the configuration has not changed then a second call to
@@ -760,7 +768,7 @@ class TestRackSyslog(MAASTestCase):
         self.assertThat(
             write_config,
             MockCalledOnceWith(
-                False, forwarders=expected_forwards))
+                False, forwarders=expected_forwards, port=port))
         self.assertThat(
             service_monitor.restartService, MockCalledOnceWith("syslog_rack"))
 
diff --git a/src/provisioningserver/rpc/region.py b/src/provisioningserver/rpc/region.py
index 0d31708..4492f78 100644
--- a/src/provisioningserver/rpc/region.py
+++ b/src/provisioningserver/rpc/region.py
@@ -657,3 +657,20 @@ class GetProxyConfiguration(amp.Command):
     errors = {
         NoSuchNode: b"NoSuchNode",
     }
+
+
+class GetSyslogConfiguration(amp.Command):
+    """Get settings to use for configuring syslog for a given system identifier.
+
+    :since: 2.5
+    """
+
+    arguments = [
+        (b"system_id", amp.Unicode()),
+    ]
+    response = [
+        (b"port", amp.Integer()),
+    ]
+    errors = {
+        NoSuchNode: b"NoSuchNode",
+    }
diff --git a/src/provisioningserver/syslog/config.py b/src/provisioningserver/syslog/config.py
index a90a78f..6fcec86 100644
--- a/src/provisioningserver/syslog/config.py
+++ b/src/provisioningserver/syslog/config.py
@@ -67,7 +67,7 @@ def is_config_present():
 
 
 @synchronous
-def write_config(write_local, forwarders=None):
+def write_config(write_local, forwarders=None, port=None):
     """Write the syslog configuration."""
     context = {
         'user': 'maas',
@@ -76,6 +76,7 @@ def write_config(write_local, forwarders=None):
         'work_dir': get_syslog_workdir_path(),
         'log_dir': get_syslog_log_path(),
         'write_local': write_local,
+        'port': port if port else 5247,
         'forwarders': (
             sorted(forwarders, key=itemgetter('name'))
             if forwarders is not None else []),
diff --git a/src/provisioningserver/syslog/tests/test_config.py b/src/provisioningserver/syslog/tests/test_config.py
index b45e829..e17ab05 100644
--- a/src/provisioningserver/syslog/tests/test_config.py
+++ b/src/provisioningserver/syslog/tests/test_config.py
@@ -92,6 +92,17 @@ class TestWriteConfig(MAASTestCase):
             "%s/%s" % (self.tmpdir, config.MAAS_SYSLOG_CONF_NAME),
             FileContains(matcher=MatchesAll(matcher_one, matcher_two)))
 
+    def test__udp_and_tcp_both_use_different_port(self):
+        port = factory.pick_port()
+        config.write_config(False, port=port)
+        matcher_one = Contains(
+            'input(type="imtcp" port="%d")' % port)
+        matcher_two = Contains(
+            'input(type="imudp" port="%d")' % port)
+        self.assertThat(
+            "%s/%s" % (self.tmpdir, config.MAAS_SYSLOG_CONF_NAME),
+            FileContains(matcher=MatchesAll(matcher_one, matcher_two)))
+
     def test__adds_tcp_stop(self):
         cidr = factory.make_ipv4_network()
         config.write_config([cidr])
@@ -140,6 +151,24 @@ class TestWriteConfig(MAASTestCase):
                 self.assertLinesContain(
                     'queue.filename="%s"' % host['name'], lines)
 
+    def test__forwarders_diff_port(self):
+        port = factory.pick_port()
+        forwarders = [
+            {
+                'ip': factory.make_ip_address(),
+                'name': factory.make_name('name')
+            }
+            for _ in range(3)
+        ]
+        config.write_config(False, forwarders, port=port)
+        with self.syslog_path.open() as syslog_file:
+            lines = [line.strip() for line in syslog_file.readlines()]
+            for host in forwarders:
+                self.assertLinesContain(
+                    'target="%s"' % host['ip'], lines)
+                self.assertLinesContain(
+                    'port="%d"' % port, lines)
+
     def test__write_local_and_forwarders(self):
         forwarders = [
             {
diff --git a/src/provisioningserver/templates/syslog/rsyslog.conf.template b/src/provisioningserver/templates/syslog/rsyslog.conf.template
index 8c43a19..d7a3a1d 100644
--- a/src/provisioningserver/templates/syslog/rsyslog.conf.template
+++ b/src/provisioningserver/templates/syslog/rsyslog.conf.template
@@ -4,11 +4,11 @@ input(type="imuxsock" socket="{{work_dir}}/log")
 
 # Enable tcp.
 module(load="imtcp")
-input(type="imtcp" port="5247")
+input(type="imtcp" port="{{port}}")
 
 # Enable udp.
 module(load="imudp")
-input(type="imudp" port="5247")
+input(type="imudp" port="{{port}}")
 
 # Reduce message repetition.
 $RepeatedMsgReduction on
@@ -55,7 +55,7 @@ if $syslogtag contains "maas" {
 # Forward all UDP messages to all the region controllers. TCP messages will
 # not make it to this point because of the stop above.
 {{for server in forwarders}}
-*.* action(type="omfwd" target="{{server['ip']}}" port="5247" protocol="tcp"
+*.* action(type="omfwd" target="{{server['ip']}}" port="{{port}}" protocol="tcp"
            action.resumeRetryCount="-1"
            queue.type="LinkedList" queue.filename="{{server['name']}}"
            queue.saveonshutdown="on")