Mixins: draw graphs at full resolution

Remove "intervalFactor: 2", which corresponded to "Resolution 1/2" in the Grafana UI. This feature has now been dropped from the UI, and I can't see why were ever using it - why would you not want the full resolution for your panels? Left `awx-mixin/dashboards/clustertable.libsonnet` untouched because those are table queries not timeseries.
grafana · Aug 22, 2022 · f3b3d58 · f3b3d58
1 parent a2ba95a
commit f3b3d58
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 13 deletions.
diff --git a/envoy-mixin/dashboards.libsonnet b/envoy-mixin/dashboards.libsonnet
@@ -116,7 +116,6 @@ local template = import 'grafonnet/template.libsonnet';
       {
         expr: 'sum by (status) (label_replace(rate(' + selector + '[$__interval]), "status", "${1}xx", "envoy_response_code_class", "(.*)"))',
         format: 'time_series',
-        intervalFactor: 2,
         legendFormat: '{{status}}',
         refId: 'A',
         step: 10,

diff --git a/grafana-builder/grafana.libsonnet b/grafana-builder/grafana.libsonnet
@@ -248,7 +248,6 @@
         legendLink: legendLink,
         expr: ql.q,
         format: 'time_series',
-        intervalFactor: 2,
         legendFormat: ql.l,
         step: 10,
       }
@@ -265,7 +264,6 @@
         expr: query,
         format: 'time_series',
         instant: true,
-        intervalFactor: 2,
         refId: 'A',
       },
     ],
@@ -328,7 +326,6 @@
         expr: qs[i],
         format: 'table',
         instant: true,
-        intervalFactor: 2,
         legendFormat: '',
         step: 10,
         refId: std.char(65 + i),
@@ -404,7 +401,6 @@
               "status", "${1}", "%s", "([a-z]+)"))
           ||| % [selector, statusLabelName, statusLabelName],
         format: 'time_series',
-        intervalFactor: 2,
         legendFormat: '{{status}}',
         refId: 'A',
         step: 10,
@@ -418,23 +414,20 @@
       {
         expr: 'histogram_quantile(0.99, sum(rate(%s_bucket%s[$__rate_interval])) by (le)) * %s' % [metricName, selector, multiplier],
         format: 'time_series',
-        intervalFactor: 2,
         legendFormat: '99th Percentile',
         refId: 'A',
         step: 10,
       },
       {
         expr: 'histogram_quantile(0.50, sum(rate(%s_bucket%s[$__rate_interval])) by (le)) * %s' % [metricName, selector, multiplier],
         format: 'time_series',
-        intervalFactor: 2,
         legendFormat: '50th Percentile',
         refId: 'B',
         step: 10,
       },
       {
         expr: 'sum(rate(%s_sum%s[$__rate_interval])) * %s / sum(rate(%s_count%s[$__rate_interval]))' % [metricName, selector, multiplier, metricName, selector],
         format: 'time_series',
-        intervalFactor: 2,
         legendFormat: 'Average',
         refId: 'C',
         step: 10,

diff --git a/jaeger-mixin/dashboards.libsonnet b/jaeger-mixin/dashboards.libsonnet
@@ -10,15 +10,13 @@ local g = (import 'grafana-builder/grafana.libsonnet') + {
       {
         expr: expr(selectorErr),
         format: 'time_series',
-        intervalFactor: 2,
         legendFormat: 'error',
         refId: 'A',
         step: 10,
       },
       {
         expr: expr(selectorTotal) + ' - ' + expr(selectorErr),
         format: 'time_series',
-        intervalFactor: 2,
         legendFormat: 'success',
         refId: 'B',
         step: 10,

diff --git a/mixin-utils/utils.libsonnet b/mixin-utils/utils.libsonnet
@@ -66,7 +66,6 @@ local g = import 'grafana-builder/grafana.libsonnet';
             sumBy: sumByHisto,
           },
           format: 'time_series',
-          intervalFactor: 2,
           legendFormat: '%(legend)s99th Percentile' % legend,
           refId: 'A',
           step: 10,
@@ -80,7 +79,6 @@ local g = import 'grafana-builder/grafana.libsonnet';
             sumBy: sumByHisto,
           },
           format: 'time_series',
-          intervalFactor: 2,
           legendFormat: '%(legend)s50th Percentile' % legend,
           refId: 'B',
           step: 10,
@@ -94,7 +92,6 @@ local g = import 'grafana-builder/grafana.libsonnet';
             sumBy: sumBy,
           },
           format: 'time_series',
-          intervalFactor: 2,
           legendFormat: '%(legend)sAverage' % legend,
           refId: 'C',
           step: 10,