- Move `services/grafana.nix` to `services/grafana/default.nix` - Split up all data collectors into separate files under `services/grafana` - Make grafana use postgres as its database
