update metrics to work better with grafana

- use more folders for summations
- include machine name for some metrics