Merge lp:~mthaddon/mojo/telegraf-swap-checks into lp:mojo/mojo-specs

Proposed by Tom Haddon on 2018-03-27
Status: Merged
Approved by: Gareth Woolridge on 2018-03-27
Approved revision: 100
Merged at revision: 100
Proposed branch: lp:~mthaddon/mojo/telegraf-swap-checks
Merge into: lp:mojo/mojo-specs
Diff against target: 14 lines (+3/-1)
1 file modified
charm-testing/telegraf/deploy (+3/-1)
To merge this branch: bzr merge lp:~mthaddon/mojo/telegraf-swap-checks
Reviewer Review Type Date Requested Status
Mojo Maintainers 2018-03-27 Pending
Review via email: mp+342181@code.launchpad.net

Commit message

Disable swap checks for telegraf charm-testing on xenial and bionic

Description of the change

Disable swap checks for telegraf charm-testing on xenial and bionic

To post a comment you must log in.

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

Change successfully merged at revision 100

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/telegraf/deploy'
2--- charm-testing/telegraf/deploy 2018-03-23 14:50:55 +0000
3+++ charm-testing/telegraf/deploy 2018-03-27 09:11:13 +0000
4@@ -7,7 +7,9 @@
5 charm: telegraf
6 nrpe:
7 charm: nrpe
8-
9+ {% if series == "xenial" or series == "bionic" %}options:
10+ procs: '-w 200 -c 250'
11+ swap: '-w 90% -c 75% -n ok'{% endif %}
12 relations:
13 - ["ubuntu:juju-info", "nrpe:general-info"]
14 - ["ubuntu:juju-info", "telegraf:juju-info"]

Subscribers

People subscribed via source and target branches

to all changes: