Merge lp:~axino/mojo/mojo-specs into lp:mojo/mojo-specs

Proposed by Junien Fridrick on 2018-04-20
Status: Merged
Approved by: Thomas Cuthbert on 2018-04-20
Approved revision: 104
Merged at revision: 103
Proposed branch: lp:~axino/mojo/mojo-specs
Merge into: lp:mojo/mojo-specs
Diff against target: 39 lines (+20/-1)
3 files modified
charm-testing/filebeat/collect (+1/-1)
charm-testing/squid-reverseproxy/collect (+5/-0)
charm-testing/squid-reverseproxy/deploy (+14/-0)
To merge this branch: bzr merge lp:~axino/mojo/mojo-specs
Reviewer Review Type Date Requested Status
Thomas Cuthbert 2018-04-20 Approve on 2018-04-20
Review via email: mp+343672@code.launchpad.net

Commit message

filebeat : handle charmstore namespace change | also add squid-reverseproxy

To post a comment you must log in.

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

Change has no commit message, setting status to needs review.

Thomas Cuthbert (tcuthbert) wrote :

+1

review: Approve

Change successfully merged at revision 103

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/filebeat/collect'
2--- charm-testing/filebeat/collect 2018-03-21 14:07:00 +0000
3+++ charm-testing/filebeat/collect 2018-04-20 07:04:24 +0000
4@@ -1,4 +1,4 @@
5 ubuntu cs:{{ series }}/ubuntu
6-filebeat cs:filebeat
7+filebeat cs:~filebeat-charmers/filebeat
8 elasticsearch cs:elasticsearch
9 nrpe cs:{{ series }}/nrpe
10
11=== added directory 'charm-testing/squid-reverseproxy'
12=== added file 'charm-testing/squid-reverseproxy/collect'
13--- charm-testing/squid-reverseproxy/collect 1970-01-01 00:00:00 +0000
14+++ charm-testing/squid-reverseproxy/collect 2018-04-20 07:04:24 +0000
15@@ -0,0 +1,5 @@
16+squid-reverseproxy lp:~canonical-sysadmins/canonical-is-charms/squid-reverseproxy
17+nrpe cs:{{ series }}/nrpe
18+
19+squid-reverseproxy/exec.d @
20+squid-reverseproxy/exec.d/basenode lp:~canonical-sysadmins/basenode/trunk
21
22=== added file 'charm-testing/squid-reverseproxy/deploy'
23--- charm-testing/squid-reverseproxy/deploy 1970-01-01 00:00:00 +0000
24+++ charm-testing/squid-reverseproxy/deploy 2018-04-20 07:04:24 +0000
25@@ -0,0 +1,14 @@
26+ubuntu:
27+ series: {{series}}
28+ services:
29+ squid-reverseproxy:
30+ charm: squid-reverseproxy
31+ options:
32+ cache_dir: /var/spool/squid
33+ nrpe:
34+ charm: nrpe
35+ {% if series == "xenial" or series == "bionic" %}options:
36+ procs: '-w 200 -c 250'
37+ swap: '-w 90% -c 75% -n ok'{% endif %}
38+ relations:
39+ - ['squid-reverseproxy', 'nrpe:nrpe-external-master']

Subscribers

People subscribed via source and target branches

to all changes: