diff --git a/src/lib/Server.js b/src/lib/Server.js index 17e5058b..1b924ff2 100644 --- a/src/lib/Server.js +++ b/src/lib/Server.js @@ -335,10 +335,6 @@ module.exports = class Server { }); }; - // Prometheus Metrics API - const routerPrometheusMetrics = createRouter(); - app.use(routerPrometheusMetrics); - // Check Prometheus credentials app.use( fromNodeMiddleware((req, res, next) => { @@ -346,11 +342,10 @@ module.exports = class Server { return next(); } const user = basicAuth(req); - if (requiresPrometheusPassword && !user) { + if (!user) { res.statusCode = 401; return { error: 'Not Logged In' }; } - if (user.pass) { if (isPasswordValid(user.pass, PROMETHEUS_METRICS_PASSWORD)) { return next(); @@ -363,6 +358,10 @@ module.exports = class Server { }), ); + // Prometheus Metrics API + const routerPrometheusMetrics = createRouter(); + app.use(routerPrometheusMetrics); + // Prometheus Routes routerPrometheusMetrics .get('/metrics', defineEventHandler(async (event) => {