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

Proposed by Jacek Nykis
Status: Merged
Approved by: Alexandre Gomes
Approved revision: no longer in the source branch.
Merged at revision: 120
Proposed branch: lp:~jacekn/mojo/mojo-specs
Merge into: lp:mojo/mojo-specs
Diff against target: 59 lines (+42/-0)
3 files modified
charm-testing/juju-introspection-proxy/collect (+3/-0)
charm-testing/juju-introspection-proxy/deploy (+20/-0)
charm-testing/juju-introspection-proxy/post-deploy (+19/-0)
To merge this branch: bzr merge lp:~jacekn/mojo/mojo-specs
Reviewer Review Type Date Requested Status
Mojo Maintainers Pending
Review via email: mp+349983@code.launchpad.net

Commit message

Add juju-introspection-proxy charm testing stage

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (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 Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 120

lp:~jacekn/mojo/mojo-specs updated
120. By Jacek Nykis

Add juju-introspection-proxy charm testing stage

Reviewed-on: https://code.launchpad.net/~jacekn/mojo/mojo-specs/+merge/349983
Reviewed-by: Alexandre Gomes <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'charm-testing/juju-introspection-proxy'
=== added file 'charm-testing/juju-introspection-proxy/collect'
--- charm-testing/juju-introspection-proxy/collect 1970-01-01 00:00:00 +0000
+++ charm-testing/juju-introspection-proxy/collect 2018-07-19 16:51:56 +0000
@@ -0,0 +1,3 @@
1ubuntu cs:ubuntu
2juju-introspection-proxy cs:~juju-introspection-proxy-charmers/juju-introspection-proxy;channel=edge
3nrpe cs:nrpe
04
=== added file 'charm-testing/juju-introspection-proxy/deploy'
--- charm-testing/juju-introspection-proxy/deploy 1970-01-01 00:00:00 +0000
+++ charm-testing/juju-introspection-proxy/deploy 2018-07-19 16:51:56 +0000
@@ -0,0 +1,20 @@
1juju-introspection-proxy:
2 series: {{series}}
3 services:
4 ubuntu:
5 charm: ubuntu
6 juju-introspection-proxy:
7 charm: juju-introspection-proxy
8 expose: true
9 options:
10 port: 19091
11 nrpe:
12 charm: nrpe
13{%- if series != "trusty" %}
14 options:
15 procs: '-w 200 -c 250 -k'
16 swap: '-w 90% -c 75% -n ok'
17{%- endif %}
18 relations:
19 - ["ubuntu", "juju-introspection-proxy"]
20 - ["ubuntu", "nrpe"]
021
=== added symlink 'charm-testing/juju-introspection-proxy/helpers'
=== target is u'../prometheus2/helpers'
=== added file 'charm-testing/juju-introspection-proxy/post-deploy'
--- charm-testing/juju-introspection-proxy/post-deploy 1970-01-01 00:00:00 +0000
+++ charm-testing/juju-introspection-proxy/post-deploy 2018-07-19 16:51:56 +0000
@@ -0,0 +1,19 @@
1#!/bin/bash
2
3. "$(dirname $0)/helpers"
4
5##################################
6# juju-introspection-proxy verification
7##################################
8for UNIT in $(get_units juju-introspection-proxy); do
9 echo -e "####\n# Calling unit to ensure it returns metrics"
10 curl -f -s -S -v http://${UNIT}:19091/metrics |grep ^juju_
11 if [ $? -ne 0 ]; then
12 fail
13 fi
14done
15
16# If we are here it means all checks passed
17echo "#####################"
18echo "# E2E Checks Passed #"
19echo "#####################"

Subscribers

People subscribed via source and target branches

to all changes: