Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
- --query-frontend.downstream-url=http://thanos-query.thanos.svc.cluster.local.:9090
- --query-range.split-interval=24h
- --query-range.max-retries-per-request=5
- --query-frontend.log_queries_longer_than=5s
- --query-frontend.log-queries-longer-than=5s
- |-
--query-range.response-cache-config="config":
"max_size": "0"
Expand Down
6 changes: 3 additions & 3 deletions jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
containers: [
if c.name == 'thanos-query-frontend' then c {
args+: [
'--query-frontend.log_queries_longer_than=' + tqf.config.logQueriesLongerThan,
'--query-frontend.log-queries-longer-than=' + tqf.config.logQueriesLongerThan,
],
} else c
for c in super.containers
Expand Down Expand Up @@ -184,7 +184,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
},
},
},
},
},

withSplitInterval:: {
local tqf = self,
Expand All @@ -208,7 +208,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
},
},
},
},
},

local fifoCacheDefaults = {
// Don't limit maximum item size.
Expand Down
8 changes: 4 additions & 4 deletions jsonnet/kube-thanos/kube-thanos-rule.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
containers: [
if c.name == 'thanos-rule' then c {
args+: [
'--alertmanagers.url=' + alertmanagerURL,
'--alertmanagers.url=' + alertmanagerURL
for alertmanagerURL in tr.config.alertmanagersURL
],
} else c
Expand All @@ -222,11 +222,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
containers: [
if c.name == 'thanos-rule' then c {
args+: [
'--rule-file=/etc/thanos/rules/' + ruleConfig.name + '/' + ruleConfig.key,
'--rule-file=/etc/thanos/rules/' + ruleConfig.name + '/' + ruleConfig.key
for ruleConfig in tr.config.rulesConfig
],
volumeMounts+: [
{ name: ruleConfig.name, mountPath: '/etc/thanos/rules/' + ruleConfig.name },
{ name: ruleConfig.name, mountPath: '/etc/thanos/rules/' + ruleConfig.name }
for ruleConfig in tr.config.rulesConfig
],
} else c
Expand All @@ -236,7 +236,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local volume = k.apps.v1.statefulSet.mixin.spec.template.spec.volumesType,
volumes+: [
volume.withName(ruleConfig.name) +
volume.mixin.configMap.withName(ruleConfig.name),
volume.mixin.configMap.withName(ruleConfig.name)
for ruleConfig in tr.config.rulesConfig
],
},
Expand Down