Skip to content

Commit ecd419e

Browse files
mishaschwartzmishaschwartz
authored
Update prometheus-log-parser component to use version 1.1.1 of the log-parser (#606)
## Overview See changes for versions [1.1.0](https://github.com/DACCS-Climate/log-parser/releases/tag/v1.1.0) and [1.1.1](https://github.com/DACCS-Climate/log-parser/releases/tag/v1.1.1). The most relevant changes to this project are support for parsing logs from streams (like stdout) and a safer way to kill the running log-parser container. ## Changes **Non-breaking changes** - prometheus log parser version increase to 1.1.1 **Breaking changes** - None ## Related Issue / Discussion ## Additional Information Links to other issues or sources. ## CI Operations <!-- The test suite can be run using a different DACCS config with ``birdhouse_daccs_configs_branch: branch_name`` in the PR description. To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci`` set to ``true`` in the PR description. Using ``[<cmd>]`` (with the brackets) where ``<cmd> = skip ci`` in the commit message will override ``birdhouse_skip_ci`` from the PR description. Such commit command can be used to override the PR description behavior for a specific commit update. However, a commit message cannot 'force run' a PR which the description turns off the CI. To run the CI, the PR should instead be updated with a ``true`` value, and a running message can be posted in following PR comments to trigger tests once again. --> birdhouse_daccs_configs_branch: master birdhouse_skip_ci: false
2 parents a056c92 + 853c4d7 commit ecd419e

File tree

8 files changed

+27
-14
lines changed

8 files changed

+27
-14
lines changed

‎.bumpversion.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tool.bumpversion]
2-
current_version = "2.18.12"
2+
current_version = "2.18.13"
33
commit = true
44
tag = false
55
tag_name = "{new_version}"

‎CHANGES.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,19 @@
1717

1818
[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
1919

20+
[2.18.13](https://github.com/bird-house/birdhouse-deploy/tree/2.18.13) (2025-12-01)
21+
------------------------------------------------------------------------------------------------------------------
22+
23+
## Changes
24+
25+
- Update `prometheus-log-parser` component to use version 1.1.1 of the log-parser
26+
27+
See changes for versions [1.1.0](https://github.com/DACCS-Climate/log-parser/releases/tag/v1.1.0) and
28+
[1.1.1](https://github.com/DACCS-Climate/log-parser/releases/tag/v1.1.1).
29+
30+
The most relevant changes to this project are support for parsing logs from streams (like stdout) and a
31+
safer way to kill the running log-parser container.
32+
2033
[2.18.12](https://github.com/bird-house/birdhouse-deploy/tree/2.18.12) (2025-11-25)
2134
------------------------------------------------------------------------------------------------------------------
2235

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ override BIRDHOUSE_MAKE_DIR := $(shell realpath -P $$(dirname $(BIRDHOUSE_MAKE_C
88
# Generic variables
99
override SHELL := bash
1010
override APP_NAME := birdhouse-deploy
11-
override APP_VERSION := 2.18.12
11+
override APP_VERSION := 2.18.13
1212

1313
# utility to remove comments after value of an option variable
1414
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

‎README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ for a full-fledged production platform.
1818
* - citation
1919
- | |citation|
2020

21-
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.18.12.svg
21+
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.18.13.svg
2222
:alt: Commits since latest release
23-
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.18.12...master
23+
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.18.13...master
2424

25-
.. |latest-version| image:: https://img.shields.io/badge/tag-2.18.12-blue.svg?style=flat
25+
.. |latest-version| image:: https://img.shields.io/badge/tag-2.18.13-blue.svg?style=flat
2626
:alt: Latest Tag
27-
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.18.12
27+
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.18.13
2828

2929
.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
3030
:alt: ReadTheDocs Build Status (latest version)

‎RELEASE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.18.12 2025-11-25T02:46:23Z
1+
2.18.13 2025-12-01T15:35:01Z

‎birdhouse/components/canarie-api/docker_configuration.py.template‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ SERVICES = {
108108
# NOTE:
109109
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
110110
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
111-
'version': '2.18.12',
112-
'releaseTime': '2025-11-25T02:46:23Z',
111+
'version': '2.18.13',
112+
'releaseTime': '2025-12-01T15:35:01Z',
113113
'institution': '${BIRDHOUSE_INSTITUTION}',
114114
'researchSubject': '${BIRDHOUSE_SUBJECT}',
115115
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
141141
# NOTE:
142142
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
143143
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
144-
'version': '2.18.12',
145-
'releaseTime': '2025-11-25T02:46:23Z',
144+
'version': '2.18.13',
145+
'releaseTime': '2025-12-01T15:35:01Z',
146146
'institution': '${BIRDHOUSE_INSTITUTION}',
147147
'researchSubject': '${BIRDHOUSE_SUBJECT}',
148148
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

‎birdhouse/optional-components/prometheus-log-parser/default.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export PROMETHEUS_LOG_PARSER_DOCKER=marbleclimate/log-parser
2-
export PROMETHEUS_LOG_PARSER_VERSION=v1.0.1
2+
export PROMETHEUS_LOG_PARSER_VERSION=v1.1.1
33
export PROMETHEUS_LOG_PARSER_IMAGE='${PROMETHEUS_LOG_PARSER_DOCKER}:${PROMETHEUS_LOG_PARSER_VERSION}'
44
export PROMETHEUS_LOG_PARSER_CLIENT_PORT=8000
55
export PROMETHEUS_LOG_PARSER_PARSERS_DIR=/parsers.d

‎docs/source/conf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
# built documents.
7070
#
7171
# The short X.Y version.
72-
version = '2.18.12'
72+
version = '2.18.13'
7373
# The full version, including alpha/beta/rc tags.
74-
release = '2.18.12'
74+
release = '2.18.13'
7575

7676
# The language for content autogenerated by Sphinx. Refer to documentation
7777
# for a list of supported languages.

0 commit comments

Comments
 (0)