Merge branch 'bjk/thanos_flags' into 'master'

Tune additional Thanos flags

See merge request !447
2 jobs for <span class="ref-name">bjk/bump_am_prom</span> in 3 minutes and 32 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Test
passed #191567269
rspec

00:02:02

 
  Lint
passed #191567270
cookstyle

00:01:29