Merge branch 'milestone/monitoring' of https://github.com/painless-security/trust...