Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix when extraflags for thanos components were overridden #99

Closed
wants to merge 1 commit into from
Closed

Fix when extraflags for thanos components were overridden #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion chart/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

apiVersion: v2
name: dnation-kubernetes-monitoring-stack
version: 3.5.0
version: 3.5.1
appVersion: 2.7.0 # dnation-kubernetes-monitoring
description: An umbrella helm chart for Kubernetes monitoring based on kube-prometheus-stack, thanos, loki, loki-distributed, promtail and dnation-kubernetes-monitoring.
keywords:
Expand Down
16 changes: 0 additions & 16 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,6 @@ thanos:
enabled: true
queryFrontend:
enabled: false
extraFlags:
- --query-range.split-interval=12h
- --query-frontend.log-queries-longer-than=10s
- --query-frontend.compress-responses
- |-
--query-range.response-cache-config="config":
"max_size": "500MB"
"max_size_items": 0
"validity": 0s
"type": "in-memory"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO we should keep these extraFlags here.
IMO we should support the scenario when the end-user uses the base values and overrides some parameters like queryFrontend.enabled=True, then the end user should end with extraFlags we set for queryFrontend

query:
extraFlags:
- --query.auto-downsampling
Expand All @@ -113,12 +103,6 @@ thanos:
enabled: false
compactor:
enabled: false
retentionResolutionRaw: 2d
retentionResolution5m: 10d
retentionResolution1h: 15d
extraFlags:
- --compact.concurrency=3
- --downsample.concurrency=3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see https://github.com/dNationCloud/kubernetes-monitoring-stack/pull/99/files#r1500332526

storegateway:
enabled: false
ruler:
Expand Down
18 changes: 18 additions & 0 deletions multicluster-config/observer-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,19 @@ thanos:
existingObjstoreSecret: thanos-objstore-config
queryFrontend:
enabled: true
extraFlags:
Copy link
Member

@matofeder matofeder Feb 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO this file should be used as a values file which should override the default values file:

  • helm install .... -f multicluster-config/observer-values.yaml

then I do not think that these changes are necessary

- --query-range.split-interval=12h
- --query-frontend.log-queries-longer-than=10s
- --query-frontend.compress-responses
- |-
--query-range.response-cache-config="config":
"max_size": "500MB"
"max_size_items": 0
"validity": 0s
"type": "in-memory"
query:
extraFlags:
- --query.auto-downsampling
replicaLabel:
- prometheus_replica
dnsDiscovery:
Expand Down Expand Up @@ -100,6 +112,12 @@ thanos:
enabled: true
compactor:
enabled: true
retentionResolutionRaw: 2d
retentionResolution5m: 10d
retentionResolution1h: 15d
extraFlags:
- --compact.concurrency=3
- --downsample.concurrency=3
storegateway:
enabled: true
ruler:
Expand Down
Loading