Skip to content

Commit bc2307e

Browse files
tlvutlvu
authored
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
2 parents 45a956d + cb3dd46 commit bc2307e

File tree

8 files changed

+33
-16
lines changed

8 files changed

+33
-16
lines changed

‎.bumpversion.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 2.6.3
2+
current_version = 2.6.4
33
commit = True
44
tag = False
55
tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
3030
replace = {new_version}
3131

3232
[bumpversion:file:RELEASE.txt]
33-
search = {current_version} 2024-12-05T23:54:48Z
33+
search = {current_version} 2024-12-09T18:49:25Z
3434
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
3535

3636
[bumpversion:part:releaseTime]
37-
values = 2024-12-05T23:54:48Z
37+
values = 2024-12-09T18:49:25Z
3838

3939
[bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
4040
search = 'version': '{current_version}'

‎CHANGES.md

+17
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,23 @@
1717

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

20+
[2.6.4](https://github.com/bird-house/birdhouse-deploy/tree/2.6.4) (2024-12-09)
21+
------------------------------------------------------------------------------------------------------------------
22+
23+
## Fixes
24+
25+
- canarie-api: fix new Thredds v5 monitoring URL
26+
27+
Fix the error below at the URL https://HOST/canarie/node/service/stats:
28+
Bad return code from http://thredds:8080//twitcher/ows/proxy/thredds/catalog.html (Expecting 200, Got 404
29+
30+
Old URL: http://thredds:8080//twitcher/ows/proxy/thredds/catalog.html
31+
New URL: http://thredds:8080/twitcher/ows/proxy/thredds/catalog/catalog.html
32+
33+
An oversight from the previous PR
34+
https://github.com/bird-house/birdhouse-deploy/pull/413
35+
36+
2037
[2.6.3](https://github.com/bird-house/birdhouse-deploy/tree/2.6.3) (2024-12-05)
2138
------------------------------------------------------------------------------------------------------------------
2239

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generic variables
22
override SHELL := bash
33
override APP_NAME := birdhouse-deploy
4-
override APP_VERSION := 2.6.3
4+
override APP_VERSION := 2.6.4
55

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

‎README.rst

+4-4
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.6.3.svg
21+
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.4.svg
2222
:alt: Commits since latest release
23-
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.3...master
23+
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.4...master
2424

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

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

‎RELEASE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.3 2024-12-05T23:54:48Z
1+
2.6.4 2024-12-09T18:49:25Z

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

+4-4
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.6.3',
112-
'releaseTime': '2024-12-05T23:54:48Z',
111+
'version': '2.6.4',
112+
'releaseTime': '2024-12-09T18:49:25Z',
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.6.3',
145-
'releaseTime': '2024-12-05T23:54:48Z',
144+
'version': '2.6.4',
145+
'releaseTime': '2024-12-09T18:49:25Z',
146146
'institution': '${BIRDHOUSE_INSTITUTION}',
147147
'researchSubject': '${BIRDHOUSE_SUBJECT}',
148148
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

‎birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ SERVICES['Thredds'] = {
6363
"monitoring": {
6464
"Thredds": {
6565
'request': {
66-
'url': 'http://thredds:8080/${TWITCHER_PROTECTED_PATH}/thredds/catalog.html'
66+
'url': 'http://thredds:8080${TWITCHER_PROTECTED_PATH}/thredds/catalog/catalog.html'
6767
}
6868
}
6969
}

‎docs/source/conf.py

+2-2
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.6.3'
72+
version = '2.6.4'
7373
# The full version, including alpha/beta/rc tags.
74-
release = '2.6.3'
74+
release = '2.6.4'
7575

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

0 commit comments

Comments
 (0)