Add bucket and key as fields

Fixes https://github.com/elasticsearch/logstash/issues/1840