Fw 2.9.0 migration

.gitignore

@@ -19,3 +19,8 @@ my_rules
 *~
 /rules/
 mod/
+comparisonFile
+comparisonFile2
+examples/ex/*
+examples/ex1/*
+comparisonFile*

.python-version

@@ -0,0 +1 @@
+3.11

Dockerfile

@@ -1,44 +1,46 @@
-FROM python:3-slim-buster as builder
-
-LABEL description="ElastAlert 2 Official Image"
-LABEL maintainer="Jason Ertel"
-
-COPY . /tmp/elastalert
-
-RUN mkdir -p /opt/elastalert && \
-    cd /tmp/elastalert && \
-    pip install setuptools wheel && \
-    python setup.py sdist bdist_wheel
-
-FROM python:3-slim-buster
-
-ARG GID=1000
-ARG UID=1000
-ARG USERNAME=elastalert
-
-COPY --from=builder /tmp/elastalert/dist/*.tar.gz /tmp/
-
-RUN apt update && apt -y upgrade && \
-    apt -y install jq curl gcc libffi-dev && \
-    rm -rf /var/lib/apt/lists/* && \
-    pip install /tmp/*.tar.gz && \
-    rm -rf /tmp/* && \
-    apt -y remove gcc libffi-dev && \
-    apt -y autoremove && \
-    mkdir -p /opt/elastalert && \
-    echo "#!/bin/sh" >> /opt/elastalert/run.sh && \
-    echo "set -e" >> /opt/elastalert/run.sh && \
-    echo "elastalert-create-index --config /opt/elastalert/config.yaml" \
-        >> /opt/elastalert/run.sh && \
-    echo "elastalert --config /opt/elastalert/config.yaml \"\$@\"" \
-        >> /opt/elastalert/run.sh && \
-    chmod +x /opt/elastalert/run.sh && \
-    groupadd -g ${GID} ${USERNAME} && \
-    useradd -u ${UID} -g ${GID} -M -b /opt -s /sbin/nologin \
-        -c "ElastAlert 2 User" ${USERNAME}
-
-USER ${USERNAME}
-ENV TZ "UTC"
+FROM python:3.9-alpine as build
+
+ENV ELASTALERT_HOME /opt/elastalert
+ADD . /opt/elastalert/
+
+WORKDIR /opt
+
+RUN apk add --update --no-cache jq curl gcc openssl-dev libffi-dev ca-certificates musl-dev
+RUN pip install "setuptools==65.5.0" "elasticsearch==6.3.1"
+
+WORKDIR "${ELASTALERT_HOME}"
+
+RUN pip install -r requirements.txt
+RUN python setup.py install
+
+RUN pip show elastalert2
+
+RUN echo "coming here..."
+RUN ls /usr/local/lib/
+RUN ls /usr/lib/
+RUN ls /lib/
+
+FROM gcr.io/distroless/python3:debug as runtime
+
+COPY --from=build /opt/elastalert /opt/elastalert
+COPY --from=build /usr/local/bin/elastalert* /usr/local/bin/
+
+COPY --from=build /opt/elastalert /opt/elastalert 
+COPY --from=build /usr/local/lib/python3.9 /usr/local/lib/python3.9
+COPY --from=build /usr/local/bin/elastalert* /usr/local/bin/
+COPY --from=build /usr/local/lib/libpython3.9.so.1.0 /usr/local/lib/
+COPY --from=build /lib/libc.musl-x86_64.so.1 /lib/
+
+#COPY  --from=build /data/elastalert /data/elastalert
+
+ENV PYTHONPATH=/usr/local/lib/python3.9/site-packages
+ENV PATH=/usr/local/lib:/usr/lib:$PATH
+
+RUN ls /usr/local/bin/
+RUN python --version
 
 WORKDIR /opt/elastalert
-ENTRYPOINT ["/opt/elastalert/run.sh"]
+
+COPY commands.sh /opt/elastalert/commands.sh
+RUN ["chmod", "+x", "/opt/elastalert/commands.sh"]
+ENTRYPOINT ["sh","/opt/elastalert/commands.sh"]

commands.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+echo "creating elastalert indices"
+python -m elastalert.create_index --config /data/elastalert/config.yaml --verbose
+echo "Starting elastalert"
+python -m elastalert.elastalert --config /data/elastalert/config.yaml --verbose

elastalert/alerters/alertmanager.py

@@ -30,7 +30,7 @@ def __init__(self, rule):
         self.timeout = self.rule.get('alertmanager_timeout', 10)
         self.alertmanager_basic_auth_login = self.rule.get('alertmanager_basic_auth_login', None)
         self.alertmanager_basic_auth_password = self.rule.get('alertmanager_basic_auth_password', None)
-
+        self.tenant = self.rule.get('tenant', "haystack")
 
     @staticmethod
     def _json_or_string(obj):
@@ -41,6 +41,7 @@ def _json_or_string(obj):
 
     def alert(self, matches):
         headers = {'content-type': 'application/json'}
+        headers.update({"X-Scope-OrgID": self.tenant})
         proxies = {'https': self.proxies} if self.proxies else None
         auth = HTTPBasicAuth(self.alertmanager_basic_auth_login, self.alertmanager_basic_auth_password) if self.alertmanager_basic_auth_login else None
 
@@ -60,7 +61,7 @@ def alert(self, matches):
 
         for host in self.hosts:
             try:
-                url = '{}/api/{}/alerts'.format(host, self.api_version)
+                url = host
 
                 if self.ca_certs:
                     verify = self.ca_certs