Commit d30a4ac4 authored by John Jarvis's avatar John Jarvis

Merge branch 'jts/adds-thanos-stuff' into 'master'

Adds thanos infra to the pre environment

See merge request !810
parents abe9dacf 5dae5b80