Set telegraf log path under Vespa home

3 files changed, 5 insertions, 2 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 42c8a13e626..2afc0267434 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
@@ -6,6 +6,7 @@ import com.yahoo.component.AbstractComponent;
 import com.yahoo.log.LogLevel;
 import com.yahoo.system.execution.ProcessExecutor;
 import com.yahoo.system.execution.ProcessResult;
+import com.yahoo.vespa.defaults.Defaults;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
@@ -24,6 +25,7 @@ public class Telegraf extends AbstractComponent {
 
     private static final String TELEGRAF_CONFIG_PATH = "/etc/telegraf/telegraf.conf";
     private static final String TELEGRAF_CONFIG_TEMPLATE_PATH = "templates/telegraf.conf.vm";
+    private static final String TELEGRAF_LOG_FILE_PATH = Defaults.getDefaults().underVespaHome("logs/telegraf/telegraf.log");
     private final TelegrafRegistry telegrafRegistry;
 
     private static final Logger logger = Logger.getLogger(Telegraf.class.getName());
@@ -38,6 +40,7 @@ public class Telegraf extends AbstractComponent {
 
     protected static void writeConfig(TelegrafConfig telegrafConfig, Writer writer) {
         VelocityContext context = new VelocityContext();
+        context.put("logFilePath", TELEGRAF_LOG_FILE_PATH);
         context.put("intervalSeconds", telegrafConfig.intervalSeconds());
         context.put("cloudwatchPlugins", telegrafConfig.cloudWatch());
         // TODO: Add node cert if hosted
diff --git a/metrics-proxy/src/main/resources/templates/telegraf.conf.vm b/metrics-proxy/src/main/resources/templates/telegraf.conf.vm
index c427ee1ce4b..e99bab8b02d 100644
--- a/metrics-proxy/src/main/resources/templates/telegraf.conf.vm
+++ b/metrics-proxy/src/main/resources/templates/telegraf.conf.vm
@@ -9,7 +9,7 @@
   flush_jitter = "0s"
   precision = ""
   logtarget = "file"
-  logfile = "/var/log/telegraf/telegraf.log"
+  logfile = "$logFilePath"
   logfile_rotation_interval = "1d"
   logfile_rotation_max_size = "20MB"
   logfile_rotation_max_archives = 5
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 85656465901..accd2cc87eb 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
@@ -9,7 +9,7 @@
   flush_jitter = "0s"
   precision = ""
   logtarget = "file"
-  logfile = "/var/log/telegraf/telegraf.log"
+  logfile = "/opt/vespa/logs/telegraf/telegraf.log"
   logfile_rotation_interval = "1d"
   logfile_rotation_max_size = "20MB"
   logfile_rotation_max_archives = 5