1 files changed, 10 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
index 865805d1258..e18c6ad6c56 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
@@ -104,6 +104,10 @@ public class ApplicationHandler extends HttpHandler {
             return applicationRepository.getLogs(applicationId, hostname, apiParams);
         }
 
+        if (isMetricsRequest(request)) {
+            return applicationRepository.getMetrics(applicationId);
+        }
+
         if (isIsSuspendedRequest(request)) {
             return new ApplicationSuspendedResponse(applicationRepository.isSuspended(applicationId));
         }
@@ -144,6 +148,7 @@ public class ApplicationHandler extends HttpHandler {
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge",
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge/*",
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*",
+                "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/metrics",
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*",
                 "http://*/application/v2/tenant/*/application/*/logs",
                 "http://*/application/v2/tenant/*/application/*");
@@ -154,6 +159,11 @@ public class ApplicationHandler extends HttpHandler {
                request.getUri().getPath().endsWith("/suspended");
     }
 
+    private static boolean isMetricsRequest(HttpRequest request) {
+        return getBindingMatch(request).groupCount() == 7 &&
+                request.getUri().getPath().endsWith("/metrics");
+    }
+
     private static boolean isLogRequest(HttpRequest request) {
         return getBindingMatch(request).groupCount() == 4 &&
                 request.getUri().getPath().endsWith("/logs");