diff --git a/assets/pgbench-dashboard/queries.libsonnet b/assets/pgbench-dashboard/queries.libsonnet index 23d0a4f..aae5f3f 100644 --- a/assets/pgbench-dashboard/queries.libsonnet +++ b/assets/pgbench-dashboard/queries.libsonnet @@ -13,7 +13,7 @@ local elasticsearch = g.query.elasticsearch; + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') + elasticsearch.bucketAggs.DateHistogram.settings.withMinDocCount(0) + elasticsearch.bucketAggs.DateHistogram.settings.withTimeZone("utc") - + elasticsearch.bucketAggs.DateHistogram.settings.withTrimEdges(null), + + elasticsearch.bucketAggs.DateHistogram.settings.withTrimEdges(0), ]) + elasticsearch.withMetrics([ elasticsearch.metrics.MetricAggregationWithSettings.Sum.withField("tps") @@ -44,7 +44,7 @@ local elasticsearch = g.query.elasticsearch; + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') + elasticsearch.bucketAggs.DateHistogram.settings.withMinDocCount(0) + elasticsearch.bucketAggs.DateHistogram.settings.withTimeZone("utc") - + elasticsearch.bucketAggs.DateHistogram.settings.withTrimEdges(null) + + elasticsearch.bucketAggs.DateHistogram.settings.withTrimEdges(0) ]) + elasticsearch.withMetrics([ elasticsearch.metrics.MetricAggregationWithSettings.Average.withField("tps_incl_con_est") @@ -66,7 +66,7 @@ local elasticsearch = g.query.elasticsearch; + elasticsearch.bucketAggs.DateHistogram.settings.withInterval('auto') + elasticsearch.bucketAggs.DateHistogram.settings.withMinDocCount(0) + elasticsearch.bucketAggs.DateHistogram.settings.withTimeZone("utc") - + elasticsearch.bucketAggs.DateHistogram.settings.withTrimEdges(null) + + elasticsearch.bucketAggs.DateHistogram.settings.withTrimEdges(0) ]) + elasticsearch.withMetrics([ elasticsearch.metrics.MetricAggregationWithSettings.Average.withField("latency_ms") diff --git a/templates/General/pgbench-dashboard-v2.jsonnet b/templates/General/pgbench-dashboard-v2.jsonnet index ccc0c45..ef389db 100644 --- a/templates/General/pgbench-dashboard-v2.jsonnet +++ b/templates/General/pgbench-dashboard-v2.jsonnet @@ -28,5 +28,4 @@ g.dashboard.new('Pgbench') panels.timeSeries.avg_tps('Overall Average TPS Per Run', 'ops', queries.avg_tps.query(), { x: 12, y: 0, w: 12, h: 9 }), panels.heatmap.base('Latency Report', 'ms', queries.latency_report.query(), { x: 0, y: 9, w: 12, h: 9 }), panels.table.base('Result Summary', queries.results.query(), { x: 12, y: 9, w: 12, h: 9 }), - ])