I'm giving it a 50/50 chance that there will be a military strike on Iran within the next 7 days. Only bombing/missiles, and it could be either the US or Israel.
Reasons why, Iran claims to have enriched uranium, and they are spewing
threats about destroying Israel which kind of puts their claim to a right of nuclear energy in question.
On the other hand, its clear that Iran wants to be attacked right now. So, from a strategic standpoint they may be calling Israel bluff. Usually countries don't blast rhetoric like this immediately before a military attack, and instead tried to hide what they are really doing (either D-day, or Egypt's invasion of Sinai.)
Either way, I don't think this problem is just going to go away on its own.