diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 45d97802..e0905dd1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.8.0 +current_version = 2.8.1 commit = True tag = False tag_name = {new_version} @@ -30,11 +30,11 @@ search = {current_version} replace = {new_version} [bumpversion:file:RELEASE.txt] -search = {current_version} 2025-01-17T23:17:16Z +search = {current_version} 2025-01-20T23:37:02Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2025-01-17T23:17:16Z +values = 2025-01-20T23:37:02Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 5d1d4cb7..44072b29 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,16 @@ [//]: # (list changes here, using '-' for each new entry, remove this when items are added) +[2.8.1](https://github.com/bird-house/birdhouse-deploy/tree/2.8.1) (2025-01-20) +------------------------------------------------------------------------------------------------------------------ + +## Fixes + +- Weaver: adjust missing `WEAVER_MANAGER_NAME` in healthchecks expecting matching `SCRIPT_NAME` configuration + + * Weaver's own `healthcheck` definition did not resolve to the expected endpoint. + * Canarie-API `monitoring` endpoint for Weaver did not resolve to the expected endpoint. + [2.8.0](https://github.com/bird-house/birdhouse-deploy/tree/2.8.0) (2025-01-17) ------------------------------------------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index 166fa34d..49a29bbd 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.8.0 +override APP_VERSION := 2.8.1 # utility to remove comments after value of an option variable override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g") diff --git a/README.rst b/README.rst index 82612aa3..0b3cee9c 100644 --- a/README.rst +++ b/README.rst @@ -18,13 +18,13 @@ for a full-fledged production platform. * - citation - | |citation| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.8.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.8.1.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.8.0...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.8.1...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.8.0-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.8.1-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.8.0 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.8.1 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version) diff --git a/RELEASE.txt b/RELEASE.txt index 56a69f9a..7f2cc40d 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.8.0 2025-01-17T23:17:16Z +2.8.1 2025-01-20T23:37:02Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index e94784c9..2092d80a 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/canarie-api/docker_configuration.py.template @@ -108,8 +108,8 @@ SERVICES = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.8.0', - 'releaseTime': '2025-01-17T23:17:16Z', + 'version': '2.8.1', + 'releaseTime': '2025-01-20T23:37:02Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', @@ -141,8 +141,8 @@ PLATFORMS = { # NOTE: # Below version and release time auto-managed by 'make VERSION=x.y.z bump'. # Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'. - 'version': '2.8.0', - 'releaseTime': '2025-01-17T23:17:16Z', + 'version': '2.8.1', + 'releaseTime': '2025-01-20T23:37:02Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/birdhouse/components/weaver/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/weaver/config/canarie-api/canarie_api_monitoring.py.template index 6ba1c83a..83bb2e5a 100644 --- a/birdhouse/components/weaver/config/canarie-api/canarie_api_monitoring.py.template +++ b/birdhouse/components/weaver/config/canarie-api/canarie_api_monitoring.py.template @@ -26,7 +26,7 @@ SERVICES['Weaver'] = { "monitoring": { "Weaver": { 'request': { - 'url': 'http://weaver:4001/' + 'url': 'http://weaver:4001/${WEAVER_MANAGER_NAME}/' }, 'response': { 'text': '\{.*"message":.*"Weaver Information".*\}' diff --git a/birdhouse/components/weaver/docker-compose-extra.yml b/birdhouse/components/weaver/docker-compose-extra.yml index a5634e48..916bb530 100644 --- a/birdhouse/components/weaver/docker-compose-extra.yml +++ b/birdhouse/components/weaver/docker-compose-extra.yml @@ -44,7 +44,12 @@ services: restart: always logging: *default-logging healthcheck: - test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:4001')"] + test: [ + "CMD", + "python", + "-c", + "import urllib.request; urllib.request.urlopen('http://localhost:4001/${WEAVER_MANAGER_NAME}/')" + ] interval: 60s timeout: 5s retries: 3 diff --git a/docs/source/conf.py b/docs/source/conf.py index a9e278c7..d937828c 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.8.0' +version = '2.8.1' # The full version, including alpha/beta/rc tags. -release = '2.8.0' +release = '2.8.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.