canarie-api: fix new Thredds v5 monitoring URL (#485)

## Overview

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
#413

## Changes

**Non-breaking changes**
- Adapt canarie-api to new Thredds v5 URL

## 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

.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}'

CHANGES.md

@@ -17,6 +17,23 @@
 
 [//]: # (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
+
+  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)
 ------------------------------------------------------------------------------------------------------------------
 

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")

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)

RELEASE.txt

@@ -1 +1 @@
-2.6.3 2024-12-05T23:54:48Z
+2.6.4 2024-12-09T18:49:25Z

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}',

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'
             }
         }
     }

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.