You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ak...@apache.org on 2020/07/24 22:16:28 UTC
[incubator-pinot] branch master updated: [TE] Thirdeye docker log
crash fix (#5749)
This is an automated email from the ASF dual-hosted git repository.
akshayrai09 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 405b4ef [TE] Thirdeye docker log crash fix (#5749)
405b4ef is described below
commit 405b4ef7f529647095740db04798404559a7b77a
Author: Alexander Pucher <ap...@apache.org>
AuthorDate: Fri Jul 24 15:16:20 2020 -0700
[TE] Thirdeye docker log crash fix (#5749)
Recent changes to ThirdEye logging aren't reflected in the config files shipped with the docker image and break the launch of apachepinot/thirdeye. This PR modifies the configuration to launch the container successfully.
---
docker/images/pinot-thirdeye/bin/start-thirdeye.sh | 4 ++--
docker/images/pinot-thirdeye/config/ephemeral/dashboard.yml | 4 ++++
docker/images/pinot-thirdeye/config/ephemeral/detector.yml | 6 +++---
docker/images/pinot-thirdeye/config/pinot-quickstart/dashboard.yml | 4 ++++
docker/images/pinot-thirdeye/config/pinot-quickstart/detector.yml | 6 +++---
5 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
index 92b8d87..56498a8 100755
--- a/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
+++ b/docker/images/pinot-thirdeye/bin/start-thirdeye.sh
@@ -39,11 +39,11 @@ fi
echo "Running thirdeye backend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-backend.yml" ] && cp "${CONFIG_DIR}/data-sources/data-sources-config-backend.yml" "${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot.jar" org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
+java -Dlog4j.configurationFile=log4j2.xml -cp "./bin/thirdeye-pinot.jar" org.apache.pinot.thirdeye.anomaly.ThirdEyeAnomalyApplication "${CONFIG_DIR}" &
sleep 10
echo "Running thirdeye frontend config: ${CONFIG_DIR}"
[ -f "${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml" ] && cp "${CONFIG_DIR}/data-sources/data-sources-config-frontend.yml" "${CONFIG_DIR}/data-sources/data-sources-config.yml"
-java -cp "./bin/thirdeye-pinot.jar" org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication "${CONFIG_DIR}" &
+java -Dlog4j.configurationFile=log4j2.xml -cp "./bin/thirdeye-pinot.jar" org.apache.pinot.thirdeye.dashboard.ThirdEyeDashboardApplication "${CONFIG_DIR}" &
wait
diff --git a/docker/images/pinot-thirdeye/config/ephemeral/dashboard.yml b/docker/images/pinot-thirdeye/config/ephemeral/dashboard.yml
index 09c4e86..c5298b1 100644
--- a/docker/images/pinot-thirdeye/config/ephemeral/dashboard.yml
+++ b/docker/images/pinot-thirdeye/config/ephemeral/dashboard.yml
@@ -1,3 +1,5 @@
+logging:
+ type: external
authConfig:
authEnabled: false
authKey: ""
@@ -24,6 +26,8 @@ alerterConfiguration:
smtpHost: localhost
smtpPort: 25
server:
+ requestLog:
+ type: external
type: default
applicationConnectors:
- type: http
diff --git a/docker/images/pinot-thirdeye/config/ephemeral/detector.yml b/docker/images/pinot-thirdeye/config/ephemeral/detector.yml
index da08eb1..a8516ec 100644
--- a/docker/images/pinot-thirdeye/config/ephemeral/detector.yml
+++ b/docker/images/pinot-thirdeye/config/ephemeral/detector.yml
@@ -1,8 +1,8 @@
logging:
- level: INFO
- loggers:
- org.hibernate.engine.internal: WARN
+ type: external
server:
+ requestLog:
+ type: external
type: default
rootPath: '/api/*'
applicationContextPath: /
diff --git a/docker/images/pinot-thirdeye/config/pinot-quickstart/dashboard.yml b/docker/images/pinot-thirdeye/config/pinot-quickstart/dashboard.yml
index b7b4b47..b039b8d 100644
--- a/docker/images/pinot-thirdeye/config/pinot-quickstart/dashboard.yml
+++ b/docker/images/pinot-thirdeye/config/pinot-quickstart/dashboard.yml
@@ -1,3 +1,5 @@
+logging:
+ type: external
authConfig:
authEnabled: false
authKey: ""
@@ -24,6 +26,8 @@ alerterConfiguration:
smtpHost: localhost
smtpPort: 25
server:
+ requestLog:
+ type: external
type: default
applicationConnectors:
- type: http
diff --git a/docker/images/pinot-thirdeye/config/pinot-quickstart/detector.yml b/docker/images/pinot-thirdeye/config/pinot-quickstart/detector.yml
index 6bca237..1ad3312 100644
--- a/docker/images/pinot-thirdeye/config/pinot-quickstart/detector.yml
+++ b/docker/images/pinot-thirdeye/config/pinot-quickstart/detector.yml
@@ -1,8 +1,8 @@
logging:
- level: INFO
- loggers:
- org.hibernate.engine.internal: WARN
+ type: external
server:
+ requestLog:
+ type: external
type: default
rootPath: '/api/*'
applicationContextPath: /
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org