Added more chart generation and metric capturing for host/storage as well.