Skip to content

Commit

Permalink
Merge branch 'master' into add_extraInitContainer_kubernetes
Browse files Browse the repository at this point in the history
  • Loading branch information
aturpin1789 authored Mar 27, 2023
2 parents b38b707 + 0ca988f commit e3c12bf
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
## New features
- TBD

# 2.10.1

## Breaking changes
- None

## New features
- None

## Other changes
- Corrected alert bug when both top_count_keys and query_key are specified in a rule - [#1128](https://github.com/jertel/elastalert2/pull/1128) - @jertel
- Fixed docker-compose detection logic from recent PR - [#1128](https://github.com/jertel/elastalert2/pull/1128) - @jertel
Expand Down
4 changes: 2 additions & 2 deletions chart/elastalert2/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
description: Automated rule-based alerting for Elasticsearch
name: elastalert2
version: 2.10.0
appVersion: 2.10.0
version: 2.10.1
appVersion: 2.10.1
home: https://github.com/jertel/elastalert2
sources:
- https://github.com/jertel/elastalert2
Expand Down
2 changes: 1 addition & 1 deletion chart/elastalert2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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.10.0 |
| `image.tag` | docker image tag | 2.10.1 |
| `image.pullPolicy` | image pull policy | IfNotPresent |
| `image.pullSecret` | image pull secret | "" |
| `podAnnotations` | Annotations to be added to pods | {} |
Expand Down
2 changes: 1 addition & 1 deletion chart/elastalert2/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ image:
# docker image
repository: jertel/elastalert2
# docker image tag
tag: 2.10.0
tag: 2.10.1
pullPolicy: IfNotPresent
pullSecret: ""

Expand Down
2 changes: 1 addition & 1 deletion docs/source/running_elastalert.rst
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ elastalert2 container image on `Docker Hub <https://hub.docker.com/r/jertel/elas

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.10.0`` instead, or ``2`` if you are comfortable with
versioned tag, such as ``2.10.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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
base_dir = os.path.dirname(__file__)
setup(
name='elastalert2',
version='2.10.0',
version='2.10.1',
description='Automated rule-based alerting for Elasticsearch',
long_description=open('README.md').read(),
long_description_content_type="text/markdown",
Expand Down

0 comments on commit e3c12bf

Please sign in to comment.