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

[David Lawson]

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

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 99

=== 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 @@
 # Services, primary charms
-prometheus              cs:prometheus
+ubuntu                  cs:ubuntu
 
 # subordinates
 telegraf                cs:telegraf
 
=== 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 @@
 prometheus:
     series: {{series}}
     services:
-        prometheus:
-            charm: prometheus
-            expose: true
-            options:
-                prometheus_registration_authtoken: "testing"
-                external_url: "http://prometheus.testing.local/"
+        ubuntu:
+            charm: ubuntu
         telegraf:
             charm: telegraf
         nrpe:
             charm: nrpe
-            {% if series == "xenial" %}options:
-                swap: '-w 90% -c 75% -n OK'{% endif %}
 
     relations:
-        - ["prometheus:nrpe-external-master", "nrpe:nrpe-external-master"]
-        - ["prometheus:juju-info", "telegraf:juju-info"]
+        - ["ubuntu:juju-info", "nrpe:general-info"]
+        - ["ubuntu:juju-info", "telegraf:juju-info"]