ensure "splunk stop" is run on shutdown

2 files changed, 14 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java
index a01d061c21f..cc1369c2470 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java
@@ -5,6 +5,7 @@ import com.yahoo.cloud.config.LogforwarderConfig;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.PortAllocBridge;
+import java.util.Optional;
 
 public class LogForwarder extends AbstractService implements LogforwarderConfig.Producer {
 
@@ -79,4 +80,13 @@ public class LogForwarder extends AbstractService implements LogforwarderConfig.
         }
     }
 
+    @Override
+    public Optional<String> getPreShutdownCommand() {
+        var builder = new LogforwarderConfig.Builder();
+        getConfig(builder);
+        var cfg = new LogforwarderConfig(builder);
+        var home = cfg.splunkHome();
+        return Optional.of("/usr/bin/env SPLUNK_HOME="+home+" "+home+"/bin/splunk stop");
+    }
+
 }
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 0866e1174ee..171958f2bfa 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -929,6 +929,10 @@ public class ModelProvisioningTest {
         assertNull(hostResource.getService("logserver"));
         assertNotNull(hostResource.getService("container"));
         assertNotNull(hostResource.getService("logforwarder"));
+
+        var lfs = hostResource.getService("logforwarder");
+        String shutdown = lfs.getPreShutdownCommand().orElse("<none>");
+        assertThat(shutdown, is("/usr/bin/env SPLUNK_HOME=/opt/splunkforwarder /opt/splunkforwarder/bin/splunk stop"));
     }