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

public/app/plugins/datasource/prometheus/plugin.json

@@ -4,5 +4,6 @@
   "id": "prometheus",
 
   "metrics": true,
-  "annotations": true
+  "annotations": true,
+  "defaultMatchFormat": "pipe"
 }