Updated with new graphana an no es