I Have Had Kidney Stones In The Past And Feel

I have had kidney stones in the past and feel like I may have another. Pain in my back, dull to sharp at times, nausea, and chills. It's not to the point of going to the ER, but is annoying and wakes me up at times. Is there anything I can do besides drink a lot of water?