The Arizona Diamondbacks have agreed to terms on a deal with Eric Chavez.