grafana-builder: fix latencyPanelNativeHistogram to work with 100th quantile

Author: juliusmh

grafana-builder/grafana.libsonnet

@@ -570,13 +570,13 @@ local utils = import 'mixin-utils/utils.libsonnet';
             local qStr = std.toString(q);
             acc + [
               {
-                expr: utils.showNativeHistogramQuery(utils.ncHistogramQuantile('0.' + qStr, metricName, selector, multiplier=multiplier)),
+                expr: utils.showNativeHistogramQuery(utils.ncHistogramQuantile(std.format('%.2f', q / 100), metricName, selector, multiplier=multiplier)),
                 format: 'time_series',
                 legendFormat: qStr + 'th percentile',
                 refId: getNextRefId(acc),
               },
               {
-                expr: utils.showClassicHistogramQuery(utils.ncHistogramQuantile('0.' + qStr, metricName, selector, multiplier=multiplier)),
+                expr: utils.showClassicHistogramQuery(utils.ncHistogramQuantile(std.format('%.2f', q / 100), metricName, selector, multiplier=multiplier)),
                 format: 'time_series',
                 legendFormat: qStr + 'th percentile',
                 refId: getNextRefId(acc) + '_classic',

grafana-builder/test/test_native-classic-histogram.libsonnet

@@ -6,43 +6,55 @@ test.new(std.thisFile)
 + test.case.new(
   name='LatencyPanel fieldConfig',
   test=test.expect.eq(
-    actual=std.get(builder.latencyPanelNativeHistogram('request_duration_seconds', 'cluster="cluster1", job="job1"'), 'targets', []),
+    actual=std.get(builder.latencyPanelNativeHistogram('request_duration_seconds', 'cluster="cluster1", job="job1"', '1e3', [100, 99, 50]), 'targets'),
     expected=[
+      {
+        expr: '(histogram_quantile(1.00, sum (rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))) * 1e3) and on() (vector($latency_metrics) == -1)',
+        format: 'time_series',
+        legendFormat: '100th percentile',
+        refId: 'A',
+      },
+      {
+        expr: '(histogram_quantile(1.00, sum by (le) (rate(request_duration_seconds_bucket{cluster="cluster1", job="job1"}[$__rate_interval]))) * 1e3) and on() (vector($latency_metrics) == 1)',
+        format: 'time_series',
+        legendFormat: '100th percentile',
+        refId: 'A_classic',
+      },
       {
         expr: '(histogram_quantile(0.99, sum (rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))) * 1e3) and on() (vector($latency_metrics) == -1)',
         format: 'time_series',
         legendFormat: '99th percentile',
-        refId: 'A',
+        refId: 'B',
       },
       {
         expr: '(histogram_quantile(0.99, sum by (le) (rate(request_duration_seconds_bucket{cluster="cluster1", job="job1"}[$__rate_interval]))) * 1e3) and on() (vector($latency_metrics) == 1)',
         format: 'time_series',
         legendFormat: '99th percentile',
-        refId: 'A_classic',
+        refId: 'B_classic',
       },
       {
         expr: '(histogram_quantile(0.50, sum (rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))) * 1e3) and on() (vector($latency_metrics) == -1)',
         format: 'time_series',
         legendFormat: '50th percentile',
-        refId: 'B',
+        refId: 'C',
       },
       {
         expr: '(histogram_quantile(0.50, sum by (le) (rate(request_duration_seconds_bucket{cluster="cluster1", job="job1"}[$__rate_interval]))) * 1e3) and on() (vector($latency_metrics) == 1)',
         format: 'time_series',
         legendFormat: '50th percentile',
-        refId: 'B_classic',
+        refId: 'C_classic',
       },
       {
         expr: '(1e3 * sum(histogram_sum(rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))) /\nsum(histogram_count(rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval])))\n) and on() (vector($latency_metrics) == -1)',
         format: 'time_series',
         legendFormat: 'Average',
-        refId: 'C',
+        refId: 'D',
       },
       {
         expr: '(1e3 * sum(rate(request_duration_seconds_sum{cluster="cluster1", job="job1"}[$__rate_interval])) /\nsum(rate(request_duration_seconds_count{cluster="cluster1", job="job1"}[$__rate_interval]))\n) and on() (vector($latency_metrics) == 1)',
         format: 'time_series',
         legendFormat: 'Average',
-        refId: 'C_classic',
+        refId: 'D_classic',
       },
     ],
   )