I use LibreOffice Draw for the diagrams.

It's pretty good. I like it because you can create connection lines between the shapes and text boxes.

It also has a feature for making mathematical equations, which is handy.