Add more elasticsearch stats

Plus a few fixes for variations in elasticsearch versions.