Issue 12942043: Add nagios-external-master support

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 12942043: Add nagios-external-master support

Can't Edit
Can't Publish+Mail
Start Review

Created:
10 years, 8 months ago by curtis

Modified:
10 years, 8 months ago

Reviewers:
mp+180209, benji

Visibility:
Public.

Description

Add nagios-external-master support This branch merges nagios-external-master support from the stable charm to this unstable charm. Conflicts had to be resolved. in 20-functional.test and in config.yaml. https://code.launchpad.net/~sinzui/charms/precise/juju-gui/unstable-nagios/+merge/180209 (do not edit description out of merge proposal)

Patch Set 1 #

Total comments: 1

Created: 10 years, 8 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+378 lines, -1 line)			Patch
A	[revision details]	View	1 chunk	+2 lines, -0 lines	0 comments	Download
M	config.yaml	View	2 chunks	+11 lines, -1 line	0 comments	Download
A	files/nrpe-external-master/check-app-access.sh	View	1 chunk	+18 lines, -0 lines	1 comment	Download
M	metadata.yaml	View	1 chunk	+3 lines, -0 lines	0 comments	Download
M	revision	View	1 chunk	+1 line, -1 line	0 comments	Download
A	scripts/charmsupport/__init__.py	View	0 chunks	+-1 lines, --1 lines	0 comments	Download
A	scripts/charmsupport/hookenv.py	View	1 chunk	+150 lines, -0 lines	0 comments	Download
A	scripts/charmsupport/nrpe.py	View	1 chunk	+169 lines, -0 lines	0 comments	Download
A	scripts/update-nrpe.py	View	1 chunk	+14 lines, -0 lines	0 comments	Download
M	tests/20-functional.test	View	1 chunk	+11 lines, -0 lines	0 comments	Download

Messages

Total messages: 2

Expand All Messages | Collapse All Messages

benji

10 years, 8 months ago (2013-08-14 19:25:34 UTC) #2

LGTM

Thanks

https://codereview.appspot.com/12942043/diff/1/files/nrpe-external-master/che...
File files/nrpe-external-master/check-app-access.sh (right):

https://codereview.appspot.com/12942043/diff/1/files/nrpe-external-master/che...
files/nrpe-external-master/check-app-access.sh:14: exit 0
If you wanted to eliminate one side of the if, you could do 

if [[ -z "$match" ]]; then
    echo juju-gui did not return content indicating it was loading.
    exit 2
fi

I'm not sure it is an improvement, just a thought that occurred to me.

Expand All Messages | Collapse All Messages