Merge lp:~axino/mojo/mojo-specs into lp:mojo/mojo-specs

[Junien F]

filebeat : handle charmstore namespace change | also add squid-reverseproxy

[🤖 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)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

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

Change has no commit message, setting status to needs review.

[Thomas Cuthbert (tcuthbert)]

+1

review: Approve

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

Change successfully merged at revision 103

=== modified file 'charm-testing/filebeat/collect'
--- charm-testing/filebeat/collect	2018-03-21 14:07:00 +0000
+++ charm-testing/filebeat/collect	2018-04-20 07:04:24 +0000
@@ -1,4 +1,4 @@
 ubuntu         cs:{{ series }}/ubuntu
-filebeat       cs:filebeat
+filebeat       cs:~filebeat-charmers/filebeat
 elasticsearch  cs:elasticsearch
 nrpe           cs:{{ series }}/nrpe

=== added directory 'charm-testing/squid-reverseproxy'
=== added file 'charm-testing/squid-reverseproxy/collect'
--- charm-testing/squid-reverseproxy/collect	1970-01-01 00:00:00 +0000
+++ charm-testing/squid-reverseproxy/collect	2018-04-20 07:04:24 +0000
@@ -0,0 +1,5 @@
+squid-reverseproxy                      lp:~canonical-sysadmins/canonical-is-charms/squid-reverseproxy
+nrpe                                    cs:{{ series }}/nrpe
+
+squid-reverseproxy/exec.d               @
+squid-reverseproxy/exec.d/basenode      lp:~canonical-sysadmins/basenode/trunk

=== added file 'charm-testing/squid-reverseproxy/deploy'
--- charm-testing/squid-reverseproxy/deploy	1970-01-01 00:00:00 +0000
+++ charm-testing/squid-reverseproxy/deploy	2018-04-20 07:04:24 +0000
@@ -0,0 +1,14 @@
+ubuntu:
+    series: {{series}}
+    services:
+        squid-reverseproxy:
+            charm: squid-reverseproxy
+            options:
+                cache_dir: /var/spool/squid
+        nrpe:
+            charm: nrpe
+            {% if series == "xenial" or series == "bionic" %}options:
+                procs: '-w 200 -c 250'
+                swap: '-w 90% -c 75% -n ok'{% endif %}
+    relations:
+        - ['squid-reverseproxy', 'nrpe:nrpe-external-master']