Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

Commit a69330e

Browse files
joe-elliottjoe-elliott
committed
Removed configurability
Signed-off-by: Joe Elliott <[email protected]>
1 parent 2d73ad2 commit a69330e

File tree

4 files changed

+13
-26
lines changed

4 files changed

+13
-26
lines changed

‎cortex-mixin/config.libsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
// Whether resources dashboards are enabled (based on cAdvisor metrics).
4444
resources_dashboards_enabled: false,
4545

46-
// If supplied adds additional panels that are broken down per instance. i.e. 'pod' in a kubernetes install
47-
per_instance_label: '',
46+
// Used on panels that show metrics per instance. i.e. 'pod' in a kubernetes install
47+
per_instance_label: 'pod',
4848
},
4949
}

‎cortex-mixin/dashboards/dashboard-utils.libsonnet‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,16 @@ local utils = import 'mixin-utils/utils.libsonnet';
3838
.addMultiTemplate('namespace', 'cortex_build_info', 'namespace'),
3939
},
4040

41-
row(title)::
42-
super.row(title) + {
43-
addPanelIf(condition, panel)::
44-
if condition
45-
then self.addPanel(panel)
46-
else self,
47-
},
48-
4941
// The mixin allow specialism of the job selector depending on if its a single binary
5042
// deployment or a namespaced one.
5143
jobMatcher(job)::
5244
if $._config.singleBinary
5345
then 'job=~"$job"'
5446
else 'cluster=~"$cluster", job=~"($namespace)/%s"' % job,
5547

48+
// jobMatcherEquality performs exact matches on cluster and namespace. Should be used on
49+
// panels that are expected to return too many series to be useful when multiplier
50+
// namespaces or clusters are selected.
5651
jobMatcherEquality(job)::
5752
if $._config.singleBinary
5853
then 'job=~"$job"'

‎cortex-mixin/dashboards/reads.libsonnet‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
1414
$.panel('Latency') +
1515
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.gateway) + [utils.selector.re('route', 'api_prom_api_v1_.+')])
1616
)
17-
.addPanelIf(
18-
$._config.per_instance_label != '',
17+
.addPanel(
1918
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
2019
$.hiddenLegendQueryPanel(
2120
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"api_prom_api_v1_.+"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.gateway)], ''
@@ -33,8 +32,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
3332
$.panel('Latency') +
3433
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.query_frontend) + [utils.selector.re('route', 'api_prom_api_v1_.+')])
3534
)
36-
.addPanelIf(
37-
$._config.per_instance_label != '',
35+
.addPanel(
3836
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
3937
$.hiddenLegendQueryPanel(
4038
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"api_prom_api_v1_.+"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.query_frontend)], ''
@@ -63,8 +61,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
6361
$.panel('Latency') +
6462
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.querier) + [utils.selector.re('route', 'api_prom_api_v1_.+')])
6563
)
66-
.addPanelIf(
67-
$._config.per_instance_label != '',
64+
.addPanel(
6865
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
6966
$.hiddenLegendQueryPanel(
7067
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"api_prom_api_v1_.+"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.querier)], ''
@@ -82,8 +79,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
8279
$.panel('Latency') +
8380
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.ingester) + [utils.selector.re('route', '/cortex.Ingester/Query(Stream)?|/cortex.Ingester/MetricsForLabelMatchers|/cortex.Ingester/LabelValues|/cortex.Ingester/MetricsMetadata')])
8481
)
85-
.addPanelIf(
86-
$._config.per_instance_label != '',
82+
.addPanel(
8783
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
8884
$.hiddenLegendQueryPanel(
8985
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"/cortex.Ingester/Query(Stream)?|/cortex.Ingester/MetricsForLabelMatchers|/cortex.Ingester/LabelValues|/cortex.Ingester/MetricsMetadata"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.ingester)], ''
@@ -102,8 +98,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
10298
$.panel('Latency') +
10399
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.store_gateway) + [utils.selector.re('route', '/gatewaypb.StoreGateway/.*')])
104100
)
105-
.addPanelIf(
106-
$._config.per_instance_label != '',
101+
.addPanel(
107102
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
108103
$.hiddenLegendQueryPanel(
109104
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"/gatewaypb.StoreGateway/.*"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.store_gateway)], ''

‎cortex-mixin/dashboards/writes.libsonnet‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
4040
$.panel('Latency') +
4141
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.gateway) + [utils.selector.eq('route', 'api_prom_push')])
4242
)
43-
.addPanelIf(
44-
$._config.per_instance_label != '',
43+
.addPanel(
4544
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
4645
$.hiddenLegendQueryPanel(
4746
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route="api_prom_push"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.gateway)], ''
@@ -59,8 +58,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
5958
$.panel('Latency') +
6059
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.distributor) + [utils.selector.re('route', '/httpgrpc.*|api_prom_push')])
6160
)
62-
.addPanelIf(
63-
$._config.per_instance_label != '',
61+
.addPanel(
6462
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
6563
$.hiddenLegendQueryPanel(
6664
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"/httpgrpc.*|api_prom_push"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.distributor)], ''
@@ -89,8 +87,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
8987
$.panel('Latency') +
9088
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.ingester) + [utils.selector.eq('route', '/cortex.Ingester/Push')])
9189
)
92-
.addPanelIf(
93-
$._config.per_instance_label != '',
90+
.addPanel(
9491
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
9592
$.hiddenLegendQueryPanel(
9693
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route="/cortex.Ingester/Push"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.ingester)], ''

0 commit comments

Comments
 (0)