Merge branch 'bjk/thanos-retention' into 'master'

Fix up Thanos compact flags

See merge request !445
2 jobs for master in 4 minutes and 15 seconds (queued for 11 seconds)
Status Job ID Name Coverage
  Test
passed #185404472
rspec

00:02:45

 
  Lint
passed #185404473
cookstyle

00:01:29