Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard
2016-03-31 06:24:04 -07:00
@@ -1,7 +1,7 @@
# CloudWatch Datasource - Native Plugin
# Prometheus Datasource - Native Plugin
Grafana ships with **built in** support for Prometheus, the open-source service monitoring system and time series database.
Read more about it here:
[http://docs.grafana.org/datasources/prometheus/](http://docs.grafana.org/datasources/prometheus/)
[http://docs.grafana.org/datasources/prometheus/](http://docs.grafana.org/datasources/prometheus/)