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 Mergebot (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 Mergebot (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
1=== added directory 'charm-testing/juju-introspection-proxy'
2=== added file 'charm-testing/juju-introspection-proxy/collect'
3--- charm-testing/juju-introspection-proxy/collect 1970-01-01 00:00:00 +0000
4+++ charm-testing/juju-introspection-proxy/collect 2018-07-19 16:51:56 +0000
5@@ -0,0 +1,3 @@
6+ubuntu cs:ubuntu
7+juju-introspection-proxy cs:~juju-introspection-proxy-charmers/juju-introspection-proxy;channel=edge
8+nrpe cs:nrpe
9
10=== added file 'charm-testing/juju-introspection-proxy/deploy'
11--- charm-testing/juju-introspection-proxy/deploy 1970-01-01 00:00:00 +0000
12+++ charm-testing/juju-introspection-proxy/deploy 2018-07-19 16:51:56 +0000
13@@ -0,0 +1,20 @@
14+juju-introspection-proxy:
15+ series: {{series}}
16+ services:
17+ ubuntu:
18+ charm: ubuntu
19+ juju-introspection-proxy:
20+ charm: juju-introspection-proxy
21+ expose: true
22+ options:
23+ port: 19091
24+ nrpe:
25+ charm: nrpe
26+{%- if series != "trusty" %}
27+ options:
28+ procs: '-w 200 -c 250 -k'
29+ swap: '-w 90% -c 75% -n ok'
30+{%- endif %}
31+ relations:
32+ - ["ubuntu", "juju-introspection-proxy"]
33+ - ["ubuntu", "nrpe"]
34
35=== added symlink 'charm-testing/juju-introspection-proxy/helpers'
36=== target is u'../prometheus2/helpers'
37=== added file 'charm-testing/juju-introspection-proxy/post-deploy'
38--- charm-testing/juju-introspection-proxy/post-deploy 1970-01-01 00:00:00 +0000
39+++ charm-testing/juju-introspection-proxy/post-deploy 2018-07-19 16:51:56 +0000
40@@ -0,0 +1,19 @@
41+#!/bin/bash
42+
43+. "$(dirname $0)/helpers"
44+
45+##################################
46+# juju-introspection-proxy verification
47+##################################
48+for UNIT in $(get_units juju-introspection-proxy); do
49+ echo -e "####\n# Calling unit to ensure it returns metrics"
50+ curl -f -s -S -v http://${UNIT}:19091/metrics |grep ^juju_
51+ if [ $? -ne 0 ]; then
52+ fail
53+ fi
54+done
55+
56+# If we are here it means all checks passed
57+echo "#####################"
58+echo "# E2E Checks Passed #"
59+echo "#####################"

Subscribers

People subscribed via source and target branches

to all changes: