diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2021-09-09 11:56:20 +0200 |
|---|---|---|
| committer | Ola Aunrønning <olaa@verizonmedia.com> | 2021-09-09 11:56:20 +0200 |
| commit | 63b42ada65ef4c9ca7903660c9ce265fadc67359 (patch) | |
| tree | 50e35e98e1bbd05c285270b3fc5423ffb4d7588f /config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring | |
| parent | 0bd1f4da69f10cfe5f4de2585a7973240e9b42f5 (diff) | |
Add vespa-cloud metric consumer
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring')
2 files changed, 5 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java index 6344e462e0f..b513c5d3021 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/MetricsConsumer.java @@ -35,6 +35,8 @@ public class MetricsConsumer { // Referenced from com.yahoo.vespa.hosted.provision.autoscale.NodeMetricsFetcher public static final MetricsConsumer autoscaling = consumer("autoscaling", autoscalingMetricSet); + public static final MetricsConsumer vespaCloud = + consumer("vespa-cloud", vespaMetricSet, systemMetricSet, networkMetricSet); private final String id; private final MetricSet metricSet; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java index 3efc50a7445..ac56143732d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/builder/xml/MetricsBuilder.java @@ -92,6 +92,9 @@ public class MetricsBuilder { if (consumerId.equalsIgnoreCase(MetricsConsumer.autoscaling.id())) throw new IllegalArgumentException("'" + MetricsConsumer.autoscaling.id() + " is not allowed as metrics consumer id (case is ignored.)"); + if (consumerId.equalsIgnoreCase(MetricsConsumer.vespaCloud.id())) + throw new IllegalArgumentException("'" + MetricsConsumer.vespaCloud.id() + " is not allowed as metrics consumer id (case is ignored.)"); + if (metrics.hasConsumerIgnoreCase(consumerId)) throw new IllegalArgumentException("'" + consumerId + "' is used as id for two metrics consumers (case is ignored.)"); } |