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

Proposed by David Lawson
Status: Merged
Approved by: Jacek Nykis
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 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.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

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

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 99

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'charm-testing/telegraf/collect'
--- charm-testing/telegraf/collect 2018-01-23 00:30:46 +0000
+++ charm-testing/telegraf/collect 2018-03-23 14:55:54 +0000
@@ -1,5 +1,5 @@
1# Services, primary charms1# Services, primary charms
2prometheus cs:prometheus2ubuntu cs:ubuntu
33
4# subordinates4# subordinates
5telegraf cs:telegraf5telegraf cs:telegraf
66
=== modified file 'charm-testing/telegraf/deploy'
--- charm-testing/telegraf/deploy 2018-01-23 00:30:46 +0000
+++ charm-testing/telegraf/deploy 2018-03-23 14:55:54 +0000
@@ -1,19 +1,13 @@
1prometheus:1prometheus:
2 series: {{series}}2 series: {{series}}
3 services:3 services:
4 prometheus:4 ubuntu:
5 charm: prometheus5 charm: ubuntu
6 expose: true
7 options:
8 prometheus_registration_authtoken: "testing"
9 external_url: "http://prometheus.testing.local/"
10 telegraf:6 telegraf:
11 charm: telegraf7 charm: telegraf
12 nrpe:8 nrpe:
13 charm: nrpe9 charm: nrpe
14 {% if series == "xenial" %}options:
15 swap: '-w 90% -c 75% -n OK'{% endif %}
1610
17 relations:11 relations:
18 - ["prometheus:nrpe-external-master", "nrpe:nrpe-external-master"]12 - ["ubuntu:juju-info", "nrpe:general-info"]
19 - ["prometheus:juju-info", "telegraf:juju-info"]13 - ["ubuntu:juju-info", "telegraf:juju-info"]

Subscribers

People subscribed via source and target branches

to all changes: