Merge lp:~niedbalski/charms/precise/rsyslog-forwarder/lp-1323627 into lp:charms/rsyslog-forwarder

[Jorge Niedbalski]

Fixes bug LP:1323627 reported by @stub

[Jorge Niedbalski (niedbalski)]

Tested on local, openstack providers.

[Jorge Niedbalski (niedbalski)]

environment: local
machines:
  "0":
    agent-state: started
    agent-version: 1.19.1.1
    dns-name: localhost
    instance-id: localhost
    series: trusty
    state-server-member-status: has-vote
  "1":
    agent-state: started
    agent-version: 1.19.1.1
    dns-name: 10.0.3.15
    instance-id: niedbalski-local-machine-1
    series: precise
    hardware: arch=amd64
  "2":
    agent-state: started
    agent-version: 1.19.1.1
    dns-name: 10.0.3.32
    instance-id: niedbalski-local-machine-2
    series: precise
    hardware: arch=amd64
services:
  mysql:
    charm: cs:precise/mysql-45
    exposed: false
    relations:
      cluster:
      - mysql
      juju-info:
      - rsyslog-forwarder
    units:
      mysql/0:
        agent-state: started
        agent-version: 1.19.1.1
        machine: "1"
        public-address: 10.0.3.15
        subordinates:
          rsyslog-forwarder/0:
            upgrading-from: local:precise/rsyslog-forwarder-10
            agent-state: started
            agent-version: 1.19.1.1
            public-address: 10.0.3.15
  rsyslog:
    charm: cs:precise/rsyslog-3
    exposed: false
    relations:
      aggregator:
      - rsyslog-forwarder
    units:
      rsyslog/0:
        agent-state: started
        agent-version: 1.19.1.1
        machine: "2"
        open-ports:
        - 514/tcp
        - 514/udp
        public-address: 10.0.3.32
  rsyslog-forwarder:
    charm: local:precise/rsyslog-forwarder-10
    exposed: false
    relations:
      juju-info:
      - mysql
      syslog:
      - rsyslog
    subordinate-to:
    - mysql

Then i sent a message using logger on mysql/0

logger -p local0.error Testing message

Received message on rsyslog/0:

Jun 3 11:11:51 niedbalski-local-machine-1 ubuntu: Testing message

[Stuart Bishop (stub)]

This looks good.

review: Approve

[Charles Butler (lazypower)]

I've deployed this without issue. Seems that moving from TCP to UDP is a fairly straight forward change. +1 LGTM

review: Approve (cr + deploy)

=== modified file 'files/forwarder.template'
--- files/forwarder.template	2012-10-25 16:57:04 +0000
+++ files/forwarder.template	2014-06-03 15:07:49 +0000
@@ -4,4 +4,4 @@
 $ActionQueueSaveOnShutdown on # save in-memory data if rsyslog shuts down
 
 # Forward everything
-*.*       @@server@@:10514
+*.*       @@server@@:514

=== modified file 'hooks/syslog-relation-joined'
--- hooks/syslog-relation-joined	2013-01-25 15:49:07 +0000
+++ hooks/syslog-relation-joined	2014-06-03 15:07:49 +0000
@@ -6,7 +6,7 @@
 
 [ -f /etc/rsyslog.d/50-default.conf ] && mv -f /etc/rsyslog.d/50-default.conf{,.off}
 
-sed -e "s/@@server@@/@@`relation-get private-address`/g;
+sed -e "s/@@server@@/@`relation-get private-address`/g;
         s/@@service@@/$rservice/g" \
  files/forwarder.template > /etc/rsyslog.d/80-$JUJU_RELATION_ID.conf