custom monitoring
Merge branch 'new/cm-api'
Merge branch 'master' into gh-pages
add custom monitoring