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

2016-02-25 15:05:20 +01:00
parent 8750ba94c8 30f3b55baf
commit 83662b5195
1 changed files with 2 additions and 1 deletions
@@ -4,5 +4,6 @@
  "id": "prometheus",

  "metrics": true,
-  "annotations": true
+  "annotations": true,
+  "defaultMatchFormat": "pipe"
 }