Resolve issue introduced in #407

jertel · Aug 23, 2021 · c9d1740 · c9d1740
1 parent 75945b3
commit c9d1740
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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',