diff options
| author | Dan Engelbrecht <[email protected]> | 2026-04-02 19:59:28 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-04-02 19:59:28 +0200 |
| commit | e417ba62801edc1d05aecd00c7da9e419ad23787 (patch) | |
| tree | 13650e35b056f797058086500f780d49a64750f0 | |
| parent | 5.8.2 (diff) | |
| download | zen-e417ba62801edc1d05aecd00c7da9e419ad23787.tar.xz zen-e417ba62801edc1d05aecd00c7da9e419ad23787.zip | |
fix hub consule health endpoint registration (#917)
* use correct health endpoint for zenhubserver consul registration
* add total disk space on hub resource pane
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | src/zenserver/frontend/html/pages/hub.js | 1 | ||||
| -rw-r--r-- | src/zenserver/hub/zenhubserver.cpp | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 04a912d6b..6be04b48c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ ## +- Bugfix: Fixed hub Consul health check registering with `/hub/health` endpoint which does not exist; now uses `/health` +- Bugfix: Hub dashboard Resources tile was missing total disk space + +## 5.8.2 - Feature: Hub dashboard proxy - instance dashboards are accessible through the hub server at `/hub/proxy/{port}/` without requiring direct port access - Feature: Hub dashboard provision button allows creating new module instances from the web UI - Improvement: Consul token is now re-read from the environment variable on every request, allowing token rotation without restarting the service diff --git a/src/zenserver/frontend/html/pages/hub.js b/src/zenserver/frontend/html/pages/hub.js index 274e3fd35..c9652f31e 100644 --- a/src/zenserver/frontend/html/pages/hub.js +++ b/src/zenserver/frontend/html/pages/hub.js @@ -236,6 +236,7 @@ export class Page extends ZenPage const left = columns.tag().classify("tile-metrics"); this._metric(left, Friendly.bytes(disk_used), "disk used", true); + this._metric(left, Friendly.bytes(machine.disk_total_bytes), "disk total"); if (disk_limit > 0) { this._metric(left, Friendly.bytes(disk_limit), "disk limit"); } const right = columns.tag().classify("tile-metrics"); diff --git a/src/zenserver/hub/zenhubserver.cpp b/src/zenserver/hub/zenhubserver.cpp index 5308a76f1..d01e5f3f2 100644 --- a/src/zenserver/hub/zenhubserver.cpp +++ b/src/zenserver/hub/zenhubserver.cpp @@ -706,7 +706,7 @@ ZenHubServer::InitializeConsulRegistration(const ZenHubServerConfig& ServerConfi Info.ServiceName = "zen-hub"; // Info.Address = "localhost"; // Let the consul agent figure out out external address // TODO: Info.BaseUri? Info.Port = static_cast<uint16_t>(EffectivePort); - Info.HealthEndpoint = "hub/health"; + Info.HealthEndpoint = "health"; Info.Tags = std::vector<std::pair<std::string, std::string>>{ std::make_pair("zen-hub", Info.ServiceId), std::make_pair("version", std::string(ZEN_CFG_VERSION)), |