Use FQDN instead of short hostname in all metrics

Change-Id: Ibf1b8888e4dec32ab563e7a6845266fc7c53fa45