Merge branch 'bjk/thanos_7d' into 'master'

Reduce local retention when using Thanos storage

See merge request !444
2 jobs for <span class="ref-name">bjk/thanos_query_cache_math</span> in 3 minutes and 26 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #189665905
rspec

00:01:52

 
  Lint
passed #189665906
cookstyle

00:01:33