diff --git a/assist/server.js b/assist/server.js index 8046c9b17..911c8cf36 100644 --- a/assist/server.js +++ b/assist/server.js @@ -4,7 +4,16 @@ const socket = require("./servers/websocket"); const {request_logger} = require("./utils/helper"); const health = require("./utils/health"); const assert = require('assert').strict -const register = require('./metrics').register; +const register = require('./utils/metrics').register; + +health.healthApp.get('/metrics', async (req, res) => { + try { + res.set('Content-Type', register.contentType); + res.end(await register.metrics()); + } catch (ex) { + res.status(500).end(ex); + } +}); const debug = process.env.debug === "1"; const heapdump = process.env.heapdump === "1"; @@ -27,15 +36,6 @@ wsapp.get(['/', PREFIX, `${PREFIX}/`, `${PREFIX}/${P_KEY}`, `${PREFIX}/${P_KEY}/ wsapp.use(`${PREFIX}/${P_KEY}`, socket.wsRouter); heapdump && wsapp.use(`${PREFIX}/${P_KEY}/heapdump`, dumps.router); -health.healthApp.get('/metrics', async (req, res) => { - try { - res.set('Content-Type', register.contentType); - res.end(await register.metrics()); - } catch (ex) { - res.status(500).end(ex); - } -}); - const wsserver = wsapp.listen(PORT, HOST, () => { console.log(`WS App listening on http://${HOST}:${PORT}`); health.healthApp.listen(health.PORT, HOST, health.listen_cb); diff --git a/ee/assist/server.js b/ee/assist/server.js index 095b7e1ea..685a77239 100644 --- a/ee/assist/server.js +++ b/ee/assist/server.js @@ -3,6 +3,16 @@ const {request_logger} = require('./utils/helper'); const express = require('express'); const health = require("./utils/health"); const assert = require('assert').strict; +const register = require('./utils/metrics').register; + +health.healthApp.get('/metrics', async (req, res) => { + try { + res.set('Content-Type', register.contentType); + res.end(await register.metrics()); + } catch (ex) { + res.status(500).end(ex); + } +}); let socket; if (process.env.redis === "true") {