Add support for custom Grafana Dashboards
This fixes the previous addition of this by correcting some variable usage issues that where missed in testing
This fixes the previous addition of this by correcting some variable usage issues that where missed in testing