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

change default for single cluster #191

Merged
merged 1 commit into from
Feb 21, 2023
Merged

change default for single cluster #191

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
6 changes: 3 additions & 3 deletions lma/base/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ spec:
# query-range.max-retries-per-request: TO_BE_FIXED
# query-frontend.log-queries-longer-than: TO_BE_FIXED
bucketweb:
enabled: TO_BE_FIXED
enabled: true
logLevel: info
refresh: 30m
timeout: 5m
Expand All @@ -872,7 +872,7 @@ spec:
http:
port: 8080
compactor:
enabled: TO_BE_FIXED
enabled: true
logLevel: info
retentionResolutionRaw: TO_BE_FIXED
retentionResolution5m: TO_BE_FIXED
Expand Down Expand Up @@ -931,7 +931,7 @@ spec:
# targetCPU: 50
# targetMemory: 50
ruler:
enabled: TO_BE_FIXED
enabled: true
logLevel: info
alertmanagers: [] # TO_BE_FIXED
evalInterval: 1m
Expand Down
17 changes: 6 additions & 11 deletions lma/base/site-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ global:
defaultUser: taco
# Secret name to connect the object storage
thanosObjstoreSecret: taco-objstore-secret
# Which it install every thanos component?
thanosPrimaryCluster: true

lokiHost: loki-loki-distributed-gateway
lokiPort: 80

charts:
- name: prometheus-operator
Expand Down Expand Up @@ -127,12 +128,6 @@ charts:

- name: addons
override:
# Configure the connection from prometheus to elasticsearch (It not used)
metricbeat.elasticsearch.host: https://eck-elasticsearch-es-http.lma.svc.$(clusterName):9200
metricbeat.kibana.host: eck-kibana-dashboard-kb-http.lma.svc.$(clusterName):5601
metricbeat.prometheus.hosts:
- thanos-query-frontend.lma.svc.$(clusterName):9090

# Initialize the kibana index
serviceMonitor.grafana.interval: $(serviceScrapeInterval)
serviceMonitor.argocd.interval: $(serviceScrapeInterval)
Expand All @@ -145,6 +140,9 @@ charts:
serviceMonitor.kubelet.interval: $(serviceScrapeInterval)
serviceMonitor.istio.interval: $(serviceScrapeInterval)
serviceMonitor.jaeger.interval: $(serviceScrapeInterval)
grafanaDatasource.prometheus.url: "lma-prometheus.lma:9090"
# grafanaDatasource.prometheus.url: "thanos-query.lma:9090"
grafanaDatasource.loki.url: $(lokiHost):$(lokiPort)

- name: prometheus-adapter
override:
Expand Down Expand Up @@ -194,8 +192,6 @@ charts:
- --query-range.max-retries-per-request=3
- --query-frontend.log-queries-longer-than=60s

bucketweb.enabled: $(thanosPrimaryCluster)
compactor.enabled: $(thanosPrimaryCluster)
compactor.retentionResolutionRaw: 30d
compactor.retentionResolution5m: 30d
compactor.retentionResolution1h: 10y
Expand All @@ -210,7 +206,6 @@ charts:
max_size: 250MB
max_item_size: 125MB
storegateway.persistence.size: 8Gi
ruler.enabled: $(thanosPrimaryCluster)
ruler.alertmanagers:
- http://alertmanager-operated:9093
ruler.config: |-
Expand Down