diff --git a/commafeed-client/src/pages/admin/MetricsPage.tsx b/commafeed-client/src/pages/admin/MetricsPage.tsx index 97fa43fc..b0de53e1 100644 --- a/commafeed-client/src/pages/admin/MetricsPage.tsx +++ b/commafeed-client/src/pages/admin/MetricsPage.tsx @@ -22,10 +22,10 @@ const shownGauges: Record = { "com.commafeed.backend.feed.FeedRefreshEngine.queue.size": "Feed Refresh Engine queue size", "com.commafeed.backend.feed.FeedRefreshEngine.worker.active": "Feed Refresh Engine active HTTP workers", "com.commafeed.backend.feed.FeedRefreshEngine.updater.active": "Feed Refresh Engine active database update workers", - "com.commafeed.backend.HttpGetter.pool.max": "HttpGetter max connections", - "com.commafeed.backend.HttpGetter.pool.available": "HttpGetter available connections", - "com.commafeed.backend.HttpGetter.pool.leased": "HttpGetter leased connections", - "com.commafeed.backend.HttpGetter.pool.pending": "HttpGetter waiting for available connections", + "com.commafeed.backend.HttpGetter.pool.max": "HttpGetter max pool size", + "com.commafeed.backend.HttpGetter.pool.size": "HttpGetter current pool size", + "com.commafeed.backend.HttpGetter.pool.leased": "HttpGetter active connections", + "com.commafeed.backend.HttpGetter.pool.pending": "HttpGetter waiting for a connection", "com.commafeed.frontend.ws.WebSocketSessions.users": "WebSocket users", "com.commafeed.frontend.ws.WebSocketSessions.sessions": "WebSocket sessions", } diff --git a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java index 92f25603..c7bc6155 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java @@ -62,7 +62,8 @@ public class HttpGetter { this.maxResponseSize = config.getApplicationSettings().getMaxFeedResponseSize(); metrics.registerGauge(MetricRegistry.name(getClass(), "pool", "max"), () -> connectionManager.getTotalStats().getMax()); - metrics.registerGauge(MetricRegistry.name(getClass(), "pool", "available"), () -> connectionManager.getTotalStats().getAvailable()); + metrics.registerGauge(MetricRegistry.name(getClass(), "pool", "size"), + () -> connectionManager.getTotalStats().getAvailable() + connectionManager.getTotalStats().getLeased()); metrics.registerGauge(MetricRegistry.name(getClass(), "pool", "leased"), () -> connectionManager.getTotalStats().getLeased()); metrics.registerGauge(MetricRegistry.name(getClass(), "pool", "pending"), () -> connectionManager.getTotalStats().getPending()); }