Merge pull request #12 from simonpasquier/fix-collectd-support

Fix collectd support and add Grafana dashboard