I like that approach, how do you determine if it has water in it? Does it separate from the diesel if you let it sit a while?
Instead of a yellowish color, depending on the fuel source, farm fuel, etc, it will appear cloudy with tiny globules of water mixed in with the fuel. I suggest you take a few samples to see what normal fuel looks like and then, you'll know the difference when you have one with water in it. Given a couple of hours, the water will physically separate from the fuel. When it does this, the water will appear very milky to somewhat brown depending on the color additives in the diesel fuel.
If you've ever seen what coolant looks like when you have a blown head gasket in a gasoline vehicle and there's a bit of oil in it, it will initially appear a lot like that from the fuel sample you take at the first filter. If you ever see that, it's best to drain until you get clear fuel. Then, replace the first stage fuel filter. I've already got one on the way to me just in case although, being in Florida, it's less likely to happen. Keeping your fuel topped off as much as possible, especially during large temperature changes, will prevent the natural formation of water. If the source is contaminated, you'll just have to proceed with the basic steps I've posted here.
The worst I ever had was with an old Deuce and a Half. It had three gallons of bad fuel drained before I got clear fuel. Had to replace all three filters to get her running right. Being an old Army truck, the fuel pumps and injectors didn't die.