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

Commit e211800

Browse files
jtlisijtlisi
authored
Merge pull request #189 from grafana/20200927_add_new_endpoints
feat: add new api endpoint prefixes to dashboards
2 parents 0e83098 + 8bcc3a5 commit e211800

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

‎cortex-mixin/dashboards/reads.libsonnet‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ local utils = import 'mixin-utils/utils.libsonnet';
88
$.row('Gateway')
99
.addPanel(
1010
$.panel('QPS') +
11-
$.qpsPanel('cortex_request_duration_seconds_count{%s, route=~"api_prom_api_v1_.+"}' % $.jobMatcher($._config.job_names.gateway))
11+
$.qpsPanel('cortex_request_duration_seconds_count{%s, route=~"(prometheus|api_prom)_api_v1_.+"}' % $.jobMatcher($._config.job_names.gateway))
1212
)
1313
.addPanel(
1414
$.panel('Latency') +
15-
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.gateway) + [utils.selector.re('route', 'api_prom_api_v1_.+')])
15+
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.gateway) + [utils.selector.re('route', '(prometheus|api_prom)_api_v1_.+')])
1616
)
1717
.addPanel(
1818
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
1919
$.hiddenLegendQueryPanel(
20-
'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)], ''
20+
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"(prometheus|api_prom)_api_v1_.+"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.gateway)], ''
2121
) +
2222
{ yaxes: $.yaxes('s') }
2323
)
@@ -26,16 +26,16 @@ local utils = import 'mixin-utils/utils.libsonnet';
2626
$.row('Query Frontend')
2727
.addPanel(
2828
$.panel('QPS') +
29-
$.qpsPanel('cortex_request_duration_seconds_count{%s, route=~"api_prom_api_v1_.+"}' % $.jobMatcher($._config.job_names.query_frontend))
29+
$.qpsPanel('cortex_request_duration_seconds_count{%s, route=~"(prometheus|api_prom)_api_v1_.+"}' % $.jobMatcher($._config.job_names.query_frontend))
3030
)
3131
.addPanel(
3232
$.panel('Latency') +
33-
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.query_frontend) + [utils.selector.re('route', 'api_prom_api_v1_.+')])
33+
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.query_frontend) + [utils.selector.re('route', '(prometheus|api_prom)_api_v1_.+')])
3434
)
3535
.addPanel(
3636
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
3737
$.hiddenLegendQueryPanel(
38-
'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)], ''
38+
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"(prometheus|api_prom)_api_v1_.+"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.query_frontend)], ''
3939
) +
4040
{ yaxes: $.yaxes('s') }
4141
)
@@ -55,16 +55,16 @@ local utils = import 'mixin-utils/utils.libsonnet';
5555
$.row('Querier')
5656
.addPanel(
5757
$.panel('QPS') +
58-
$.qpsPanel('cortex_request_duration_seconds_count{%s, route=~"api_prom_api_v1_.+"}' % $.jobMatcher($._config.job_names.querier))
58+
$.qpsPanel('cortex_request_duration_seconds_count{%s, route=~"(prometheus|api_prom)_api_v1_.+"}' % $.jobMatcher($._config.job_names.querier))
5959
)
6060
.addPanel(
6161
$.panel('Latency') +
62-
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.querier) + [utils.selector.re('route', 'api_prom_api_v1_.+')])
62+
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.querier) + [utils.selector.re('route', '(prometheus|api_prom)_api_v1_.+')])
6363
)
6464
.addPanel(
6565
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
6666
$.hiddenLegendQueryPanel(
67-
'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)], ''
67+
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"(prometheus|api_prom)_api_v1_.+"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.querier)], ''
6868
) +
6969
{ yaxes: $.yaxes('s') }
7070
)

‎cortex-mixin/dashboards/writes.libsonnet‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@ local utils = import 'mixin-utils/utils.libsonnet';
2727
)
2828
.addPanel(
2929
$.panel('QPS') +
30-
$.statPanel('sum(rate(cortex_request_duration_seconds_count{%s, route="api_prom_push"}[5m]))' % $.jobMatcher($._config.job_names.gateway), format='reqps')
30+
$.statPanel('sum(rate(cortex_request_duration_seconds_count{%s, route="api_(v1|prom)_push"}[5m]))' % $.jobMatcher($._config.job_names.gateway), format='reqps')
3131
)
3232
)
3333
.addRow(
3434
$.row('Gateway')
3535
.addPanel(
3636
$.panel('QPS') +
37-
$.qpsPanel('cortex_request_duration_seconds_count{%s, route="api_prom_push"}' % $.jobMatcher($._config.job_names.gateway))
37+
$.qpsPanel('cortex_request_duration_seconds_count{%s, route="api_(v1|prom)_push"}' % $.jobMatcher($._config.job_names.gateway))
3838
)
3939
.addPanel(
4040
$.panel('Latency') +
41-
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.gateway) + [utils.selector.eq('route', 'api_prom_push')])
41+
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.gateway) + [utils.selector.eq('route', 'api_(v1|prom)_push')])
4242
)
4343
.addPanel(
4444
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
4545
$.hiddenLegendQueryPanel(
46-
'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)], ''
46+
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route="api_(v1|prom)_push"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.gateway)], ''
4747
) +
4848
{ yaxes: $.yaxes('s') }
4949
)
@@ -52,16 +52,16 @@ local utils = import 'mixin-utils/utils.libsonnet';
5252
$.row('Distributor')
5353
.addPanel(
5454
$.panel('QPS') +
55-
$.qpsPanel('cortex_request_duration_seconds_count{%s, route=~"/httpgrpc.*|api_prom_push"}' % $.jobMatcher($._config.job_names.distributor))
55+
$.qpsPanel('cortex_request_duration_seconds_count{%s, route=~"/httpgrpc.*|api_(v1|prom)_push"}' % $.jobMatcher($._config.job_names.distributor))
5656
)
5757
.addPanel(
5858
$.panel('Latency') +
59-
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.distributor) + [utils.selector.re('route', '/httpgrpc.*|api_prom_push')])
59+
utils.latencyRecordingRulePanel('cortex_request_duration_seconds', $.jobSelector($._config.job_names.distributor) + [utils.selector.re('route', '/httpgrpc.*|api_(v1|prom)_push')])
6060
)
6161
.addPanel(
6262
$.panel('Per %s p99 Latency' % $._config.per_instance_label) +
6363
$.hiddenLegendQueryPanel(
64-
'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)], ''
64+
'histogram_quantile(0.99, sum by(le, %s) (rate(cortex_request_duration_seconds_bucket{%s, route=~"/httpgrpc.*|api_(v1|prom)_push"}[$__interval])))' % [$._config.per_instance_label, $.jobMatcherEquality($._config.job_names.distributor)], ''
6565
) +
6666
{ yaxes: $.yaxes('s') }
6767
)

0 commit comments

Comments
 (0)