From 2132ab285831f368f204210be8de409714573df3 Mon Sep 17 00:00:00 2001
From: Amund Bergland Kvalsvik <akvalsvik@verizonmedia.com>
Date: Fri, 26 Jun 2020 12:01:42 +0200
Subject: Updated ApplicationMetricsHandler. Removed PrometheusV1Handler

---
 .../admin/metricsproxy/MetricsProxyContainerCluster.java  |  2 +-
 .../model/container/ApplicationContainerCluster.java      | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
index 20f2bfe6636..d698d42b2d9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java
@@ -117,7 +117,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC
         addHttpHandler(PrometheusHandler.class, PrometheusHandler.V1_PATH);
         addHttpHandler(YamasHandler.class, YamasHandler.V1_PATH);
 
-        addHttpHandler(ApplicationMetricsHandler.class, ApplicationMetricsHandler.V1_PATH);
+        addHttpHandler(ApplicationMetricsHandler.class, ApplicationMetricsHandler.V1_METRICS);
         addMetricsProxyComponent(ApplicationMetricsRetriever.class);
 
         addTelegrafComponents();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index b9f849405da..55ce199eddf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -13,7 +13,6 @@ import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.container.handler.ThreadpoolConfig;
 import com.yahoo.container.handler.metrics.MetricsProxyApiConfig;
 import com.yahoo.container.handler.metrics.MetricsV2Handler;
-import com.yahoo.container.handler.metrics.PrometheusV1Handler;
 import com.yahoo.container.jdisc.ContainerMbusConfig;
 import com.yahoo.container.jdisc.messagebus.MbusServerProvider;
 import com.yahoo.jdisc.http.ServletPathsConfig;
@@ -59,10 +58,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
     public static final String METRICS_V2_HANDLER_BINDING_1 = "http://*" + MetricsV2Handler.V2_PATH;
     public static final String METRICS_V2_HANDLER_BINDING_2 = METRICS_V2_HANDLER_BINDING_1 + "/*";
 
-    public static final String PROMETHEUS_V1_HANDLER_CLASS = PrometheusV1Handler.class.getName();
-    public static final String PROMETHEUS_V1_HANDLER_BINDING_1 = "http://*" + PrometheusV1Handler.V1_PATH;
-    public static final String PROMETHEUS_V1_HANDLER_BINDING_2 = PROMETHEUS_V1_HANDLER_BINDING_1 + "/*";
-
     public static final int heapSizePercentageOfTotalNodeMemory = 60;
     public static final int heapSizePercentageOfTotalNodeMemoryWhenCombinedCluster = 17;
 
@@ -94,7 +89,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         addSimpleComponent("com.yahoo.container.jdisc.AthenzIdentityProviderProvider");
         addSimpleComponent("com.yahoo.container.jdisc.SystemInfoProvider");
         addMetricsV2Handler();
-        addPrometheusV1Handler();
         addTestrunnerComponentsIfTester(deployState);
     }
 
@@ -129,13 +123,6 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         addComponent(handler);
     }
 
-    public void addPrometheusV1Handler() {
-        Handler<AbstractConfigProducer<?>> handler = new Handler<>(
-                new ComponentModel(PROMETHEUS_V1_HANDLER_CLASS, null, null, null));
-        handler.addServerBindings(PROMETHEUS_V1_HANDLER_BINDING_1, PROMETHEUS_V1_HANDLER_BINDING_2);
-        addComponent(handler);
-    }
-
     private void addTestrunnerComponentsIfTester(DeployState deployState) {
         if (deployState.isHosted() && deployState.getProperties().applicationId().instance().isTester())
             addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/vespa-testrunner-components-jar-with-dependencies.jar")));
@@ -227,7 +214,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
     @Override
     public void getConfig(MetricsProxyApiConfig.Builder builder) {
         builder.metricsPort(MetricsProxyContainer.BASEPORT)
-                .metricsApiPath(ApplicationMetricsHandler.VALUES_PATH);
+                .metricsApiPath(ApplicationMetricsHandler.METRICS_VALUES_PATH);
     }
 
     @Override
-- 
cgit v1.2.3