Merge lp:~mthaddon/mojo/charm-testing-graylog into lp:mojo/mojo-specs

[Tom Haddon]

charm-testing/graylog: switch to default series for graylog, so we can test on other series

charm-testing/graylog: switch to default series for graylog, so we can test on other series

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

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

[Junien F (axino)]

+1

review: Approve

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

Change successfully merged at revision 159

=== modified file 'charm-testing/graylog/collect'
--- charm-testing/graylog/collect	2018-07-04 08:49:42 +0000
+++ charm-testing/graylog/collect	2020-02-21 10:07:09 +0000
@@ -4,4 +4,3 @@
 graylog                     cs:graylog
 mongodb                     cs:mongodb
 nrpe                        cs:nrpe
-nrpe-xenial                 cs:nrpe

=== modified file 'charm-testing/graylog/deploy'
--- charm-testing/graylog/deploy	2019-05-15 15:06:02 +0000
+++ charm-testing/graylog/deploy	2020-02-21 10:07:09 +0000
@@ -1,6 +1,6 @@
 # vim: set filetype=yaml sw=2:
 centralized-logging:
-  series: bionic
+  series: {{ series }}
   services:
     apache2:
       charm: apache2
@@ -22,7 +22,6 @@
         logpath: "/var/log/*.log /var/log/syslog /var/log/*/*.log /var/snap/graylog/common/log/*.log"
     graylog:
       charm: graylog
-      options:
     mongodb:
       charm: mongodb
     elasticsearch-nrpe:
@@ -43,14 +42,6 @@
         hostgroups: ci-graylog-testing
         nagios_host_context: ci-graylog-testing
         nagios_hostname_type: unit
-    nrpe-xenial:
-      charm: nrpe
-      options:
-        export_nagios_definitions: true
-        sub_postfix: ""
-        hostgroups: ci-graylog-testing
-        nagios_host_context: ci-graylog-testing
-        nagios_hostname_type: unit
   relations:
     - ['apache2:reverseproxy', 'graylog:website']
     - ['apache2', 'filebeat']
@@ -59,6 +50,6 @@
     - ['graylog', 'nrpe']
     - ['graylog', 'elasticsearch']
     - ['graylog', 'mongodb:database']
-    - ['mongodb', 'nrpe-xenial']
+    - ['mongodb', 'nrpe']
     - ['elasticsearch:juju-info', 'filebeat:beats-host']
     - ['elasticsearch', 'elasticsearch-nrpe']

=== removed file 'charm-testing/graylog/pre-deploy'