Skip to content

Commit e063e9c

Browse files
committed
compact, rule, tools: add log format flag
It was already added to store, query, and query-frontend. Signed-off-by: Craig Furman <[email protected]>
1 parent cd6b00d commit e063e9c

12 files changed

+15
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
2121

2222
- [#170](https://github.com/thanos-io/kube-thanos/pull/170) Add Store shard and Receive hashring helpers
2323
- [#173](https://github.com/thanos-io/kube-thanos/pull/173) Store, query, frontend: add log.format flag
24+
- [#178](https://github.com/thanos-io/kube-thanos/pull/178) compact, rule, tools: add log format flag
2425

2526
### Fixed
2627

examples/all/manifests/thanos-bucket-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ spec:
2929
- bucket
3030
- web
3131
- --log.level=info
32+
- --log.format=logfmt
3233
- --objstore.config=$(OBJSTORE_CONFIG)
3334
- |-
3435
--tracing.config="config":

examples/all/manifests/thanos-compact-statefulSet.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ spec:
2929
- compact
3030
- --wait
3131
- --log.level=info
32+
- --log.format=logfmt
3233
- --objstore.config=$(OBJSTORE_CONFIG)
3334
- --data-dir=/var/thanos/compact
3435
- --debug.accept-malformed-index

examples/all/manifests/thanos-receive-default-statefulSet.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ spec:
6565
- args:
6666
- receive
6767
- --log.level=info
68+
- --log.format=logfmt
6869
- --grpc-address=0.0.0.0:10901
6970
- --http-address=0.0.0.0:10902
7071
- --remote-write.address=0.0.0.0:19291

examples/all/manifests/thanos-receive-region-1-statefulSet.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ spec:
6565
- args:
6666
- receive
6767
- --log.level=info
68+
- --log.format=logfmt
6869
- --grpc-address=0.0.0.0:10901
6970
- --http-address=0.0.0.0:10902
7071
- --remote-write.address=0.0.0.0:19291

examples/all/manifests/thanos-receive-statefulSet.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ spec:
6161
- args:
6262
- receive
6363
- --log.level=info
64+
- --log.format=logfmt
6465
- --grpc-address=0.0.0.0:10901
6566
- --http-address=0.0.0.0:10902
6667
- --remote-write.address=0.0.0.0:19291

examples/all/manifests/thanos-rule-statefulSet.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ spec:
2828
- args:
2929
- rule
3030
- --log.level=info
31+
- --log.format=logfmt
3132
- --grpc-address=0.0.0.0:10901
3233
- --http-address=0.0.0.0:10902
3334
- --objstore.config=$(OBJSTORE_CONFIG)

jsonnet/kube-thanos/kube-thanos-bucket.libsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ local defaults = {
1010
objectStorageConfig: error 'must provide objectStorageConfig',
1111
resources: {},
1212
logLevel: 'info',
13+
logFormat: 'logfmt',
1314
ports: {
1415
http: 10902,
1516
},
@@ -71,6 +72,7 @@ function(params) {
7172
'bucket',
7273
'web',
7374
'--log.level=' + tb.config.logLevel,
75+
'--log.format=' + tb.config.logFormat,
7476
'--objstore.config=$(OBJSTORE_CONFIG)',
7577
] + (
7678
if std.length(tb.config.tracing) > 0 then [

jsonnet/kube-thanos/kube-thanos-compact.libsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ local defaults = {
1010
objectStorageConfig: error 'must provide objectStorageConfig',
1111
resources: {},
1212
logLevel: 'info',
13+
logFormat: 'logfmt',
1314
serviceMonitor: false,
1415
volumeClaimTemplate: {},
1516
retentionResolutionRaw: '0d',
@@ -81,6 +82,7 @@ function(params) {
8182
'compact',
8283
'--wait',
8384
'--log.level=' + tc.config.logLevel,
85+
'--log.format=' + tc.config.logFormat,
8486
'--objstore.config=$(OBJSTORE_CONFIG)',
8587
'--data-dir=/var/thanos/compact',
8688
'--debug.accept-malformed-index',

jsonnet/kube-thanos/kube-thanos-receive-default-params.libsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
volumeClaimTemplate: {},
1616
retention: '15d',
1717
logLevel: 'info',
18+
logFormat: 'logfmt',
1819
resources: {},
1920
serviceMonitor: false,
2021
ports: {

0 commit comments

Comments
 (0)