Water pump noticed some water?

There was a sound coming from around the alternator and the battery kept dying. Changed the alternator and but the sound didn't stop. I noticed some water on floorboard. I think it's the water pump. It isn't running hot or smoking. It won't idle long without going dead. Sound d seems to go away with acceleration. It runs fine unless idling. Also noticed a little oil in water resavour