From b197371c417a3c477843428fecc8af0b723b6a9a Mon Sep 17 00:00:00 2001 From: Teo Cheng Lim Date: Thu, 13 Jan 2022 16:19:53 +0800 Subject: [PATCH 1/2] fixed double path /opt/elastalert/elastalert on linux user elastalert --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 71c2c720..044a1f40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN apt update && apt -y upgrade && \ >> /opt/elastalert/run.sh && \ chmod +x /opt/elastalert/run.sh && \ groupadd -g ${GID} ${USERNAME} && \ - useradd -u ${UID} -g ${GID} -M -b /opt/elastalert -s /sbin/nologin \ + useradd -u ${UID} -g ${GID} -M -b /opt -s /sbin/nologin \ -c "ElastAlert 2 User" ${USERNAME} USER ${USERNAME} From b5f851d722e853fc0684c8e7b7532d96e5e04695 Mon Sep 17 00:00:00 2001 From: Teo Cheng Lim Date: Fri, 14 Jan 2022 09:15:26 +0800 Subject: [PATCH 2/2] update CHANGELOG.md for Dockerfile changes at user home /opt/elastalert/ --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52e052d9..0378d187 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ # 2.x.x ## Breaking changes -- None +- Dockerfile refactor for app home and user home to be the same directory (/opt/elastalert/). Before app home is /opt/elastalert/ and user home is /opt/elastalert/elastalert. After app home and user home are the same /opt/elastalert/ - [#656](https://github.com/jertel/elastalert2/pull/656) ## New features - TBD - [#000](https://github.com/jertel/elastalert2/pull/000) - @some_elastic_contributor_tbd @@ -239,7 +239,7 @@ ## New features - Support for multiple rules directories and fix `..data` Kubernetes/Openshift recursive directories in FileRulesLoader [#157](https://github.com/jertel/elastalert2/pull/157) - @mrfroggg - Support environment variable substition in yaml files - [#149](https://github.com/jertel/elastalert2/pull/149) - @archfz -- Update schema.yaml and enhance documentation for Email alerter - [#144](https://github.com/jertel/elastalert2/pull/144) - @nsano-rururu +- Update schema.yaml and enhance documentation for Email alerter - [#144](https://github.com/jertel/elastalert2/pull/144) - @nsano-rururu - Default Email alerter to use port 25, and require http_post_url for HTTP Post alerter - [#143](https://github.com/jertel/elastalert2/pull/143) - @nsano-rururu - Support extra message features for Slack and Mattermost - [#140](https://github.com/jertel/elastalert2/pull/140) - @nsano-rururu - Support a footer in alert text - [#133](https://github.com/jertel/elastalert2/pull/133) - @nsano-rururu