Merge branch 'bjk/thanos_query_cache_math' into 'master'

Adjust Thanos settings

See merge request !446
2 jobs for master in 3 minutes and 37 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #189909037
rspec

00:02:02

 
  Lint
passed #189909038
cookstyle

00:01:34