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

2025-02-16 18:34:52 -06:00 · 2016-02-25 15:05:20 +01:00 · 2016-02-25 15:05:20 +01:00 · 83662b5195
commit 83662b5195
parent 8750ba94c8 30f3b55baf
1 changed files with 2 additions and 1 deletions
--- a/public/app/plugins/datasource/prometheus/plugin.json
+++ b/public/app/plugins/datasource/prometheus/plugin.json
@ -4,5 +4,6 @@
  "id": "prometheus",

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