Merge pull request #173 from craigfurman/log-format

store, query, frontend: add log.format flag
thanos-io · Nov 25, 2020 · bc95ea6 · bc95ea6
2 parents 39435d2 + 82e824b
commit bc95ea6
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 ### Added
 
 - [#170](https://github.com/thanos-io/kube-thanos/pull/170) Add Store shard and Receive hashring helpers
+- [#173](https://github.com/thanos-io/kube-thanos/pull/173) Store, query, frontend: add log.format flag
 
 ### Fixed
 

diff --git a/examples/all/manifests/store-shard0-statefulSet.yaml b/examples/all/manifests/store-shard0-statefulSet.yaml
@@ -49,6 +49,7 @@ spec:
       - args:
         - store
         - --log.level=info
+        - --log.format=logfmt
         - --data-dir=/var/thanos/store
         - --grpc-address=0.0.0.0:10901
         - --http-address=0.0.0.0:10902

diff --git a/examples/all/manifests/store-shard1-statefulSet.yaml b/examples/all/manifests/store-shard1-statefulSet.yaml
@@ -49,6 +49,7 @@ spec:
       - args:
         - store
         - --log.level=info
+        - --log.format=logfmt
         - --data-dir=/var/thanos/store
         - --grpc-address=0.0.0.0:10901
         - --http-address=0.0.0.0:10902

diff --git a/examples/all/manifests/store-shard2-statefulSet.yaml b/examples/all/manifests/store-shard2-statefulSet.yaml
@@ -49,6 +49,7 @@ spec:
       - args:
         - store
         - --log.level=info
+        - --log.format=logfmt
         - --data-dir=/var/thanos/store
         - --grpc-address=0.0.0.0:10901
         - --http-address=0.0.0.0:10902

diff --git a/examples/all/manifests/thanos-query-deployment.yaml b/examples/all/manifests/thanos-query-deployment.yaml
@@ -43,6 +43,7 @@ spec:
         - --grpc-address=0.0.0.0:10901
         - --http-address=0.0.0.0:9090
         - --log.level=debug
+        - --log.format=logfmt
         - --query.replica-label=prometheus_replica
         - --query.replica-label=rule_replica
         - --store=dnssrv+_grpc._tcp.thanos-receive.thanos.svc.cluster.local

diff --git a/examples/all/manifests/thanos-query-frontend-deployment.yaml b/examples/all/manifests/thanos-query-frontend-deployment.yaml
@@ -40,6 +40,8 @@ spec:
       containers:
       - args:
         - query-frontend
+        - --log.level=info
+        - --log.format=logfmt
         - --query-frontend.compress-responses
         - --http-address=0.0.0.0:9090
         - --query-frontend.downstream-url=http://thanos-query.thanos.svc.cluster.local.:9090

diff --git a/examples/all/manifests/thanos-store-statefulSet.yaml b/examples/all/manifests/thanos-store-statefulSet.yaml
@@ -46,6 +46,7 @@ spec:
       - args:
         - store
         - --log.level=info
+        - --log.format=logfmt
         - --data-dir=/var/thanos/store
         - --grpc-address=0.0.0.0:10901
         - --http-address=0.0.0.0:10902

diff --git a/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet b/jsonnet/kube-thanos/kube-thanos-query-frontend.libsonnet
@@ -22,6 +22,7 @@ local defaults = {
   queryRangeCache: {},
   labelsCache: {},
   logLevel: 'info',
+  logFormat: 'logfmt',
   resources: {},
   serviceMonitor: false,
   ports: {
@@ -124,6 +125,8 @@ function(params) {
       image: tqf.config.image,
       args: [
         'query-frontend',
+        '--log.level=' + tqf.config.logLevel,
+        '--log.format=' + tqf.config.logFormat,
         '--query-frontend.compress-responses',
         '--http-address=0.0.0.0:%d' % tqf.config.ports.http,
         '--query-frontend.downstream-url=%s' % tqf.config.downstreamURL,

diff --git a/jsonnet/kube-thanos/kube-thanos-query.libsonnet b/jsonnet/kube-thanos/kube-thanos-query.libsonnet
@@ -20,6 +20,7 @@ local defaults = {
   },
   serviceMonitor: false,
   logLevel: 'info',
+  logFormat: 'logfmt',
   tracing: {},
 
   commonLabels:: {
@@ -83,6 +84,7 @@ function(params) {
           '--grpc-address=0.0.0.0:%d' % tq.config.ports.grpc,
           '--http-address=0.0.0.0:%d' % tq.config.ports.http,
           '--log.level=' + tq.config.logLevel,
+          '--log.format=' + tq.config.logFormat,
         ] + [
           '--query.replica-label=%s' % labelName
           for labelName in tq.config.replicaLabels

diff --git a/jsonnet/kube-thanos/kube-thanos-store-default-params.libsonnet b/jsonnet/kube-thanos/kube-thanos-store-default-params.libsonnet
@@ -11,6 +11,7 @@
   objectStorageConfig: error 'must provide objectStorageConfig',
   ignoreDeletionMarksDelay: '24h',
   logLevel: 'info',
+  logFormat: 'logfmt',
   resources: {},
   volumeClaimTemplate: {},
   serviceMonitor: false,

diff --git a/jsonnet/kube-thanos/kube-thanos-store.libsonnet b/jsonnet/kube-thanos/kube-thanos-store.libsonnet
@@ -54,6 +54,7 @@ function(params) {
       args: [
         'store',
         '--log.level=' + ts.config.logLevel,
+        '--log.format=' + ts.config.logFormat,
         '--data-dir=/var/thanos/store',
         '--grpc-address=0.0.0.0:%d' % ts.config.ports.grpc,
         '--http-address=0.0.0.0:%d' % ts.config.ports.http,

diff --git a/manifests/thanos-query-deployment.yaml b/manifests/thanos-query-deployment.yaml
@@ -43,6 +43,7 @@ spec:
         - --grpc-address=0.0.0.0:10901
         - --http-address=0.0.0.0:9090
         - --log.level=info
+        - --log.format=logfmt
         - --query.replica-label=prometheus_replica
         - --query.replica-label=rule_replica
         - --store=dnssrv+_grpc._tcp.thanos-store.thanos.svc.cluster.local

diff --git a/manifests/thanos-store-statefulSet.yaml b/manifests/thanos-store-statefulSet.yaml
@@ -46,6 +46,7 @@ spec:
       - args:
         - store
         - --log.level=info
+        - --log.format=logfmt
         - --data-dir=/var/thanos/store
         - --grpc-address=0.0.0.0:10901
         - --http-address=0.0.0.0:10902