From e186bfe6a663ea7464765cc34ab30417f09fbb7f Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Mon, 28 Sep 2020 14:45:46 -0400 Subject: [PATCH] update query frontend flag name Signed-off-by: Ben Ye --- .../all/manifests/thanos-query-frontend-deployment.yaml | 2 +- jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet | 6 +++--- jsonnet/kube-thanos/kube-thanos-rule.libsonnet | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/all/manifests/thanos-query-frontend-deployment.yaml b/examples/all/manifests/thanos-query-frontend-deployment.yaml index 559ed37b..c70f0f2b 100644 --- a/examples/all/manifests/thanos-query-frontend-deployment.yaml +++ b/examples/all/manifests/thanos-query-frontend-deployment.yaml @@ -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" diff --git a/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet b/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet index 688ab1e7..207d6123 100644 --- a/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet @@ -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 @@ -184,7 +184,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; }, }, }, - }, + }, withSplitInterval:: { local tqf = self, @@ -208,7 +208,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; }, }, }, - }, + }, local fifoCacheDefaults = { // Don't limit maximum item size. diff --git a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet index 3892f4d5..154dc8ae 100644 --- a/jsonnet/kube-thanos/kube-thanos-rule.libsonnet +++ b/jsonnet/kube-thanos/kube-thanos-rule.libsonnet @@ -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 @@ -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 @@ -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 ], },