Added hostnames to metrics

Looks like we also want metrics to be named after their hosts at the
end of the tree. Makes sense...