Merge "Add elasticsearch output & memory buffer"