diff --git a/envoy-mixin/dashboards.libsonnet b/envoy-mixin/dashboards.libsonnet index 71fffb8f7..06bed9f91 100644 --- a/envoy-mixin/dashboards.libsonnet +++ b/envoy-mixin/dashboards.libsonnet @@ -134,7 +134,6 @@ local template = import 'grafonnet/template.libsonnet'; { expr: 'sum by (status) (label_replace(rate(' + selector + '[$__rate_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 index 3d51192ff..d58b51ec4 100644 --- a/grafana-builder/grafana.libsonnet +++ b/grafana-builder/grafana.libsonnet @@ -289,7 +289,6 @@ legendLink: legendLink, expr: ql.q, format: 'time_series', - intervalFactor: 2, legendFormat: ql.l, } for ql in qsandls @@ -305,7 +304,6 @@ expr: query, format: 'time_series', instant: true, - intervalFactor: 2, refId: 'A', }, ], @@ -368,7 +366,6 @@ expr: qs[i], format: 'table', instant: true, - intervalFactor: 2, legendFormat: '', refId: std.char(65 + i), } @@ -445,7 +442,6 @@ "status", "${1}", "%s", "([a-zA-Z]+)")) ||| % [selector, statusLabelName, statusLabelName], format: 'time_series', - intervalFactor: 2, legendFormat: '{{status}}', refId: 'A', }, @@ -458,21 +454,18 @@ { 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', }, { 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', }, { 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', }, diff --git a/jaeger-mixin/dashboards.libsonnet b/jaeger-mixin/dashboards.libsonnet index 200c52a0d..cf8390521 100644 --- a/jaeger-mixin/dashboards.libsonnet +++ b/jaeger-mixin/dashboards.libsonnet @@ -10,7 +10,6 @@ local g = (import 'grafana-builder/grafana.libsonnet') + { { expr: expr(selectorErr), format: 'time_series', - intervalFactor: 2, legendFormat: 'error', refId: 'A', step: 10, @@ -18,7 +17,6 @@ local g = (import 'grafana-builder/grafana.libsonnet') + { { 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 index 2e94e3d26..8113a9890 100644 --- 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,