Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
* `CortexAlertmanagerInitialSyncFailed`
* [ENHANCEMENT] Add support for Azure storage in Alertmanager configuration. #381
* [ENHANCEMENT] Add support for running Alertmanager in sharding mode. #394
* [ENHANCEMENT] Allow to customize PromQL engine settings via `queryEngineConfig`. #399
* [BUGFIX] Fixed `CortexIngesterHasNotShippedBlocks` alert false positive in case an ingester instance had ingested samples in the past, then no traffic was received for a long period and then it started receiving samples again. #308
* [BUGFIX] Alertmanager: fixed `--alertmanager.cluster.peers` CLI flag passed to alertmanager when HA is enabled. #329
* [BUGFIX] Fixed `CortexInconsistentRuntimeConfig` metric. #335
Expand Down
7 changes: 6 additions & 1 deletion cortex/config.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
) else {}
),

// Shared between the Ruler and Querier
// Querier component config (shared between the ruler and querier).
queryConfig: {
'runtime-config.file': '/etc/cortex/overrides.yaml',

Expand Down Expand Up @@ -239,6 +239,11 @@
else {}
),

// PromQL query engine config (shared between all services running PromQL engine, like the ruler and querier).
queryEngineConfig: {
// Keep it even if empty, to allow downstream projects to easily configure it.
},

ringConfig: {
'consul.hostname': 'consul.%s.svc.cluster.local:8500' % $._config.namespace,
'ring.prefix': '',
Expand Down
1 change: 1 addition & 0 deletions cortex/querier.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
$._config.storageConfig +
$._config.blocksStorageConfig +
$._config.queryConfig +
$._config.queryEngineConfig +
$._config.distributorConfig +
{
target: 'querier',
Expand Down
1 change: 1 addition & 0 deletions cortex/ruler.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
$._config.storageConfig +
$._config.blocksStorageConfig +
$._config.queryConfig +
$._config.queryEngineConfig +
$._config.distributorConfig +
$._config.rulerClientConfig +
$._config.rulerLimitsConfig +
Expand Down