Merge lp:~deej/mojo/telegraf-charm-testing into lp:mojo/mojo-specs

Proposed by David Lawson on 2018-03-23
Status: Merged
Approved by: Jacek Nykis on 2018-03-23
Approved revision: 99
Merged at revision: 99
Proposed branch: lp:~deej/mojo/telegraf-charm-testing
Merge into: lp:mojo/mojo-specs
Diff against target: 38 lines (+5/-11)
2 files modified
charm-testing/telegraf/collect (+1/-1)
charm-testing/telegraf/deploy (+4/-10)
To merge this branch: bzr merge lp:~deej/mojo/telegraf-charm-testing
Reviewer Review Type Date Requested Status
Mojo Maintainers 2018-03-23 Pending
Review via email: mp+341973@code.launchpad.net

Commit message

Update telegraf charm testing deploy to use ubuntu primary charm for simplicity's sake

Description of the change

Update telegraf charm testing deploy to use ubuntu primary charm for simplicity's sake

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 99

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/telegraf/collect'
2--- charm-testing/telegraf/collect 2018-01-23 00:30:46 +0000
3+++ charm-testing/telegraf/collect 2018-03-23 14:55:54 +0000
4@@ -1,5 +1,5 @@
5 # Services, primary charms
6-prometheus cs:prometheus
7+ubuntu cs:ubuntu
8
9 # subordinates
10 telegraf cs:telegraf
11
12=== modified file 'charm-testing/telegraf/deploy'
13--- charm-testing/telegraf/deploy 2018-01-23 00:30:46 +0000
14+++ charm-testing/telegraf/deploy 2018-03-23 14:55:54 +0000
15@@ -1,19 +1,13 @@
16 prometheus:
17 series: {{series}}
18 services:
19- prometheus:
20- charm: prometheus
21- expose: true
22- options:
23- prometheus_registration_authtoken: "testing"
24- external_url: "http://prometheus.testing.local/"
25+ ubuntu:
26+ charm: ubuntu
27 telegraf:
28 charm: telegraf
29 nrpe:
30 charm: nrpe
31- {% if series == "xenial" %}options:
32- swap: '-w 90% -c 75% -n OK'{% endif %}
33
34 relations:
35- - ["prometheus:nrpe-external-master", "nrpe:nrpe-external-master"]
36- - ["prometheus:juju-info", "telegraf:juju-info"]
37+ - ["ubuntu:juju-info", "nrpe:general-info"]
38+ - ["ubuntu:juju-info", "telegraf:juju-info"]

Subscribers

People subscribed via source and target branches

to all changes: