diff --git a/cortex-mixin/dashboards/writes.libsonnet b/cortex-mixin/dashboards/writes.libsonnet index 22634d1b..4b7f0508 100644 --- a/cortex-mixin/dashboards/writes.libsonnet +++ b/cortex-mixin/dashboards/writes.libsonnet @@ -56,11 +56,11 @@ local utils = import 'mixin-utils/utils.libsonnet'; $.row('KV Store (HA Dedupe)') .addPanel( $.panel('QPS') + - $.qpsPanel('cortex_kv_request_duration_seconds_count{%s, kv_name="distributor-hatracker"}' % $.jobMatcher($._config.job_names.distributor)) + $.qpsPanel('cortex_kv_request_duration_seconds_count{%s}' % $.jobMatcher($._config.job_names.distributor)) ) .addPanel( $.panel('Latency') + - utils.latencyRecordingRulePanel('cortex_kv_request_duration_seconds', $.jobSelector($._config.job_names.distributor) + [utils.selector.eq('kv_name', 'distributor-hatracker')]) + utils.latencyRecordingRulePanel('cortex_kv_request_duration_seconds', $.jobSelector($._config.job_names.distributor)) ) ) .addRow( @@ -78,11 +78,11 @@ local utils = import 'mixin-utils/utils.libsonnet'; $.row('KV Store (Ring)') .addPanel( $.panel('QPS') + - $.qpsPanel('cortex_kv_request_duration_seconds_count{%s, kv_name="ingester-lifecycler"}' % $.jobMatcher($._config.job_names.ingester)) + $.qpsPanel('cortex_kv_request_duration_seconds_count{%s}' % $.jobMatcher($._config.job_names.ingester)) ) .addPanel( $.panel('Latency') + - utils.latencyRecordingRulePanel('cortex_kv_request_duration_seconds', $.jobSelector($._config.job_names.ingester) + [utils.selector.eq('kv_name', 'ingester-lifecycler')]) + utils.latencyRecordingRulePanel('cortex_kv_request_duration_seconds', $.jobSelector($._config.job_names.ingester)) ) ) .addRowIf( diff --git a/cortex-mixin/recording_rules.libsonnet b/cortex-mixin/recording_rules.libsonnet index 84cfc01d..73bdbcac 100644 --- a/cortex-mixin/recording_rules.libsonnet +++ b/cortex-mixin/recording_rules.libsonnet @@ -29,7 +29,7 @@ local utils = import 'mixin-utils/utils.libsonnet'; utils.histogramRules('cortex_chunk_store_chunks_per_query', ['cluster', 'job']) + utils.histogramRules('cortex_database_request_duration_seconds', ['cluster', 'job', 'method']) + utils.histogramRules('cortex_gcs_request_duration_seconds', ['cluster', 'job', 'operation']) + - utils.histogramRules('cortex_kv_request_duration_seconds', ['cluster', 'job', 'kv_name']), + utils.histogramRules('cortex_kv_request_duration_seconds', ['cluster', 'job']), }, { name: 'cortex_queries',