Improve elasticsearch logging