Add M/Monit support

(cherry picked from commit 607c8f784ab0637e7882d65b18174fcf6e26e8d0)
(cherry picked from commit 2b0c0da01dbf6a953dc63d55672f848ed17552a5)