swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

nixos/thanos: remove deprecations

Browse source 
* replaced store.grpc.series-sample-limit by store.limits.request-samples
* replaced query.replica-label by query.replica-labels
* replaced store.addresses by endpoints
* removed block-sync-concurrency (removed upstream)
This commit is contained in:
Anthony Roussel 2023-10-10 20:34:50 +02:00
parent abed24c0d6
commit 9abb2a2116
No known key found for this signature in database
GPG key ID: 9DC4987B1A55E75E
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
nixos/modules/services/monitoring/thanos.nix
View file

@ -266,14 +266,14 @@ let
Maximum size of concurrently allocatable bytes for chunks. Maximum size of concurrently allocatable bytes for chunks.
''; '';
store.grpc.series-sample-limit = mkParamDef types.int 0 '' store.limits.request-samples = mkParamDef types.int 0 ''
Maximum amount of samples returned via a single Series call. The maximum samples allowed for a single Series request.
The Series call fails if this limit is exceeded.
`0` means no limit. `0` means no limit.
NOTE: for efficiency we take 120 as the number of samples in chunk (it NOTE: For efficiency the limit is internally implemented as 'chunks limit'
cannot be bigger than that), so the actual number of samples might be considering each chunk contains a maximum of 120 samples.
lower, even though the maximum could be hit.
''; '';
store.grpc.series-max-concurrency = mkParamDef types.int 20 '' store.grpc.series-max-concurrency = mkParamDef types.int 20 ''
@ -371,24 +371,25 @@ let
Maximum number of queries processed concurrently by query node. Maximum number of queries processed concurrently by query node.
''; '';
query.replica-label = mkParam types.str '' query.replica-labels = mkAttrsParam "query.replica-label" ''
Label to treat as a replica indicator along which data is Labels to treat as a replica indicator along which data is
deduplicated. deduplicated.
Still you will be able to query without deduplication using Still you will be able to query without deduplication using
`dedup=false` parameter. 'dedup=false' parameter. Data includes time series, recording
rules, and alerting rules.
''; '';
selector-labels = mkAttrsParam "selector-label" '' selector-labels = mkAttrsParam "selector-label" ''
Query selector labels that will be exposed in info endpoint. Query selector labels that will be exposed in info endpoint.
''; '';
store.addresses = mkListParam "store" '' endpoints = mkListParam "endpoint" ''
Addresses of statically configured store API servers. Addresses of statically configured Thanos API servers (repeatable).
The scheme may be prefixed with `dns+` or The scheme may be prefixed with 'dns+' or 'dnssrv+' to detect
`dnssrv+` to detect store API servers through Thanos API servers through respective DNS lookups.
respective DNS lookups.
''; '';
store.sd-files = mkListParam "store.sd-files" '' store.sd-files = mkListParam "store.sd-files" ''
@ -453,7 +454,7 @@ let
Rule files that should be used by rule manager. Can be in glob format. Rule files that should be used by rule manager. Can be in glob format.
''; '';
eval-interval = mkParamDef types.str "30s" '' eval-interval = mkParamDef types.str "1m" ''
The default evaluation interval to use. The default evaluation interval to use.
''; '';
@ -603,10 +604,6 @@ let
to render all samples for a human eye anyway to render all samples for a human eye anyway
''; '';
block-sync-concurrency = mkParamDef types.int 20 ''
Number of goroutines to use when syncing block metadata from object storage.
'';
compact.concurrency = mkParamDef types.int 1 '' compact.concurrency = mkParamDef types.int 1 ''
Number of goroutines to use when compacting groups. Number of goroutines to use when compacting groups.
''; '';

4
nixos/tests/prometheus.nix
View file

@ -153,7 +153,7 @@ in import ./make-test-python.nix {
services.thanos.query = { services.thanos.query = {
enable = true; enable = true;
http-address = "0.0.0.0:${toString queryPort}"; http-address = "0.0.0.0:${toString queryPort}";
store.addresses = [ endpoints = [
"prometheus:${toString grpcPort}" "prometheus:${toString grpcPort}"
]; ];
}; };
@ -184,7 +184,7 @@ in import ./make-test-python.nix {
services.thanos.query = { services.thanos.query = {
enable = true; enable = true;
http-address = "0.0.0.0:${toString queryPort}"; http-address = "0.0.0.0:${toString queryPort}";
store.addresses = [ endpoints = [
"localhost:${toString grpcPort}" "localhost:${toString grpcPort}"
]; ];
}; };