From c9d17400adfeac3c98c2f7f07a51a4c0db673153 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Sun, 22 Aug 2021 22:01:54 -0400 Subject: [PATCH] Resolve issue introduced in #407 --- CHANGELOG.md | 11 +++++++++++ chart/elastalert2/Chart.yaml | 4 ++-- chart/elastalert2/README.md | 2 +- chart/elastalert2/values.yaml | 2 +- docs/source/running_elastalert.rst | 2 +- elastalert/elastalert.py | 2 +- setup.py | 2 +- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fb8ec80..3b5103d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,17 @@ - None +# 2.2.1 + +## Breaking changes +- None + +## New features +- None + +## Other changes +- Fixed config lookup bug accidentally introduced in [#407](https://github.com/jertel/elastalert2/pull/407) + # 2.2.0 ## Breaking changes diff --git a/chart/elastalert2/Chart.yaml b/chart/elastalert2/Chart.yaml index 22d6bae1..b741d225 100644 --- a/chart/elastalert2/Chart.yaml +++ b/chart/elastalert2/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Automated rule-based alerting for Elasticsearch name: elastalert2 -version: 2.2.0 -appVersion: 2.2.0 +version: 2.2.1 +appVersion: 2.2.1 home: https://github.com/jertel/elastalert2 sources: - https://github.com/jertel/elastalert2 diff --git a/chart/elastalert2/README.md b/chart/elastalert2/README.md index 50d010e9..594dc01c 100644 --- a/chart/elastalert2/README.md +++ b/chart/elastalert2/README.md @@ -47,7 +47,7 @@ The command removes all the Kubernetes components associated with the chart and | Parameter | Description | Default | |----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------| | `image.repository` | docker image | jertel/elastalert2 | -| `image.tag` | docker image tag | 2.2.0 | +| `image.tag` | docker image tag | 2.2.1 | | `image.pullPolicy` | image pull policy | IfNotPresent | | `image.pullSecret` | image pull secret | "" | | `podAnnotations` | Annotations to be added to pods | {} | diff --git a/chart/elastalert2/values.yaml b/chart/elastalert2/values.yaml index 734f690c..e8ba2482 100644 --- a/chart/elastalert2/values.yaml +++ b/chart/elastalert2/values.yaml @@ -25,7 +25,7 @@ image: # docker image repository: jertel/elastalert2 # docker image tag - tag: 2.2.0 + tag: 2.2.1 pullPolicy: IfNotPresent pullSecret: "" diff --git a/docs/source/running_elastalert.rst b/docs/source/running_elastalert.rst index a5131e18..348edaaf 100644 --- a/docs/source/running_elastalert.rst +++ b/docs/source/running_elastalert.rst @@ -77,7 +77,7 @@ If you're interested in a pre-built Docker image check out the Be aware that the ``latest`` tag of the image represents the latest commit into the master branch. If you prefer to upgrade more slowly you will need utilize a -versioned tag, such as ``2.2.0`` instead, or ``2`` if you are comfortable with +versioned tag, such as ``2.2.1`` instead, or ``2`` if you are comfortable with always using the latest released version of ElastAlert 2. A properly configured config.yaml file must be mounted into the container during diff --git a/elastalert/elastalert.py b/elastalert/elastalert.py index dbf0301d..12392b78 100755 --- a/elastalert/elastalert.py +++ b/elastalert/elastalert.py @@ -167,7 +167,7 @@ def __init__(self, args): self.add_metadata_alert = self.conf.get('add_metadata_alert', False) self.prometheus_port = self.args.prometheus_port self.show_disabled_rules = self.conf.get('show_disabled_rules', True) - self.pretty_ts_format = self.conf['custom_pretty_ts_format'] + self.pretty_ts_format = self.conf.get('custom_pretty_ts_format') self.writeback_es = elasticsearch_client(self.conf) diff --git a/setup.py b/setup.py index 2c1513ff..f561f0c8 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ base_dir = os.path.dirname(__file__) setup( name='elastalert2', - version='2.2.0', + version='2.2.1', description='Automated rule-based alerting for Elasticsearch', setup_requires='setuptools', license='Apache 2.0',