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

Proposed by Jorge Niedbalski
Status: Merged
Approved by: Stuart Bishop
Approved revision: 9
Merged at revision: 9
Proposed branch: lp://qastaging/~niedbalski/charms/precise/rsyslog-forwarder/lp-1323627
Merge into: lp://qastaging/charms/rsyslog-forwarder
Diff against target: 21 lines (+2/-2)
2 files modified
files/forwarder.template (+1/-1)
hooks/syslog-relation-joined (+1/-1)
To merge this branch: bzr merge lp://qastaging/~niedbalski/charms/precise/rsyslog-forwarder/lp-1323627
Reviewer Review Type Date Requested Status
Charles Butler (community) cr + deploy Approve
Stuart Bishop (community) Approve
Review via email: mp+221903@code.qastaging.launchpad.net

Description of the change

Fixes bug LP:1323627 reported by @stub

To post a comment you must log in.
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

Tested on local, openstack providers.

Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

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

Revision history for this message
Stuart Bishop (stub) wrote :

This looks good.

review: Approve
Revision history for this message
Charles Butler (lazypower) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: