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

[Junien F]

charm-testing/filebeat : fix for bionic

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

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

[Paul Gear (paulgear)]

Makes sense

review: Approve

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

Change successfully merged at revision 101

[lp:~axino/mojo/mojo-specs]

101. By Junien F on 2018-04-03

charm-testing/filebeat : fix for bionic

Reviewed-on: https://code.launchpad.net/~axino/mojo/mojo-specs/+merge/342456
Reviewed-by: Paul Gear <email address hidden>

=== modified file 'charm-testing/filebeat/deploy'
--- charm-testing/filebeat/deploy	2018-03-21 14:07:00 +0000
+++ charm-testing/filebeat/deploy	2018-03-30 14:21:57 +0000
@@ -6,13 +6,17 @@
         filebeat:
             charm: filebeat
             options:
-                install_sources: deb http://archive.admin.canonical.com/other/packages.elastic.co stable main
-         elasticsearch:
+                install_sources: 'deb http://archive.admin.canonical.com/other/packages.elastic.co stable main'
+        elasticsearch:
             charm: elasticsearch
             series: trusty
+            num_units: 2
             options:
-                apt-key-url: http://archive.admin.canonical.com/other/artifacts.elastic.co/GPG-KEY-elasticsearch
-                apt-repository: deb http://archive.admin.canonical.com/other/artifacts.elastic.co stable main
+                apt-key-url: 'http://archive.admin.canonical.com/other/artifacts.elastic.co/GPG-KEY-elasticsearch'
+                apt-repository: 'deb http://archive.admin.canonical.com/other/artifacts.elastic.co stable main'
+        nrpe-trusty:
+            charm: nrpe
+            series: trusty
         nrpe:
             charm: nrpe
             {% if series == "xenial" or series == "bionic" %}options:
@@ -22,4 +26,4 @@
         - ['ubuntu', 'filebeat']
         - ['filebeat:elasticsearch', 'elasticsearch:client']
         - ['nrpe', 'ubuntu']
-        - ['nrpe', 'elasticsearch']
+        - ['nrpe-trusty', 'elasticsearch']
 
=== added file 'charm-testing/filebeat/post-deploy'
--- charm-testing/filebeat/post-deploy	1970-01-01 00:00:00 +0000
+++ charm-testing/filebeat/post-deploy	2018-03-30 14:21:57 +0000
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -eu
+
+TEST_MESSAGE="testfilebeatmessage"
+# filebeat doesn't process syslog by default
+# so use auth.crit instead
+TEST_FACILITY="auth.crit"
+
+echo "Starting functional testing of filebeat."
+
+# Generate a message in a file watched by filebeat
+juju ssh ubuntu/0 logger -p ${TEST_FACILITY} ${TEST_MESSAGE}
+
+# filebeat scan_frequency defaults to 10s, so sleep for 15s
+sleep 15
+
+# Check if the message made it to elasticsearch
+hits=$(juju ssh elasticsearch/0 curl -s "localhost:9200/_search?q=${TEST_MESSAGE}"|jq '.hits.total')
+if [ "$hits" != "1" ]; then
+  echo "ERROR : test message not found in elasticsearch"
+  exit 1
+else
+  echo "SUCCESS : test message found in elasticsearch"
+  exit 0
+fi
 
=== added file 'charm-testing/filebeat/pre-deploy'
--- charm-testing/filebeat/pre-deploy	1970-01-01 00:00:00 +0000
+++ charm-testing/filebeat/pre-deploy	2018-03-30 14:21:57 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+mkdir -p $MOJO_REPO_DIR/trusty
+rsync -av $MOJO_REPO_DIR/bionic/elasticsearch $MOJO_REPO_DIR/trusty/
+rsync -av $MOJO_REPO_DIR/bionic/nrpe $MOJO_REPO_DIR/trusty/