Merge "log-logstash is now a daemonSet"