Cleaning
Added grafana support.
Merge branch 'test' into dev
merge.