Juju Charms Collection
zabbix-agent package

Merge lp:~thomnico/charms/trusty/zabbix-agent/trunk into lp:~samuel-cozannet/charms/trusty/zabbix-agent/trunk

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into trunk
Proposed by Nicolas Thomas
Status: Approved
Approved by: Samuel Cozannet
Approved revision: 5
Proposed branch: lp:~thomnico/charms/trusty/zabbix-agent/trunk
Merge into: lp:~samuel-cozannet/charms/trusty/zabbix-agent/trunk
Diff against target: 11 lines (+2/-0)
1 file modified
hooks/config-changed (+2/-0)
To merge this branch: bzr merge lp:~thomnico/charms/trusty/zabbix-agent/trunk
Reviewer Review Type Date Requested Status
Samuel Cozannet Approve
Review via email: mp+292309@code.launchpad.net

Description of the change

Can you merge please (small bug fix)

To post a comment you must log in.
Revision history for this message
Samuel Cozannet (samuel-cozannet) wrote :

Hola!

Let's do this.

review: Approve
Reply

Unmerged revisions

5. By Nicolas Thomas

Add workaround for config-changed (missing directory)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/config-changed'
2--- hooks/config-changed 2014-10-07 19:33:59 +0000
3+++ hooks/config-changed 2016-04-19 17:13:22 +0000
4@@ -36,6 +36,8 @@
5 sed -i.bak.1 -e "s/^#\ HostMetadata=/HostMetadata=${METADATA}/g" \
6 /etc/zabbix/zabbix_agentd.conf
7
8+# workaround for now
9+mkdir -p /etc/zabbix/zabbix_agentd.d/
10 # Copying data
11 cp -f data/user-parameter/*.conf /etc/zabbix/zabbix_agentd.d/
12

Subscribers

People subscribed via source and target branches