feat: add metric and fix querier int test flake#3207

pstibrany merged 2 commits intocortexproject:mastercortexproject/cortex:masterfrom

grafana:20200918_fix_flakgrafana/cortex:20200918_fix_flakCopy head branch name to clipboard