Merge lp:~niedbalski/charms/trusty/rsyslog-forwarder-ha/fix-1594965 into lp:charms/trusty/rsyslog-forwarder-ha

[Jorge Niedbalski]

This fixes bug LP: #1594965

[lp:~niedbalski/charms/trusty/rsyslog-forwarder-ha/fix-1594965]

10. By Jorge Niedbalski on 2016-06-21

standalone template added

11. By Jorge Niedbalski on 2016-06-21

standalone template added

12. By Jorge Niedbalski on 2016-06-21

standalone template added

[Stuart Bishop (stub)]

You have merge conflict markers

Unmerged revisions

12. By Jorge Niedbalski on 2016-06-21

standalone template added

11. By Jorge Niedbalski on 2016-06-21

standalone template added

10. By Jorge Niedbalski on 2016-06-21

standalone template added

9. By Jorge Niedbalski on 2016-06-21

Fix for LP: #1594965

=== modified file 'config.yaml'
--- config.yaml	2016-04-26 17:00:59 +0000
+++ config.yaml	2016-06-21 20:50:25 +0000
@@ -6,6 +6,7 @@
   replication-mode:
     type: string
     default: fanout
+<<<<<<< TREE
     description: Possible options are 'fanout' or 'failover' fanout replicates the log messages over all the defined syslog relations, failover replicates the log messages just if the previous server is down. Failover always uses tcp for the protocol.
   nagios_context:
     default: "juju"
@@ -32,3 +33,10 @@
     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."
 
+=======
+    description: Possible options are 'fanout' or 'failover' fanout replicates the log messages over all the defined syslog relations, failover replicates the log messages just if the previous server is down.
+  rsyslog-server:
+    type: string
+    default: ""
+    description: Comma separated list of remote rsyslog servers, not managed by Juju (i.e: 10.0.0.1:514 or 10.0.0.1:514, 10.0.0.2:514)
+>>>>>>> MERGE-SOURCE

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-06-06 17:09:07 +0000
+++ hooks/hooks.py	2016-06-21 20:50:25 +0000
@@ -57,7 +57,6 @@
 LOGS_SYSTEM_FILE = '/etc/rsyslog.d/50-default.conf'
 REPLICATION_FILE = '/etc/rsyslog.d/80-rsyslog-replication.conf'
 
-
 hooks = Hooks()
 
 
@@ -122,6 +121,18 @@
             }))
 
 
+def update_standalone(rsyslog):
+    """
+    Set the current mode to standalone by using the provided rsyslog server
+    """
+    with open(REPLICATION_FILE, 'w') as fd:
+        fd.write(get_template('standalone').render(
+            **{
+                'servers': rsyslog.split(","),
+            }
+        ))
+
+
 def update_replication():
     servers = session.query(Server).all()
 
@@ -218,9 +229,18 @@
 @hooks.hook()
 def config_changed():
     update_local_logs(config_get("log-locally"))
+<<<<<<< TREE
     update_imfile(config_get("watch-files").split())
     update_replication()
     update_nrpe_config()
+=======
+
+    rsyslog_server = config_get('rsyslog-server')
+    if rsyslog_server:
+        update_standalone(rsyslog_server)
+    else:
+        update_replication()
+>>>>>>> MERGE-SOURCE
 
 
 if __name__ == "__main__":

=== added file 'templates/standalone.template'
--- templates/standalone.template	1970-01-01 00:00:00 +0000
+++ templates/standalone.template	2016-06-21 20:50:25 +0000
@@ -0,0 +1,10 @@
+{% for server in servers %}
+$ActionQueueType LinkedList   # use asynchronous processing
+$ActionQueueFileName {{ server }} # set file name, also enables disk mode
+$ActionResumeRetryCount -1    # infinite retries on insert failure
+$ActionQueueSaveOnShutdown on # save in-memory data if rsyslog shuts down
+
+# Forward everything
+*.*   @{{server}}
+
+{% endfor %}