Merge ~pguimaraes/charm-rsyslog-forwarder-ha/+git/rsyslog-forwarder-ha-charm:master into ~rsyslog-charmers/charm-rsyslog-forwarder-ha:master

[Pedro Guimarães]

* Allows to add rsyslog servers to log forward to via config options
* Added unit tests

LP: #1812004

* Allows to add rsyslog servers to log forward to via config options
* Added unit tests

LP: #1812004

[Tom Haddon (mthaddon)]

One comment inline

review: Needs Fixing

[Chris Sanders (chris.sanders)]

One inline comment

[Tom Haddon (mthaddon)]

LGTM, thanks

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision a6557a9e7f05a5b7377464029ed49b6c5b0b2dbb

diff --git a/config.yaml b/config.yaml
index 6fd48cb..1993475 100644
--- a/config.yaml
+++ b/config.yaml
@@ -35,4 +35,10 @@ options:
     type: string
     default: "/var/log/dpkg.log /var/log/apt/history.log"
     description: "A space separated list of files to follow with rsyslog imfile and forward to the aggregator. If set to empty string no files will be watched with imfile."
-
+  forward_hosts:
+    type: string
+    default:
+    description: >
+        A comma-separated list of key=value representing hostname and 
+        ip address of servers to forward all logs to as in
+        hostname1=host_ip1,hostname2=host_ip2,hostname3=host_ip3
diff --git a/hooks/hooks.py b/hooks/hooks.py
index 16aa879..7728a8c 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -149,7 +149,18 @@ def update_fanout_replication(servers):
 
 
 def update_replication():
+    server_list = config_get('forward_hosts')
     servers = session.query(Server).all()
+    if server_list:
+        for server_pair in server_list.split(','):
+            if len(server_pair.split('=')) != 2:
+                juju_log("Wrong forward_hosts option, missing "
+                         "hostname=address format, found: {}".format(server_pair))
+                continue
+            server = Server()
+            [server.remote_unit,
+             server.private_address] = server_pair.split('=')
+            servers.append(server)
 
     if not len(servers):
         juju_log("Ready for add rsyslog relations to this forwarder")
diff --git a/tests/unit/test_basic.py b/tests/unit/test_basic.py
index 85991f8..a1a6bd1 100644
--- a/tests/unit/test_basic.py
+++ b/tests/unit/test_basic.py
@@ -185,3 +185,40 @@ class HooksTestCase(unittest.TestCase):
         fanout.assert_called_once()
 
         self.service_restart.assert_called_once_with("rsyslog")
+
+    @mock.patch("hooks.hooks.update_failover_replication")
+    @mock.patch("hooks.hooks.update_fanout_replication")
+    def test_update_replication_bad_charm_config(self, fanout, failover):
+        """rsyslog forwarding (malformed config check)"""
+
+        class DummyServer(object):
+            @classmethod
+            def all(self, *args, **kwargs):
+                return [{}, {}]
+
+        self.session.query.return_value = DummyServer()
+        self.config_get.return_value = 'wrong format'
+
+        hooks.update_replication()
+        args, kwargs = self.juju_log.call_args
+        assert "found: wrong format" in args[0]
+
+    @mock.patch("hooks.hooks.Server")
+    @mock.patch("hooks.hooks.update_failover_replication")
+    @mock.patch("hooks.hooks.update_fanout_replication")
+    def test_update_replication_good_charm_config(self, fanout, failover, Server):
+        """rsyslog forwarding (valid config options)"""
+
+        class DummyServer(object):
+            @classmethod
+            def all(self, *args, **kwargs):
+                return [{}, {}]
+
+        self.session.query.return_value = DummyServer()
+        self.config_get.return_value = \
+            'hostname1=host_ip1,hostname2=host_ip2,hostname3=host_ip3'
+
+        hooks.update_replication()
+        self.assertEqual(Server.mock_calls, [
+            mock.call(), mock.call(), mock.call()
+        ])