Jason Grilli and the Braves have reached an agreement on a two-year, $8.25 million deal that includes a $3 million option for the 2017 season.