You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ro...@apache.org on 2022/07/11 15:56:46 UTC
[pinot] branch master updated: Change Helm chart to log info to console by default (#9015)
This is an automated email from the ASF dual-hosted git repository.
rongr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 7b3e01e5d3 Change Helm chart to log info to console by default (#9015)
7b3e01e5d3 is described below
commit 7b3e01e5d314627208df74dfdddeae519afa5f90
Author: Gonzalo Ortiz Jaureguizar <go...@users.noreply.github.com>
AuthorDate: Mon Jul 11 17:56:38 2022 +0200
Change Helm chart to log info to console by default (#9015)
---
docker/images/pinot/etc/conf/pinot-broker-log4j2.xml | 2 +-
.../pinot/etc/conf/pinot-controller-log4j2.xml | 2 +-
docker/images/pinot/etc/conf/pinot-server-log4j2.xml | 2 +-
kubernetes/helm/pinot/values.yaml | 20 +++++++++++++++-----
pinot-tools/src/main/resources/conf/log4j2.xml | 2 +-
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/docker/images/pinot/etc/conf/pinot-broker-log4j2.xml b/docker/images/pinot/etc/conf/pinot-broker-log4j2.xml
index 5f2c7db16d..8716e4ca6b 100644
--- a/docker/images/pinot/etc/conf/pinot-broker-log4j2.xml
+++ b/docker/images/pinot/etc/conf/pinot-broker-log4j2.xml
@@ -49,7 +49,7 @@
<Loggers>
<Root level="info" additivity="false">
<!-- Display warnings on the console -->
- <AppenderRef ref="console" level="warn"/>
+ <AppenderRef ref="console" level="${env:LOG4J_CONSOLE_LEVEL:-warn}"/>
<!-- Direct most logs to the log file -->
<AppenderRef ref="brokerLog"/>
</Root>
diff --git a/docker/images/pinot/etc/conf/pinot-controller-log4j2.xml b/docker/images/pinot/etc/conf/pinot-controller-log4j2.xml
index e227fe3e74..c0be22bd19 100644
--- a/docker/images/pinot/etc/conf/pinot-controller-log4j2.xml
+++ b/docker/images/pinot/etc/conf/pinot-controller-log4j2.xml
@@ -48,7 +48,7 @@
<Loggers>
<Root level="info" additivity="false">
<!-- Display warnings on the console -->
- <AppenderRef ref="console" level="warn"/>
+ <AppenderRef ref="console" level="${env:LOG4J_CONSOLE_LEVEL:-warn}"/>
<!-- Direct most logs to the log file -->
<AppenderRef ref="controllerLog"/>
</Root>
diff --git a/docker/images/pinot/etc/conf/pinot-server-log4j2.xml b/docker/images/pinot/etc/conf/pinot-server-log4j2.xml
index d6bd3f77be..535874094b 100644
--- a/docker/images/pinot/etc/conf/pinot-server-log4j2.xml
+++ b/docker/images/pinot/etc/conf/pinot-server-log4j2.xml
@@ -48,7 +48,7 @@
<Loggers>
<Root level="info" additivity="false">
<!-- Display warnings on the console -->
- <AppenderRef ref="console" level="warn"/>
+ <AppenderRef ref="console" level="${env:LOG4J_CONSOLE_LEVEL:-warn}"/>
<!-- Direct most logs to the log file -->
<AppenderRef ref="serverLog"/>
</Root>
diff --git a/kubernetes/helm/pinot/values.yaml b/kubernetes/helm/pinot/values.yaml
index 5a72b3fa0d..a437cad6a2 100644
--- a/kubernetes/helm/pinot/values.yaml
+++ b/kubernetes/helm/pinot/values.yaml
@@ -156,7 +156,9 @@ controller:
# Use extraEnv to add individual key value pairs as container environment variables.
# ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
- extraEnv: []
+ extraEnv:
+ - name: LOG4J_CONSOLE_LEVEL
+ value: info
# - name: PINOT_CUSTOM_ENV
# value: custom-value
@@ -247,7 +249,9 @@ broker:
# Use extraEnv to add individual key value pairs as container environment variables.
# ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
- extraEnv: []
+ extraEnv:
+ - name: LOG4J_CONSOLE_LEVEL
+ value: info
# - name: PINOT_CUSTOM_ENV
# value: custom-value
@@ -329,7 +333,9 @@ server:
# Use extraEnv to add individual key value pairs as container environment variables.
# ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
- extraEnv: []
+ extraEnv:
+ - name: LOG4J_CONSOLE_LEVEL
+ value: info
# - name: PINOT_CUSTOM_ENV
# value: custom-value
@@ -409,7 +415,9 @@ minion:
# Use extraEnv to add individual key value pairs as container environment variables.
# ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
- extraEnv: []
+ extraEnv:
+ - name: LOG4J_CONSOLE_LEVEL
+ value: info
# - name: PINOT_CUSTOM_ENV
# value: custom-value
@@ -478,7 +486,9 @@ minionStateless:
# Use extraEnv to add individual key value pairs as container environment variables.
# ref: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/
- extraEnv: []
+ extraEnv:
+ - name: LOG4J_CONSOLE_LEVEL
+ value: info
# - name: PINOT_CUSTOM_ENV
# value: custom-value
diff --git a/pinot-tools/src/main/resources/conf/log4j2.xml b/pinot-tools/src/main/resources/conf/log4j2.xml
index 0dfc92906f..0535836c15 100644
--- a/pinot-tools/src/main/resources/conf/log4j2.xml
+++ b/pinot-tools/src/main/resources/conf/log4j2.xml
@@ -40,7 +40,7 @@
<Loggers>
<Root level="info" additivity="false">
<AppenderRef ref="pinotLog"/>
- <AppenderRef ref="console"/>
+ <AppenderRef ref="console" level="${env:LOG4J_CONSOLE_LEVEL:-info}"/>
</Root>
<Logger name="org.apache.pinot.tools.admin" level="info" additivity="false">
<AppenderRef ref="console"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org