refactor

16 jobs for !894 with 820_separate_logstash_tcpserver in 41 minutes and 48 seconds (queued for 1 second)
merge request