From dbe48d376fdc62ab8c7b1e82a227728b5e252eea Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 5 Dec 2024 19:36:59 -0500 Subject: [PATCH 1/3] canarie-api: fix new Thredds v5 monitoring URL Fix the error below at the URL https://HOST/canarie/node/service/stats: Bad return code from http://thredds:8080//twitcher/ows/proxy/thredds/catalog.html (Expecting 200, Got 404 Old URL: http://thredds:8080//twitcher/ows/proxy/thredds/catalog.html New URL: http://thredds:8080/twitcher/ows/proxy/thredds/catalog/catalog.html --- .../config/canarie-api/canarie_api_monitoring.py.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template index 2ba78d1b6..904723802 100644 --- a/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template +++ b/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template @@ -63,7 +63,7 @@ SERVICES['Thredds'] = { "monitoring": { "Thredds": { 'request': { - 'url': 'http://thredds:8080/${TWITCHER_PROTECTED_PATH}/thredds/catalog.html' + 'url': 'http://thredds:8080${TWITCHER_PROTECTED_PATH}/thredds/catalog/catalog.html' } } } From e8339a043eb9456391e2f35a0ef18526e7b49365 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 5 Dec 2024 19:45:13 -0500 Subject: [PATCH 2/3] CHANGES: canarie-api: fix new Thredds v5 monitoring URL --- CHANGES.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 5c0eba928..ec6012fc9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,19 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Fixes + +- canarie-api: fix new Thredds v5 monitoring URL + + Fix the error below at the URL https://HOST/canarie/node/service/stats: + Bad return code from http://thredds:8080//twitcher/ows/proxy/thredds/catalog.html (Expecting 200, Got 404 + + Old URL: http://thredds:8080//twitcher/ows/proxy/thredds/catalog.html + New URL: http://thredds:8080/twitcher/ows/proxy/thredds/catalog/catalog.html + + An oversight from the previous PR + https://github.com/bird-house/birdhouse-deploy/pull/413 + [2.6.3](https://github.com/bird-house/birdhouse-deploy/tree/2.6.3) (2024-12-05) ------------------------------------------------------------------------------------------------------------------ From cb3dd462573932dc52d40abd0b0c11713ac490aa Mon Sep 17 00:00:00 2001 From: Long Vu Date: Mon, 9 Dec 2024 13:49:26 -0500 Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=202.6.3=20=E2=86=92=202.6.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 +++++ Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 50bd4734f..b6aeb8d1c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.6.3 +current_version = 2.6.4 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} 2024-12-05T23:54:48Z +search = {current_version} 2024-12-09T18:49:25Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-12-05T23:54:48Z +values = 2024-12-09T18:49:25Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 9eff07afc..003e02f18 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,11 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ +[//]: # (list changes here, using '-' for each new entry, remove this when items are added) + +[2.6.4](https://github.com/bird-house/birdhouse-deploy/tree/2.6.4) (2024-12-09) +------------------------------------------------------------------------------------------------------------------ + ## Fixes - canarie-api: fix new Thredds v5 monitoring URL diff --git a/Makefile b/Makefile index 1fa26a23a..eb748017d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.6.3 +override APP_VERSION := 2.6.4 # 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 e3df4e230..89b53a048 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.6.3.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.4.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.3...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.4...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.3-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.4-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.3 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.4 .. |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 a4342d060..0eb98c1ff 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.6.3 2024-12-05T23:54:48Z +2.6.4 2024-12-09T18:49:25Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index f4b726751..660e9ab88 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.6.3', - 'releaseTime': '2024-12-05T23:54:48Z', + 'version': '2.6.4', + 'releaseTime': '2024-12-09T18:49:25Z', '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.6.3', - 'releaseTime': '2024-12-05T23:54:48Z', + 'version': '2.6.4', + 'releaseTime': '2024-12-09T18:49:25Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index fa7659117..1a81a8520 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.6.3' +version = '2.6.4' # The full version, including alpha/beta/rc tags. -release = '2.6.3' +release = '2.6.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.