Change up how we deal with hostnames and urls to be consistent with infr...

...a-monitoring/nagios.