diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2019-09-05 11:27:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 11:27:07 +0200 |
| commit | 3b81210bcbb23dd073d2b6903a1179039ae2012e (patch) | |
| tree | ba7a62cae3931565c179727f640b5e69a8c077ba /config-model | |
| parent | 7d8823ef79a852ea21eaf3b092fd989d723bd844 (diff) | |
| parent | d84dddd3d6544c5f0f640a908e673cf90ce3667b (diff) | |
Merge pull request #10472 from vespa-engine/olaa/metrics-proxy-gather-node-metrics
Yamas handler and system metric gatherer
Diffstat (limited to 'config-model')
2 files changed, 4 insertions, 0 deletions
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 6cd0a80bee3..94dbdafe980 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 @@ -10,6 +10,7 @@ import ai.vespa.metricsproxy.core.MetricsManager; import ai.vespa.metricsproxy.core.MonitoringConfig; import ai.vespa.metricsproxy.core.VespaMetrics; import ai.vespa.metricsproxy.http.MetricsHandler; +import ai.vespa.metricsproxy.http.yamas.YamasHandler; import ai.vespa.metricsproxy.http.prometheus.PrometheusHandler; import ai.vespa.metricsproxy.metric.ExternalMetrics; import ai.vespa.metricsproxy.metric.dimensions.ApplicationDimensions; @@ -111,6 +112,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC addMetricsProxyComponent(VespaMetrics.class); addHttpHandler(MetricsHandler.class, MetricsHandler.V1_PATH); addHttpHandler(PrometheusHandler.class, PrometheusHandler.V1_PATH); + addHttpHandler(YamasHandler.class, YamasHandler.V1_PATH); } private void addHttpHandler(Class<? extends ThreadedHttpRequestHandler> clazz, String bindingPath) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java index db29dbba306..be6f84c2a28 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerClusterTest.java @@ -6,6 +6,7 @@ package com.yahoo.vespa.model.admin.metricsproxy; import ai.vespa.metricsproxy.core.ConsumersConfig; import ai.vespa.metricsproxy.http.MetricsHandler; +import ai.vespa.metricsproxy.http.yamas.YamasHandler; import ai.vespa.metricsproxy.http.prometheus.PrometheusHandler; import ai.vespa.metricsproxy.metric.dimensions.ApplicationDimensionsConfig; import com.yahoo.component.ComponentSpecification; @@ -107,6 +108,7 @@ public class MetricsProxyContainerClusterTest { assertThat(handlerClasses, hasItem(ComponentSpecification.fromString(MetricsHandler.class.getName()))); assertThat(handlerClasses, hasItem(ComponentSpecification.fromString(PrometheusHandler.class.getName()))); + assertThat(handlerClasses, hasItem(ComponentSpecification.fromString(YamasHandler.class.getName()))); } @Test |