diff --git a/common-lib/CHANGELOG.md b/common-lib/CHANGELOG.md index b21d7a483..d1192bbd8 100644 --- a/common-lib/CHANGELOG.md +++ b/common-lib/CHANGELOG.md @@ -1,3 +1,6 @@ +# 0.4.3 +- [Signal] fix: No longer aggregates histogram signals after histogram_quantile() as it is pointless aggregation. Aggregation before applying histogram_quantile() is kept and works as expected. + # 0.4.2 - [Panels] Add table rows styles in requests panels. diff --git a/common-lib/common/signal/test_histogram.libsonnet b/common-lib/common/signal/test_histogram.libsonnet index f9000cc0a..a7d969c60 100644 --- a/common-lib/common/signal/test_histogram.libsonnet +++ b/common-lib/common/signal/test_histogram.libsonnet @@ -34,7 +34,7 @@ local m1 = signal.init( }, testExpression: { actual: raw.expr, - expect: 'avg by (job) (\n histogram_quantile(0.95, sum(rate(apiserver_request_duration_seconds_bucket{job="abc",job=~"$job",instance=~"$instance"}[10m])) by (le,job))\n)', + expect: 'histogram_quantile(0.95, sum(rate(apiserver_request_duration_seconds_bucket{job="abc",job=~"$job",instance=~"$instance"}[10m])) by (le,job))', }, }), }, @@ -92,11 +92,11 @@ local m1 = signal.init( testResult: test.suite({ testDefaultQuantile: { actual: customHistogram.asTarget().expr, - expect: 'avg by (job,handler) (\n histogram_quantile(0.99, sum(rate(http_request_duration_seconds_bucket{job="abc",job=~"$job",instance=~"$instance"}[10m])) by (le,job,handler))\n)', + expect: 'histogram_quantile(0.99, sum(rate(http_request_duration_seconds_bucket{job="abc",job=~"$job",instance=~"$instance"}[10m])) by (le,job,handler))', }, testCustomQuantile: { actual: customHistogram.withQuantile(quantile=0.50).asTarget().expr, - expect: 'avg by (job,handler) (\n histogram_quantile(0.50, sum(rate(http_request_duration_seconds_bucket{job="abc",job=~"$job",instance=~"$instance"}[10m])) by (le,job,handler))\n)', + expect: 'histogram_quantile(0.50, sum(rate(http_request_duration_seconds_bucket{job="abc",job=~"$job",instance=~"$instance"}[10m])) by (le,job,handler))', }, }), }, diff --git a/common-lib/common/signal/utils.libsonnet b/common-lib/common/signal/utils.libsonnet index 3102ea976..53836406c 100644 --- a/common-lib/common/signal/utils.libsonnet +++ b/common-lib/common/signal/utils.libsonnet @@ -4,7 +4,7 @@ // additional templates to wrap base expression functionTemplates:: ( - if aggLevel != 'none' && (type == 'counter' || type == 'gauge' || type == 'histogram' || type == 'info') + if aggLevel != 'none' && (type == 'counter' || type == 'gauge' || type == 'info') then [ ['%(aggFunction)s by (%(agg)s) (', ')'],