Merge branch 'master' into kibana_discover812

CHANGELOG.md

@@ -23,7 +23,8 @@
 - [Docs] Refactor the docs structure for improved ease-of-use - [#1337](https://github.com/jertel/elastalert2/pull/1337) - @jertel
 - [Email] Refactor SMTP cert/key usage to support Python 3.12 - [#1341](https://github.com/jertel/elastalert2/pull/1341) - @jertel
 - [IRIS] Fix schema.yaml(iris_url to iris_host) - [#1346](https://github.com/jertel/elastalert2/pull/1346) - @nsano-rururu
-- [IRIS] Fix issue with document with nested json inside. See [#1348](https://github.com/jertel/elastalert2/discussions/1348) - [#1352](https://github.com/jertel/elastalert2/pull/1352) @malinkinsa
+- [IRIS] Fix issue with document with nested json inside. See [#1348](https://github.com/jertel/elastalert2/discussions/1348) - [#1352](https://github.com/jertel/elastalert2/pull/1352) - @malinkinsa
+- [Docs] Clarify `jinja_template_path` documentation - [20a05f9](https://github.com/jertel/elastalert2/commit/20a05f995f566f8719d6e4bf7b8a3977c7ab9e23) - @jertel
 
 # 2.15.0
 

docs/source/configuration.rst

@@ -134,7 +134,7 @@ The default value is ``.keyword``.
 
 ``jinja_root_name``: When using a Jinja template, specify the name of the root field name in the template. The default is ``_data``.
 
-``jinja_template_path``: When using a Jinja template, specify filesystem path to template, this overrides the default behaviour of using alert_text as the template.
+``jinja_template_path``: When using a Jinja template, specify relative (based on current working directory) filesystem path to template, this overrides the default behaviour of using alert_text as the template.
 
 ``custom_pretty_ts_format``: This option provides a way to define custom format of timestamps printed in log messages and in alert messages.
 If this option is not set, default timestamp format ('%Y-%m-%d %H:%M %Z') will be used. (Optional, string, default None)

elastalert/elastalert.py

@@ -1152,7 +1152,7 @@ def start(self):
             if self.args.end:
                 endtime = ts_to_dt(self.args.end)
 
-                next_run_dt = next_run.replace(tzinfo=timezone.utc)
+                next_run_dt = next_run.replace(tzinfo=datetime.timezone.utc)
                 if next_run_dt > endtime:
                     elastalert_logger.info("End time '%s' falls before the next run time '%s', exiting." % (endtime, next_run_dt))
                     exit(0)