Skip to content

Commit

Permalink
fix invalid weaver healthchecks
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault committed Jan 20, 2025
1 parent 1892911 commit f909fe3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
7 changes: 6 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
[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

- 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)
------------------------------------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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".*\}'
Expand Down
7 changes: 6 additions & 1 deletion birdhouse/components/weaver/docker-compose-extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f909fe3

Please sign in to comment.