Free/libre software recommendations for network/deployment diagrams?

It's more a catalog of servers, specs, and what apps/DBs are running on them. Not too fussed about routers, firewalls, etc.

I'm using PlantUML deployment diagrams at the moment. It's OK but wondering if something is more suited.