Merge "Remove redundant filebeat from portal-db"