Merge lp:~caio1982/capomastro/nagios-hostname-fix-1496338 into lp:~ubuntuone-hackers/capomastro/charm

[Caio Begotti]

Fix the sitename option of the charm so it's correctly used by the Nagios check, instead of having a hardcoded (legacy) hostname there.

Fix the sitename option of the charm so it's correctly used by the Nagios check, instead of having a hardcoded (legacy) hostname there.

This has been tested on Wendigo, the verify phase of the Mojo spec is happy about it too.

[Daniel Manrique (roadmr)]

Looks good to me, even though I'm not awesome with nagios. Thanks!

review: Approve

=== modified file 'hooks/nrpe-external-master-relation-changed'
--- hooks/nrpe-external-master-relation-changed	2015-02-19 00:59:50 +0000
+++ hooks/nrpe-external-master-relation-changed	2015-09-28 00:38:52 +0000
@@ -22,7 +22,7 @@
 	# check for the actual web page being available or not
 	export t_nagios_service_description="Capomastro build server"
 	export t_nagios_command_name="check_${t_nagios_context}_capomastro_app"
-	export t_nagios_command="/usr/lib/nagios/plugins/check_http -I ${private_address} -p ${port} -u / -e '302 FOUND' -u / -d 'http://capomastro/accounts/login/'"
+	export t_nagios_command="/usr/lib/nagios/plugins/check_http -I ${private_address} -p ${port} -H ${sitename} -u / -e '302 FOUND' -u / -d 'http://${sitename}/accounts/login/'"
 	
 	cheetah fill --env -p templates/nrpe_command_file.tmpl > /etc/nagios/nrpe.d/${t_nagios_command_name}.cfg
 	cheetah fill --env -p templates/nrpe_service_file.tmpl > /var/lib/nagios/export/service_${t_nagios_hostname}_${t_nagios_command_name}.cfg