Skip to content

Commit

Permalink
Upstream jsonnet config used at Grafana Labs (#905)
Browse files Browse the repository at this point in the history
* Upstream jsonnet config used at Grafana Labs

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Rebuilt tests

Signed-off-by: Marco Pracucci <marco@pracucci.com>
  • Loading branch information
pracucci authored Jan 26, 2022
1 parent cad5243 commit 34cae90
Show file tree
Hide file tree
Showing 15 changed files with 136 additions and 78 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,13 @@
* `cortex_store_gateway_data_disk_class` renamed to `store_gateway_data_disk_class`
* `cortex_store_gateway_data_disk_size` renamed to `store_gateway_data_disk_size`
* [CHANGE] The overrides configmap default mountpoint has changed from `/etc/cortex` to `/etc/mimir`. It can be customized via the `overrides_configmap_mountpoint` config field. #899
* [CHANGE] Enabled in the querier the features to query label names with matchers, PromQL at modifier and query long-term storage for labels. #905
* [CHANGE] Reduced TSDB blocks retention on ingesters disk from 96h to 24h. #905
* [CHANGE] Enabled closing of idle TSDB in ingesters. #905
* [CHANGE] Disabled TSDB isolation in ingesters for better performances. #905
* [CHANGE] Changed log level of querier, query-frontend, query-scheduler and alertmanager from `debug` to `info`. #905
* [CHANGE] Enabled attributes in-memory cache in store-gateway. #905
* [CHANGE] Configured store-gateway to not load blocks containing samples more recent than 10h (because such samples are queried from ingesters). #905
* [FEATURE] Added query sharding support. It can be enabled setting `cortex_query_sharding_enabled: true` in the `_config` object. #653
* [FEATURE] Added shuffle-sharding support. It can be enabled and configured using the following config: #902
```
Expand Down
15 changes: 10 additions & 5 deletions operations/mimir-tests/test-disable-chunk-streaming-generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -836,12 +836,14 @@ spec:
- -consul.hostname=consul.default.svc.cluster.local:8500
- -distributor.health-check-ingesters=true
- -distributor.replication-factor=3
- -log.level=debug
- -mem-ballast-size-bytes=268435456
- -querier.at-modifier-enabled=true
- -querier.frontend-client.grpc-max-send-msg-size=104857600
- -querier.max-concurrent=8
- -querier.query-ingesters-within=13h
- -querier.query-label-names-with-matchers-enabled=true
- -querier.query-store-after=12h
- -querier.query-store-for-labels-enabled=true
- -querier.scheduler-address=query-scheduler-discovery.default.svc.cluster.local:9095
- -querier.worker-match-max-concurrent=true
- -ring.heartbeat-timeout=10m
Expand Down Expand Up @@ -928,7 +930,6 @@ spec:
- -frontend.results-cache.memcached.timeout=500ms
- -frontend.scheduler-address=query-scheduler-discovery.default.svc.cluster.local:9095
- -frontend.split-queries-by-interval=24h
- -log.level=debug
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc.keepalive.min-time-between-pings=10s
Expand Down Expand Up @@ -995,7 +996,6 @@ spec:
topologyKey: kubernetes.io/hostname
containers:
- args:
- -log.level=debug
- -query-scheduler.max-outstanding-requests-per-tenant=100
- -server.grpc.keepalive.min-time-between-pings=10s
- -server.grpc.keepalive.ping-without-stream-allowed=true
Expand Down Expand Up @@ -1078,7 +1078,9 @@ spec:
- -distributor.health-check-ingesters=true
- -distributor.replication-factor=3
- -experimental.ruler.enable-api=true
- -querier.at-modifier-enabled=true
- -querier.query-ingesters-within=13h
- -querier.query-label-names-with-matchers-enabled=true
- -querier.query-store-after=12h
- -ring.heartbeat-timeout=10m
- -ring.prefix=
Expand Down Expand Up @@ -1161,7 +1163,6 @@ spec:
- -alertmanager.storage.path=/data
- -alertmanager.web.external-url=http://test/alertmanager
- -experimental.alertmanager.enable-api=true
- -log.level=debug
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc.keepalive.min-time-between-pings=10s
- -server.grpc.keepalive.ping-without-stream-allowed=true
Expand Down Expand Up @@ -1338,8 +1339,10 @@ spec:
- -blocks-storage.backend=gcs
- -blocks-storage.gcs.bucket-name=blocks-bucket
- -blocks-storage.tsdb.block-ranges-period=2h
- -blocks-storage.tsdb.close-idle-tsdb-timeout=13h
- -blocks-storage.tsdb.dir=/data/tsdb
- -blocks-storage.tsdb.retention-period=96h
- -blocks-storage.tsdb.isolation-enabled=false
- -blocks-storage.tsdb.retention-period=24h
- -blocks-storage.tsdb.ship-interval=1m
- -consul.hostname=consul.default.svc.cluster.local:8500
- -distributor.health-check-ingesters=true
Expand Down Expand Up @@ -1643,6 +1646,7 @@ spec:
- args:
- -blocks-storage.backend=gcs
- -blocks-storage.bucket-store.bucket-index.enabled=true
- -blocks-storage.bucket-store.chunks-cache.attributes-in-memory-max-items=50000
- -blocks-storage.bucket-store.chunks-cache.backend=memcached
- -blocks-storage.bucket-store.chunks-cache.memcached.addresses=dnssrvnoa+memcached.default.svc.cluster.local:11211
- -blocks-storage.bucket-store.chunks-cache.memcached.max-async-buffer-size=25000
Expand All @@ -1652,6 +1656,7 @@ spec:
- -blocks-storage.bucket-store.chunks-cache.memcached.max-idle-connections=100
- -blocks-storage.bucket-store.chunks-cache.memcached.max-item-size=1048576
- -blocks-storage.bucket-store.chunks-cache.memcached.timeout=200ms
- -blocks-storage.bucket-store.ignore-blocks-within=10h
- -blocks-storage.bucket-store.ignore-deletion-marks-delay=1h
- -blocks-storage.bucket-store.index-cache.backend=memcached
- -blocks-storage.bucket-store.index-cache.memcached.addresses=dnssrvnoa+memcached-index-queries.default.svc.cluster.local:11211
Expand Down
16 changes: 11 additions & 5 deletions operations/mimir-tests/test-query-sharding-generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -835,12 +835,14 @@ spec:
- -consul.hostname=consul.default.svc.cluster.local:8500
- -distributor.health-check-ingesters=true
- -distributor.replication-factor=3
- -log.level=debug
- -mem-ballast-size-bytes=268435456
- -querier.at-modifier-enabled=true
- -querier.frontend-client.grpc-max-send-msg-size=419430400
- -querier.max-concurrent=16
- -querier.query-ingesters-within=13h
- -querier.query-label-names-with-matchers-enabled=true
- -querier.query-store-after=12h
- -querier.query-store-for-labels-enabled=true
- -querier.scheduler-address=query-scheduler-discovery.default.svc.cluster.local:9095
- -querier.worker-match-max-concurrent=true
- -ring.heartbeat-timeout=10m
Expand Down Expand Up @@ -930,7 +932,7 @@ spec:
- -frontend.results-cache.memcached.timeout=500ms
- -frontend.scheduler-address=query-scheduler-discovery.default.svc.cluster.local:9095
- -frontend.split-queries-by-interval=24h
- -log.level=debug
- -querier.at-modifier-enabled=true
- -querier.max-query-parallelism=240
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=419430400
Expand Down Expand Up @@ -998,7 +1000,6 @@ spec:
topologyKey: kubernetes.io/hostname
containers:
- args:
- -log.level=debug
- -query-scheduler.max-outstanding-requests-per-tenant=800
- -server.grpc.keepalive.min-time-between-pings=10s
- -server.grpc.keepalive.ping-without-stream-allowed=true
Expand Down Expand Up @@ -1081,7 +1082,9 @@ spec:
- -distributor.health-check-ingesters=true
- -distributor.replication-factor=3
- -experimental.ruler.enable-api=true
- -querier.at-modifier-enabled=true
- -querier.query-ingesters-within=13h
- -querier.query-label-names-with-matchers-enabled=true
- -querier.query-store-after=12h
- -ring.heartbeat-timeout=10m
- -ring.prefix=
Expand Down Expand Up @@ -1164,7 +1167,6 @@ spec:
- -alertmanager.storage.path=/data
- -alertmanager.web.external-url=http://test/alertmanager
- -experimental.alertmanager.enable-api=true
- -log.level=debug
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc.keepalive.min-time-between-pings=10s
- -server.grpc.keepalive.ping-without-stream-allowed=true
Expand Down Expand Up @@ -1341,8 +1343,10 @@ spec:
- -blocks-storage.backend=gcs
- -blocks-storage.gcs.bucket-name=blocks-bucket
- -blocks-storage.tsdb.block-ranges-period=2h
- -blocks-storage.tsdb.close-idle-tsdb-timeout=13h
- -blocks-storage.tsdb.dir=/data/tsdb
- -blocks-storage.tsdb.retention-period=96h
- -blocks-storage.tsdb.isolation-enabled=false
- -blocks-storage.tsdb.retention-period=24h
- -blocks-storage.tsdb.ship-interval=1m
- -consul.hostname=consul.default.svc.cluster.local:8500
- -distributor.health-check-ingesters=true
Expand Down Expand Up @@ -1646,6 +1650,7 @@ spec:
- args:
- -blocks-storage.backend=gcs
- -blocks-storage.bucket-store.bucket-index.enabled=true
- -blocks-storage.bucket-store.chunks-cache.attributes-in-memory-max-items=50000
- -blocks-storage.bucket-store.chunks-cache.backend=memcached
- -blocks-storage.bucket-store.chunks-cache.memcached.addresses=dnssrvnoa+memcached.default.svc.cluster.local:11211
- -blocks-storage.bucket-store.chunks-cache.memcached.max-async-buffer-size=25000
Expand All @@ -1655,6 +1660,7 @@ spec:
- -blocks-storage.bucket-store.chunks-cache.memcached.max-idle-connections=100
- -blocks-storage.bucket-store.chunks-cache.memcached.max-item-size=1048576
- -blocks-storage.bucket-store.chunks-cache.memcached.timeout=200ms
- -blocks-storage.bucket-store.ignore-blocks-within=10h
- -blocks-storage.bucket-store.ignore-deletion-marks-delay=1h
- -blocks-storage.bucket-store.index-cache.backend=memcached
- -blocks-storage.bucket-store.index-cache.memcached.addresses=dnssrvnoa+memcached-index-queries.default.svc.cluster.local:11211
Expand Down
Loading

0 comments on commit 34cae90

Please sign in to comment.