Don't mangle hostname from nrpe

[axinojolais]

I think the following code is buggy :

jenkins-charm/reactive/jenkins.py

Lines 265 to 270 in 734965f

	# We have to strip the nagios host context from the nagios hostname
	# since the nagios.add_check will put it back again...
	nagios_hostname = rel['nagios_hostname']
	if nagios_hostname.startswith(nagios_host_context + '-'):
	nagios_hostname = nagios_hostname[len(nagios_host_context +
	'-'):]

The charm should use the hostname as given by the relation. It shouldn't modify it.

I ran into this issue while deploying this charm, where the hostname on the generated check was mangled.
Removing the if block above fixed this problem.

[mthaddon]

Looking at https://github.com/cmars/nrpe-external-master-interface/blob/master/provides.py#L22 host_name seems to be:

if not unit:
    unit = hookenv.local_unit()
unit = unit.replace('/', '-')
context = self.get_remote('nagios_host_context', context)
host_name = self.get_remote('nagios_hostname', '%s-%s' % (context, unit))

So it looks like the interface code is prepending nagios_context into nagios_hostname. What was nagios_context set to in your case?

[axinojolais]

That was a while ago, I don't remember sorry