diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-02-27 11:21:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 11:21:34 +0100 |
| commit | ccc613e98f3b2cd0f69cb48715646c7093da8134 (patch) | |
| tree | bae9bcdf01ab2b6e603150effccd679ed6dc67da | |
| parent | 0b1ce5f0c2f709c1ef103269b87a08f933e3e44a (diff) | |
| parent | 7d7d6d838cd38407e5ae142511d94f19ca51a5fd (diff) | |
Merge pull request #12358 from vespa-engine/gjoranv/hosted-vespa-flag
Add flag that tells if this is hosted Vespa.
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java | 2 | ||||
| -rw-r--r-- | metrics-proxy/src/main/resources/configdefinitions/telegraf.def | 2 |
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 b30cf9248a1..9c68b3eb28a 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 @@ -177,6 +177,8 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC @Override public void getConfig(TelegrafConfig.Builder builder) { + builder.isHostedVespa(isHostedVespa()); + var userConsumers = getUserMetricsConsumers(); for (var consumer : userConsumers.values()) { for (var cloudWatch : consumer.cloudWatches()) { diff --git a/metrics-proxy/src/main/resources/configdefinitions/telegraf.def b/metrics-proxy/src/main/resources/configdefinitions/telegraf.def index 6abbd7921b5..cb03ce6f1f6 100644 --- a/metrics-proxy/src/main/resources/configdefinitions/telegraf.def +++ b/metrics-proxy/src/main/resources/configdefinitions/telegraf.def @@ -1,6 +1,8 @@ # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package=ai.vespa.metricsproxy.telegraf +isHostedVespa bool default=false + # Metrics pull/push interval intervalSeconds int default=60 |