Merge pull request grafana#85 from efritz/master

Make time_series default for prometheus format (closes grafana#84).
alanpeng · Sep 21, 2018 · 64147da · 64147da
2 parents 6458d12 + e6f9438
commit 64147da
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/grafonnet/prometheus.libsonnet b/grafonnet/prometheus.libsonnet
@@ -1,6 +1,7 @@
 {
   target(
     expr,
+    format='time_series',
     intervalFactor=2,
     legendFormat='',
     datasource=null,
@@ -9,7 +10,7 @@
   ):: {
     [if datasource != null then 'datasource']: datasource,
     expr: expr,
-    format: 'time_series',
+    format: format,
     intervalFactor: intervalFactor,
     legendFormat: legendFormat,
     [if interval != null then 'interval']: interval,

diff --git a/tests/prometheus/test.jsonnet b/tests/prometheus/test.jsonnet
@@ -11,4 +11,8 @@ local prometheus = grafana.prometheus;
     interval='1m',
     legendFormat='{{instance}}'
   ),
+  heatmap: prometheus.target(
+    'heatmap',
+    format='heatmap',
+  ),
 }
diff --git a/tests/prometheus/test_compiled.json b/tests/prometheus/test_compiled.json
@@ -13,5 +13,11 @@
       "format": "time_series",
       "intervalFactor": 2,
       "legendFormat": ""
+   },
+   "heatmap": {
+      "expr": "heatmap",
+      "format": "heatmap",
+      "intervalFactor": 2,
+      "legendFormat": ""
    }
 }