Improve monitoring e2e test.
Merge pull request #3079 from vishh/fix_monitoring

Improve monitoring e2e test.