Change ES Endpoint & metrics mapping for ES 1.0