The former Oldham and Aberdeen centre-half was without a club after being released by the Latics in May.
Diamond, 27, was appointed skipper at Boundary Park during an impressive stay but was forced to move on after a clause in his contract proved too expensive for the League One club.
The Scot is Gary Rowett's second signing of the summer following the addition of midfielder Robbie Weir.
Opta bring us the key stats ahead of the More »
Pitchside Europe - 11 hours agoTonight is Germany's time to shine in the More »
Early Doors - 14 hours agoArsene Wenger says Bayern Munich's financial More »
Arsene Wenger - Fri, May 24, 2013 20:44 BSTIf Muhammad Ali was once named the Louisville More »
Pitchside Europe - Fri, May 24, 2013 12:27 BSTJim White says England should pay close attention More »
Jim White - Fri, May 24, 2013 12:10 BST