diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-02-27 11:34:56 +0100 |
|---|---|---|
| committer | Ola Aunrønning <olaa@verizonmedia.com> | 2020-02-27 11:34:56 +0100 |
| commit | 2f56dc4e5aa81f1b28446569a44fb2c584337213 (patch) | |
| tree | ba4c0925ecffe719d03e280a379f1996fbc63861 /metrics-proxy | |
| parent | ccc613e98f3b2cd0f69cb48715646c7093da8134 (diff) | |
Determine metrics API protocol based on isHostedVespa
Diffstat (limited to 'metrics-proxy')
4 files changed, 5 insertions, 3 deletions
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/telegraf/Telegraf.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/telegraf/Telegraf.java index 2afc0267434..c12cf5b2e09 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/telegraf/Telegraf.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/telegraf/Telegraf.java @@ -43,6 +43,7 @@ public class Telegraf extends AbstractComponent { context.put("logFilePath", TELEGRAF_LOG_FILE_PATH); context.put("intervalSeconds", telegrafConfig.intervalSeconds()); context.put("cloudwatchPlugins", telegrafConfig.cloudWatch()); + context.put("protocol", telegrafConfig.isHostedVespa() ? "https" : "http"); // TODO: Add node cert if hosted VelocityEngine velocityEngine = new VelocityEngine(); diff --git a/metrics-proxy/src/main/resources/templates/telegraf.conf.vm b/metrics-proxy/src/main/resources/templates/telegraf.conf.vm index e99bab8b02d..5a5f2d5f712 100644 --- a/metrics-proxy/src/main/resources/templates/telegraf.conf.vm +++ b/metrics-proxy/src/main/resources/templates/telegraf.conf.vm @@ -31,7 +31,7 @@ # Configuration for Vespa input plugin [[inputs.vespa]] - url = "http://localhost:19092/metrics/v2/values?consumer=$cloudwatch.consumer()" + url = "${protocol}://localhost:19092/metrics/v2/values?consumer=$cloudwatch.consumer()" [inputs.vespa.tags] vespa_consumer = "$cloudwatch.consumer()" #* TODO: Add node cert if hosted diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/telegraf/TelegrafTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/telegraf/TelegrafTest.java index 9ad31a0d9e8..d35cc12918c 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/telegraf/TelegrafTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/telegraf/TelegrafTest.java @@ -32,6 +32,7 @@ public class TelegrafTest { .consumer("consumer2") ) .intervalSeconds(300) + .isHostedVespa(true) .build(); StringWriter stringWriter = new StringWriter(); Telegraf.writeConfig(telegrafConfig, stringWriter); diff --git a/metrics-proxy/src/test/resources/telegraf-config-with-two-cloudwatch-plugins.txt b/metrics-proxy/src/test/resources/telegraf-config-with-two-cloudwatch-plugins.txt index accd2cc87eb..3569703ad03 100644 --- a/metrics-proxy/src/test/resources/telegraf-config-with-two-cloudwatch-plugins.txt +++ b/metrics-proxy/src/test/resources/telegraf-config-with-two-cloudwatch-plugins.txt @@ -26,7 +26,7 @@ # Configuration for Vespa input plugin [[inputs.vespa]] - url = "http://localhost:19092/metrics/v2/values?consumer=consumer1" + url = "https://localhost:19092/metrics/v2/values?consumer=consumer1" [inputs.vespa.tags] vespa_consumer = "consumer1" # Configuration for AWS CloudWatch output. @@ -40,7 +40,7 @@ # Configuration for Vespa input plugin [[inputs.vespa]] - url = "http://localhost:19092/metrics/v2/values?consumer=consumer2" + url = "https://localhost:19092/metrics/v2/values?consumer=consumer2" [inputs.vespa.tags] vespa_consumer = "consumer2" |