updated to remove kibana (will be separate repo)