diff options
author | Ola Aunronning <olaa@yahooinc.com> | 2023-03-10 10:15:32 +0100 |
---|---|---|
committer | Ola Aunronning <olaa@yahooinc.com> | 2023-03-10 10:15:32 +0100 |
commit | bc8ce77595e7a2224bdfd973759bffa103f4a853 (patch) | |
tree | 53af09d801cc67537aa3667456e1e5a2e0d800ab /config-model/src/main/java/com | |
parent | 88bef544c54e3784e80dbcb8270dd2857d8a6559 (diff) |
Remove telegraf metrics-proxy integration
Diffstat (limited to 'config-model/src/main/java/com')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java | 40 |
1 files changed, 0 insertions, 40 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 5a1c3d87e5e..ec543dba6fb 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 @@ -20,9 +20,6 @@ import ai.vespa.metricsproxy.metric.dimensions.PublicDimensions; import ai.vespa.metricsproxy.rpc.RpcServer; import ai.vespa.metricsproxy.service.ConfigSentinelClient; import ai.vespa.metricsproxy.service.SystemPollerProvider; -import ai.vespa.metricsproxy.telegraf.Telegraf; -import ai.vespa.metricsproxy.telegraf.TelegrafConfig; -import ai.vespa.metricsproxy.telegraf.TelegrafRegistry; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.TreeConfigProducer; import com.yahoo.config.provision.ApplicationId; @@ -67,7 +64,6 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC ApplicationDimensionsConfig.Producer, ConsumersConfig.Producer, MonitoringConfig.Producer, - TelegrafConfig.Producer, MetricsNodesConfig.Producer { public static final Logger log = Logger.getLogger(MetricsProxyContainerCluster.class.getName()); @@ -124,8 +120,6 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC addHttpHandler(ApplicationMetricsHandler.class, ApplicationMetricsHandler.METRICS_V1_PATH); addMetricsProxyComponent(ApplicationMetricsRetriever.class); - - addTelegrafComponents(); } private void addHttpHandler(Class<? extends ThreadedHttpRequestHandler> clazz, String bindingPath) { @@ -142,15 +136,6 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC return metricsHandler; } - private void addTelegrafComponents() { - getAdmin().ifPresent(admin -> { - if (admin.getUserMetrics().usesExternalMetricSystems()) { - addMetricsProxyComponent(Telegraf.class); - addMetricsProxyComponent(TelegrafRegistry.class); - } - }); - } - @Override protected void doPrepare(DeployState deployState) { } @@ -180,31 +165,6 @@ 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()) { - var cloudWatchBuilder = new TelegrafConfig.CloudWatch.Builder(); - cloudWatchBuilder - .region(cloudWatch.region()) - .namespace(cloudWatch.namespace()) - .consumer(cloudWatch.consumer()); - - cloudWatch.hostedAuth().ifPresent(hostedAuth -> cloudWatchBuilder - .accessKeyName(hostedAuth.accessKeyName) - .secretKeyName(hostedAuth.secretKeyName)); - - cloudWatch.sharedCredentials().ifPresent(sharedCredentials -> { - cloudWatchBuilder.file(sharedCredentials.file); - sharedCredentials.profile.ifPresent(cloudWatchBuilder::profile); - }); - builder.cloudWatch(cloudWatchBuilder); - } - } - } protected boolean messageBusEnabled() { return false; } |