Adding host awareness to logstash reporting
change logstash around a bit
Merge branch 'better-logstash'