More general elasticsearch query alert

In progress - failing test