I have had a number of kidney stones. Not fun. The first was the worst, and it was a heck of a story in itself. 2 hospitals, an ambulance ride to a second hospital during a blizzard that required a second ambulance. Then 3 days in the second hospital.
One of the ambulances had both attendants as female. They BOTH said that they'd given birth, and had kidney stones, and they each would much rather have another child before ever having another stone. Take that for what it's worth.
Water. Increase your water intake.
Salt. Decrease your salt intake.
---as was explained to my by a urologist, the kidney doesn't normally process out calcium. BUT, in the due process of removing excess salt from your blood, it ALSO takes out calcium. Hence why most stones are made-up of calcium. Another component of many stones is oxylate. That is found in a number of foods, such as spinach, swiss-chard, and rhubarb primarily, but smaller amounts are in many other foods too.
There's other things too, that the stones are/can-be made up of. Each person is different.
Over the years, out-of-the-blue I too have had 'repeat attacks' and have had different levels of intervention. The most painful part of the process is when they leave the kidney are travel (?) through the Ureter to the bladder. This is where moderate levels of STRONG pain-killers come into play. Also, is a particular "muscle relaxer" (I forget the name but it truly DOES work wonders at this point) to help 'ease' the passage. When those little bastards get stuck in your ureter, it is indescribable.
My sister found a 'tea' that supposedly helped reduce/dissolve the stones. I was skeptical as all hell, but had NOTHING to lose and gave it a try. "Cleavers Tea". (do your own search on it, it actually exists. Release-The-Ducks, google, whatever you use)
I SHIT YOU NOT, after drinking Cleaver's Tea for 3 straight days, I pissed out a kidney stone (ish). Obviously, we have one of those filter-funnel things for trapping these little bastards. The tea actually dissolved the stone. All ones previous were both solid and jagged (up to 5mm's) This one was 'skeletal' as well as 'crumbly' to-which there were quite a few 'little bits' that were caught in the filter. The point being, it obviously was bigger and 'solider' and the ONLY thing I can point a finger to is that Cleaver's Tea.
So yeah, we keep that stuff on hand now. And yeah, I too have been through the 'sit in the bath while we ultrasonically attempt to shatter the kidney-stone before it causes further problems' and I gotta say that the tea is a far simpler AND effective'r method of progress.
Take that for what it's worth, run with it, and prosper.
, lithotripsy procedure needed to remove kidney stones, and small ones taking up residency in my kidney that are still there but the worst I had was one lodged in the urethra just outside the kidney that required the surgeon to "go in the hard way." It was a short surgery 
but the first time I took a piss...
