-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/64660/
-----------------------------------------------------------
Review request for Ambari, Attila Magyar, Krisztian Kasa, Miklos Gergely, and
Sid Wagle.
Bugs: AMBARI-22647
https://issues.apache.org/jira/browse/AMBARI-22647
Repository: ambari
Description
-------
- package logsearch / logfeeder classes into jars
- create default logsearch-env and logfeeder-env files (those where only
generated by ambari stack code)
- rename run.sh start scripts to logsearch.sh and logfeeder.sh, and create a
symlink for those in /usr/bin/
(therefore we can call commands like: 'logsearch start' or 'logfeeder test
--test-log-entry ...')
- refactor logfeeder command line tool -> new java entry point -> use it
through /usr/bin/logfeeder
- remove pid / process handling logic from ambari stack code (as the new
logsaerch/logfeeder script will handle those)
- move all config files from classes target/package/conf during maven package
phase
- move "/etc/ambari-logsearch-.../conf" folder to
/usr/lib/ambari-logsearch.../conf, keep the old one as a symlink. (this
solution is useful as we can include every requried files in a tar.gz as well
and it can work without provided rpm/deb)
- as conf file was moved out, we need to handle some cases during yum/apt
upgrade - move conf/keys/ or conf/checkpoints/ files to the new location (as
those could be generated there before and we do not want to loose them)
- as conf files are moved, cleanup maven assembly configs
- upgrade docker environment to make it work with the new changes
Diffs
-----
ambari-logsearch/ambari-logsearch-assembly/pom.xml cbc62ce
ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/logfeeder/postinst
21a01fa
ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/logfeeder/postrm
21a01fa
ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/logfeeder/posttrm
21a01fa
ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/logfeeder/preinst
21a01fa
ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/portal/postinst
21a01fa
ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/portal/postrm
21a01fa
ambari-logsearch/ambari-logsearch-assembly/src/main/package/deb/portal/preinst
21a01fa
ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postinstall.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/preinstall.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postinstall.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/preinstall.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-logfeeder/README.md d2e55f0
ambari-logsearch/ambari-logsearch-logfeeder/build.properties 013ba2e
ambari-logsearch/ambari-logsearch-logfeeder/build.xml 738b2ef
ambari-logsearch/ambari-logsearch-logfeeder/pom.xml 005af15
ambari-logsearch/ambari-logsearch-logfeeder/run.sh 70947ec
ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
2d31e5a
ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeederCommandLine.java
61e7a1e
ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/ConfigHandler.java
35c0e6a
ambari-logsearch/ambari-logsearch-logfeeder/src/main/package/deb/control/control
40cd855
ambari-logsearch/ambari-logsearch-logfeeder/src/main/package/deb/control/postinst
21a01fa
ambari-logsearch/ambari-logsearch-logfeeder/src/main/package/deb/control/postrm
21a01fa
ambari-logsearch/ambari-logsearch-logfeeder/src/main/package/deb/control/preinst
21a01fa
ambari-logsearch/ambari-logsearch-logfeeder/src/main/package/deb/control/prerm
21a01fa
ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder-env.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/run.sh 22e1cb2
ambari-logsearch/ambari-logsearch-server/README.md 26b1f73
ambari-logsearch/ambari-logsearch-server/build.xml 5c50485
ambari-logsearch/ambari-logsearch-server/pom.xml 5444b00
ambari-logsearch/ambari-logsearch-server/run.sh f245930
ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/LogSearch.java
39343c7
ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch-env.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch.sh
PRE-CREATION
ambari-logsearch/ambari-logsearch-server/src/main/scripts/run.sh 241b32f
ambari-logsearch/ambari-logsearch-server/src/main/scripts/stop.sh 3612f08
ambari-logsearch/docker/Dockerfile e79f61b
ambari-logsearch/docker/all.yml 369db39
ambari-logsearch/docker/bin/start.sh bea06de
ambari-logsearch/docker/docker-compose.yml 725af36
ambari-logsearch/docker/logsearch-logfeeder.yml 4d48501
ambari-logsearch/docker/logsearch-server.yml 6a0d71e
ambari-logsearch/docker/test-config/logfeeder/logfeeder-env.sh 5beb093
ambari-logsearch/docker/test-config/logfeeder/logfeeder.properties 1ae57bb
ambari-logsearch/docker/test-config/logsearch/logsearch-env.sh 80f9c4c
ambari-logsearch/docker/test-config/logsearch/logsearch-https.properties
5e7853d
ambari-logsearch/docker/test-config/logsearch/logsearch.properties 5bde17c
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml
e308479
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-properties.xml
a38f961
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml
5c263db
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py
fbc29c8
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py
4410712
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch_common.py
c4e0c16
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
884d32a
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logfeeder.py
653d604
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch.py
7738cc1
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-env.sh.j2
f2dd06b
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logsearch-env.sh.j2
7d9b5de
ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py
bf9d79b
ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
19c81a8
ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py 159cb81
ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py db19e0f
ambari-server/src/test/python/stacks/2.4/configs/default.json 9966f3e
Diff: https://reviews.apache.org/r/64660/diff/1/
Testing
-------
UTs passed after some changes.
FT:
- install packages manually with yum (try out that i have keys + checkpoint
folder in old /etc/.. conf locations)
- start applications with docker compose + start from IDE as well.
- tried out logfeeder/logsearch script options (start/stop/status/help/test)
Thanks,
Oliver Szabo
