add monitor host
add override sentry role
Merge branch 'master' into develop