Add possibility to measure water usage to the Energy dashboard

It would be very nice to extend the energy dashboard and add the water usage tracking. It would be similar to Gas, but on a separate graph.
I have tried to add water usage as Gas source, but the frontend mixes up gas and water

Duplicate.