From f8a4aea41699451e595b9ed5efcaf7739bc59ef4 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 13 Jul 2023 17:26:51 +0700 Subject: [PATCH] add changelog --- CHANGELOG.md | 2 +- docs/source/ruletypes.rst | 4 +++- elastalert/schema.yaml | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27024b13..69267fb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ - [Kubernetes] Fix mistake introduced in #1141 related to initContainers - [#1145](https://github.com/jertel/elastalert2/pull/1145) - @aturpin1789 - Add support for Kibana 8.7 for Kibana Discover - [#1153](https://github.com/jertel/elastalert2/pull/1153) - @nsano-rururu - [Docs] Add documentation for accessing subfields of array items - [#1166](https://github.com/jertel/elastalert2/pull/1166) - @jertel - +- Add alertmanager resolve timeout configuration option. # 2.10.1 ## Breaking changes diff --git a/docs/source/ruletypes.rst b/docs/source/ruletypes.rst index 80cc3486..4ef31084 100644 --- a/docs/source/ruletypes.rst +++ b/docs/source/ruletypes.rst @@ -1809,7 +1809,9 @@ Optional: ``alertmanager_ignore_ssl_errors``: By default ElastAlert 2 will verify SSL certificate. Set this option to ``True`` if you want to ignore SSL errors. ``alertmanager_timeout``: You can specify a timeout value, in seconds, for making communicating with Alertmanager. The default is 10. If a timeout occurs, the alert will be retried next time ElastAlert 2 cycles. - +`` +``alertmanager_resolve_timeout``: You can specify a timeout value, in minutes.The default is 5, and we recommend leaving this configuration greater than the ``buffer_time`` or the ``realert`` value because Alertmanager has a default ``resolve_timeout`` of 5 minutes (this means that after 5 minutes, if it doesn't receive any repeated alerts, it will consider the alert to have stopped firing). +`` ``alertmanager_basic_auth_login``: Basic authentication username. ``alertmanager_basic_auth_password``: Basic authentication password. diff --git a/elastalert/schema.yaml b/elastalert/schema.yaml index f3f46051..4b08fc3c 100644 --- a/elastalert/schema.yaml +++ b/elastalert/schema.yaml @@ -328,6 +328,9 @@ properties: alertmanager_ca_certs: {type: [boolean, string]} alertmanager_ignore_ssl_errors: {type: boolean} alertmanager_timeout: {type: integer} + alertmanager_resolve_timeout: + type: integer + minProperties: 1 alertmanager_basic_auth_login: {type: string} alertmanager_basic_auth_password: {type: string} alertmanager_labels: