Merge branch 'release/v2.5.0' into develop
This commit is contained in:
commit
0f5611eeb2
@ -1316,6 +1316,7 @@ install_elasticsearch () {
|
|||||||
install_fluent_bit () {
|
install_fluent_bit () {
|
||||||
if [ "$INSTALL_FLUENT_BIT" == "true" ]; then
|
if [ "$INSTALL_FLUENT_BIT" == "true" ]; then
|
||||||
curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh
|
curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh
|
||||||
|
systemctl enable fluent-bit
|
||||||
|
|
||||||
if systemctl list-unit-files --type=service | grep -q "fluent-bit.service"; then
|
if systemctl list-unit-files --type=service | grep -q "fluent-bit.service"; then
|
||||||
sed -i "s/OPENSEARCH_SCHEME/$(get_env_parameter "ELK_SHEME")/g" "${BASE_DIR}/config/fluent-bit.conf"
|
sed -i "s/OPENSEARCH_SCHEME/$(get_env_parameter "ELK_SHEME")/g" "${BASE_DIR}/config/fluent-bit.conf"
|
||||||
@ -1326,6 +1327,13 @@ install_fluent_bit () {
|
|||||||
cp -rf ${BASE_DIR}/config/fluent-bit.conf /etc/fluent-bit/fluent-bit.conf
|
cp -rf ${BASE_DIR}/config/fluent-bit.conf /etc/fluent-bit/fluent-bit.conf
|
||||||
systemctl restart fluent-bit
|
systemctl restart fluent-bit
|
||||||
|
|
||||||
|
DOCKER_SYSTEMD_DIR="/etc/systemd/system/docker.service.d"
|
||||||
|
if [ ! -f "${DOCKER_SYSTEMD_DIR}/fluent-after.conf" ]; then
|
||||||
|
mkdir -p ${DOCKER_SYSTEMD_DIR}
|
||||||
|
echo -e "[Unit]\n$(grep After= $(systemctl show -p FragmentPath docker.service | awk -F= '{print $2}')) fluent-bit.service" > "${DOCKER_SYSTEMD_DIR}/fluent-after.conf"
|
||||||
|
systemctl daemon-reload
|
||||||
|
fi
|
||||||
|
|
||||||
DOCKER_DAEMON_FILE="/etc/docker/daemon.json"
|
DOCKER_DAEMON_FILE="/etc/docker/daemon.json"
|
||||||
if [[ ! -f "${DOCKER_DAEMON_FILE}" ]]; then
|
if [[ ! -f "${DOCKER_DAEMON_FILE}" ]]; then
|
||||||
echo "{\"log-driver\": \"fluentd\", \"log-opts\": { \"fluentd-address\": \"127.0.0.1:24224\" }}" > "${DOCKER_DAEMON_FILE}"
|
echo "{\"log-driver\": \"fluentd\", \"log-opts\": { \"fluentd-address\": \"127.0.0.1:24224\" }}" > "${DOCKER_DAEMON_FILE}"
|
||||||
|
@ -1,13 +1,15 @@
|
|||||||
# Ignoring node_modules errors due to lack of ability to influence them
|
# Ignoring node_modules errors due to lack of ability to influence them
|
||||||
embedded-javascript-library var/www/{{product}}/services/*/node_modules/*
|
embedded-javascript-library var/www/{{product}}/*/node_modules/*
|
||||||
# Ignoring node_modules errors due to lack of ability to influence them
|
# Ignoring node_modules errors due to lack of ability to influence them
|
||||||
executable-not-elf-or-script var/www/{{product}}/services/*/node_modules/*
|
executable-not-elf-or-script var/www/{{product}}/*/node_modules/*
|
||||||
# Ignoring node_modules errors due to lack of ability to influence them
|
# Ignoring node_modules errors due to lack of ability to influence them
|
||||||
privacy-breach-generic var/www/{{product}}/services/*/node_modules/*
|
privacy-breach-generic var/www/{{product}}/*/node_modules/*
|
||||||
# Ignoring node_modules errors due to lack of ability to influence them
|
# Ignoring node_modules errors due to lack of ability to influence them
|
||||||
script-not-executable var/www/{{product}}/services/*/node_modules/*
|
script-not-executable var/www/{{product}}/*/node_modules/*
|
||||||
# Ignoring node_modules errors due to lack of ability to influence them
|
# Ignoring node_modules errors due to lack of ability to influence them
|
||||||
unusual-interpreter */node_modules/*
|
unusual-interpreter */node_modules/*
|
||||||
|
# Ignoring node_modules errors due to lack of ability to influence them
|
||||||
|
statically-linked-binary var/www/{{product}}/*/node_modules/*
|
||||||
|
|
||||||
# The use of the /var/www directory is caused by its past history as the default document root
|
# The use of the /var/www directory is caused by its past history as the default document root
|
||||||
dir-or-file-in-var-www
|
dir-or-file-in-var-www
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
version: "3"
|
|
||||||
services:
|
services:
|
||||||
onlyoffice-opensearch-dashboards:
|
onlyoffice-opensearch-dashboards:
|
||||||
image: opensearchproject/opensearch-dashboards:${DASHBOARDS_VERSION}
|
image: opensearchproject/opensearch-dashboards:${DASHBOARDS_VERSION}
|
||||||
|
Loading…
Reference in New Issue
Block a user