More native histograms related utils and renaming

Makefile

@@ -41,6 +41,7 @@ lint-mixins:
 
 tests:
 	pushd . && cd ./common-lib && make vendor && make tests
+	pushd . && cd ./mixin-utils/test && make tests
 
 drone:
 	drone jsonnet --stream --source .drone/drone.jsonnet --target .drone/drone.yml --format yaml

grafana-builder/grafana.libsonnet

@@ -531,13 +531,13 @@ local utils = import 'mixin-utils/utils.libsonnet';
     },
     targets: [
       {
-        expr: utils.showClassicHistogramQuery(sumByStatus(utils.nativeClassicHistogramCountRate(metricName, selector))),
+        expr: utils.showClassicHistogramQuery(sumByStatus(utils.ncHistogramCountRate(metricName, selector))),
         format: 'time_series',
         legendFormat: '{{status}}',
         refId: 'A_classic',
       },
       {
-        expr: utils.showNativeHistogramQuery(sumByStatus(utils.nativeClassicHistogramCountRate(metricName, selector))),
+        expr: utils.showNativeHistogramQuery(sumByStatus(utils.ncHistogramCountRate(metricName, selector))),
         format: 'time_series',
         legendFormat: '{{status}}',
         refId: 'A',
@@ -583,37 +583,37 @@ local utils = import 'mixin-utils/utils.libsonnet';
     },
     targets: [
       {
-        expr: utils.showNativeHistogramQuery(utils.nativeClassicHistogramQuantile('0.99', metricName, selector, multiplier=multiplier)),
+        expr: utils.showNativeHistogramQuery(utils.ncHistogramQuantile('0.99', metricName, selector, multiplier=multiplier)),
         format: 'time_series',
         legendFormat: '99th percentile',
         refId: 'A',
       },
       {
-        expr: utils.showClassicHistogramQuery(utils.nativeClassicHistogramQuantile('0.99', metricName, selector, multiplier=multiplier)),
+        expr: utils.showClassicHistogramQuery(utils.ncHistogramQuantile('0.99', metricName, selector, multiplier=multiplier)),
         format: 'time_series',
         legendFormat: '99th percentile',
         refId: 'A_classic',
       },
       {
-        expr: utils.showNativeHistogramQuery(utils.nativeClassicHistogramQuantile('0.50', metricName, selector, multiplier=multiplier)),
+        expr: utils.showNativeHistogramQuery(utils.ncHistogramQuantile('0.50', metricName, selector, multiplier=multiplier)),
         format: 'time_series',
         legendFormat: '50th percentile',
         refId: 'B',
       },
       {
-        expr: utils.showClassicHistogramQuery(utils.nativeClassicHistogramQuantile('0.50', metricName, selector, multiplier=multiplier)),
+        expr: utils.showClassicHistogramQuery(utils.ncHistogramQuantile('0.50', metricName, selector, multiplier=multiplier)),
         format: 'time_series',
         legendFormat: '50th percentile',
         refId: 'B_classic',
       },
       {
-        expr: utils.showNativeHistogramQuery(utils.nativeClassicHistogramAverageRate(metricName, selector, multiplier=multiplier)),
+        expr: utils.showNativeHistogramQuery(utils.ncHistogramAverageRate(metricName, selector, multiplier=multiplier)),
         format: 'time_series',
         legendFormat: 'Average',
         refId: 'C',
       },
       {
-        expr: utils.showClassicHistogramQuery(utils.nativeClassicHistogramAverageRate(metricName, selector, multiplier=multiplier)),
+        expr: utils.showClassicHistogramQuery(utils.ncHistogramAverageRate(metricName, selector, multiplier=multiplier)),
         format: 'time_series',
         legendFormat: 'Average',
         refId: 'C_classic',

mixin-utils/test/.gitignore

@@ -0,0 +1,2 @@
+vendor/
+jsonnetfile.lock.json

mixin-utils/test/Makefile

@@ -0,0 +1,7 @@
+.PHONY: tests
+
+vendor jsonnetfile.lock.json: jsonnetfile.json
+	jb install
+
+tests: jsonnetfile.lock.json vendor
+	jsonnet -J vendor/ test_*.libsonnet

mixin-utils/test/jsonnetfile.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "dependencies": [
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/jsonnet-libs/testonnet.git"
+        }
+      },
+      "version": "master"
+    }
+  ],
+  "legacyImports": true
+}

mixin-utils/test/test_native-classic-histogram.libsonnet

@@ -0,0 +1,191 @@
+local utils = import '../utils.libsonnet';
+local test = import 'github.com/jsonnet-libs/testonnet/main.libsonnet';
+
+test.new(std.thisFile)
+
++ test.case.new(
+  name='Quantile defaults',
+  test=test.expect.eq(
+    actual=utils.ncHistogramQuantile('0.95', 'request_duration_seconds', 'cluster="cluster1", job="job1"'),
+    expected={
+      classic: 'histogram_quantile(0.95, sum by (le) (rate(request_duration_seconds_bucket{cluster="cluster1", job="job1"}[$__rate_interval])))',
+      native: 'histogram_quantile(0.95, sum (rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval])))',
+    },
+  )
+)
++ test.case.new(
+  name='Quantile different groups, interval, multiplier',
+  test=test.expect.eq(
+    actual=utils.ncHistogramQuantile('0.95', 'request_duration_seconds', 'cluster="cluster1", job="job1"', ['namespace', 'route'], '5m', '42'),
+    expected={
+      classic: 'histogram_quantile(0.95, sum by (le,namespace,route) (rate(request_duration_seconds_bucket{cluster="cluster1", job="job1"}[5m]))) * 42',
+      native: 'histogram_quantile(0.95, sum by (namespace,route) (rate(request_duration_seconds{cluster="cluster1", job="job1"}[5m]))) * 42',
+    },
+  )
+)
++ test.case.new(
+  name='Quantile in recording rule with different groups, interval, multiplier, rate',
+  test=test.expect.eq(
+    actual=utils.ncHistogramQuantile('0.95', 'request_duration_seconds', 'cluster="cluster1", job="job1"', ['namespace', 'route'], '5m', '42', true),
+    expected={
+      classic: 'histogram_quantile(0.95, sum by (le,namespace,route) (request_duration_seconds_bucket:sum_rate{cluster="cluster1", job="job1"})) * 42',
+      native: 'histogram_quantile(0.95, sum by (namespace,route) (request_duration_seconds:sum_rate{cluster="cluster1", job="job1"})) * 42',
+    },
+  )
+)
+
++ test.case.new(
+  name='rate of sum defaults',
+  test=test.expect.eq(
+    actual=utils.ncHistogramSumRate('request_duration_seconds', 'cluster="cluster1", job="job1"'),
+    expected={
+      classic: 'rate(request_duration_seconds_sum{cluster="cluster1", job="job1"}[$__rate_interval])',
+      native: 'histogram_sum(rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))',
+    },
+  )
+)
++ test.case.new(
+  name='rate of sum with different interval',
+  test=test.expect.eq(
+    actual=utils.ncHistogramSumRate('request_duration_seconds', 'cluster="cluster1", job="job1"', '5m'),
+    expected={
+      classic: 'rate(request_duration_seconds_sum{cluster="cluster1", job="job1"}[5m])',
+      native: 'histogram_sum(rate(request_duration_seconds{cluster="cluster1", job="job1"}[5m]))',
+    },
+  )
+)
++ test.case.new(
+  name='rate of sum in recording rule with different interval',
+  test=test.expect.eq(
+    actual=utils.ncHistogramSumRate('request_duration_seconds', 'cluster="cluster1", job="job1"', '5m', true),
+    expected={
+      classic: 'request_duration_seconds_sum:sum_rate{cluster="cluster1", job="job1"}',
+      native: 'histogram_sum(request_duration_seconds:sum_rate{cluster="cluster1", job="job1"})',
+    },
+  )
+)
+
++ test.case.new(
+  name='rate of count defaults',
+  test=test.expect.eq(
+    actual=utils.ncHistogramCountRate('request_duration_seconds', 'cluster="cluster1", job="job1"'),
+    expected={
+      classic: 'rate(request_duration_seconds_count{cluster="cluster1", job="job1"}[$__rate_interval])',
+      native: 'histogram_count(rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))',
+    },
+  )
+)
++ test.case.new(
+  name='rate of count with different interval',
+  test=test.expect.eq(
+    actual=utils.ncHistogramCountRate('request_duration_seconds', 'cluster="cluster1", job="job1"', '5m'),
+    expected={
+      classic: 'rate(request_duration_seconds_count{cluster="cluster1", job="job1"}[5m])',
+      native: 'histogram_count(rate(request_duration_seconds{cluster="cluster1", job="job1"}[5m]))',
+    },
+  )
+)
++ test.case.new(
+  name='rate of count in recording rule with different interval',
+  test=test.expect.eq(
+    actual=utils.ncHistogramCountRate('request_duration_seconds', 'cluster="cluster1", job="job1"', '5m', true),
+    expected={
+      classic: 'request_duration_seconds_count:sum_rate{cluster="cluster1", job="job1"}',
+      native: 'histogram_count(request_duration_seconds:sum_rate{cluster="cluster1", job="job1"})',
+    },
+  )
+)
+
++ test.case.new(
+  name='rate of average defaults',
+  test=test.expect.eq(
+    actual=utils.ncHistogramAverageRate('request_duration_seconds', 'cluster="cluster1", job="job1"'),
+    expected={
+      classic: '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',
+      native: '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',
+    },
+  )
+)
++ test.case.new(
+  name='rate of average with different interval, multiplier',
+  test=test.expect.eq(
+    actual=utils.ncHistogramAverageRate('request_duration_seconds', 'cluster="cluster1", job="job1"', '5m', '42'),
+    expected={
+      classic: '42 * sum(rate(request_duration_seconds_sum{cluster="cluster1", job="job1"}[5m])) /\nsum(rate(request_duration_seconds_count{cluster="cluster1", job="job1"}[5m]))\n',
+      native: '42 * sum(histogram_sum(rate(request_duration_seconds{cluster="cluster1", job="job1"}[5m]))) /\nsum(histogram_count(rate(request_duration_seconds{cluster="cluster1", job="job1"}[5m])))\n',
+    },
+  )
+)
++ test.case.new(
+  name='rate of average in recording rule with different interval, multiplier',
+  test=test.expect.eq(
+    actual=utils.ncHistogramAverageRate('request_duration_seconds', 'cluster="cluster1", job="job1"', '5m', '42', true),
+    expected={
+      classic: '42 * sum(request_duration_seconds_sum:sum_rate{cluster="cluster1", job="job1"}) /\nsum(request_duration_seconds_count:sum_rate{cluster="cluster1", job="job1"})\n',
+      native: '42 * sum(histogram_sum(request_duration_seconds:sum_rate{cluster="cluster1", job="job1"})) /\nsum(histogram_count(request_duration_seconds:sum_rate{cluster="cluster1", job="job1"}))\n',
+    },
+  )
+)
+
++ test.case.new(
+  name='histogram sum by defaults',
+  test=test.expect.eq(
+    actual=utils.ncHistogramSumBy(utils.ncHistogramCountRate('request_duration_seconds_sum', '{cluster="cluster1", job="job1"}')),
+    expected={
+      classic: 'sum (rate(request_duration_seconds_sum_count{{cluster="cluster1", job="job1"}}[$__rate_interval]))',
+      native: 'sum (histogram_count(rate(request_duration_seconds_sum{{cluster="cluster1", job="job1"}}[$__rate_interval])))',
+    },
+  )
+)
++ test.case.new(
+  name='histogram sum by with different labels and multiplier',
+  test=test.expect.eq(
+    actual=utils.ncHistogramSumBy(utils.ncHistogramCountRate('request_duration_seconds_sum', '{cluster="cluster1", job="job1"}'), ['namespace', 'route'], '42'),
+    expected={
+      classic: 'sum by (namespace, route) (rate(request_duration_seconds_sum_count{{cluster="cluster1", job="job1"}}[$__rate_interval])) * 42',
+      native: 'sum by (namespace, route) (histogram_count(rate(request_duration_seconds_sum{{cluster="cluster1", job="job1"}}[$__rate_interval]))) * 42',
+    },
+  )
+)
+
++ test.case.new(
+  name='histogram le rate defaults and le is float',
+  test=test.expect.eq(
+    actual=utils.ncHistogramLeRate('request_duration_seconds', 'cluster="cluster1", job="job1"', '0.1'),
+    expected={
+      classic: 'rate(request_duration_seconds_bucket{cluster="cluster1", job="job1", le=~"0.1"}[$__rate_interval])',
+      native: 'histogram_fraction(0, 0.1, rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))*histogram_count(rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))',
+    },
+  )
+)
++ test.case.new(
+  name='histogram le rate defaults and le is whole',
+  test=test.expect.eq(
+    actual=utils.ncHistogramLeRate('request_duration_seconds', 'cluster="cluster1", job="job1"', '10'),
+    expected={
+      classic: 'rate(request_duration_seconds_bucket{cluster="cluster1", job="job1", le=~"10|10\\\\.0"}[$__rate_interval])',
+      native: 'histogram_fraction(0, 10.0, rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))*histogram_count(rate(request_duration_seconds{cluster="cluster1", job="job1"}[$__rate_interval]))',
+    },
+  )
+)
++ test.case.new(
+  name='histogram le rate defaults and le is float with different interval',
+  test=test.expect.eq(
+    actual=utils.ncHistogramLeRate('request_duration_seconds', 'cluster="cluster1", job="job1"', '0.1', '5m'),
+    expected={
+      classic: 'rate(request_duration_seconds_bucket{cluster="cluster1", job="job1", le=~"0.1"}[5m])',
+      native: 'histogram_fraction(0, 0.1, rate(request_duration_seconds{cluster="cluster1", job="job1"}[5m]))*histogram_count(rate(request_duration_seconds{cluster="cluster1", job="job1"}[5m]))',
+    },
+  )
+)
+
++ test.case.new(
+  name='commenting histogram query',
+  test=test.expect.eq(
+    actual=utils.ncHistogramComment({ classic: 'classic_query', native: 'native_query' }, 'comment\n'),
+    expected={
+      classic: 'comment\nclassic_query\n',
+      native: 'comment\nnative_query\n',
+    },
+  )
+)